From cc80f8ef1f67d4d60da8c63e1b165491378779de Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Tue, 16 Jan 2024 14:11:06 -0800
Subject: [PATCH 01/66] Add ZST references to GhostPtrToken based on thesis

---
 creusot-contracts/src/ghost_ptr.rs | 154 ++++++++++++++++++++++++-----
 1 file changed, 127 insertions(+), 27 deletions(-)

diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index bc31353e43..95162e1a17 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -1,12 +1,26 @@
 // Inspired by https://plv.mpi-sws.org/rustbelt/ghostcell/ https://rust-unofficial.github.io/too-many-lists/fifth.html
 use crate::{logic::FMap, *};
-use ::std::marker::PhantomData;
+use ::std::{
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
 
 /// Models a fragment of the heap that maps the [`GhostPtr`]s it has permission to their value.
 /// At most one [`GhostToken`] has permission to each [`GhostPtr`]
 /// No [`GhostToken`] has permission to a dangling [`GhostPtr`]
 #[trusted]
-pub struct GhostPtrToken<T: ?Sized>(Ghost<FMap<GhostPtr<T>, T>>, PhantomData<T>);
+pub struct GhostPtrToken<T: ?Sized>(PhantomData<T>);
+
+/// ZST equivalent of [`&'a GhostPtrToken<T>`](GhostPtrToken)
+/// Can be created using [`GhostPtrToken::borrow`]
+#[trusted]
+#[derive(Copy, Clone)]
+pub struct GhostPtrTokenRef<'a, T: ?Sized>(PhantomData<&'a T>);
+
+/// ZST equivalent of [`&'a mut GhostPtrToken<T>`](GhostPtrToken)
+/// Can be created using [`GhostPtrToken::borrow_mut`]
+#[trusted]
+pub struct GhostPtrTokenMut<'a, T: ?Sized>(PhantomData<&'a mut T>);
 
 /// Thin wrapper over a raw pointer managed by a [`GhostPtr`]
 pub type GhostPtr<T> = *const T;
@@ -26,7 +40,7 @@ impl<T: ?Sized> GhostPtrToken<T> {
     /// Creates a new [`GhostPtr`] that has no permission
     #[ensures(result@ == FMap::empty())]
     pub fn new() -> Self {
-        GhostPtrToken(gh!(FMap::empty()), PhantomData)
+        GhostPtrToken(PhantomData)
     }
 
     #[trusted]
@@ -68,35 +82,12 @@ impl<T: ?Sized> GhostPtrToken<T> {
         unsafe { &*ptr }
     }
 
-    /// Shrinks the view of the `self` so that it's model is now new-model
-    #[trusted]
-    #[requires(_new_model.subset(self@))]
-    #[ensures(result@ == *_new_model)]
-    pub fn shrink_token_ref(&self, _new_model: Ghost<FMap<*const T, T>>) -> &GhostPtrToken<T> {
-        self
-    }
-
-    /// Mutably borrows `ptr` and shrinks `t` so that it can no longer be used to access `ptr`
-    // Safety no other token has permission to `self`
-    // `t` can no longer be used to access `ptr`
-    #[trusted]
-    #[requires((**self)@.contains(ptr))]
-    #[ensures(*result == *(**self)@.lookup_unsized(ptr))]
-    #[ensures((*^self)@ == (**self)@.remove(ptr))]
-    #[ensures((^*self)@ == (^^self)@.insert(ptr, ^result))]
-    // #[ensures(!(^^t)@.contains(ptr))]
-    // ^~ It shouldn't have been possible to add pointer to `t` while we were holding a mutable reference to the pointer
-    pub fn take_mut<'o, 'i>(self: &'o mut &'i mut GhostPtrToken<T>, ptr: *const T) -> &'i mut T {
-        unsafe { &mut *(ptr as *mut _) }
-    }
-
     /// Mutably borrows `ptr`
     #[requires(self@.contains(ptr))]
     #[ensures(*result == *(*self)@.lookup_unsized(ptr))]
     #[ensures((^self)@ == (*self)@.insert(ptr, ^result))]
     pub fn ptr_as_mut(&mut self, ptr: *const T) -> &mut T {
-        let mut t = self;
-        t.take_mut(ptr)
+        self.borrow_mut().take_mut(ptr)
     }
 
     /// Transfers ownership of `ptr` back into a `Box`
@@ -119,6 +110,21 @@ impl<T: ?Sized> GhostPtrToken<T> {
     /// Leaks memory iff the precondition fails
     #[requires(self@.is_empty())]
     pub fn drop(self) {}
+
+    /// Convert a shared reference in an equivalent ZST
+    #[trusted]
+    #[ensures(result@ == self@)]
+    pub fn borrow(&self) -> GhostPtrTokenRef<'_, T> {
+        GhostPtrTokenRef(PhantomData)
+    }
+
+    /// Convert a mutable reference in an equivalent ZST
+    #[trusted]
+    #[ensures(result.curr() == (*result)@)]
+    #[ensures(result.fin() == (^result)@)]
+    pub fn borrow_mut(&mut self) -> GhostPtrTokenMut<'_, T> {
+        GhostPtrTokenMut(PhantomData)
+    }
 }
 
 impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
@@ -140,6 +146,100 @@ impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
     }
 }
 
+impl<'a, T: ?Sized> ShallowModel for GhostPtrTokenRef<'a, T> {
+    type ShallowModelTy = FMap<GhostPtr<T>, T>;
+
+    #[trusted]
+    #[ghost]
+    #[open(self)]
+    fn shallow_model(self) -> Self::ShallowModelTy {
+        absurd
+    }
+}
+
+impl<'a, T: ?Sized> Deref for GhostPtrTokenRef<'a, T> {
+    type Target = GhostPtrToken<T>;
+
+    #[trusted]
+    #[ensures(result@ == self@)]
+    fn deref(&self) -> &Self::Target {
+        &GhostPtrToken(PhantomData)
+    }
+}
+
+impl<'a, T: ?Sized> GhostPtrTokenRef<'a, T> {
+    /// Shrinks the view of the `self` so that it's model is now new-model
+    #[trusted]
+    #[requires(_new_model.subset(self@))]
+    #[ensures(result@ == *_new_model)]
+    pub fn shrink_token_ref(self, _new_model: Ghost<FMap<*const T, T>>) -> Self {
+        self
+    }
+}
+
+impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
+    #[trusted]
+    #[ghost]
+    #[open(self)]
+    pub fn curr(self) -> FMap<GhostPtr<T>, T> {
+        absurd
+    }
+
+    #[trusted]
+    #[logic]
+    #[open(self)]
+    pub fn fin(self) -> FMap<GhostPtr<T>, T> {
+        absurd
+    }
+
+    #[ensures(self.fin() == self.cur())]
+    #[ensures(result@ == self.cur())]
+    pub fn shr(self) -> GhostPtrTokenRef<'a, T> {
+        GhostPtrTokenRef(PhantomData)
+    }
+
+    /// Mutably borrows `ptr` and shrinks `t` so that it can no longer be used to access `ptr`
+    // Safety no other token has permission to `self`
+    // `t` can no longer be used to access `ptr`
+    #[trusted]
+    #[requires((*self).curr().contains(ptr))]
+    #[ensures(*result == *(*self).curr().lookup_unsized(ptr))]
+    #[ensures((^self).curr() == (*self).curr().remove(ptr))]
+    #[ensures((*self).fin() == (^self).fin().insert(ptr, ^result))]
+    #[ensures(!(^self).fin().contains(ptr))]
+    pub fn take_mut(&mut self, ptr: *const T) -> &'a mut T {
+        unsafe { &mut *(ptr as *mut _) }
+    }
+}
+
+impl<'a, T> Deref for GhostPtrTokenMut<'a, T> {
+    type Target = GhostPtrToken<T>;
+
+    #[trusted]
+    #[ensures(result@ == self.curr())]
+    fn deref(&self) -> &Self::Target {
+        &GhostPtrToken(PhantomData)
+    }
+}
+
+impl<'a, T> DerefMut for GhostPtrTokenMut<'a, T> {
+    #[trusted]
+    #[ensures((*result)@ == (*self).curr())]
+    #[ensures((^self).curr() == (^result)@)]
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        Box::leak(Box::new(GhostPtrToken(PhantomData)))
+    }
+}
+
+#[trusted]
+impl<'a, T> Resolve for GhostPtrTokenMut<'a, T> {
+    #[logic]
+    #[open]
+    fn resolve(self) -> bool {
+        self.curr() == self.fin()
+    }
+}
+
 pub trait GhostPtrExt<T: ?Sized>: Sized {
     #[ghost]
     fn null_logic() -> Self;

From 73bc5385aa0e7a6792599b4ee12533bcd4e20084 Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Fri, 26 Jan 2024 11:33:11 -0800
Subject: [PATCH 02/66] Guaranteed that the ptr::null().addr() == 0

---
 creusot-contracts/src/ghost_ptr.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index 95162e1a17..6df84ae1ef 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -132,7 +132,7 @@ impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
     #[open(self)]
     #[ghost]
     #[ensures(forall<t: GhostPtrToken<T>> !t@.contains(result))]
-    // #[ensures(result.addr_logic() == 0@)]
+    #[ensures(result.addr_logic() == 0@)]
     #[ensures(forall<ptr: GhostPtr<T>> ptr.addr_logic() == result.addr_logic() ==> ptr == result)]
     fn null_logic() -> Self {
         absurd

From 267f0775d18689999ff0bb7c682aa8e9b3310bea Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Fri, 26 Jan 2024 13:26:06 -0800
Subject: [PATCH 03/66] Fixes

---
 creusot-contracts/src/ghost_ptr.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index 6df84ae1ef..c02ed743ce 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -1,5 +1,5 @@
 // Inspired by https://plv.mpi-sws.org/rustbelt/ghostcell/ https://rust-unofficial.github.io/too-many-lists/fifth.html
-use crate::{logic::FMap, *};
+use crate::{logic::FMap, Clone, *};
 use ::std::{
     marker::PhantomData,
     ops::{Deref, DerefMut},
@@ -120,8 +120,8 @@ impl<T: ?Sized> GhostPtrToken<T> {
 
     /// Convert a mutable reference in an equivalent ZST
     #[trusted]
-    #[ensures(result.curr() == (*result)@)]
-    #[ensures(result.fin() == (^result)@)]
+    #[ensures(result.curr() == (*self)@)]
+    #[ensures(result.fin() == (^self)@)]
     pub fn borrow_mut(&mut self) -> GhostPtrTokenMut<'_, T> {
         GhostPtrTokenMut(PhantomData)
     }
@@ -132,7 +132,7 @@ impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
     #[open(self)]
     #[ghost]
     #[ensures(forall<t: GhostPtrToken<T>> !t@.contains(result))]
-    #[ensures(result.addr_logic() == 0@)]
+    #[ensures(result.addr_logic() == 0)]
     #[ensures(forall<ptr: GhostPtr<T>> ptr.addr_logic() == result.addr_logic() ==> ptr == result)]
     fn null_logic() -> Self {
         absurd
@@ -192,8 +192,8 @@ impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
         absurd
     }
 
-    #[ensures(self.fin() == self.cur())]
-    #[ensures(result@ == self.cur())]
+    #[ensures(self.fin() == self.curr())]
+    #[ensures(result@ == self.curr())]
     pub fn shr(self) -> GhostPtrTokenRef<'a, T> {
         GhostPtrTokenRef(PhantomData)
     }
@@ -233,7 +233,7 @@ impl<'a, T> DerefMut for GhostPtrTokenMut<'a, T> {
 
 #[trusted]
 impl<'a, T> Resolve for GhostPtrTokenMut<'a, T> {
-    #[logic]
+    #[predicate]
     #[open]
     fn resolve(self) -> bool {
         self.curr() == self.fin()

From 887d58426f20a21565bb0be5a923e01fdc2d76c8 Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Sat, 27 Jan 2024 10:42:07 -0800
Subject: [PATCH 04/66] Improve GhostPtrToken::take_mut documentation and added
 test

---
 creusot-contracts/src/ghost_ptr.rs            |  26 +-
 creusot-contracts/src/logic/fmap.rs           |   5 +-
 .../should_succeed/ghost_ptr_token.mlcfg      | 509 ++++++++++++++++++
 .../tests/should_succeed/ghost_ptr_token.rs   |  18 +
 4 files changed, 555 insertions(+), 3 deletions(-)
 create mode 100644 creusot/tests/should_succeed/ghost_ptr_token.mlcfg
 create mode 100644 creusot/tests/should_succeed/ghost_ptr_token.rs

diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index c02ed743ce..c2b8b8a09e 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -198,9 +198,31 @@ impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
         GhostPtrTokenRef(PhantomData)
     }
 
-    /// Mutably borrows `ptr` and shrinks `t` so that it can no longer be used to access `ptr`
+    /// Mutably borrows `ptr` and shrinks `self` so that it can no longer be used to access `ptr`
+    ///
+    /// This function can be used to get multiple mutable references to non-aliasing pointers at the same time
+    ///
+    /// ```
+    /// use creusot_contracts::ghost_ptr::GhostPtrToken;
+    ///
+    /// let mut token = GhostPtrToken::new();
+    /// let ptr1 = token.ptr_from_box(Box::new(1));
+    /// let ptr2 = token.ptr_from_box(Box::new(2));
+    ///
+    /// let mut token_mut = token.borrow_mut();
+    /// let m1 = token_mut.take_mut(ptr1);
+    /// // let m1_alias = token_mut.take_mut(ptr1); // Verification Error
+    /// let m2 = token_mut.take_mut(ptr2);
+    ///
+    /// assert_eq!(*m1, 1);
+    /// assert_eq!(*m2, 2);
+    ///
+    /// core::mem::swap(m1, m2);
+    /// assert_eq!(*token.ptr_as_ref(ptr1), 2);
+    /// assert_eq!(*token.ptr_as_ref(ptr2), 1);
+    /// ```
     // Safety no other token has permission to `self`
-    // `t` can no longer be used to access `ptr`
+    // `self` can no longer be used to access `ptr`
     #[trusted]
     #[requires((*self).curr().contains(ptr))]
     #[ensures(*result == *(*self).curr().lookup_unsized(ptr))]
diff --git a/creusot-contracts/src/logic/fmap.rs b/creusot-contracts/src/logic/fmap.rs
index 1300eede27..d67d4e7487 100644
--- a/creusot-contracts/src/logic/fmap.rs
+++ b/creusot-contracts/src/logic/fmap.rs
@@ -57,6 +57,7 @@ impl<K, V: ?Sized> FMap<K, V> {
 
     #[ghost]
     #[open]
+    #[why3::attr = "inline:trivial"]
     pub fn lookup_unsized(self, k: K) -> SizedW<V> {
         unwrap(self.get(k))
     }
@@ -73,6 +74,7 @@ impl<K, V: ?Sized> FMap<K, V> {
 
     #[ghost]
     #[open]
+    #[why3::attr = "inline:trivial"]
     pub fn contains(self, k: K) -> bool {
         self.get(k) != None
     }
@@ -129,10 +131,11 @@ impl<K, V: ?Sized> FMap<K, V> {
     }
 
     #[ghost]
-    #[open]
+    #[open(self)]
     #[requires(other.subset(self))]
     #[ensures(result.disjoint(other))]
     #[ensures(other.union(result).ext_eq(self))]
+    #[ensures(forall<k: K> result.get(k) == if other.contains(k) {None} else {self.get(k)})]
     pub fn subtract(self, other: Self) -> Self {
         self.subtract_keys(other)
     }
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
new file mode 100644
index 0000000000..17e01fea41
--- /dev/null
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -0,0 +1,509 @@
+
+module CreusotContracts_GhostPtr_GhostPtrToken_Type
+  type t_ghostptrtoken 't
+end
+module CreusotContracts_GhostPtr_GhostPtrTokenMut_Type
+  type t_ghostptrtokenmut 't
+end
+module CreusotContracts_Logic_Fmap_FMap_Type
+  type t_fmap 'k 'v
+end
+module Core_Panicking_AssertKind_Type
+  type t_assertkind  =
+    | C_Eq
+    | C_Ne
+    | C_Match
+    
+end
+module Core_Option_Option_Type
+  type t_option 't =
+    | C_None
+    | C_Some 't
+    
+end
+module Core_Ptr_NonNull_NonNull_Type
+  use prelude.Opaque
+  type t_nonnull 't =
+    | C_NonNull opaque_ptr
+    
+end
+module Core_Marker_PhantomData_Type
+  type t_phantomdata 't =
+    | C_PhantomData
+    
+end
+module Core_Ptr_Unique_Unique_Type
+  use Core_Marker_PhantomData_Type as Core_Marker_PhantomData_Type
+  use Core_Ptr_NonNull_NonNull_Type as Core_Ptr_NonNull_NonNull_Type
+  type t_unique 't =
+    | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
+    
+end
+module Alloc_Boxed_Box_Type
+  use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
+  type t_box 't 'a =
+    | C_Box (Core_Ptr_Unique_Unique_Type.t_unique 't) 'a
+    
+end
+module Alloc_Alloc_Global_Type
+  type t_global  =
+    | C_Global
+    
+end
+module GhostPtrToken_Test
+  use prelude.Int32
+  use prelude.Opaque
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant7 (self : Core_Option_Option_Type.t_option int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant7 (self : Core_Option_Option_Type.t_option int32) : bool
+    ensures { result = invariant7 self }
+    
+  predicate inv7 (_x : Core_Option_Option_Type.t_option int32)
+  val inv7 (_x : Core_Option_Option_Type.t_option int32) : bool
+    ensures { result = inv7 _x }
+    
+  axiom inv7 : forall x : Core_Option_Option_Type.t_option int32 . inv7 x = true
+  use map.Map
+  predicate invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+    ensures { result = invariant6 self }
+    
+  predicate inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32))
+  val inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+    ensures { result = inv6 _x }
+    
+  axiom inv6 : forall x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32) . inv6 x = true
+  predicate invariant5 (self : int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant5 (self : int32) : bool
+    ensures { result = invariant5 self }
+    
+  predicate inv5 (_x : int32)
+  val inv5 (_x : int32) : bool
+    ensures { result = inv5 _x }
+    
+  axiom inv5 : forall x : int32 . inv5 x = true
+  predicate invariant4 (self : opaque_ptr) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant4 (self : opaque_ptr) : bool
+    ensures { result = invariant4 self }
+    
+  predicate inv4 (_x : opaque_ptr)
+  val inv4 (_x : opaque_ptr) : bool
+    ensures { result = inv4 _x }
+    
+  axiom inv4 : forall x : opaque_ptr . inv4 x = true
+  use CreusotContracts_Logic_Fmap_FMap_Type as CreusotContracts_Logic_Fmap_FMap_Type
+  predicate invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+    ensures { result = invariant3 self }
+    
+  predicate inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32)
+  val inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+    ensures { result = inv3 _x }
+    
+  axiom inv3 : forall x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . inv3 x = true
+  predicate invariant2 (self : int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant2 (self : int32) : bool
+    ensures { result = invariant2 self }
+    
+  predicate inv2 (_x : int32)
+  val inv2 (_x : int32) : bool
+    ensures { result = inv2 _x }
+    
+  axiom inv2 : forall x : int32 . inv2 x = true
+  use prelude.Borrow
+  predicate invariant1 (self : borrowed int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant1 (self : borrowed int32) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv1 (_x : borrowed int32)
+  val inv1 (_x : borrowed int32) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : borrowed int32 . inv1 x = true
+  predicate invariant0 (self : int32) =
+    [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant0 (self : int32) : bool
+    ensures { result = invariant0 self }
+    
+  predicate inv0 (_x : int32)
+  val inv0 (_x : int32) : bool
+    ensures { result = inv0 _x }
+    
+  use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
+  axiom inv0 : forall x : int32 . inv0 x = true
+  use prelude.Opaque
+  use Core_Panicking_AssertKind_Type as Core_Panicking_AssertKind_Type
+  use CreusotContracts_GhostPtr_GhostPtrToken_Type as CreusotContracts_GhostPtr_GhostPtrToken_Type
+  function unreachable0 (_1 : ()) : int32
+  val unreachable0 (_1 : ()) : int32
+    requires {[#"../../../../creusot-contracts/src/util.rs" 24 11 24 16] false}
+    ensures { result = unreachable0 _1 }
+    
+  axiom unreachable0_spec : forall _1 : () . ([#"../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
+  function unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
+  val unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
+    requires {[#"../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None}
+    requires {[#"../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv7 op}
+    ensures { result = unwrap0 op }
+    
+  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv7 op) -> ([#"../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
+  use map.Map
+  function mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = mk0 _m }
+    
+  function view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
+    
+  val view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self}
+    ensures { result = view0 self }
+    
+  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv6 (view0 self)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
+  function get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/fmap.rs" 55 8 55 26] Map.get (view0 self) k
+  val get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
+    ensures { result = get0 self k }
+    
+  function lookup_unsized0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/fmap.rs" 62 8 62 27] unwrap0 (get0 self k)
+  val lookup_unsized0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+    ensures { result = lookup_unsized0 self k }
+    
+  function contains0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/fmap.rs" 79 8 79 27] get0 self k <> Core_Option_Option_Type.C_None
+  val contains0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
+    ensures { result = contains0 self k }
+    
+  function shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = shallow_model0 self }
+    
+  function shallow_model1 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+   =
+    [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model0 self
+  val shallow_model1 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = shallow_model1 self }
+    
+  val ptr_as_ref0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) (ptr : opaque_ptr) : int32
+    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 79 4 79 36] contains0 (shallow_model1 self) ptr}
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 80 14 80 51] result = lookup_unsized0 (shallow_model1 self) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 81 4 81 49] inv2 result }
+    
+  predicate resolve2 (self : borrowed int32) =
+    [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
+  val resolve2 (self : borrowed int32) : bool
+    ensures { result = resolve2 self }
+    
+  val swap0 (x : borrowed int32) (y : borrowed int32) : ()
+    requires {inv1 x}
+    requires {inv1 y}
+    ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 11 22 11 30]  ^ x =  * y }
+    ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 12 22 12 30]  ^ y =  * x }
+    
+  predicate resolve3 (self : int32) =
+    [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
+  val resolve3 (self : int32) : bool
+    ensures { result = resolve3 self }
+    
+  predicate resolve1 (self : (int32, int32)) =
+    [#"../../../../creusot-contracts/src/resolve.rs" 16 8 16 60] resolve3 (let (a, _) = self in a) /\ resolve3 (let (_, a) = self in a)
+  val resolve1 (self : (int32, int32)) : bool
+    ensures { result = resolve1 self }
+    
+  use CreusotContracts_GhostPtr_GhostPtrTokenMut_Type as CreusotContracts_GhostPtr_GhostPtrTokenMut_Type
+  function fin0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val fin0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = fin0 self }
+    
+  function curr0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val curr0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = curr0 self }
+    
+  predicate resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) =
+    [#"../../../../creusot-contracts/src/ghost_ptr.rs" 261 8 261 33] curr0 self = fin0 self
+  val resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : bool
+    ensures { result = resolve0 self }
+    
+  use prelude.Int
+  function len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
+  val len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self}
+    ensures { result = len0 self }
+    
+  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
+  use map.Map
+  function make_sized0 (self : int32) : int32
+  val make_sized0 (self : int32) : int32
+    requires {[#"../../../../creusot-contracts/src/util.rs" 16 18 16 22] inv5 self}
+    ensures { result = make_sized0 self }
+    
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../creusot-contracts/src/util.rs" 16 18 16 22] inv5 self) -> ([#"../../../../creusot-contracts/src/util.rs" 16 4 16 39] inv0 (make_sized0 self)) && ([#"../../../../creusot-contracts/src/util.rs" 15 14 15 29] make_sized0 self = self)
+  function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self}
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k}
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v}
+    ensures { result = insert0 self k v }
+    
+  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv3 (insert0 self k v)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
+  function remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self}
+    requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k}
+    ensures { result = remove0 self k }
+    
+  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv3 (remove0 self k)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
+    len0 self - 1
+  else
+    len0 self
+  )) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 45 14 45 55] view0 (remove0 self k) = Map.set (view0 self) k (Core_Option_Option_Type.C_None))
+  val take_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32)) (ptr : opaque_ptr) : borrowed int32
+    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 227 15 227 43] contains0 (curr0 ( * self)) ptr}
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 228 14 228 60]  * result = lookup_unsized0 (curr0 ( * self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 229 14 229 58] curr0 ( ^ self) = remove0 (curr0 ( * self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 230 14 230 65] fin0 ( * self) = insert0 (fin0 ( ^ self)) ptr ( ^ result) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 231 14 231 42] not contains0 (fin0 ( ^ self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 232 4 232 58] inv1 result }
+    
+  val borrow_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 123 14 123 39] curr0 result = shallow_model0 ( * self) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 124 14 124 38] fin0 result = shallow_model0 ( ^ self) }
+    
+  val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr
+    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 71 35 71 38] inv0 val'}
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 67 4 67 42] not contains0 (shallow_model0 ( * self)) result }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 70 14 70 55] shallow_model0 ( ^ self) = insert0 (shallow_model0 ( * self)) result val' }
+    
+  use map.Const
+  function empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+  val empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = empty0 _1 }
+    
+  axiom empty0_spec : forall _1 : () . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 87 4 87 26] inv3 (empty0 _1)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 86 14 86 49] view0 (empty0 _1) = Const.const (Core_Option_Option_Type.C_None)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 85 14 85 31] len0 (empty0 _1) = 0)
+  val new0 (_1 : ()) : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () }
+    
+  let constant promoted0 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
+    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
+  let constant promoted1 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
+    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
+  let constant promoted2 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
+    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
+  let constant promoted3 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
+    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
+  let rec cfg test [#"../ghost_ptr_token.rs" 3 0 3 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : ();
+  var token : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32;
+  var ptr1 : opaque_ptr;
+  var _3 : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+  var ptr2 : opaque_ptr;
+  var _6 : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+  var token_mut : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32;
+  var _9 : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+  var m1 : borrowed int32;
+  var _11 : borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
+  var m2 : borrowed int32;
+  var _14 : borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
+  var _17 : (int32, int32);
+  var left_val : int32;
+  var right_val : int32;
+  var kind : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _32 : int32;
+  var _34 : int32;
+  var _37 : (int32, int32);
+  var left_val1 : int32;
+  var right_val1 : int32;
+  var kind1 : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _52 : int32;
+  var _54 : int32;
+  var _56 : ();
+  var _57 : borrowed int32;
+  var _58 : borrowed int32;
+  var _60 : (int32, int32);
+  var _62 : int32;
+  var left_val2 : int32;
+  var right_val2 : int32;
+  var kind2 : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _78 : int32;
+  var _80 : int32;
+  var _83 : (int32, int32);
+  var _85 : int32;
+  var left_val3 : int32;
+  var right_val3 : int32;
+  var kind3 : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _101 : int32;
+  var _103 : int32;
+  var _105 : int32;
+  var _106 : int32;
+  var _107 : int32;
+  var _108 : int32;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../ghost_ptr_token.rs" 4 20 4 40] token <- ([#"../ghost_ptr_token.rs" 4 20 4 40] new0 ());
+    goto BB1
+  }
+  BB1 {
+    [#"../ghost_ptr_token.rs" 5 15 5 46] _3 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 5 15 5 46] token <-  ^ _3;
+    goto BB2
+  }
+  BB2 {
+    [#"../ghost_ptr_token.rs" 5 15 5 46] ptr1 <- ([#"../ghost_ptr_token.rs" 5 15 5 46] ptr_from_box0 _3 ([#"../ghost_ptr_token.rs" 5 43 5 44] [#"../ghost_ptr_token.rs" 5 43 5 44] (1 : int32)));
+    _3 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+    goto BB3
+  }
+  BB3 {
+    [#"../ghost_ptr_token.rs" 6 15 6 46] _6 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 6 15 6 46] token <-  ^ _6;
+    goto BB4
+  }
+  BB4 {
+    [#"../ghost_ptr_token.rs" 6 15 6 46] ptr2 <- ([#"../ghost_ptr_token.rs" 6 15 6 46] ptr_from_box0 _6 ([#"../ghost_ptr_token.rs" 6 43 6 44] [#"../ghost_ptr_token.rs" 6 43 6 44] (2 : int32)));
+    _6 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+    goto BB5
+  }
+  BB5 {
+    [#"../ghost_ptr_token.rs" 8 24 8 42] _9 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 8 24 8 42] token <-  ^ _9;
+    [#"../ghost_ptr_token.rs" 8 24 8 42] token_mut <- ([#"../ghost_ptr_token.rs" 8 24 8 42] borrow_mut0 _9);
+    _9 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+    goto BB6
+  }
+  BB6 {
+    [#"../ghost_ptr_token.rs" 9 13 9 37] _11 <- Borrow.borrow_mut token_mut;
+    [#"../ghost_ptr_token.rs" 9 13 9 37] token_mut <-  ^ _11;
+    [#"../ghost_ptr_token.rs" 9 13 9 37] m1 <- ([#"../ghost_ptr_token.rs" 9 13 9 37] take_mut0 _11 ([#"../ghost_ptr_token.rs" 9 32 9 36] ptr1));
+    _11 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
+    goto BB7
+  }
+  BB7 {
+    [#"../ghost_ptr_token.rs" 10 13 10 37] _14 <- Borrow.borrow_mut token_mut;
+    [#"../ghost_ptr_token.rs" 10 13 10 37] token_mut <-  ^ _14;
+    [#"../ghost_ptr_token.rs" 10 13 10 37] m2 <- ([#"../ghost_ptr_token.rs" 10 13 10 37] take_mut0 _14 ([#"../ghost_ptr_token.rs" 10 32 10 36] ptr2));
+    _14 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
+    goto BB8
+  }
+  BB8 {
+    assume { resolve0 token_mut };
+    _108 <- promoted3;
+    _17 <- ( * m1, _108);
+    left_val <- (let (a, _) = _17 in a);
+    right_val <- (let (_, a) = _17 in a);
+    assume { resolve1 _17 };
+    switch (not left_val = right_val)
+      | False -> goto BB10
+      | True -> goto BB9
+      end
+  }
+  BB9 {
+    assume { resolve2 m2 };
+    kind <- Core_Panicking_AssertKind_Type.C_Eq;
+    _32 <- left_val;
+    _34 <- right_val;
+    assert { false };
+    absurd
+  }
+  BB10 {
+    _107 <- promoted2;
+    _37 <- ( * m2, _107);
+    left_val1 <- (let (a, _) = _37 in a);
+    right_val1 <- (let (_, a) = _37 in a);
+    assume { resolve1 _37 };
+    switch (not left_val1 = right_val1)
+      | False -> goto BB12
+      | True -> goto BB11
+      end
+  }
+  BB11 {
+    assume { resolve2 m1 };
+    kind1 <- Core_Panicking_AssertKind_Type.C_Eq;
+    _52 <- left_val1;
+    _54 <- right_val1;
+    assert { false };
+    absurd
+  }
+  BB12 {
+    [#"../ghost_ptr_token.rs" 15 20 15 22] _57 <- Borrow.borrow_mut ( * m1);
+    [#"../ghost_ptr_token.rs" 15 20 15 22] m1 <- { m1 with current =  ^ _57 };
+    [#"../ghost_ptr_token.rs" 15 24 15 26] _58 <- Borrow.borrow_mut ( * m2);
+    [#"../ghost_ptr_token.rs" 15 24 15 26] m2 <- { m2 with current =  ^ _58 };
+    [#"../ghost_ptr_token.rs" 15 4 15 27] _56 <- ([#"../ghost_ptr_token.rs" 15 4 15 27] swap0 _57 _58);
+    _57 <- any borrowed int32;
+    _58 <- any borrowed int32;
+    goto BB13
+  }
+  BB13 {
+    assume { resolve2 m2 };
+    assume { resolve2 m1 };
+    [#"../ghost_ptr_token.rs" 16 16 16 38] _62 <- ([#"../ghost_ptr_token.rs" 16 16 16 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 16 16 16 38] token) ([#"../ghost_ptr_token.rs" 16 33 16 37] ptr1));
+    goto BB14
+  }
+  BB14 {
+    _106 <- promoted1;
+    _60 <- (_62, _106);
+    left_val2 <- (let (a, _) = _60 in a);
+    right_val2 <- (let (_, a) = _60 in a);
+    assume { resolve1 _60 };
+    switch (not left_val2 = right_val2)
+      | False -> goto BB16
+      | True -> goto BB15
+      end
+  }
+  BB15 {
+    kind2 <- Core_Panicking_AssertKind_Type.C_Eq;
+    _78 <- left_val2;
+    _80 <- right_val2;
+    assert { false };
+    absurd
+  }
+  BB16 {
+    [#"../ghost_ptr_token.rs" 17 16 17 38] _85 <- ([#"../ghost_ptr_token.rs" 17 16 17 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 17 16 17 38] token) ([#"../ghost_ptr_token.rs" 17 33 17 37] ptr2));
+    goto BB17
+  }
+  BB17 {
+    _105 <- promoted0;
+    _83 <- (_85, _105);
+    left_val3 <- (let (a, _) = _83 in a);
+    right_val3 <- (let (_, a) = _83 in a);
+    assume { resolve1 _83 };
+    switch (not left_val3 = right_val3)
+      | False -> goto BB19
+      | True -> goto BB18
+      end
+  }
+  BB18 {
+    kind3 <- Core_Panicking_AssertKind_Type.C_Eq;
+    _101 <- left_val3;
+    _103 <- right_val3;
+    assert { false };
+    absurd
+  }
+  BB19 {
+    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ());
+    return _0
+  }
+  
+end
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.rs b/creusot/tests/should_succeed/ghost_ptr_token.rs
new file mode 100644
index 0000000000..eb91e8f54b
--- /dev/null
+++ b/creusot/tests/should_succeed/ghost_ptr_token.rs
@@ -0,0 +1,18 @@
+extern crate creusot_contracts;
+use creusot_contracts::ghost_ptr::GhostPtrToken;
+pub fn test() {
+    let mut token = GhostPtrToken::new();
+    let ptr1 = token.ptr_from_box(Box::new(1));
+    let ptr2 = token.ptr_from_box(Box::new(2));
+
+    let mut token_mut = token.borrow_mut();
+    let m1 = token_mut.take_mut(ptr1);
+    let m2 = token_mut.take_mut(ptr2);
+
+    assert_eq!(*m1, 1);
+    assert_eq!(*m2, 2);
+
+    core::mem::swap(m1, m2);
+    assert_eq!(*token.ptr_as_ref(ptr1), 2);
+    assert_eq!(*token.ptr_as_ref(ptr2), 1);
+}

From 4dfcc6cdf61962752c933d43aaa3bcd79e8f45d7 Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Sat, 27 Jan 2024 10:44:45 -0800
Subject: [PATCH 05/66] rename `curr` to `cur`

---
 creusot-contracts/src/ghost_ptr.rs            | 22 +++++++++----------
 .../should_succeed/ghost_ptr_token.mlcfg      | 16 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index c2b8b8a09e..61058aed31 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -120,7 +120,7 @@ impl<T: ?Sized> GhostPtrToken<T> {
 
     /// Convert a mutable reference in an equivalent ZST
     #[trusted]
-    #[ensures(result.curr() == (*self)@)]
+    #[ensures(result.cur() == (*self)@)]
     #[ensures(result.fin() == (^self)@)]
     pub fn borrow_mut(&mut self) -> GhostPtrTokenMut<'_, T> {
         GhostPtrTokenMut(PhantomData)
@@ -181,7 +181,7 @@ impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
     #[trusted]
     #[ghost]
     #[open(self)]
-    pub fn curr(self) -> FMap<GhostPtr<T>, T> {
+    pub fn cur(self) -> FMap<GhostPtr<T>, T> {
         absurd
     }
 
@@ -192,8 +192,8 @@ impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
         absurd
     }
 
-    #[ensures(self.fin() == self.curr())]
-    #[ensures(result@ == self.curr())]
+    #[ensures(self.fin() == self.cur())]
+    #[ensures(result@ == self.cur())]
     pub fn shr(self) -> GhostPtrTokenRef<'a, T> {
         GhostPtrTokenRef(PhantomData)
     }
@@ -224,9 +224,9 @@ impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
     // Safety no other token has permission to `self`
     // `self` can no longer be used to access `ptr`
     #[trusted]
-    #[requires((*self).curr().contains(ptr))]
-    #[ensures(*result == *(*self).curr().lookup_unsized(ptr))]
-    #[ensures((^self).curr() == (*self).curr().remove(ptr))]
+    #[requires((*self).cur().contains(ptr))]
+    #[ensures(*result == *(*self).cur().lookup_unsized(ptr))]
+    #[ensures((^self).cur() == (*self).cur().remove(ptr))]
     #[ensures((*self).fin() == (^self).fin().insert(ptr, ^result))]
     #[ensures(!(^self).fin().contains(ptr))]
     pub fn take_mut(&mut self, ptr: *const T) -> &'a mut T {
@@ -238,7 +238,7 @@ impl<'a, T> Deref for GhostPtrTokenMut<'a, T> {
     type Target = GhostPtrToken<T>;
 
     #[trusted]
-    #[ensures(result@ == self.curr())]
+    #[ensures(result@ == self.cur())]
     fn deref(&self) -> &Self::Target {
         &GhostPtrToken(PhantomData)
     }
@@ -246,8 +246,8 @@ impl<'a, T> Deref for GhostPtrTokenMut<'a, T> {
 
 impl<'a, T> DerefMut for GhostPtrTokenMut<'a, T> {
     #[trusted]
-    #[ensures((*result)@ == (*self).curr())]
-    #[ensures((^self).curr() == (^result)@)]
+    #[ensures((*result)@ == (*self).cur())]
+    #[ensures((^self).cur() == (^result)@)]
     fn deref_mut(&mut self) -> &mut Self::Target {
         Box::leak(Box::new(GhostPtrToken(PhantomData)))
     }
@@ -258,7 +258,7 @@ impl<'a, T> Resolve for GhostPtrTokenMut<'a, T> {
     #[predicate]
     #[open]
     fn resolve(self) -> bool {
-        self.curr() == self.fin()
+        self.cur() == self.fin()
     }
 }
 
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index 17e01fea41..c32dc89e82 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -232,13 +232,13 @@ module GhostPtrToken_Test
   val fin0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     ensures { result = fin0 self }
     
-  function curr0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+  function cur0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
-  val curr0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
-    ensures { result = curr0 self }
+  val cur0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = cur0 self }
     
   predicate resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) =
-    [#"../../../../creusot-contracts/src/ghost_ptr.rs" 261 8 261 33] curr0 self = fin0 self
+    [#"../../../../creusot-contracts/src/ghost_ptr.rs" 261 8 261 32] cur0 self = fin0 self
   val resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : bool
     ensures { result = resolve0 self }
     
@@ -278,15 +278,15 @@ module GhostPtrToken_Test
     len0 self
   )) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 45 14 45 55] view0 (remove0 self k) = Map.set (view0 self) k (Core_Option_Option_Type.C_None))
   val take_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32)) (ptr : opaque_ptr) : borrowed int32
-    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 227 15 227 43] contains0 (curr0 ( * self)) ptr}
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 228 14 228 60]  * result = lookup_unsized0 (curr0 ( * self)) ptr }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 229 14 229 58] curr0 ( ^ self) = remove0 (curr0 ( * self)) ptr }
+    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 227 15 227 42] contains0 (cur0 ( * self)) ptr}
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 228 14 228 59]  * result = lookup_unsized0 (cur0 ( * self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 229 14 229 56] cur0 ( ^ self) = remove0 (cur0 ( * self)) ptr }
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 230 14 230 65] fin0 ( * self) = insert0 (fin0 ( ^ self)) ptr ( ^ result) }
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 231 14 231 42] not contains0 (fin0 ( ^ self)) ptr }
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 232 4 232 58] inv1 result }
     
   val borrow_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 123 14 123 39] curr0 result = shallow_model0 ( * self) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 123 14 123 38] cur0 result = shallow_model0 ( * self) }
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 124 14 124 38] fin0 result = shallow_model0 ( ^ self) }
     
   val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr

From cafe0b0ded4d80ec095c719c5e6e21048f4c374c Mon Sep 17 00:00:00 2001
From: Dominik Stolz <d.stolz@tum.de>
Date: Wed, 14 Feb 2024 19:58:32 +0100
Subject: [PATCH 06/66] Add a chapter on type invariants to the guide

---
 guide/src/type_invariants.md | 91 ++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 guide/src/type_invariants.md

diff --git a/guide/src/type_invariants.md b/guide/src/type_invariants.md
new file mode 100644
index 0000000000..617b9d5909
--- /dev/null
+++ b/guide/src/type_invariants.md
@@ -0,0 +1,91 @@
+# Type Invariants
+
+## Overview
+
+Defining a type invariant allows you to constrain a data type's set of valid values with a logical predicate that all values must satisfy.
+During verification, Creusot enforces that all type invariants are preserved across functions.
+Inside a function, values subject to type invariants may temporarily break their invariants as long as each value's invariant is restored before the value can be observed by another function.
+
+
+## Defining Type Invariants
+
+To attach an invariant to a type, you implement the `Invariant` trait provided by Creusot.
+Here is an example:
+
+```rust
+struct SumTo10 {
+    a: i32,
+    b: i32,
+}
+
+// The type invariant constrains the set of valid `SumTo10`s to
+// only allow values where the sum of both fields is equal to 10.
+impl Invariant for SumTo10 {
+    #[predicate]
+    fn invariant(self) -> bool {
+        pearlite! {
+            self.a@ + self.b@ == 10
+        }
+    }
+}
+```
+
+## Enforcement of Type Invariants
+
+Creusot enforces type invariants on function boundaries by generating additional pre- and postconditions based on the types of a function's arguments and return value.
+The type invariants of a function’s arguments are treated as additional preconditions and a type invariant of the return value corresponds to an extra postcondition.
+Here is an example:
+
+```rust
+// `inv` generically refers to the invariant of some value
+#[requires(inv(x))] // generated by Creusot
+#[ensures(inv(result))] // generated by Creusot
+fn foo(x: SumTo10) -> SumTo10 {
+    x
+}
+```
+
+These generated pre- and postconditions require you to prove the invariants of any values used as arguments in function calls or returned values.
+Besides the proof obligations at function boundaries, you must also prove the type invariants of mutably borrowed values when the lifetimes of the created references end.
+When creating a mutable reference `r`, Creusot requires you to prove the type invariant of its current value at the end of `r`'s lifetime, since `r` might have been used to break the invariant of the borrowed value.
+This lets Creusot assume the invariant of the final value `^r` holds, simplifying the reasoning about mutable references.
+Here is an example:
+
+```rust
+fn swap() {
+    let mut s = SumTo10 { a: 3, b: 7 }
+    let r = &mut s;
+    // Creusot can prophetically assume inv(^r) holds:
+    proof_assert! { inv(^r) };
+
+    let tmp = r.a;
+    *r.a = r.b;
+    *r.b = tmp;
+    // The lifetime of r ends: We must prove inv(*r)
+
+    proof_assert! { inv(v) }; // provable since v = ^r = *r
+}
+```
+
+## Structural Invariants
+
+To determine the invariant of a particular type, Creusot considers both whether the user provided an explicit definition through the `Invariant` trait, as well as any invariants the can be derived automatically based on the type's definition.
+We call those automatically derived invariants *structural invariants*.
+When neither an explicit definition exists, nor a structural invariant, the type has the *trivial* invariant, which does not impose any constraints on the set of valid values.
+
+Here are some examples demonstrating structural invariants of various types:
+
+| Type of `x` | Invariant `inv(x)` |
+|-------------|--------------------|
+| `bool, u8, i32, ...` | `true` |
+| `&mut Foo` | `inv(*x) && inv(^x)` |
+| `&Foo` | `inv(*x)` |
+| `Box<Foo>` | `inv(*x)` |
+| `*const Foo, *mut Foo` | `true` |
+| `(Foo, Bar)` | `inv(x.0) && inv(x.1)` |
+| `struct Foo { f: Bar }` | `inv(x.f)` |
+| `enum Foo { A(Bar), B(Baz) }` | `match x { A(y) => inv(y), B(z) => inv(z) }` |
+| `Vec<Foo>` | `inv(x[0]) && ... && inv(x[x.len()-1])` |
+
+
+

From 4c21d0a0955f5ed26681e9849ad4a35b2fd9760e Mon Sep 17 00:00:00 2001
From: Dominik Stolz <voidc@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:39:21 +0100
Subject: [PATCH 07/66] Add link to thesis

---
 guide/src/type_invariants.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/guide/src/type_invariants.md b/guide/src/type_invariants.md
index 617b9d5909..34f5d8267f 100644
--- a/guide/src/type_invariants.md
+++ b/guide/src/type_invariants.md
@@ -6,6 +6,7 @@ Defining a type invariant allows you to constrain a data type's set of valid val
 During verification, Creusot enforces that all type invariants are preserved across functions.
 Inside a function, values subject to type invariants may temporarily break their invariants as long as each value's invariant is restored before the value can be observed by another function.
 
+Type invariant were added to Creusot as part of a Master's thesis available [here](https://mediatum.ub.tum.de/1726472).
 
 ## Defining Type Invariants
 

From 9f6cc8da0a99a2cade6510e20f03748001090211 Mon Sep 17 00:00:00 2001
From: Dominik Stolz <voidc@users.noreply.github.com>
Date: Thu, 15 Feb 2024 11:40:42 +0100
Subject: [PATCH 08/66] Typo

---
 guide/src/type_invariants.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guide/src/type_invariants.md b/guide/src/type_invariants.md
index 34f5d8267f..84fd070cac 100644
--- a/guide/src/type_invariants.md
+++ b/guide/src/type_invariants.md
@@ -6,7 +6,7 @@ Defining a type invariant allows you to constrain a data type's set of valid val
 During verification, Creusot enforces that all type invariants are preserved across functions.
 Inside a function, values subject to type invariants may temporarily break their invariants as long as each value's invariant is restored before the value can be observed by another function.
 
-Type invariant were added to Creusot as part of a Master's thesis available [here](https://mediatum.ub.tum.de/1726472).
+Type invariants were added to Creusot as part of a Master's thesis available [here](https://mediatum.ub.tum.de/1726472).
 
 ## Defining Type Invariants
 

From 38a270208e90864e31eeed7e7f667c332c7d3ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Mon, 19 Feb 2024 20:40:34 +0100
Subject: [PATCH 09/66] fix: why3 version check was only comparing the first 2
 numbers

---
 creusot-rustc/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/creusot-rustc/src/main.rs b/creusot-rustc/src/main.rs
index 7baa67ec1f..f1a59a1a87 100644
--- a/creusot-rustc/src/main.rs
+++ b/creusot-rustc/src/main.rs
@@ -87,7 +87,7 @@ fn setup_plugin() {
     if creusot.check_why3 {
         if let Some(why3_vers) = why3_version() {
             let parts: Vec<_> = why3_vers.split(|c| c == '.' || c == '+').collect();
-            if &parts[..2] < WHY3_VERSION {
+            if &parts[..3] < WHY3_VERSION {
                 emit_warning(format!(
                     "the recommended version of why3 is at least {} (installed: {why3_vers})",
                     WHY3_VERSION.join(".")

From 5b709198e0900724c2b46660c7e1841c846596eb Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Mon, 19 Feb 2024 14:27:45 +0100
Subject: [PATCH 10/66] initial coma AST

---
 why3/src/coma.rs | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
 why3/src/lib.rs  |  3 ++
 2 files changed, 90 insertions(+)
 create mode 100644 why3/src/coma.rs

diff --git a/why3/src/coma.rs b/why3/src/coma.rs
new file mode 100644
index 0000000000..588e81f113
--- /dev/null
+++ b/why3/src/coma.rs
@@ -0,0 +1,87 @@
+use crate::{declaration::Use, ty::Type, Ident};
+
+type Term = crate::Exp;
+
+/// The Coma Intermediate Verification Language
+///
+/// This language is developed by Paul Patault, Andrei Paskeivich and Jean-Christophe Filiatre.
+/// In this module is a complete, faithful ast and pretty printer for Coma.
+///
+/// TODO: Document Coma and its motivation
+///
+/// Notable points
+///
+/// 1. Higher order functional language that always generates first-order VCs
+/// 2. User level control on transparency of functions
+/// 3. CPS structure
+
+pub enum Expr {
+    /// Variables eg: `x`
+    Symbol(Ident),
+    /// Generic application for type lambdas, terms, references and continuations
+    /// e <ty>... t... | e...
+    App(Box<Expr>, Box<Arg>),
+    /// Functions, used for anonymous closures
+    /// fun pl -> e
+    Lambda(Vec<Param>, Box<Expr>),
+    /// Handler group definitions, binds a set of (mutually recursive) handlers
+    /// Can be read as a "where" clause in haskell.
+    //
+    /// e / rec? h p e and ...
+    Defn(Box<Expr>, bool, Vec<Defn>),
+    /// Similarly to handlers, the assignment should be read "backwards", the expression happens in a context where
+    /// the identifiers have been updated
+    Assign(Box<Expr>, Vec<(Ident, Term)>),
+    /// Let binding, introduces a new lexical scope.
+    Let(Box<Expr>, Vec<Var>),
+    /// Asserts that the term holds before evaluating the expression
+    Assert(Box<Term>, Box<Expr>),
+    /// The core operator of coma is the "black box" or *abstraction barrier* operator.
+    /// This operator distinguishes the responsibility between the caller and callee for
+    /// verification. Everything under an abstraction is opaque to the outside world, whereas from the inside,
+    /// we can suppose than any surrounding assertions hold.
+    //
+    /// TODO: Write a more intuitive explanaitio
+    //
+    /// ! e
+    BlackBox(Box<Expr>),
+    /// Good question...
+    WhiteBox(Box<Expr>),
+    /// A non-deterministic value
+    Any,
+}
+
+/// TODO: what is the bool?
+pub struct Var(Ident, Term, Type, bool);
+
+/// Parameter declarations
+pub enum Param {
+    Ty(Type),
+    Term(Ident, Type),
+    Region(Ident, Type),
+    Cont(Ident, Vec<Ident>, Vec<Param>),
+}
+
+pub enum Arg {
+    Ty(Type),
+    Term(Term),
+    Ref(Ident),
+    Cont(Expr),
+}
+
+pub struct Defn {
+    pub name: Ident,
+    pub writes: Vec<Ident>,
+    pub params: Vec<Param>,
+    pub body: Expr,
+}
+
+pub enum Decl {
+    /// Coma definitions
+    Defn(Vec<Defn>),
+    /// Escape hatch for type declarations, predicates etc...
+    PureDecl(crate::declaration::Decl),
+    Use(Use),
+}
+
+pub struct Module(pub Vec<Decl>);
diff --git a/why3/src/lib.rs b/why3/src/lib.rs
index 7e17f3eee3..7972597489 100644
--- a/why3/src/lib.rs
+++ b/why3/src/lib.rs
@@ -6,6 +6,9 @@ pub mod mlcfg;
 pub mod name;
 pub mod ty;
 
+// Coma IR
+pub mod coma;
+
 pub use exp::Exp;
 pub use mlcfg::printer::Print;
 pub use name::*;

From 3fbeaf52da7d67dcaec29edc1890c8d20448dee4 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Tue, 20 Feb 2024 16:50:32 +0100
Subject: [PATCH 11/66] Add a coma pretty printer

---
 Cargo.lock                 | 271 ++++++++++++++--
 creusot/src/translation.rs |   4 +-
 why3/Cargo.toml            |   7 +-
 why3/src/ce_models.rs      | 195 ++++++-----
 why3/src/coma.rs           | 209 +++++++++++-
 why3/src/mlcfg/printer.rs  | 642 ++++++++++++++-----------------------
 6 files changed, 799 insertions(+), 529 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f1320bf60..82a61e7c36 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,12 +92,33 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
 [[package]]
 name = "bstr"
 version = "0.2.17"
@@ -154,7 +175,7 @@ checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
+ "bitflags 1.3.2",
  "clap_lex",
  "strsim",
 ]
@@ -315,23 +336,12 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -346,12 +356,24 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -384,7 +406,7 @@ version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "libc",
  "libgit2-sys",
  "log",
@@ -495,7 +517,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
- "rustix",
+ "rustix 0.37.18",
  "windows-sys 0.48.0",
 ]
 
@@ -531,9 +553,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libgit2-sys"
@@ -549,6 +571,12 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
 [[package]]
 name = "libssh2-sys"
 version = "0.2.23"
@@ -587,6 +615,12 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -699,6 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -758,6 +793,12 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "predicates"
 version = "2.1.5"
@@ -806,6 +847,32 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proptest"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags 2.4.2",
+ "lazy_static",
+ "num-traits",
+ "rand 0.8.5",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.2",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
 [[package]]
 name = "quote"
 version = "1.0.35"
@@ -828,6 +895,27 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -843,6 +931,24 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -880,7 +986,7 @@ checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.7.1",
 ]
 
 [[package]]
@@ -895,6 +1001,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
 
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -919,14 +1031,39 @@ version = "0.37.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.6",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.13"
@@ -993,10 +1130,22 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 dependencies = [
- "rand",
+ "rand 0.4.6",
  "remove_dir_all",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix 0.38.31",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.2.0"
@@ -1042,6 +1191,12 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.13"
@@ -1124,8 +1279,10 @@ dependencies = [
  "itertools",
  "num",
  "pretty",
+ "proptest",
  "serde",
  "serde_json",
+ "tempfile",
 ]
 
 [[package]]
@@ -1192,7 +1349,16 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -1210,6 +1376,21 @@ dependencies = [
  "windows_x86_64_msvc 0.48.0",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -1222,6 +1403,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -1234,6 +1421,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -1246,6 +1439,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -1258,6 +1457,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -1270,6 +1475,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -1282,6 +1493,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -1294,6 +1511,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
 [[package]]
 name = "xmlparser"
 version = "0.13.5"
diff --git a/creusot/src/translation.rs b/creusot/src/translation.rs
index 74b7e8e2ea..2c5c35eb61 100644
--- a/creusot/src/translation.rs
+++ b/creusot/src/translation.rs
@@ -236,12 +236,12 @@ fn print_crate<W, I: Iterator<Item = Module>>(
 where
     W: Write,
 {
-    let (alloc, mut pe) = mlcfg::printer::PrintEnv::new();
+    let alloc = mlcfg::printer::ALLOC;
 
     writeln!(out)?;
 
     for modl in functions {
-        modl.pretty(&alloc, &mut pe).1.render(120, out)?;
+        modl.pretty(&alloc).1.render(120, out)?;
         writeln!(out)?;
     }
 
diff --git a/why3/Cargo.toml b/why3/Cargo.toml
index 3e73331ff6..ec6774f34c 100644
--- a/why3/Cargo.toml
+++ b/why3/Cargo.toml
@@ -14,6 +14,11 @@ indexmap = "1.2.0"
 serde = { version = "1.0", optional = true, features = ["derive"] }
 num = "*"
 serde_json = "1.0.107"
-[features]
 
+[dev-dependencies]
+proptest= "1.4.0"
+tempfile="3.10.0"
+
+
+[features]
 serialize = ["serde"]
diff --git a/why3/src/ce_models.rs b/why3/src/ce_models.rs
index a6e085ee32..077ff7e9cd 100644
--- a/why3/src/ce_models.rs
+++ b/why3/src/ce_models.rs
@@ -1,17 +1,18 @@
+#[cfg(feature = "serde")]
 use serde::Deserialize;
 use serde_json::Value as Json;
 use std::fmt::{Debug, Formatter};
 
-#[derive(Deserialize)]
-#[serde(untagged)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
+#[cfg_attr(feature = "serde", serde(untagged))]
 pub enum Loc {
     Span(Why3Span),
     Other(Json),
 }
 
 #[allow(dead_code)]
-#[derive(Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
 pub struct Why3Span {
     pub file_name: String,
     pub start_line: u32,
@@ -31,41 +32,47 @@ impl Debug for Loc {
     }
 }
 
-#[derive(Deserialize, Debug)]
-#[serde(untagged)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
+#[cfg_attr(feature = "serde", serde(untagged))]
 pub enum Fallible<T> {
     Ok(T),
     Err(Json),
 }
 
-#[derive(Deserialize, Debug)]
-#[serde(untagged)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
+#[cfg_attr(feature = "serde", serde(untagged))]
 pub enum Model {
     Model { answer: String, model: Vec<Fallible<Model2>> },
     Unknown(Json),
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Model2 {
     pub filename: String,
     pub model: Vec<Fallible<Model3>>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Model3 {
     pub is_vc_line: bool,
     pub line: String,
     pub model_elements: Vec<Fallible<ModelElem>>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct LSymbol {
     pub name: String,
     pub attrs: Vec<String>,
     pub loc: Loc,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct ModelElem {
     pub attrs: Vec<String>,
     pub kind: String,
@@ -74,20 +81,21 @@ pub struct ModelElem {
     pub value: Value,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Value {
     pub value_concrete_term: ConcreteTerm,
     pub value_term: Term,
     pub value_type: Type,
 }
 
-#[derive(Deserialize)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub enum Type {
-    #[serde(rename = "Tyvar")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tyvar"))]
     Var(String),
-    #[serde(rename = "Tyapp")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tyapp"))]
     App { ty_symbol: String, ty_args: Vec<Type> },
-    #[serde(untagged)]
+    #[cfg_attr(feature = "serde", serde(untagged))]
     Unknown(Json),
 }
 
@@ -107,102 +115,107 @@ impl Debug for Type {
     }
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct VSymbol {
     pub vs_name: String,
     pub vs_type: Type,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub enum TBool {
-    #[serde(rename = "Ttrue")]
+    #[cfg_attr(feature = "serde", serde(rename = "Ttrue"))]
     True,
-    #[serde(rename = "Tfalse")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tfalse"))]
     False,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub enum Term {
-    #[serde(rename = "Tvar")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tvar"))]
     Var(VSymbol),
-    #[serde(rename = "Tconst")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tconst"))]
     Const {
-        #[serde(rename = "const_type")]
+        #[cfg_attr(feature = "serde", serde(rename = "const_type"))]
         ty: String,
-        #[serde(rename = "const_value")]
+        #[cfg_attr(feature = "serde", serde(rename = "const_value"))]
         val: String,
     },
-    #[serde(rename = "Tapp")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tapp"))]
     App {
-        #[serde(rename = "app_ls")]
+        #[cfg_attr(feature = "serde", serde(rename = "app_ls"))]
         ls: String,
-        #[serde(rename = "app_args")]
+        #[cfg_attr(feature = "serde", serde(rename = "app_args"))]
         args: Vec<Term>,
     },
-    #[serde(rename = "Tif")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tif"))]
     If {
-        #[serde(rename = "if")]
+        #[cfg_attr(feature = "serde", serde(rename = "if"))]
         ift: Box<Term>,
         then: Box<Term>,
-        #[serde(rename = "else")]
+        #[cfg_attr(feature = "serde", serde(rename = "else"))]
         elset: Box<Term>,
     },
-    #[serde(rename = "Teps")]
+    #[cfg_attr(feature = "serde", serde(rename = "Teps"))]
     Eps {
-        #[serde(rename = "eps_vs")]
+        #[cfg_attr(feature = "serde", serde(rename = "eps_vs"))]
         vs: VSymbol,
-        #[serde(rename = "eps_t")]
+        #[cfg_attr(feature = "serde", serde(rename = "eps_t"))]
         t: Box<Term>,
     },
-    #[serde(rename = "Tfun")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tfun"))]
     Fun {
-        #[serde(rename = "fun_args")]
+        #[cfg_attr(feature = "serde", serde(rename = "fun_args"))]
         args: Vec<VSymbol>,
-        #[serde(rename = "fun_body")]
+        #[cfg_attr(feature = "serde", serde(rename = "fun_body"))]
         body: Box<Term>,
     },
-    #[serde(rename = "Tquant")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tquant"))]
     Quant {
         quant: String,
-        #[serde(rename = "quant_vs")]
+        #[cfg_attr(feature = "serde", serde(rename = "quant_vs"))]
         vs: Vec<VSymbol>,
-        #[serde(rename = "quant_t")]
+        #[cfg_attr(feature = "serde", serde(rename = "quant_t"))]
         t: Box<Term>,
     },
-    #[serde(rename = "Tbinop")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tbinop"))]
     Binop {
         binop: String,
-        #[serde(rename = "binop_t1")]
+        #[cfg_attr(feature = "serde", serde(rename = "binop_t1"))]
         t1: Box<Term>,
-        #[serde(rename = "binop_t2")]
+        #[cfg_attr(feature = "serde", serde(rename = "binop_t2"))]
         t2: Box<Term>,
     },
-    #[serde(rename = "Tnot")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tnot"))]
     Not(Box<Term>),
-    #[serde(rename = "Tlet")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tlet"))]
     Let(String),
-    #[serde(rename = "Tcase")]
+    #[cfg_attr(feature = "serde", serde(rename = "Tcase"))]
     Case(String),
-    #[serde(untagged)]
+    #[cfg_attr(feature = "serde", serde(untagged))]
     Bool(TBool),
-    #[serde(untagged)]
+    #[cfg_attr(feature = "serde", serde(untagged))]
     Unknown(Json),
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct BitVector {
     pub bv_value_as_decimal: String,
     pub bv_length: u32,
     pub bv_verbatim: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Real {
     pub real_value: String,
     pub real_verbatim: String,
 }
 
-#[derive(Deserialize)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Integer {
     pub int_value: String,
     pub int_verbatim: String,
@@ -231,28 +244,31 @@ impl Debug for Integer {
     }
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub enum Float {
     Infinity,
-    #[serde(rename = "Plus_zero")]
+    #[cfg_attr(feature = "serde", serde(rename = "Plus_zero"))]
     PlusZero,
-    #[serde(rename = "Minus_zero")]
+    #[cfg_attr(feature = "serde", serde(rename = "Minus_zero"))]
     MinusZero,
-    #[serde(rename = "Float_value")]
+    #[cfg_attr(feature = "serde", serde(rename = "Float_value"))]
     Value {
         float_hex: String,
     },
 }
 
 #[allow(dead_code)]
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct FunLitElt {
     pub indice: ConcreteTerm,
     pub value: ConcreteTerm,
 }
 
-#[derive(Deserialize, Debug)]
-#[serde(tag = "type", content = "val")]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
+#[cfg_attr(feature = "serde", serde(tag = "type", content = "val"))]
 pub enum ConcreteTerm {
     Var(String),
     Boolean(bool),
@@ -261,92 +277,95 @@ pub enum ConcreteTerm {
     Real(Real),
     BitVector(BitVector),
     Fraction {
-        #[serde(rename = "frac_num")]
+        #[cfg_attr(feature = "serde", serde(rename = "frac_num"))]
         num: Real,
-        #[serde(rename = "frac_num")]
+        #[cfg_attr(feature = "serde", serde(rename = "frac_num"))]
         denom: Real,
-        #[serde(rename = "frac_verbatim")]
+        #[cfg_attr(feature = "serde", serde(rename = "frac_verbatim"))]
         verbatim: String,
     },
     Float(Float),
-    #[serde(rename = "Apply")]
+    #[cfg_attr(feature = "serde", serde(rename = "Apply"))]
     App {
-        #[serde(rename = "app_ls")]
+        #[cfg_attr(feature = "serde", serde(rename = "app_ls"))]
         ls: String,
-        #[serde(rename = "app_args")]
+        #[cfg_attr(feature = "serde", serde(rename = "app_args"))]
         args: Vec<ConcreteTerm>,
     },
     If {
-        #[serde(rename = "if")]
+        #[cfg_attr(feature = "serde", serde(rename = "if"))]
         ift: Box<ConcreteTerm>,
         then: Box<ConcreteTerm>,
-        #[serde(rename = "else")]
+        #[cfg_attr(feature = "serde", serde(rename = "else"))]
         elset: Box<ConcreteTerm>,
     },
-    #[serde(rename = "Epsilon")]
+    #[cfg_attr(feature = "serde", serde(rename = "Epsilon"))]
     Eps {
-        #[serde(rename = "eps_var")]
+        #[cfg_attr(feature = "serde", serde(rename = "eps_var"))]
         var: String,
-        #[serde(rename = "eps_t")]
+        #[cfg_attr(feature = "serde", serde(rename = "eps_t"))]
         t: Box<ConcreteTerm>,
     },
-    #[serde(rename = "Function")]
+    #[cfg_attr(feature = "serde", serde(rename = "Function"))]
     Fun {
-        #[serde(rename = "fun_args")]
+        #[cfg_attr(feature = "serde", serde(rename = "fun_args"))]
         args: Vec<String>,
-        #[serde(rename = "fun_body")]
+        #[cfg_attr(feature = "serde", serde(rename = "fun_body"))]
         body: Box<ConcreteTerm>,
     },
     Quant {
         quant: String,
-        #[serde(rename = "quant_vs")]
+        #[cfg_attr(feature = "serde", serde(rename = "quant_vs"))]
         vs: Vec<String>,
-        #[serde(rename = "quant_t")]
+        #[cfg_attr(feature = "serde", serde(rename = "quant_t"))]
         t: Box<ConcreteTerm>,
     },
     Binop {
         binop: String,
-        #[serde(rename = "binop_t1")]
+        #[cfg_attr(feature = "serde", serde(rename = "binop_t1"))]
         t1: Box<ConcreteTerm>,
-        #[serde(rename = "binop_t2")]
+        #[cfg_attr(feature = "serde", serde(rename = "binop_t2"))]
         t2: Box<ConcreteTerm>,
     },
     Not(Box<ConcreteTerm>),
     FunctionLiteral {
-        #[serde(rename = "funliteral_elts")]
+        #[cfg_attr(feature = "serde", serde(rename = "funliteral_elts"))]
         elts: Vec<FunLitElt>,
-        #[serde(rename = "funliteral_others")]
+        #[cfg_attr(feature = "serde", serde(rename = "funliteral_others"))]
         other: Box<ConcreteTerm>,
     },
     Proj {
-        #[serde(rename = "proj_name")]
+        #[cfg_attr(feature = "serde", serde(rename = "proj_name"))]
         name: String,
-        #[serde(rename = "proj_value")]
+        #[cfg_attr(feature = "serde", serde(rename = "proj_value"))]
         value: Box<ConcreteTerm>,
     },
-    #[serde(untagged)]
+    #[cfg_attr(feature = "serde", serde(untagged))]
     Unknown(Json),
 }
 
-#[derive(Deserialize)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct Goal {
     pub term: GoalTerm,
-    #[serde(alias = "prover-result")]
+    #[cfg_attr(feature = "serde", serde(alias = "prover-result"))]
     pub prover_result: ProverResult,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct GoalTerm {
     pub loc: Loc,
-    #[serde(alias = "goal-name")] //Why3 doesn't currently use kebab-case but this might change
+    #[cfg_attr(feature = "serde", serde(alias = "goal-name"))]
+    //Why3 doesn't currently use kebab-case but this might change
     pub goal_name: String,
     pub explanations: Vec<String>,
 }
 #[allow(dead_code)]
-#[derive(Deserialize, Debug)]
+#[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(Deserialize))]
 pub struct ProverResult {
     pub answer: String,
-    #[serde(rename = "ce-models")]
+    #[cfg_attr(feature = "serde", serde(rename = "ce-models"))]
     pub ce_models: Vec<Model>,
     pub time: f32,
     pub step: i32,
diff --git a/why3/src/coma.rs b/why3/src/coma.rs
index 588e81f113..4cb515c0be 100644
--- a/why3/src/coma.rs
+++ b/why3/src/coma.rs
@@ -1,4 +1,6 @@
-use crate::{declaration::Use, ty::Type, Ident};
+use pretty::docs;
+
+use crate::{declaration::Use, ty::Type, Ident, Print};
 
 type Term = crate::Exp;
 
@@ -15,6 +17,7 @@ type Term = crate::Exp;
 /// 2. User level control on transparency of functions
 /// 3. CPS structure
 
+#[derive(Clone, Debug)]
 pub enum Expr {
     /// Variables eg: `x`
     Symbol(Ident),
@@ -51,31 +54,48 @@ pub enum Expr {
     Any,
 }
 
-/// TODO: what is the bool?
-pub struct Var(Ident, Term, Type, bool);
+#[derive(Clone, Debug)]
+pub struct Var(Ident, Type, Term, IsRef);
+
+#[derive(Clone, Debug)]
+pub enum IsRef {
+    Ref,
+    NotRef,
+}
 
 /// Parameter declarations
+#[derive(Clone, Debug)]
 pub enum Param {
+    // Can only be type parameters
     Ty(Type),
     Term(Ident, Type),
-    Region(Ident, Type),
+    Reference(Ident, Type),
+    /// Continuations accept a set of handlers and a set of ordinary parameters
     Cont(Ident, Vec<Ident>, Vec<Param>),
 }
 
+#[derive(Clone, Debug)]
 pub enum Arg {
+    /// Type application
     Ty(Type),
+    /// Logical terms (and 'program' ones)
     Term(Term),
+    /// Reference
     Ref(Ident),
+    /// Continuation parameter
     Cont(Expr),
 }
 
+#[derive(Clone, Debug)]
 pub struct Defn {
     pub name: Ident,
+    /// Only relevant if using references
     pub writes: Vec<Ident>,
     pub params: Vec<Param>,
     pub body: Expr,
 }
 
+#[derive(Clone, Debug)]
 pub enum Decl {
     /// Coma definitions
     Defn(Vec<Defn>),
@@ -84,4 +104,185 @@ pub enum Decl {
     Use(Use),
 }
 
+#[derive(Clone, Debug)]
 pub struct Module(pub Vec<Decl>);
+
+impl Print for Param {
+    fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
+        &'a self,
+        alloc: &'a A,
+    ) -> pretty::DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        match self {
+            Param::Ty(ty) => ty.pretty(alloc),
+            Param::Term(id, ty) => docs![alloc, id.pretty(alloc), ":", ty.pretty(alloc)],
+            Param::Reference(id, ty) => docs![alloc, "&", id.pretty(alloc), ":", ty.pretty(alloc)],
+            Param::Cont(id, writes, params) => docs![
+                alloc,
+                id.pretty(alloc),
+                alloc.space(),
+                brackets(alloc.intersperse(writes.iter().map(|a| a.pretty(alloc)), " ")),
+                alloc.space(),
+                alloc.intersperse(params.iter().map(|a| a.pretty(alloc)), " "),
+            ]
+            .parens(),
+        }
+    }
+}
+impl Print for Var {
+    fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
+        &'a self,
+        alloc: &'a A,
+    ) -> pretty::DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        docs![
+            alloc,
+            if matches!(self.3, IsRef::Ref) { alloc.text("& ") } else { alloc.nil() },
+            self.0.pretty(alloc),
+            " : ",
+            self.1.pretty(alloc),
+            " = ",
+            self.2.pretty(alloc)
+        ]
+    }
+}
+
+impl Print for Arg {
+    fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
+        &'a self,
+        alloc: &'a A,
+    ) -> pretty::DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        match self {
+            Arg::Ty(ty) => ty.pretty(alloc).enclose("<", ">"),
+            Arg::Term(t) => t.pretty(alloc).braces(),
+            Arg::Ref(r) => alloc.text("& ").append(r.pretty(alloc)),
+            Arg::Cont(c) => c.pretty(alloc).parens(),
+        }
+    }
+}
+
+impl Print for Expr {
+    fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
+        &'a self,
+        alloc: &'a A,
+    ) -> pretty::DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        match self {
+            Expr::Symbol(id) => id.pretty(alloc),
+            Expr::App(e, arg) => {
+                let needs_paren = !matches!(
+                    &**e,
+                    Expr::App(_, _) | Expr::Symbol(_) | Expr::Any | Expr::Lambda(_, _)
+                );
+
+                let doc = e.pretty(alloc);
+
+                if needs_paren { doc.parens() } else { doc }.append(arg.pretty(alloc))
+            }
+            Expr::Lambda(params, body) => {
+                let header = if params.is_empty() {
+                    alloc.text("->")
+                } else {
+                    docs![
+                        alloc,
+                        "fun ",
+                        alloc.intersperse(params.iter().map(|p| p.pretty(alloc)), alloc.text(" "))
+                    ]
+                };
+
+                header.append(body.pretty(alloc)).parens()
+            }
+            Expr::Defn(cont, rec, handlers) => {
+                let handlers =
+                    handlers.iter().map(|d| print_defn(d, if *rec { "=" } else { "->" }, alloc));
+                cont.pretty(alloc).append(alloc.intersperse(handlers, alloc.text(" | ")).brackets())
+            }
+            Expr::Let(cont, lets) => docs![
+                alloc,
+                cont.pretty(alloc),
+                alloc.intersperse(lets.iter().map(|l| l.pretty(alloc)), alloc.text(" | "))
+            ],
+            Expr::Assign(cont, asgns) => docs![
+                alloc,
+                alloc
+                    .intersperse(
+                        asgns.iter().map(|(id, t)| docs![
+                            alloc,
+                            "&",
+                            id.pretty(alloc),
+                            "<-",
+                            t.pretty(alloc).braces()
+                        ]),
+                        alloc.text(" | ")
+                    )
+                    .brackets(),
+                cont.pretty(alloc)
+            ],
+            Expr::Assert(t, e) => docs![alloc, t.pretty(alloc).braces(), e.pretty(alloc)],
+            Expr::BlackBox(e) => docs![alloc, "!", alloc.space(), e.pretty(alloc)].parens(),
+            Expr::WhiteBox(e) => docs![alloc, "?", alloc.space(), e.pretty(alloc)].parens(),
+            Expr::Any => alloc.text("any"),
+        }
+    }
+}
+
+fn braces<'a, A: pretty::DocAllocator<'a>>(
+    doc: pretty::DocBuilder<'a, A>,
+) -> pretty::DocBuilder<'a, A> {
+    if !matches!(&*doc.1, pretty::Doc::Nil) {
+        doc.braces()
+    } else {
+        doc
+    }
+}
+
+fn brackets<'a, A: pretty::DocAllocator<'a>>(
+    doc: pretty::DocBuilder<'a, A>,
+) -> pretty::DocBuilder<'a, A> {
+    if !matches!(&*doc.1, pretty::Doc::Nil) {
+        doc.brackets()
+    } else {
+        doc
+    }
+}
+
+fn print_defn<'a, A: pretty::DocAllocator<'a>>(
+    defn: &'a Defn,
+    arrow_kind: &'a str,
+    alloc: &'a A,
+) -> pretty::DocBuilder<'a, A>
+where
+    A::Doc: Clone,
+{
+    docs![
+        alloc,
+        defn.name.pretty(alloc),
+        alloc.space(),
+        brackets(alloc.intersperse(defn.writes.iter().map(|a| a.pretty(alloc)), " ")),
+        alloc.space(),
+        alloc.intersperse(defn.params.iter().map(|a| a.pretty(alloc)), " "),
+        arrow_kind,
+        defn.body.pretty(alloc),
+    ]
+}
+
+impl Print for Defn {
+    fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
+        &'a self,
+        alloc: &'a A,
+    ) -> pretty::DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        docs![alloc, "let ", print_defn(self, "=", alloc),]
+    }
+}
diff --git a/why3/src/mlcfg/printer.rs b/why3/src/mlcfg/printer.rs
index a0f6099332..a4aaa1a9aa 100644
--- a/why3/src/mlcfg/printer.rs
+++ b/why3/src/mlcfg/printer.rs
@@ -8,33 +8,20 @@ use crate::{
 use num::{Float, Zero};
 use pretty::*;
 
-#[derive(Default)]
-pub struct PrintEnv {
-    pub scopes: Vec<Ident>,
-}
-
-impl PrintEnv {
-    pub fn new() -> (BoxAllocator, Self) {
-        (BoxAllocator, PrintEnv::default())
-    }
-}
-
 pub struct PrintDisplay<'a, A: Print>(&'a A);
 
 impl<'a, A: Print> Display for PrintDisplay<'a, A> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let (alloc, mut env) = PrintEnv::new();
-        self.0.pretty(&alloc, &mut env).1.render_fmt(120, f)?;
+        let alloc = BoxAllocator;
+        self.0.pretty(&alloc).1.render_fmt(120, f)?;
         Ok(())
     }
 }
 
+pub const ALLOC: BoxAllocator = BoxAllocator;
+
 pub trait Print {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone;
 
@@ -48,17 +35,16 @@ pub trait Print {
 
 // TODO: replace with functions
 macro_rules! parens {
-    ($alloc:ident, $env:ident, $parent:ident, $child:ident) => {
-        parens($alloc, $env, $parent.precedence(), $child)
+    ($alloc:ident, $parent:ident, $child:ident) => {
+        parens($alloc, $parent.precedence(), $child)
     };
-    ($alloc:ident, $env:ident, $par_prec:expr, $child:ident) => {
-        parens($alloc, $env, $par_prec, $child)
+    ($alloc:ident, $par_prec:expr, $child:ident) => {
+        parens($alloc, $par_prec, $child)
     };
 }
 
 fn parens<'b, 'a: 'b, A: DocAllocator<'a>>(
     alloc: &'a A,
-    env: &mut PrintEnv,
     prec: Precedence,
     child: &'a Exp,
 ) -> DocBuilder<'a, A>
@@ -67,81 +53,63 @@ where
 {
     let child_prec = child.precedence();
     if child_prec == Precedence::Atom {
-        child.pretty(alloc, env)
+        child.pretty(alloc)
     } else if child_prec < prec {
-        child.pretty(alloc, env).parens()
+        child.pretty(alloc).parens()
     } else if child_prec == prec && child.associativity() != child.associativity() {
-        child.pretty(alloc, env).parens()
+        child.pretty(alloc).parens()
     } else {
-        child.pretty(alloc, env)
+        child.pretty(alloc)
     }
 }
 
 impl Print for Decl {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
-            Decl::CfgDecl(fun) => fun.pretty(alloc, env),
-            Decl::LogicDefn(log) => log.pretty(alloc, env),
-            Decl::Module(modl) => modl.pretty(alloc, env),
-            Decl::Scope(scope) => scope.pretty(alloc, env),
-            Decl::PredDecl(p) => p.pretty(alloc, env),
-            Decl::TyDecl(t) => t.pretty(alloc, env),
-            Decl::Clone(c) => c.pretty(alloc, env),
-            Decl::ValDecl(v) => v.pretty(alloc, env),
-            Decl::UseDecl(u) => u.pretty(alloc, env),
-            Decl::Axiom(a) => a.pretty(alloc, env),
-            Decl::Goal(g) => g.pretty(alloc, env),
-            Decl::Let(l) => l.pretty(alloc, env),
+            Decl::CfgDecl(fun) => fun.pretty(alloc),
+            Decl::LogicDefn(log) => log.pretty(alloc),
+            Decl::Module(modl) => modl.pretty(alloc),
+            Decl::Scope(scope) => scope.pretty(alloc),
+            Decl::PredDecl(p) => p.pretty(alloc),
+            Decl::TyDecl(t) => t.pretty(alloc),
+            Decl::Clone(c) => c.pretty(alloc),
+            Decl::ValDecl(v) => v.pretty(alloc),
+            Decl::UseDecl(u) => u.pretty(alloc),
+            Decl::Axiom(a) => a.pretty(alloc),
+            Decl::Goal(g) => g.pretty(alloc),
+            Decl::Let(l) => l.pretty(alloc),
         }
     }
 }
 
 impl Print for Module {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
-        env.scopes.push(self.name.clone());
         let doc = alloc
             .text("module ")
             .append(&*self.name)
             .append(alloc.hardline())
             .append(
                 alloc
-                    .intersperse(
-                        self.decls.iter().map(|decl| decl.pretty(alloc, env)),
-                        alloc.hardline(),
-                    )
+                    .intersperse(self.decls.iter().map(|decl| decl.pretty(alloc)), alloc.hardline())
                     .indent(2),
             )
             .append(alloc.hardline())
             .append("end");
-        env.scopes.pop();
         doc
     }
 }
 
 impl Print for Scope {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
-        env.scopes.push(self.name.clone());
         let doc = alloc
             .text("scope")
             .append(alloc.space())
@@ -149,59 +117,43 @@ impl Print for Scope {
             .append(alloc.hardline())
             .append(
                 alloc
-                    .intersperse(
-                        self.decls.iter().map(|decl| decl.pretty(alloc, env)),
-                        alloc.hardline(),
-                    )
+                    .intersperse(self.decls.iter().map(|decl| decl.pretty(alloc)), alloc.hardline())
                     .indent(2),
             )
             .append(alloc.hardline())
             .append("end");
-        env.scopes.pop();
         doc
     }
 }
 
 impl Print for Axiom {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         alloc
             .text("axiom ")
-            .append(self.name.pretty(alloc, env))
+            .append(self.name.pretty(alloc))
             .append(if self.rewrite { " [@rewrite] : " } else { " : " })
-            .append(self.axiom.pretty(alloc, env))
+            .append(self.axiom.pretty(alloc))
     }
 }
 
 impl Print for Goal {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         alloc
             .text("goal ")
-            .append(self.name.pretty(alloc, env))
+            .append(self.name.pretty(alloc))
             .append(" : ")
-            .append(self.goal.pretty(alloc, env))
+            .append(self.goal.pretty(alloc))
     }
 }
 
 impl Print for LetDecl {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -225,24 +177,20 @@ impl Print for LetDecl {
         doc = doc
             .append(
                 self.sig
-                    .pretty(alloc, env)
+                    .pretty(alloc)
                     .append(alloc.line_())
                     .append(alloc.text(" = [@vc:do_not_keep_trace] [@vc:sp]")),
             )
             .group()
             .append(alloc.line())
-            .append(self.body.pretty(alloc, env).indent(2));
+            .append(self.body.pretty(alloc).indent(2));
 
         doc
     }
 }
 
 impl Print for Attribute {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        _: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -265,91 +213,70 @@ impl Print for Attribute {
 }
 
 impl Print for Signature {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         self.name
-            .pretty(alloc, env)
+            .pretty(alloc)
             .append(alloc.space())
             .append(alloc.intersperse(
-                self.attrs.iter().map(|a| a.pretty(alloc, env)).chain(once(alloc.nil())),
+                self.attrs.iter().map(|a| a.pretty(alloc)).chain(once(alloc.nil())),
                 alloc.space(),
             ))
-            .append(arg_list(alloc, env, &self.args))
+            .append(arg_list(alloc, &self.args))
             .append(
-                self.retty.as_ref().map_or_else(
-                    || alloc.nil(),
-                    |t| alloc.text(" : ").append(t.pretty(alloc, env)),
-                ),
+                self.retty
+                    .as_ref()
+                    .map_or_else(|| alloc.nil(), |t| alloc.text(" : ").append(t.pretty(alloc))),
             )
-            .append(alloc.line_().append(self.contract.pretty(alloc, env)))
+            .append(alloc.line_().append(self.contract.pretty(alloc)))
             .nest(2)
             .group()
         // .append(alloc.line())
-        // .append(self.contract.pretty(alloc, env).indent(2))
+        // .append(self.contract.pretty(alloc).indent(2))
     }
 }
 
 impl Print for Predicate {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         alloc
             .text("predicate ")
-            .append(self.sig.pretty(alloc, env).append(alloc.line_()).append(alloc.text(" =")))
+            .append(self.sig.pretty(alloc).append(alloc.line_()).append(alloc.text(" =")))
             .group()
             .append(alloc.line())
-            .append(self.body.pretty(alloc, env).indent(2))
+            .append(self.body.pretty(alloc).indent(2))
     }
 }
 
-fn arg_list<'b: 'a, 'a, A: DocAllocator<'a>>(
-    alloc: &'a A,
-    env: &mut PrintEnv,
-    args: &'a [Binder],
-) -> DocBuilder<'a, A>
+fn arg_list<'b: 'a, 'a, A: DocAllocator<'a>>(alloc: &'a A, args: &'a [Binder]) -> DocBuilder<'a, A>
 where
     A::Doc: Clone,
 {
     {
-        alloc.intersperse(args.iter().map(|b| b.pretty(alloc, env)), alloc.space())
+        alloc.intersperse(args.iter().map(|b| b.pretty(alloc)), alloc.space())
     }
 }
 
 impl Print for Logic {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         alloc
             .text("function ")
-            .append(self.sig.pretty(alloc, env).append(alloc.line_()).append(alloc.text(" =")))
+            .append(self.sig.pretty(alloc).append(alloc.line_()).append(alloc.text(" =")))
             .group()
             .append(alloc.line())
-            .append(self.body.pretty(alloc, env).indent(2))
+            .append(self.body.pretty(alloc).indent(2))
     }
 }
 
 impl Print for DeclClone {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -362,8 +289,7 @@ impl Print for DeclClone {
             _ => alloc.nil(),
         };
 
-        let doc =
-            alloc.text("clone ").append(kind).append(self.name.pretty(alloc, env)).append(as_doc);
+        let doc = alloc.text("clone ").append(kind).append(self.name.pretty(alloc)).append(as_doc);
 
         if self.subst.is_empty() {
             doc
@@ -371,7 +297,7 @@ impl Print for DeclClone {
             doc.append(" with").append(alloc.hardline()).append(
                 alloc
                     .intersperse(
-                        self.subst.iter().map(|s| s.pretty(alloc, env)),
+                        self.subst.iter().map(|s| s.pretty(alloc)),
                         alloc.text(",").append(alloc.hardline()),
                     )
                     .indent(2),
@@ -381,37 +307,29 @@ impl Print for DeclClone {
 }
 
 impl Print for CloneSubst {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
-            CloneSubst::Type(id, ty) => alloc
-                .text("type ")
-                .append(id.pretty(alloc, env))
-                .append(" = ")
-                .append(ty.pretty(alloc, env)),
-            CloneSubst::Val(id, o) => alloc
-                .text("val ")
-                .append(id.pretty(alloc, env))
-                .append(" = ")
-                .append(o.pretty(alloc, env)),
+            CloneSubst::Type(id, ty) => {
+                alloc.text("type ").append(id.pretty(alloc)).append(" = ").append(ty.pretty(alloc))
+            }
+            CloneSubst::Val(id, o) => {
+                alloc.text("val ").append(id.pretty(alloc)).append(" = ").append(o.pretty(alloc))
+            }
             CloneSubst::Predicate(id, o) => alloc
                 .text("predicate ")
-                .append(id.pretty(alloc, env))
+                .append(id.pretty(alloc))
                 .append(" = ")
-                .append(o.pretty(alloc, env)),
+                .append(o.pretty(alloc)),
             CloneSubst::Function(id, o) => alloc
                 .text("function ")
-                .append(id.pretty(alloc, env))
+                .append(id.pretty(alloc))
                 .append(" = ")
-                .append(o.pretty(alloc, env)),
+                .append(o.pretty(alloc)),
             CloneSubst::Axiom(id) => match id {
-                Some(id) => alloc.text("axiom ").append(id.pretty(alloc, env)),
+                Some(id) => alloc.text("axiom ").append(id.pretty(alloc)),
                 None => alloc.text("axiom ."),
             },
         }
@@ -419,20 +337,16 @@ impl Print for CloneSubst {
 }
 
 impl Print for Use {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         alloc
             .text("use ")
             .append(if self.export { alloc.text("export ") } else { alloc.nil() })
-            .append(self.name.pretty(alloc, env))
+            .append(self.name.pretty(alloc))
             .append(if let Some(as_) = &self.as_ {
-                alloc.text(" as ").append(as_.pretty(alloc, env))
+                alloc.text(" as ").append(as_.pretty(alloc))
             } else {
                 alloc.nil()
             })
@@ -440,11 +354,7 @@ impl Print for Use {
 }
 
 impl Print for ValDecl {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -465,17 +375,13 @@ impl Print for ValDecl {
             None => {}
         };
 
-        doc = doc.append(self.sig.pretty(alloc, env));
+        doc = doc.append(self.sig.pretty(alloc));
         doc
     }
 }
 
 impl Print for Contract {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -483,10 +389,7 @@ impl Print for Contract {
 
         for req in &self.requires {
             doc = doc.append(
-                alloc
-                    .text("requires ")
-                    .append(req.pretty(alloc, env).braces())
-                    .append(alloc.hardline()),
+                alloc.text("requires ").append(req.pretty(alloc).braces()).append(alloc.hardline()),
             )
         }
 
@@ -494,19 +397,14 @@ impl Print for Contract {
             doc = doc.append(
                 alloc
                     .text("ensures ")
-                    .append(
-                        alloc.space().append(req.pretty(alloc, env)).append(alloc.space()).braces(),
-                    )
+                    .append(alloc.space().append(req.pretty(alloc)).append(alloc.space()).braces())
                     .append(alloc.hardline()),
             )
         }
 
         for var in &self.variant {
             doc = doc.append(
-                alloc
-                    .text("variant ")
-                    .append(var.pretty(alloc, env).braces())
-                    .append(alloc.hardline()),
+                alloc.text("variant ").append(var.pretty(alloc).braces()).append(alloc.hardline()),
             )
         }
 
@@ -515,11 +413,7 @@ impl Print for Contract {
 }
 
 impl Print for CfgFunction {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -530,7 +424,7 @@ impl Print for CfgFunction {
             .append(if self.constant { "constant " } else { "" })
             .append(
                 self.sig
-                    .pretty(alloc, env)
+                    .pretty(alloc)
                     .append(alloc.line_())
                     .append(alloc.text(" = [@vc:do_not_keep_trace] [@vc:sp]")),
             )
@@ -542,9 +436,9 @@ impl Print for CfgFunction {
                     if *ghost { alloc.text("ghost var ") } else { alloc.text("var ") }
                         .append(alloc.as_string(&var.0))
                         .append(" : ")
-                        .append(ty.pretty(alloc, env))
+                        .append(ty.pretty(alloc))
                         .append(if let Some(init) = init {
-                            alloc.text(" = ").append(init.pretty(alloc, env))
+                            alloc.text(" = ").append(init.pretty(alloc))
                         } else {
                             alloc.nil()
                         })
@@ -552,11 +446,11 @@ impl Print for CfgFunction {
                 }),
                 alloc.hardline(),
             ))
-            .append(self.entry.pretty(alloc, env).append(alloc.hardline()))
+            .append(self.entry.pretty(alloc).append(alloc.hardline()))
             .append(sep_end_by(
                 alloc,
                 self.blocks.iter().map(|(id, block)| {
-                    id.pretty(alloc, env).append(alloc.space()).append(block.pretty(alloc, env))
+                    id.pretty(alloc).append(alloc.space()).append(block.pretty(alloc))
                 }),
                 alloc.hardline(),
             ))
@@ -564,22 +458,18 @@ impl Print for CfgFunction {
 }
 
 impl Print for Type {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         use Type::*;
 
         macro_rules! ty_parens {
-            ($alloc:ident, $env:ident, $e:ident) => {
+            ($alloc:ident, $e:ident) => {
                 if $e.complex() {
-                    $e.pretty($alloc, $env).parens()
+                    $e.pretty($alloc).parens()
                 } else {
-                    $e.pretty($alloc, $env)
+                    $e.pretty($alloc)
                 }
             };
         }
@@ -587,145 +477,127 @@ impl Print for Type {
             Bool => alloc.text("bool"),
             Char => alloc.text("char"),
             Integer => alloc.text("int"),
-            MutableBorrow(box t) => alloc.text("borrowed ").append(ty_parens!(alloc, env, t)),
+            MutableBorrow(box t) => alloc.text("borrowed ").append(ty_parens!(alloc, t)),
             TVar(v) => alloc.text(format!("'{}", v.0)),
-            TConstructor(ty) => ty.pretty(alloc, env),
+            TConstructor(ty) => ty.pretty(alloc),
 
-            TFun(box a, box b) => {
-                ty_parens!(alloc, env, a).append(" -> ").append(ty_parens!(alloc, env, b))
-            }
+            TFun(box a, box b) => ty_parens!(alloc, a).append(" -> ").append(ty_parens!(alloc, b)),
             TApp(box tyf, args) => {
                 if args.is_empty() {
-                    tyf.pretty(alloc, env)
+                    tyf.pretty(alloc)
                 } else {
-                    tyf.pretty(alloc, env).append(alloc.space()).append(alloc.intersperse(
-                        args.iter().map(|arg| ty_parens!(alloc, env, arg)),
-                        alloc.space(),
-                    ))
+                    tyf.pretty(alloc).append(alloc.space()).append(
+                        alloc.intersperse(
+                            args.iter().map(|arg| ty_parens!(alloc, arg)),
+                            alloc.space(),
+                        ),
+                    )
                 }
             }
-            Tuple(tys) if tys.len() == 1 => tys[0].pretty(alloc, env),
-            Tuple(tys) => {
-                alloc.intersperse(tys.iter().map(|ty| ty.pretty(alloc, env)), ", ").parens()
-            }
+            Tuple(tys) if tys.len() == 1 => tys[0].pretty(alloc),
+            Tuple(tys) => alloc.intersperse(tys.iter().map(|ty| ty.pretty(alloc)), ", ").parens(),
         }
     }
 }
 
 impl Print for Trigger {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match &self.0 {
             None => alloc.nil(),
-            Some(exp) => exp.pretty(alloc, env).brackets(),
+            Some(exp) => exp.pretty(alloc).brackets(),
         }
     }
 }
 
 impl Print for Exp {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
-            Exp::Any(ty) => alloc.text("any ").append(ty.pretty(alloc, env)),
-            Exp::Current(box e) => alloc.text(" * ").append(parens!(alloc, env, self, e)),
-            Exp::Final(box e) => alloc.text(" ^ ").append(parens!(alloc, env, self, e)),
+            Exp::Any(ty) => alloc.text("any ").append(ty.pretty(alloc)),
+            Exp::Current(box e) => alloc.text(" * ").append(parens!(alloc, self, e)),
+            Exp::Final(box e) => alloc.text(" ^ ").append(parens!(alloc, self, e)),
             // TODO parenthesization
             Exp::Let { pattern, box arg, box body } => alloc
                 .text("let ")
-                .append(pattern.pretty(alloc, env))
+                .append(pattern.pretty(alloc))
                 .append(" = ")
-                .append(arg.pretty(alloc, env))
+                .append(arg.pretty(alloc))
                 .append(" in ")
-                .append(body.pretty(alloc, env)),
-            Exp::Var(v, _) => v.pretty(alloc, env),
-            Exp::QVar(v, _) => v.pretty(alloc, env),
+                .append(body.pretty(alloc)),
+            Exp::Var(v, _) => v.pretty(alloc),
+            Exp::QVar(v, _) => v.pretty(alloc),
             Exp::RecUp { box record, updates } => {
                 let mut res = alloc
                     .space()
-                    .append(parens!(alloc, env, self.precedence().next(), record))
+                    .append(parens!(alloc, self.precedence().next(), record))
                     .append(" with ");
                 for (label, val) in updates {
                     res = res
                         .append(alloc.text(label))
                         .append(" = ")
-                        .append(parens!(alloc, env, self, val))
+                        .append(parens!(alloc, self, val))
                         .append(" ; ");
                 }
                 res.braces()
             }
-            Exp::RecField { box record, label } => {
-                record.pretty(alloc, env).append(".").append(label)
-            }
+            Exp::RecField { box record, label } => record.pretty(alloc).append(".").append(label),
 
             Exp::Tuple(args) => alloc
-                .intersperse(args.iter().map(|a| parens!(alloc, env, Precedence::Cast, a)), ", ")
+                .intersperse(args.iter().map(|a| parens!(alloc, Precedence::Cast, a)), ", ")
                 .parens(),
 
-            Exp::Constructor { ctor, args } => ctor.pretty(alloc, env).append(if args.is_empty() {
-                alloc.nil()
-            } else {
-                alloc.space().append(alloc.intersperse(
-                    args.iter().map(|a| parens!(alloc, env, Precedence::Brackets, a)),
-                    " ",
-                ))
-            }),
-            Exp::Const(c) => c.pretty(alloc, env),
-
-            Exp::UnaryOp(UnOp::Not, box op) => {
-                alloc.text("not ").append(parens!(alloc, env, self, op))
+            Exp::Constructor { ctor, args } => {
+                ctor.pretty(alloc).append(if args.is_empty() {
+                    alloc.nil()
+                } else {
+                    alloc.space().append(alloc.intersperse(
+                        args.iter().map(|a| parens!(alloc, Precedence::Brackets, a)),
+                        " ",
+                    ))
+                })
             }
+            Exp::Const(c) => c.pretty(alloc),
 
-            Exp::UnaryOp(UnOp::Neg, box op) => {
-                alloc.text("- ").append(parens!(alloc, env, self, op))
-            }
+            Exp::UnaryOp(UnOp::Not, box op) => alloc.text("not ").append(parens!(alloc, self, op)),
+
+            Exp::UnaryOp(UnOp::Neg, box op) => alloc.text("- ").append(parens!(alloc, self, op)),
             Exp::UnaryOp(UnOp::FloatNeg, box op) => {
-                alloc.text(".- ").append(parens!(alloc, env, self, op))
+                alloc.text(".- ").append(parens!(alloc, self, op))
             }
             Exp::BinaryOp(op, box l, box r) => match self.associativity() {
-                Some(AssocDir::Left) => parens!(alloc, env, self, l),
-                Some(AssocDir::Right) | None => parens!(alloc, env, self.precedence().next(), l),
+                Some(AssocDir::Left) => parens!(alloc, self, l),
+                Some(AssocDir::Right) | None => parens!(alloc, self.precedence().next(), l),
             }
             .append(alloc.space())
             .append(bin_op_to_string(op))
             .append(alloc.space())
             .append(match self.associativity() {
-                Some(AssocDir::Right) => parens!(alloc, env, self, r),
-                Some(AssocDir::Left) | None => parens!(alloc, env, self.precedence().next(), r),
+                Some(AssocDir::Right) => parens!(alloc, self, r),
+                Some(AssocDir::Left) | None => parens!(alloc, self.precedence().next(), r),
             }),
             Exp::Call(box fun, args) => {
-                parens!(alloc, env, self, fun).append(alloc.space()).append(alloc.intersperse(
-                    args.iter().map(|a| parens!(alloc, env, Precedence::App.next(), a)),
+                parens!(alloc, self, fun).append(alloc.space()).append(alloc.intersperse(
+                    args.iter().map(|a| parens!(alloc, Precedence::App.next(), a)),
                     alloc.space(),
                 ))
             }
 
             Exp::Verbatim(verb) => alloc.text(verb),
-            Exp::Attr(attr, e) => {
-                attr.pretty(alloc, env).append(alloc.space()).append(e.pretty(alloc, env))
-            }
+            Exp::Attr(attr, e) => attr.pretty(alloc).append(alloc.space()).append(e.pretty(alloc)),
             Exp::Abs(binders, box body) => alloc
                 .text("fun ")
-                .append(
-                    alloc.intersperse(binders.iter().map(|b| b.pretty(alloc, env)), alloc.space()),
-                )
+                .append(alloc.intersperse(binders.iter().map(|b| b.pretty(alloc)), alloc.space()))
                 .append(" -> ")
-                .append(body.pretty(alloc, env)),
+                .append(body.pretty(alloc)),
 
             Exp::Match(box scrut, brs) => alloc
                 .text("match ")
-                .append(scrut.pretty(alloc, env))
+                .append(scrut.pretty(alloc))
                 .append(" with")
                 .append(alloc.hardline())
                 .append(
@@ -734,9 +606,9 @@ impl Print for Exp {
                         brs.iter().map(|(pat, br)| {
                             alloc
                                 .text("| ")
-                                .append(pat.pretty(alloc, env))
+                                .append(pat.pretty(alloc))
                                 .append(" -> ")
-                                .append(br.pretty(alloc, env))
+                                .append(br.pretty(alloc))
                         }),
                         alloc.hardline(),
                     )
@@ -745,52 +617,53 @@ impl Print for Exp {
                 .append("end"),
             Exp::IfThenElse(s, i, e) => alloc
                 .text("if ")
-                .append(s.pretty(alloc, env))
+                .append(s.pretty(alloc))
                 .append(" then")
-                .append(alloc.line().append(i.pretty(alloc, env)).nest(2).append(alloc.line()))
+                .append(alloc.line().append(i.pretty(alloc)).nest(2).append(alloc.line()))
                 .append("else")
-                .append(alloc.line().append(e.pretty(alloc, env)).nest(2).append(alloc.line_()))
+                .append(alloc.line().append(e.pretty(alloc)).nest(2).append(alloc.line_()))
                 .group(),
             Exp::Forall(binders, trig, box exp) => alloc
                 .text("forall ")
-                .append(alloc.intersperse(
-                    binders.iter().map(|(b, t)| {
-                        b.pretty(alloc, env).append(" : ").append(t.pretty(alloc, env))
-                    }),
-                    ", ",
-                ))
-                .append(trig.pretty(alloc, env))
+                .append(
+                    alloc.intersperse(
+                        binders
+                            .iter()
+                            .map(|(b, t)| b.pretty(alloc).append(" : ").append(t.pretty(alloc))),
+                        ", ",
+                    ),
+                )
+                .append(trig.pretty(alloc))
                 .append(" . ")
-                .append(exp.pretty(alloc, env)),
+                .append(exp.pretty(alloc)),
             Exp::Exists(binders, trig, box exp) => alloc
                 .text("exists ")
-                .append(alloc.intersperse(
-                    binders.iter().map(|(b, t)| {
-                        b.pretty(alloc, env).append(" : ").append(t.pretty(alloc, env))
-                    }),
-                    ", ",
-                ))
-                .append(trig.pretty(alloc, env))
+                .append(
+                    alloc.intersperse(
+                        binders
+                            .iter()
+                            .map(|(b, t)| b.pretty(alloc).append(" : ").append(t.pretty(alloc))),
+                        ", ",
+                    ),
+                )
+                .append(trig.pretty(alloc))
                 .append(" . ")
-                .append(exp.pretty(alloc, env)),
+                .append(exp.pretty(alloc)),
             Exp::Impl(box hyp, box exp) => {
-                parens!(alloc, env, self, hyp).append(" -> ").append(parens!(alloc, env, self, exp))
+                parens!(alloc, self, hyp).append(" -> ").append(parens!(alloc, self, exp))
             }
             Exp::Ascribe(e, t) => {
-                parens!(alloc, env, self, e).append(" : ").append(t.pretty(alloc, env)).group()
-            }
-            Exp::Pure(e) => alloc.text("pure ").append(e.pretty(alloc, env).braces()),
-            Exp::Ghost(e) => {
-                alloc.text("ghost ").append(parens!(alloc, env, Precedence::App.next(), e))
+                parens!(alloc, self, e).append(" : ").append(t.pretty(alloc)).group()
             }
+            Exp::Pure(e) => alloc.text("pure ").append(e.pretty(alloc).braces()),
+            Exp::Ghost(e) => alloc.text("ghost ").append(parens!(alloc, Precedence::App.next(), e)),
             Exp::Absurd => alloc.text("absurd"),
-            Exp::Old(e) => alloc.text("old").append(e.pretty(alloc, env).parens()),
+            Exp::Old(e) => alloc.text("old").append(e.pretty(alloc).parens()),
             Exp::Record { fields } => alloc
                 .intersperse(
                     fields.iter().map(|(nm, a)| {
                         alloc.text(nm).append(" = ").append(parens!(
                             alloc,
-                            env,
                             Precedence::Attr.next(),
                             a
                         ))
@@ -798,36 +671,30 @@ impl Print for Exp {
                     "; ",
                 )
                 .braces(),
-            Exp::Chain(fields) => {
-                alloc.intersperse(fields.iter().map(|f| f.pretty(alloc, env)), "; ")
-            }
-            Exp::FnLit(e) => alloc.text("fun _ -> ").append(e.pretty(alloc, env)).parens(),
-            Exp::Assert(e) => alloc.text("assert ").append(e.pretty(alloc, env).braces()),
-            Exp::Assume(e) => alloc.text("assume ").append(e.pretty(alloc, env).braces()),
+            Exp::Chain(fields) => alloc.intersperse(fields.iter().map(|f| f.pretty(alloc)), "; "),
+            Exp::FnLit(e) => alloc.text("fun _ -> ").append(e.pretty(alloc)).parens(),
+            Exp::Assert(e) => alloc.text("assert ").append(e.pretty(alloc).braces()),
+            Exp::Assume(e) => alloc.text("assume ").append(e.pretty(alloc).braces()),
         }
     }
 }
 
 impl Print for Binder {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
             Binder::Wild => alloc.text("_"),
-            Binder::UnNamed(ty) => ty.pretty(alloc, env),
-            Binder::Named(id) => id.pretty(alloc, env),
+            Binder::UnNamed(ty) => ty.pretty(alloc),
+            Binder::Named(id) => id.pretty(alloc),
             Binder::Typed(ghost, ids, ty) => {
                 (if *ghost { alloc.text("ghost ") } else { alloc.nil() })
                     .append(
                         alloc
-                            .intersperse(ids.iter().map(|id| id.pretty(alloc, env)), alloc.space())
+                            .intersperse(ids.iter().map(|id| id.pretty(alloc)), alloc.space())
                             .append(" : ")
-                            .append(ty.pretty(alloc, env)),
+                            .append(ty.pretty(alloc)),
                     )
                     .parens()
             }
@@ -838,52 +705,47 @@ impl Print for Binder {
 fn pretty_attr<'b, 'a: 'b, A: DocAllocator<'a>>(
     attr: &'a Option<Attribute>,
     alloc: &'a A,
-    env: &mut PrintEnv,
 ) -> DocBuilder<'a, A>
 where
     A::Doc: Clone,
 {
     match attr {
-        Some(attr) => attr.pretty(alloc, env).append(" "),
+        Some(attr) => attr.pretty(alloc).append(" "),
         None => alloc.nil(),
     }
 }
 
 impl Print for Statement {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
-            Statement::Assign { attr, lhs, rhs } => pretty_attr(attr, alloc, env)
-                .append(lhs.pretty(alloc, env))
+            Statement::Assign { attr, lhs, rhs } => pretty_attr(attr, alloc)
+                .append(lhs.pretty(alloc))
                 .append(" <- ")
-                .append(parens!(alloc, env, Precedence::Impl, rhs)),
+                .append(parens!(alloc, Precedence::Impl, rhs)),
             Statement::Invariant(e) => {
-                let doc = alloc.text("invariant ").append(
-                    alloc.space().append(e.pretty(alloc, env)).append(alloc.space()).braces(),
-                );
+                let doc = alloc
+                    .text("invariant ")
+                    .append(alloc.space().append(e.pretty(alloc)).append(alloc.space()).braces());
                 doc
             }
             Statement::Variant(e) => {
-                let doc = alloc.text("variant ").append(
-                    alloc.space().append(e.pretty(alloc, env)).append(alloc.space()).braces(),
-                );
+                let doc = alloc
+                    .text("variant ")
+                    .append(alloc.space().append(e.pretty(alloc)).append(alloc.space()).braces());
                 doc
             }
             Statement::Assume(assump) => {
                 let doc = alloc.text("assume ").append(
-                    alloc.space().append(assump.pretty(alloc, env)).append(alloc.space()).braces(),
+                    alloc.space().append(assump.pretty(alloc)).append(alloc.space()).braces(),
                 );
                 doc
             }
             Statement::Assert(assert) => {
                 let doc = alloc.text("assert ").append(
-                    alloc.space().append(assert.pretty(alloc, env)).append(alloc.space()).braces(),
+                    alloc.space().append(assert.pretty(alloc)).append(alloc.space()).braces(),
                 );
                 doc
             }
@@ -892,22 +754,18 @@ impl Print for Statement {
 }
 
 impl Print for Terminator {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         use Terminator::*;
         match self {
-            Goto(tgt) => alloc.text("goto ").append(tgt.pretty(alloc, env)),
+            Goto(tgt) => alloc.text("goto ").append(tgt.pretty(alloc)),
             Absurd => alloc.text("absurd"),
             Return => alloc.text("return _0"),
             Switch(discr, brs) => alloc
                 .text("switch ")
-                .append(discr.pretty(alloc, env).parens())
+                .append(discr.pretty(alloc).parens())
                 .append(alloc.hardline())
                 .append(
                     sep_end_by(
@@ -915,9 +773,9 @@ impl Print for Terminator {
                         brs.iter().map(|(pat, tgt)| {
                             alloc
                                 .text("| ")
-                                .append(pat.pretty(alloc, env))
+                                .append(pat.pretty(alloc))
                                 .append(" -> ")
-                                .append(tgt.pretty(alloc, env))
+                                .append(tgt.pretty(alloc))
                         }),
                         alloc.hardline(),
                     )
@@ -929,30 +787,26 @@ impl Print for Terminator {
 }
 
 impl Print for Pattern {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         match self {
             Pattern::Wildcard => alloc.text("_"),
-            Pattern::VarP(v) => v.pretty(alloc, env),
+            Pattern::VarP(v) => v.pretty(alloc),
             Pattern::TupleP(pats) => {
-                alloc.intersperse(pats.iter().map(|p| p.pretty(alloc, env)), ", ").parens()
+                alloc.intersperse(pats.iter().map(|p| p.pretty(alloc)), ", ").parens()
             }
             Pattern::ConsP(c, pats) => {
-                let mut doc = c.pretty(alloc, env);
+                let mut doc = c.pretty(alloc);
 
                 if !pats.is_empty() {
                     doc = doc.append(alloc.space()).append(alloc.intersperse(
                         pats.iter().map(|p| {
                             if matches!(p, Pattern::ConsP(_, _)) {
-                                p.pretty(alloc, env).parens()
+                                p.pretty(alloc).parens()
                             } else {
-                                p.pretty(alloc, env)
+                                p.pretty(alloc)
                             }
                         }),
                         " ",
@@ -965,11 +819,7 @@ impl Print for Pattern {
 }
 
 impl Print for BlockId {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        _: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -996,11 +846,7 @@ where
 }
 
 impl Print for Block {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -1009,10 +855,10 @@ impl Print for Block {
             .append(
                 sep_end_by(
                     alloc,
-                    self.statements.iter().map(|stmt| stmt.pretty(alloc, env)),
+                    self.statements.iter().map(|stmt| stmt.pretty(alloc)),
                     alloc.text(";").append(alloc.line()),
                 )
-                .append(self.terminator.pretty(alloc, env)),
+                .append(self.terminator.pretty(alloc)),
             )
             .nest(2)
             .append(alloc.hardline())
@@ -1051,11 +897,7 @@ fn bin_op_to_string(op: &BinOp) -> &str {
 }
 
 impl Print for Constant {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -1069,11 +911,11 @@ impl Print for Constant {
                 }
             }
             Constant::Int(i, Some(t)) => {
-                alloc.as_string(i).append(" : ").append(t.pretty(alloc, env)).parens()
+                alloc.as_string(i).append(" : ").append(t.pretty(alloc)).parens()
             }
             Constant::Int(i, None) => alloc.as_string(i),
             Constant::Uint(i, Some(t)) => {
-                alloc.as_string(i).append(" : ").append(t.pretty(alloc, env)).parens()
+                alloc.as_string(i).append(" : ").append(t.pretty(alloc)).parens()
             }
             Constant::String(s) => alloc.text(format!("{s:?}")),
             Constant::Uint(i, None) => alloc.as_string(i),
@@ -1088,7 +930,7 @@ impl Print for Constant {
             Constant::Float(f, Some(t)) => {
                 assert!(f.is_finite());
                 let f_str = print_float(*f);
-                alloc.text(f_str).append(" : ").append(t.pretty(alloc, env)).parens()
+                alloc.text(f_str).append(" : ").append(t.pretty(alloc)).parens()
             }
         }
     }
@@ -1112,21 +954,17 @@ fn print_float(f: f64) -> String {
 }
 
 impl Print for TyDecl {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         let ty_decl = match self {
             TyDecl::Opaque { ty_name, ty_params } => {
-                let mut decl = alloc.text("type ").append(ty_name.pretty(alloc, env));
+                let mut decl = alloc.text("type ").append(ty_name.pretty(alloc));
 
                 if !ty_params.is_empty() {
                     decl = decl.append(" ").append(alloc.intersperse(
-                        ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc, env))),
+                        ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc))),
                         alloc.space(),
                     ));
                 }
@@ -1134,14 +972,14 @@ impl Print for TyDecl {
             }
             TyDecl::Alias { ty_name, ty_params, alias } => alloc
                 .text("type ")
-                .append(ty_name.pretty(alloc, env))
+                .append(ty_name.pretty(alloc))
                 .append(" ")
                 .append(alloc.intersperse(
-                    ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc, env))),
+                    ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc))),
                     alloc.space(),
                 ))
                 .append(alloc.text(" =").append(alloc.hardline()))
-                .append(alias.pretty(alloc, env).indent(2)),
+                .append(alias.pretty(alloc).indent(2)),
             TyDecl::Adt { tys } => {
                 use std::iter::*;
                 let header = once("type").chain(repeat("with"));
@@ -1151,21 +989,21 @@ impl Print for TyDecl {
                     decl = decl
                         .append(hdr)
                         .append(" ")
-                        .append(ty_decl.ty_name.pretty(alloc, env))
+                        .append(ty_decl.ty_name.pretty(alloc))
                         .append(" ")
                         .append(
                             alloc.intersperse(
                                 ty_decl
                                     .ty_params
                                     .iter()
-                                    .map(|p| alloc.text("'").append(p.pretty(alloc, env))),
+                                    .map(|p| alloc.text("'").append(p.pretty(alloc))),
                                 alloc.space(),
                             ),
                         );
 
                     let mut inner_doc = alloc.nil();
                     for cons in &ty_decl.constrs {
-                        let ty_cons = alloc.text("| ").append(cons.pretty(alloc, env));
+                        let ty_cons = alloc.text("| ").append(cons.pretty(alloc));
                         inner_doc = inner_doc.append(ty_cons.append(alloc.hardline()))
                     }
                     decl = decl
@@ -1177,9 +1015,9 @@ impl Print for TyDecl {
         };
 
         // let mut ty_decl =
-        //     alloc.text("type ").append(self.ty_name.pretty(alloc, env)).append(" ").append(
+        //     alloc.text("type ").append(self.ty_name.pretty(alloc)).append(" ").append(
         //         alloc.intersperse(
-        //             self.ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc, env))),
+        //             self.ty_params.iter().map(|p| alloc.text("'").append(p.pretty(alloc))),
         //             alloc.space(),
         //         ),
         //     );
@@ -1188,24 +1026,20 @@ impl Print for TyDecl {
         //     ty_decl = ty_decl.append(alloc.text(" =").append(alloc.hardline()));
         // }
         ty_decl
-        // ty_decl.append(self.kind.pretty(alloc, env).indent(2))
+        // ty_decl.append(self.kind.pretty(alloc).indent(2))
     }
 }
 
 impl Print for ConstructorDecl {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
-        let mut cons_doc = self.name.pretty(alloc, env);
+        let mut cons_doc = self.name.pretty(alloc);
 
         if !self.fields.is_empty() {
             cons_doc = cons_doc.append(alloc.space()).append(
-                alloc.intersperse(self.fields.iter().map(|ty_arg| ty_arg.pretty(alloc, env)), " "),
+                alloc.intersperse(self.fields.iter().map(|ty_arg| ty_arg.pretty(alloc)), " "),
             );
         }
 
@@ -1214,17 +1048,13 @@ impl Print for ConstructorDecl {
 }
 
 impl Print for Field {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
         let parens = self.ghost || self.ty.complex();
         let doc = if self.ghost { alloc.text("ghost ") } else { alloc.nil() }
-            .append(self.ty.pretty(alloc, env));
+            .append(self.ty.pretty(alloc));
 
         if parens {
             doc.parens()
@@ -1234,11 +1064,7 @@ impl Print for Field {
     }
 }
 impl Print for Ident {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        _env: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {
@@ -1247,11 +1073,7 @@ impl Print for Ident {
 }
 
 impl Print for QName {
-    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(
-        &'a self,
-        alloc: &'a A,
-        _: &mut PrintEnv,
-    ) -> DocBuilder<'a, A>
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where
         A::Doc: Clone,
     {

From 00d7ba9c8a4363067f4cbd07583efe60fc95eca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Tue, 20 Feb 2024 23:42:35 +0100
Subject: [PATCH 12/66] fix: emit correct relative paths in spans with 'cargo
 creusot'

add an option to creusot-rustc to specify the relative location of the
project's root with respect to creusot's output. This option is used
by the test harness, which uses a different file layout than 'cargo
creusot'. ('cargo creusot' then simply uses the default value of the
option, which matches its usecase.)
---
 creusot-args/src/options.rs  | 14 +++++++++++++-
 creusot-rustc/src/options.rs |  1 +
 creusot/src/backend.rs       |  1 -
 creusot/src/options.rs       | 15 +++++++++++++--
 creusot/tests/ui.rs          |  1 +
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/creusot-args/src/options.rs b/creusot-args/src/options.rs
index 6fbe839da1..b8e5090a69 100644
--- a/creusot-args/src/options.rs
+++ b/creusot-args/src/options.rs
@@ -1,6 +1,6 @@
 use clap::*;
 use serde::{Deserialize, Serialize};
-use std::{error::Error, ffi::OsString};
+use std::{error::Error, ffi::OsString, path::PathBuf};
 
 #[derive(Parser, Serialize, Deserialize)]
 pub struct CreusotArgs {
@@ -10,6 +10,11 @@ pub struct CreusotArgs {
     /// [None] provides the clearest diffs.
     #[clap(long, value_enum, default_value_t=SpanMode::Relative)]
     pub span_mode: SpanMode,
+    #[clap(long, default_value_os_t = get_default_root_path_relative_from_output())]
+    /// Relative path of the root of the Rust project relative to the output files
+    /// of Creusot. This is used when producing [Relative] spans, to know the location
+    /// of Rust files corresponding to the generated Why3 files.
+    pub root_path_relative_from_output: PathBuf,
     #[clap(long)]
     /// Only generate proofs for items matching the provided string. The string is treated
     /// as a Rust qualified path.
@@ -61,6 +66,13 @@ pub enum Why3SubCommand {
     Replay,
 }
 
+/// Default relative path of the root project wrt the output.
+/// This corresponds to the default scenario where the user invokes "cargo creusot"
+/// which writes its output in target/debug/
+fn get_default_root_path_relative_from_output() -> PathBuf {
+    ["..", ".."].iter().collect()
+}
+
 /// Parse a single key-value pair
 fn parse_key_val<T, U>(s: &str) -> Result<(T, U), Box<dyn Error + Send + Sync + 'static>>
 where
diff --git a/creusot-rustc/src/options.rs b/creusot-rustc/src/options.rs
index 4add35c947..9d2bae2079 100644
--- a/creusot-rustc/src/options.rs
+++ b/creusot-rustc/src/options.rs
@@ -42,6 +42,7 @@ impl CreusotArgsExt for CreusotArgs {
             output_file,
             in_cargo: cargo_creusot,
             span_mode: span_mode,
+            root_path_relative_from_output: self.root_path_relative_from_output,
             match_str: self.focus_on,
             simple_triggers: self.simple_triggers,
             why3_cmd: self.subcommand.map(why3_command),
diff --git a/creusot/src/backend.rs b/creusot/src/backend.rs
index 0bf36c5dac..71ffbf4434 100644
--- a/creusot/src/backend.rs
+++ b/creusot/src/backend.rs
@@ -383,7 +383,6 @@ impl<'tcx> Why3Generator<'tcx> {
         let filename = match self.opts.span_mode {
             SpanMode::Absolute => path.to_string_lossy().into_owned(),
             SpanMode::Relative => {
-                // Why3 treats the spans as relative to the session not the source file??
                 format!("{}", self.opts.relative_to_output(&path).to_string_lossy())
             }
             _ => return None,
diff --git a/creusot/src/options.rs b/creusot/src/options.rs
index 7759ecfdf9..bc0476dc3b 100644
--- a/creusot/src/options.rs
+++ b/creusot/src/options.rs
@@ -32,6 +32,7 @@ pub struct Options {
     pub output_file: Option<OutputFile>,
     pub in_cargo: bool,
     pub span_mode: SpanMode,
+    pub root_path_relative_from_output: PathBuf,
     pub match_str: Option<String>,
     pub simple_triggers: bool,
     pub why3_cmd: Option<Why3Command>,
@@ -65,8 +66,18 @@ impl Options {
         let output_components = other.components().count();
         let mut buf = PathBuf::new();
 
-        (0..(output_components - same)).for_each(|_| buf.push(".."));
+        (0..(output_components - same)).for_each(|_| {
+            // Why3 treats the spans as relative to the session, not the source file,
+            // and the session is in a subdirectory next to the mlcfg file, so we need
+            // to add ..
+            buf.push("..");
+            // then add the relative path of the root project with respect to the output
+            // directory (typically some amount of ..)
+            buf.extend(&self.root_path_relative_from_output)
+        });
         buf.extend(p.components().skip(same));
-        buf
+        // the roundtrip through [components()] gives us some basic (syntactic)
+        // normalization of the path (e.g. remove /./)
+        buf.components().collect()
     }
 }
diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
index 41c80ba545..70ce3c0275 100644
--- a/creusot/tests/ui.rs
+++ b/creusot/tests/ui.rs
@@ -91,6 +91,7 @@ fn run_creusot(
         "--stdout",
         "--export-metadata=false",
         "--span-mode=relative",
+        "--root-path-relative-from-output=.",
         "--check-why3=false",
     ]);
     cmd.args(&[

From 4fb23bef9e4fe98615d233701fd8452a288c81b1 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Wed, 21 Feb 2024 18:22:12 +0100
Subject: [PATCH 13/66] Demote `Expr::Call` to `Statement::Call`

---
 creusot/src/backend/optimization.rs           |  23 +++-
 creusot/src/backend/program.rs                | 124 +++++++++++-------
 creusot/src/translation.rs                    |   2 +-
 creusot/src/translation/fmir.rs               |  20 +--
 creusot/src/translation/function.rs           |   4 +-
 creusot/src/translation/function/statement.rs |   6 +-
 .../src/translation/function/terminator.rs    |  21 +--
 creusot/tests/should_succeed/100doors.mlcfg   |   2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   6 +-
 .../should_succeed/filter_positive.mlcfg      |   2 +-
 creusot/tests/should_succeed/hashmap.mlcfg    |   2 +-
 creusot/tests/should_succeed/knapsack.mlcfg   |   4 +-
 .../tests/should_succeed/knapsack_full.mlcfg  |   4 +-
 .../tests/should_succeed/sparse_array.mlcfg   |   6 +-
 .../should_succeed/syntax/13_vec_macro.mlcfg  |   6 +-
 .../vector/06_knights_tour.mlcfg              |   2 +-
 why3/src/coma.rs                              |  10 --
 17 files changed, 136 insertions(+), 108 deletions(-)

diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index cabc00804e..933a34c146 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -94,6 +94,10 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
             }
             Statement::AssumeBorrowInv(p) => self.read_place(p),
             Statement::AssertTyInv(p) => self.read_place(p),
+            Statement::Call(dest, _, _, args, _) => {
+                self.write_place(dest);
+                args.iter().for_each(|a| self.visit_expr(a));
+            }
         }
     }
 
@@ -110,17 +114,22 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
 
     // fn visit_term(&mut self, t: &Term<'tcx>) {}
 
+    fn visit_operand(&mut self, op: &Operand<'tcx>) {
+        match op {
+            Operand::Move(p) => self.read_place(p),
+            Operand::Copy(p) => self.read_place(p),
+        }
+    }
+
     fn visit_expr(&mut self, e: &Expr<'tcx>) {
         match &e.kind {
-            ExprKind::Move(p) => self.read_place(p),
-            ExprKind::Copy(p) => self.read_place(p),
+            ExprKind::Operand(op) => self.visit_operand(op),
             ExprKind::BinOp(_, l, r) => {
                 self.visit_expr(l);
                 self.visit_expr(r)
             }
             ExprKind::UnaryOp(_, e) => self.visit_expr(e),
             ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| self.visit_expr(e)),
-            ExprKind::Call(_, _, es) => es.iter().for_each(|e| self.visit_expr(e)),
             ExprKind::Constant(t) => self.visit_term(t),
             ExprKind::Cast(e, _, _) => self.visit_expr(e),
             ExprKind::Tuple(es) => es.iter().for_each(|e| self.visit_expr(e)),
@@ -220,11 +229,11 @@ impl<'tcx> SimplePropagator<'tcx> {
             match s {
                 Statement::Assignment(l, RValue::Expr(r), _)
                     // we do not propagate calls to avoid moving them after the resolve of their arguments
-                    if self.should_propagate(l.local) && !self.usage[&l.local].used_in_pure_ctx && !r.is_call() => {
+                    if self.should_propagate(l.local) && !self.usage[&l.local].used_in_pure_ctx => {
                       self.prop.insert(l.local, r);
                       self.dead.insert(l.local);
                     }
-                Statement::Assignment(ref l, RValue::Expr(ref r), _) if self.should_erase(l.local)  && !r.is_call() && r.is_pure() => {
+                Statement::Assignment(ref l, RValue::Expr(ref r), _) if self.should_erase(l.local) && r.is_pure() => {
                       self.dead.insert(l.local);
                 }
                 Statement::Resolve(_,_, ref p) => {
@@ -255,6 +264,7 @@ impl<'tcx> SimplePropagator<'tcx> {
               }
             }
             Statement::Assertion { cond, msg: _ } => self.visit_term(cond),
+            Statement::Call(_, _, _, args, _) => args.iter_mut().for_each(|a| self.visit_expr(a)),
             Statement::AssumeBorrowInv(_) => {},
             Statement::AssertTyInv( _) => {},
         }
@@ -272,7 +282,7 @@ impl<'tcx> SimplePropagator<'tcx> {
 
     fn visit_expr(&mut self, e: &mut Expr<'tcx>) {
         match &mut e.kind {
-            ExprKind::Move(p) | ExprKind::Copy(p) => {
+            ExprKind::Operand(Operand::Move(p) | Operand::Copy(p)) => {
               if let Some(l) = p.as_symbol() && let Some(v) = self.prop.remove(&l) {
                 *e = v;
               }
@@ -283,7 +293,6 @@ impl<'tcx> SimplePropagator<'tcx> {
             }
             ExprKind::UnaryOp(_, e) => self.visit_expr(e),
             ExprKind::Constructor(_, _, es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
-            ExprKind::Call(_, _, es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
             ExprKind::Constant(t) => self.visit_term(t),
             ExprKind::Cast(e, _, _) => self.visit_expr(e),
             ExprKind::Tuple(es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index ad2a3a5ace..131f97d1d5 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -7,11 +7,12 @@ use super::{
 };
 use crate::{
     backend::{
-        closure_generic_decls, optimization, place,
-        place::translate_rplace,
+        closure_generic_decls, optimization,
+        place::{self, translate_rplace},
         ty::{self, translate_closure_ty, translate_ty},
     },
     ctx::{BodyId, CloneMap, TranslationCtx},
+    fmir::Operand,
     translation::{
         binop_to_binop,
         fmir::{
@@ -25,7 +26,7 @@ use crate::{
 use rustc_hir::{def_id::DefId, Unsafety};
 use rustc_middle::{
     mir::{BasicBlock, BinOp, ProjectionElem},
-    ty::TyKind,
+    ty::{GenericArgsRef, TyKind},
 };
 use rustc_span::{Span, DUMMY_SP};
 use rustc_type_ir::{IntTy, UintTy};
@@ -301,11 +302,11 @@ impl<'tcx> Expr<'tcx> {
         locals: &LocalDecls<'tcx>,
     ) -> Exp {
         let e = match self.kind {
-            ExprKind::Move(pl) => {
+            ExprKind::Operand(Operand::Move(pl)) => {
                 // TODO invalidate original place
                 pl.as_rplace(ctx, names, locals)
             }
-            ExprKind::Copy(pl) => pl.as_rplace(ctx, names, locals),
+            ExprKind::Operand(Operand::Copy(pl)) => pl.as_rplace(ctx, names, locals),
             ExprKind::BinOp(BinOp::BitAnd, l, r) if l.ty.is_bool() => {
                 l.to_why(ctx, names, locals).lazy_and(r.to_why(ctx, names, locals))
             }
@@ -338,36 +339,6 @@ impl<'tcx> Expr<'tcx> {
                 let ctor = names.constructor(id, subst);
                 Exp::Constructor { ctor, args }
             }
-            ExprKind::Call(id, subst, args) => {
-                let mut args: Vec<_> =
-                    args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
-                let fname = names.value(id, subst);
-
-                let exp = if ctx.is_closure(id) {
-                    assert!(args.len() == 2, "closures should only have two arguments (env, args)");
-
-                    let real_sig =
-                        ctx.signature_unclosure(subst.as_closure().sig(), Unsafety::Normal);
-                    let closure_arg_count = real_sig.inputs().skip_binder().len();
-                    let names = ('a'..).take(closure_arg_count);
-
-                    let mut closure_args = vec![args.remove(0)];
-
-                    closure_args
-                        .extend(names.clone().map(|nm| Exp::impure_var(nm.to_string().into())));
-
-                    Exp::Let {
-                        pattern: Pattern::TupleP(
-                            names.map(|nm| Pattern::VarP(nm.to_string().into())).collect(),
-                        ),
-                        arg: Box::new(args.remove(0)),
-                        body: Box::new(Exp::impure_qvar(fname).app(closure_args)),
-                    }
-                } else {
-                    Exp::impure_qvar(fname).app(args)
-                };
-                exp
-            }
             ExprKind::Constant(c) => lower_impure(ctx, names, &c),
             ExprKind::Tuple(f) => {
                 Exp::Tuple(f.into_iter().map(|f| f.to_why(ctx, names, locals)).collect())
@@ -455,15 +426,14 @@ impl<'tcx> Expr<'tcx> {
 
     fn invalidated_places(&self, places: &mut Vec<(fmir::Place<'tcx>, Span)>) {
         match &self.kind {
-            ExprKind::Move(p) => places.push((p.clone(), self.span)),
-            ExprKind::Copy(_) => {}
+            ExprKind::Operand(Operand::Move(p)) => places.push((p.clone(), self.span)),
+            ExprKind::Operand(_) => {}
             ExprKind::BinOp(_, l, r) => {
                 l.invalidated_places(places);
                 r.invalidated_places(places)
             }
             ExprKind::UnaryOp(_, e) => e.invalidated_places(places),
             ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| e.invalidated_places(places)),
-            ExprKind::Call(_, _, es) => es.iter().for_each(|e| e.invalidated_places(places)),
             ExprKind::Constant(_) => {}
             ExprKind::Cast(e, _, _) => e.invalidated_places(places),
             ExprKind::Tuple(es) => es.iter().for_each(|e| e.invalidated_places(places)),
@@ -729,18 +699,24 @@ impl<'tcx> Statement<'tcx> {
                 let rhs = rhs.to_why(ctx, names, locals);
                 let mut exps =
                     vec![place::create_assign_inner(ctx, names, locals, &lhs, rhs, span)];
-                for (pl, pl_span) in invalid {
-                    let ty = pl.ty(ctx.tcx, locals);
-                    let ty = translate_ty(ctx, names, pl_span.substitute_dummy(span), ty);
-                    exps.push(place::create_assign_inner(
-                        ctx,
-                        names,
-                        locals,
-                        &pl,
-                        Exp::Any(ty),
-                        pl_span,
-                    ));
+                invalidate_places(ctx, names, locals, span, invalid, &mut exps);
+
+                exps
+            }
+            Statement::Call(dest, fun_id, subst, args, span) => {
+                let mut invalid = Vec::new();
+                args.iter().for_each(|a| a.invalidated_places(&mut invalid));
+
+                let mut exp = func_call_to_why3(ctx, names, locals, fun_id, subst, args);
+
+                if let Some(attr) = ctx.span_attr(span) {
+                    exp = Exp::Attr(attr, Box::new(exp));
                 }
+
+                let mut exps =
+                    vec![place::create_assign_inner(ctx, names, locals, &dest, exp, span)];
+                invalidate_places(ctx, names, locals, span, invalid, &mut exps);
+
                 exps
             }
             Statement::Resolve(id, subst, pl) => {
@@ -779,6 +755,56 @@ impl<'tcx> Statement<'tcx> {
     }
 }
 
+fn invalidate_places<'tcx>(
+    ctx: &mut Why3Generator<'tcx>,
+    names: &mut CloneMap<'tcx>,
+    locals: &LocalDecls<'tcx>,
+    span: Span,
+    invalid: Vec<(Place<'tcx>, Span)>,
+    out: &mut Vec<mlcfg::Statement>,
+) {
+    for (pl, pl_span) in invalid {
+        let ty = pl.ty(ctx.tcx, locals);
+        let ty = translate_ty(ctx, names, pl_span.substitute_dummy(span), ty);
+        out.push(place::create_assign_inner(ctx, names, locals, &pl, Exp::Any(ty), pl_span));
+    }
+}
+
+fn func_call_to_why3<'tcx>(
+    ctx: &mut Why3Generator<'tcx>,
+    names: &mut CloneMap<'tcx>,
+    locals: &LocalDecls<'tcx>,
+    id: DefId,
+    subst: GenericArgsRef<'tcx>,
+    args: Vec<Expr<'tcx>>,
+) -> Exp {
+    let mut args: Vec<_> = args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
+    let fname = names.value(id, subst);
+
+    let exp = if ctx.is_closure(id) {
+        assert!(args.len() == 2, "closures should only have two arguments (env, args)");
+
+        let real_sig = ctx.signature_unclosure(subst.as_closure().sig(), Unsafety::Normal);
+        let closure_arg_count = real_sig.inputs().skip_binder().len();
+        let names = ('a'..).take(closure_arg_count);
+
+        let mut closure_args = vec![args.remove(0)];
+
+        closure_args.extend(names.clone().map(|nm| Exp::impure_var(nm.to_string().into())));
+
+        Exp::Let {
+            pattern: Pattern::TupleP(
+                names.map(|nm| Pattern::VarP(nm.to_string().into())).collect(),
+            ),
+            arg: Box::new(args.remove(0)),
+            body: Box::new(Exp::impure_qvar(fname).app(closure_args)),
+        }
+    } else {
+        Exp::impure_qvar(fname).app(args)
+    };
+    exp
+}
+
 pub(crate) fn int_to_prelude(ity: IntTy) -> PreludeModule {
     match ity {
         IntTy::Isize => PreludeModule::Isize,
diff --git a/creusot/src/translation.rs b/creusot/src/translation.rs
index 2c5c35eb61..1cfb160c9a 100644
--- a/creusot/src/translation.rs
+++ b/creusot/src/translation.rs
@@ -100,7 +100,7 @@ pub(crate) fn after_analysis(ctx: TranslationCtx) -> Result<(), Box<dyn Error>>
                 let outputs = why3.output_filenames(());
                 let crate_name = why3.crate_name(LOCAL_CRATE);
 
-                let libname = format!("{}-{}.mlcfg", crate_name.as_str(), why3.crate_types()[0]);
+                let libname = format!("{}-{}.coma", crate_name.as_str(), why3.crate_types()[0]);
 
                 let directory = if why3.opts.in_cargo {
                     let mut dir = outputs.out_directory.clone();
diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index 28fdb02a52..840986f4f0 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -42,7 +42,9 @@ pub enum Statement<'tcx> {
     Resolve(DefId, GenericArgsRef<'tcx>, Place<'tcx>),
     Assertion { cond: Term<'tcx>, msg: String },
     AssumeBorrowInv(Place<'tcx>),
+    // Todo: fold into `Assertion`
     AssertTyInv(Place<'tcx>),
+    Call(Place<'tcx>, DefId, GenericArgsRef<'tcx>, Vec<Expr<'tcx>>, Span),
 }
 
 // Re-organize this completely
@@ -68,16 +70,18 @@ pub struct Expr<'tcx> {
 }
 
 #[derive(Clone, Debug)]
-pub enum ExprKind<'tcx> {
-    // Extract this into a standalone `Operand` type
+pub enum Operand<'tcx> {
     Move(Place<'tcx>),
     Copy(Place<'tcx>),
+}
+
+#[derive(Clone, Debug)]
+pub enum ExprKind<'tcx> {
+    Operand(Operand<'tcx>),
     // Revisit whether this is a good idea to allow general expression trees.
     BinOp(BinOp, Box<Expr<'tcx>>, Box<Expr<'tcx>>),
     UnaryOp(UnOp, Box<Expr<'tcx>>),
     Constructor(DefId, GenericArgsRef<'tcx>, Vec<Expr<'tcx>>),
-    // Should this be a statement?
-    Call(DefId, GenericArgsRef<'tcx>, Vec<Expr<'tcx>>),
     Constant(Term<'tcx>),
     Cast(Box<Expr<'tcx>>, Ty<'tcx>, Ty<'tcx>),
     Tuple(Vec<Expr<'tcx>>),
@@ -89,12 +93,10 @@ pub enum ExprKind<'tcx> {
 impl<'tcx> Expr<'tcx> {
     pub fn is_call(&self) -> bool {
         match &self.kind {
-            ExprKind::Move(_) => false,
-            ExprKind::Copy(_) => false,
+            ExprKind::Operand(_) => false,
             ExprKind::BinOp(_, _, _) => false,
             ExprKind::UnaryOp(_, _) => false,
             ExprKind::Constructor(_, _, _) => false,
-            ExprKind::Call(_, _, _) => true,
             ExprKind::Constant(_) => false,
             ExprKind::Cast(_, _, _) => false,
             ExprKind::Tuple(_) => false,
@@ -106,8 +108,7 @@ impl<'tcx> Expr<'tcx> {
 
     pub fn is_pure(&self) -> bool {
         match &self.kind {
-            ExprKind::Move(_) => true,
-            ExprKind::Copy(_) => true,
+            ExprKind::Operand(_) => true,
             ExprKind::BinOp(
                 BinOp::Add | BinOp::Mul | BinOp::Rem | BinOp::Div | BinOp::Sub,
                 _,
@@ -117,7 +118,6 @@ impl<'tcx> Expr<'tcx> {
             ExprKind::UnaryOp(UnOp::Neg, _) => false,
             ExprKind::UnaryOp(_, _) => true,
             ExprKind::Constructor(_, _, es) => es.iter().all(|e| e.is_pure()),
-            ExprKind::Call(_, _, es) => es.iter().all(|e| e.is_pure()),
             ExprKind::Constant(_) => true,
             ExprKind::Cast(_, _, _) => false,
             ExprKind::Tuple(es) => es.iter().all(|e| e.is_pure()),
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index ee0d9493b4..49c8a5fa5f 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -348,8 +348,8 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
     // Useful helper to translate an operand
     pub(crate) fn translate_operand(&mut self, operand: &Operand<'tcx>) -> Expr<'tcx> {
         let kind = match operand {
-            Operand::Copy(pl) => ExprKind::Copy(self.translate_place(*pl)),
-            Operand::Move(pl) => ExprKind::Move(self.translate_place(*pl)),
+            Operand::Copy(pl) => ExprKind::Operand(fmir::Operand::Copy(self.translate_place(*pl))),
+            Operand::Move(pl) => ExprKind::Operand(fmir::Operand::Move(self.translate_place(*pl))),
             Operand::Constant(c) => {
                 return crate::constant::from_mir_constant(self.param_env(), self.ctx, c)
             }
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index 24ce51c75b..5f65ee8008 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -1,6 +1,7 @@
 use super::BodyTranslator;
 use crate::{
     analysis::NotFinalPlaces,
+    fmir::Operand,
     translation::{
         fmir::{self, Expr, ExprKind, RValue},
         specification::inv_subst,
@@ -90,7 +91,8 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                         return;
                     }
 
-                    ExprKind::Copy(self.translate_place(self.compute_ref_place(*pl, loc)))
+                    let op = Operand::Copy(self.translate_place(self.compute_ref_place(*pl, loc)));
+                    ExprKind::Operand(op)
                 }
                 Mut { .. } => {
                     if self.erased_locals.contains(pl.local) {
@@ -158,7 +160,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             }
             Rvalue::Len(pl) => {
                 let e = Expr {
-                    kind: ExprKind::Copy(self.translate_place(*pl)),
+                    kind: ExprKind::Operand(Operand::Copy(self.translate_place(*pl))),
                     ty: pl.ty(self.body, self.tcx).ty,
                     span: DUMMY_SP,
                 };
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index a5435b93c3..c09d670a25 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -106,10 +106,12 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                         ty: self.ctx.types.unit,
                     })
                 }
-                let call_exp = if self.is_box_new(fun_def_id) {
+                let (loc, bb) = (destination, target.unwrap());
+
+                if self.is_box_new(fun_def_id) {
                     assert_eq!(func_args.len(), 1);
 
-                    func_args.remove(0)
+                    self.emit_assignment(&loc, RValue::Expr(func_args.remove(0)), span);
                 } else {
                     let (fun_def_id, subst) =
                         resolve_function(self.ctx, self.param_env(), fun_def_id, subst, span);
@@ -118,16 +120,15 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                         .try_normalize_erasing_regions(self.param_env(), subst)
                         .unwrap_or(subst);
 
-                    let exp = Expr {
-                        span: span.source_callsite(),
-                        kind: ExprKind::Call(fun_def_id, subst, func_args),
-                        ty: destination.ty(self.body, self.tcx).ty,
-                    };
-                    exp
+                    self.emit_statement(Statement::Call(
+                        self.translate_place(*loc),
+                        fun_def_id,
+                        subst,
+                        func_args,
+                        span.source_callsite(),
+                    ));
                 };
 
-                let (loc, bb) = (destination, target.unwrap());
-                self.emit_assignment(&loc, RValue::Expr(call_exp), span);
                 self.emit_terminator(Terminator::Goto(bb));
             }
             Assert { cond, expected, msg, target, unwind: _ } => {
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index 3e79bd28a9..afcad7798f 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -375,7 +375,7 @@ module C100doors_F
     goto BB0
   }
   BB0 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 ([#"../100doors.rs" 19 40 19 45] [#"../100doors.rs" 19 40 19 45] false) ([#"../100doors.rs" 19 47 19 50] [#"../100doors.rs" 19 47 19 50] (100 : usize)));
+    [#"../100doors.rs" 19 35 19 51] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 ([#"../100doors.rs" 19 40 19 45] [#"../100doors.rs" 19 40 19 45] false) ([#"../100doors.rs" 19 47 19 50] [#"../100doors.rs" 19 47 19 50] (100 : usize)));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index bb5bb69294..63e5f6614a 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -290,7 +290,7 @@ module C874_CanExtend
     goto BB2
   }
   BB2 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 254 8 254 58] v <- ([#"../874.rs" 5 16 5 29] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] [#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] [#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] [#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 5 16 5 29] v <- ([#"../874.rs" 5 16 5 29] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] [#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] [#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] [#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB3
   }
   BB3 {
@@ -300,7 +300,7 @@ module C874_CanExtend
     goto BB5
   }
   BB5 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 254 8 254 58] w <- ([#"../874.rs" 6 12 6 25] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] [#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] [#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] [#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 6 12 6 25] w <- ([#"../874.rs" 6 12 6 25] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] [#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] [#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] [#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB6
   }
   BB6 {
@@ -319,7 +319,7 @@ module C874_CanExtend
     goto BB9
   }
   BB9 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 254 8 254 58] z <- ([#"../874.rs" 9 12 9 34] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] [#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] [#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] [#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] [#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] [#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] [#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp));
+    [#"../874.rs" 9 12 9 34] z <- ([#"../874.rs" 9 12 9 34] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] [#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] [#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] [#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] [#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] [#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] [#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp));
     goto BB10
   }
   BB10 {
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index 9d0c742143..736c16c50d 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -382,7 +382,7 @@ module FilterPositive_M
     goto BB3
   }
   BB11 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 ([#"../filter_positive.rs" 95 31 95 32] [#"../filter_positive.rs" 95 31 95 32] (0 : int32)) ([#"../filter_positive.rs" 95 34 95 39] count));
+    [#"../filter_positive.rs" 95 26 95 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 ([#"../filter_positive.rs" 95 31 95 32] [#"../filter_positive.rs" 95 31 95 32] (0 : int32)) ([#"../filter_positive.rs" 95 34 95 39] count));
     goto BB12
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index 9d85e30728..bf068bf2d6 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -289,7 +289,7 @@ module Hashmap_Impl5_New
     goto BB0
   }
   BB0 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil) ([#"../hashmap.rs" 99 55 99 59] size));
+    [#"../hashmap.rs" 99 39 99 60] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil) ([#"../hashmap.rs" 99 55 99 59] size));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index 70b4b6168e..f552550362 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -644,7 +644,7 @@ module Knapsack_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 ([#"../knapsack.rs" 49 35 49 36] [#"../knapsack.rs" 49 35 49 36] (0 : usize)) ([#"../knapsack.rs" 49 38 49 52] ([#"../knapsack.rs" 49 38 49 48] max_weight) + ([#"../knapsack.rs" 49 51 49 52] [#"../knapsack.rs" 49 51 49 52] (1 : usize))));
+    [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 ([#"../knapsack.rs" 49 35 49 36] [#"../knapsack.rs" 49 35 49 36] (0 : usize)) ([#"../knapsack.rs" 49 38 49 52] ([#"../knapsack.rs" 49 38 49 48] max_weight) + ([#"../knapsack.rs" 49 51 49 52] [#"../knapsack.rs" 49 51 49 52] (1 : usize))));
     goto BB1
   }
   BB1 {
@@ -652,7 +652,7 @@ module Knapsack_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 ([#"../knapsack.rs" 49 55 49 70] _11 + ([#"../knapsack.rs" 49 69 49 70] [#"../knapsack.rs" 49 69 49 70] (1 : usize))));
+    [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 ([#"../knapsack.rs" 49 55 49 70] _11 + ([#"../knapsack.rs" 49 69 49 70] [#"../knapsack.rs" 49 69 49 70] (1 : usize))));
     _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     _11 <- any usize;
     goto BB3
diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 2b79bfda79..72f2c91618 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -1095,7 +1095,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 ([#"../knapsack_full.rs" 86 35 86 36] [#"../knapsack_full.rs" 86 35 86 36] (0 : usize)) ([#"../knapsack_full.rs" 86 38 86 52] ([#"../knapsack_full.rs" 86 38 86 48] max_weight) + ([#"../knapsack_full.rs" 86 51 86 52] [#"../knapsack_full.rs" 86 51 86 52] (1 : usize))));
+    [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 ([#"../knapsack_full.rs" 86 35 86 36] [#"../knapsack_full.rs" 86 35 86 36] (0 : usize)) ([#"../knapsack_full.rs" 86 38 86 52] ([#"../knapsack_full.rs" 86 38 86 48] max_weight) + ([#"../knapsack_full.rs" 86 51 86 52] [#"../knapsack_full.rs" 86 51 86 52] (1 : usize))));
     goto BB1
   }
   BB1 {
@@ -1103,7 +1103,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 ([#"../knapsack_full.rs" 86 55 86 70] _14 + ([#"../knapsack_full.rs" 86 69 86 70] [#"../knapsack_full.rs" 86 69 86 70] (1 : usize))));
+    [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 ([#"../knapsack_full.rs" 86 55 86 70] _14 + ([#"../knapsack_full.rs" 86 69 86 70] [#"../knapsack_full.rs" 86 69 86 70] (1 : usize))));
     _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     _14 <- any usize;
     goto BB3
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 13c38a0688..f0ab87c15d 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -1132,15 +1132,15 @@ module SparseArray_Create
   BB0 {
     assert { [@expl:type invariant] inv0 dummy };
     assume { resolve0 dummy };
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _6 <- ([#"../sparse_array.rs" 135 37 135 52] from_elem0 ([#"../sparse_array.rs" 135 42 135 47] dummy) ([#"../sparse_array.rs" 135 49 135 51] sz));
+    [#"../sparse_array.rs" 135 37 135 52] _6 <- ([#"../sparse_array.rs" 135 37 135 52] from_elem0 ([#"../sparse_array.rs" 135 42 135 47] dummy) ([#"../sparse_array.rs" 135 49 135 51] sz));
     goto BB1
   }
   BB1 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 ([#"../sparse_array.rs" 135 64 135 65] [#"../sparse_array.rs" 135 64 135 65] (0 : usize)) ([#"../sparse_array.rs" 135 67 135 69] sz));
+    [#"../sparse_array.rs" 135 59 135 70] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 ([#"../sparse_array.rs" 135 64 135 65] [#"../sparse_array.rs" 135 64 135 65] (0 : usize)) ([#"../sparse_array.rs" 135 67 135 69] sz));
     goto BB2
   }
   BB2 {
-    [#"../../../../creusot-contracts/src/lib.rs" 251 8 251 40] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 ([#"../sparse_array.rs" 135 83 135 84] [#"../sparse_array.rs" 135 83 135 84] (0 : usize)) ([#"../sparse_array.rs" 135 86 135 88] sz));
+    [#"../sparse_array.rs" 135 78 135 89] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 ([#"../sparse_array.rs" 135 83 135 84] [#"../sparse_array.rs" 135 83 135 84] (0 : usize)) ([#"../sparse_array.rs" 135 86 135 88] sz));
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index c57c421f83..f71e01f3b3 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -213,7 +213,7 @@ module C13VecMacro_X
     goto BB0
   }
   BB0 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 248 8 248 30] v0 <- ([#"../13_vec_macro.rs" 6 23 6 29] new0 ());
+    [#"../13_vec_macro.rs" 6 23 6 29] v0 <- ([#"../13_vec_macro.rs" 6 23 6 29] new0 ());
     goto BB1
   }
   BB1 {
@@ -222,7 +222,7 @@ module C13VecMacro_X
     goto BB2
   }
   BB2 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 251 8 251 40] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 ([#"../13_vec_macro.rs" 9 18 9 19] [#"../13_vec_macro.rs" 9 18 9 19] (0 : int32)) ([#"../13_vec_macro.rs" 9 21 9 22] [#"../13_vec_macro.rs" 9 21 9 22] (2 : usize)));
+    [#"../13_vec_macro.rs" 9 13 9 23] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 ([#"../13_vec_macro.rs" 9 18 9 19] [#"../13_vec_macro.rs" 9 18 9 19] (0 : int32)) ([#"../13_vec_macro.rs" 9 21 9 22] [#"../13_vec_macro.rs" 9 21 9 22] (2 : usize)));
     goto BB3
   }
   BB3 {
@@ -237,7 +237,7 @@ module C13VecMacro_X
     goto BB6
   }
   BB6 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 254 8 254 58] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] [#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] [#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] [#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../13_vec_macro.rs" 12 13 12 26] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] [#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] [#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] [#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index 7661676331..ecdfc5f9da 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -277,7 +277,7 @@ module C06KnightsTour_Impl1_New_Closure3
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../../../../../creusot-contracts/src/lib.rs" 251 8 251 40] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 ([#"../06_knights_tour.rs" 44 28 44 29] [#"../06_knights_tour.rs" 44 28 44 29] (0 : usize)) ([#"../06_knights_tour.rs" 44 31 44 35] field_00 ( * _1)));
+    [#"../06_knights_tour.rs" 44 23 44 36] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 ([#"../06_knights_tour.rs" 44 28 44 29] [#"../06_knights_tour.rs" 44 28 44 29] (0 : usize)) ([#"../06_knights_tour.rs" 44 31 44 35] field_00 ( * _1)));
     goto BB1
   }
   BB1 {
diff --git a/why3/src/coma.rs b/why3/src/coma.rs
index 4cb515c0be..607c21f995 100644
--- a/why3/src/coma.rs
+++ b/why3/src/coma.rs
@@ -235,16 +235,6 @@ impl Print for Expr {
     }
 }
 
-fn braces<'a, A: pretty::DocAllocator<'a>>(
-    doc: pretty::DocBuilder<'a, A>,
-) -> pretty::DocBuilder<'a, A> {
-    if !matches!(&*doc.1, pretty::Doc::Nil) {
-        doc.braces()
-    } else {
-        doc
-    }
-}
-
 fn brackets<'a, A: pretty::DocAllocator<'a>>(
     doc: pretty::DocBuilder<'a, A>,
 ) -> pretty::DocBuilder<'a, A> {

From 397d24be1a2a6abb57ebd6e113306f302c8b5731 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Wed, 21 Feb 2024 19:11:52 +0100
Subject: [PATCH 14/66] Revert the coma extension in files

---
 creusot/src/translation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/creusot/src/translation.rs b/creusot/src/translation.rs
index 1cfb160c9a..2c5c35eb61 100644
--- a/creusot/src/translation.rs
+++ b/creusot/src/translation.rs
@@ -100,7 +100,7 @@ pub(crate) fn after_analysis(ctx: TranslationCtx) -> Result<(), Box<dyn Error>>
                 let outputs = why3.output_filenames(());
                 let crate_name = why3.crate_name(LOCAL_CRATE);
 
-                let libname = format!("{}-{}.coma", crate_name.as_str(), why3.crate_types()[0]);
+                let libname = format!("{}-{}.mlcfg", crate_name.as_str(), why3.crate_types()[0]);
 
                 let directory = if why3.opts.in_cargo {
                     let mut dir = outputs.out_directory.clone();

From 0a4eac7f72e39df24a09d407c86b79c45a10319e Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Wed, 21 Feb 2024 16:05:06 +0100
Subject: [PATCH 15/66] Fix #949

---
 creusot/src/backend/clone_map.rs            |   2 +-
 creusot/src/backend/clone_map/elaborator.rs |   2 +-
 creusot/src/backend/clone_map/expander.rs   |   9 +-
 creusot/src/backend/dependency.rs           |   8 +-
 creusot/tests/should_succeed/bug/949.mlcfg  | 308 ++++++++++++++++++++
 creusot/tests/should_succeed/bug/949.rs     |  10 +
 6 files changed, 329 insertions(+), 10 deletions(-)
 create mode 100644 creusot/tests/should_succeed/bug/949.mlcfg
 create mode 100644 creusot/tests/should_succeed/bug/949.rs

diff --git a/creusot/src/backend/clone_map.rs b/creusot/src/backend/clone_map.rs
index ebe25a097d..db49c5e224 100644
--- a/creusot/src/backend/clone_map.rs
+++ b/creusot/src/backend/clone_map.rs
@@ -221,7 +221,7 @@ impl<'tcx> Namer<'tcx> for CloneMap<'tcx> {
     }
 
     fn import_prelude_module(&mut self, module: PreludeModule) {
-        self.insert(DepNode::Buitlin(module));
+        self.insert(DepNode::Builtin(module));
     }
 
     fn with_vis<F, A>(&mut self, vis: CloneLevel, f: F) -> A
diff --git a/creusot/src/backend/clone_map/elaborator.rs b/creusot/src/backend/clone_map/elaborator.rs
index a9dd1cc264..3fbf4775e3 100644
--- a/creusot/src/backend/clone_map/elaborator.rs
+++ b/creusot/src/backend/clone_map/elaborator.rs
@@ -64,7 +64,7 @@ impl<'tcx> SymbolElaborator<'tcx> {
 
         match item {
             DepNode::Type(ty) => return self.elaborate_ty(ctx, names, ty),
-            DepNode::Buitlin(b) => {
+            DepNode::Builtin(b) => {
                 return vec![Decl::UseDecl(Use { name: b.qname(), as_: None, export: false })]
             }
             DepNode::TyInv(ty, kind) => {
diff --git a/creusot/src/backend/clone_map/expander.rs b/creusot/src/backend/clone_map/expander.rs
index 587ac1cce8..e438c952b6 100644
--- a/creusot/src/backend/clone_map/expander.rs
+++ b/creusot/src/backend/clone_map/expander.rs
@@ -162,10 +162,11 @@ impl<'a, 'tcx> Expander<'a, 'tcx> {
                     Some(self.resolve_dep(ctx, node))
                 }
                 TyKind::Closure(_, _) => Some(DepNode::Type(t)),
-                TyKind::Ref(_, _, Mutability::Mut) => Some(DepNode::Buitlin(PreludeModule::Borrow)),
-                TyKind::Int(ity) => Some(DepNode::Buitlin(int_to_prelude(*ity))),
-                TyKind::Uint(uty) => Some(DepNode::Buitlin(uint_to_prelude(*uty))),
-                TyKind::Slice(_) => Some(DepNode::Buitlin(PreludeModule::Slice)),
+                TyKind::Ref(_, _, Mutability::Mut) => Some(DepNode::Builtin(PreludeModule::Borrow)),
+                TyKind::Int(ity) => Some(DepNode::Builtin(int_to_prelude(*ity))),
+                TyKind::Uint(uty) => Some(DepNode::Builtin(uint_to_prelude(*uty))),
+                TyKind::Slice(_) => Some(DepNode::Builtin(PreludeModule::Slice)),
+                TyKind::RawPtr(_) => Some(DepNode::Builtin(PreludeModule::Opaque)),
                 TyKind::Adt(_, _) => Some(DepNode::Type(t)),
                 _ => None,
             };
diff --git a/creusot/src/backend/dependency.rs b/creusot/src/backend/dependency.rs
index 7dba79f1d4..7daaac6aa9 100644
--- a/creusot/src/backend/dependency.rs
+++ b/creusot/src/backend/dependency.rs
@@ -25,7 +25,7 @@ pub(crate) enum Dependency<'tcx> {
     Item(DefId, GenericArgsRef<'tcx>),
     TyInv(Ty<'tcx>, TyInvKind),
     Hacked(HackedId, DefId, GenericArgsRef<'tcx>),
-    Buitlin(PreludeModule),
+    Builtin(PreludeModule),
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
@@ -99,7 +99,7 @@ impl<'tcx> Dependency<'tcx> {
             Dependency::Item(id, _) => Some(TransId::Item(id)),
             Dependency::TyInv(_, k) => Some(TransId::TyInv(k)),
             Dependency::Hacked(h, id, _) => Some(TransId::Hacked(h, id)),
-            Dependency::Buitlin(_) => None,
+            Dependency::Builtin(_) => None,
         }
     }
 
@@ -125,7 +125,7 @@ impl<'tcx> Dependency<'tcx> {
                 _ => None,
             },
             Dependency::Hacked(_, id, substs) => Some((id, substs)),
-            Dependency::Buitlin(_) => None,
+            Dependency::Builtin(_) => None,
         }
     }
 
@@ -200,7 +200,7 @@ impl<'tcx> Dependency<'tcx> {
                 HackedId::Resolve => Symbol::intern("resolve"),
                 HackedId::Accessor(ix) => Symbol::intern(&format!("field_{ix}")),
             },
-            Dependency::Buitlin(_) => Symbol::intern("builtin_should_not_appear"),
+            Dependency::Builtin(_) => Symbol::intern("builtin_should_not_appear"),
         }
     }
 }
diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
new file mode 100644
index 0000000000..b537986375
--- /dev/null
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -0,0 +1,308 @@
+
+module CreusotContracts_GhostPtr_GhostPtrToken_Type
+  type t_ghostptrtoken 't
+end
+module CreusotContracts_Logic_Fmap_FMap_Type
+  type t_fmap 'k 'v
+end
+module Core_Option_Option_Type
+  type t_option 't =
+    | C_None
+    | C_Some 't
+    
+end
+module Core_Ptr_NonNull_NonNull_Type
+  use prelude.Opaque
+  type t_nonnull 't =
+    | C_NonNull opaque_ptr
+    
+end
+module Core_Marker_PhantomData_Type
+  type t_phantomdata 't =
+    | C_PhantomData
+    
+end
+module Core_Ptr_Unique_Unique_Type
+  use Core_Marker_PhantomData_Type as Core_Marker_PhantomData_Type
+  use Core_Ptr_NonNull_NonNull_Type as Core_Ptr_NonNull_NonNull_Type
+  type t_unique 't =
+    | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
+    
+end
+module Alloc_Boxed_Box_Type
+  use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
+  type t_box 't 'a =
+    | C_Box (Core_Ptr_Unique_Unique_Type.t_unique 't) 'a
+    
+end
+module Alloc_Alloc_Global_Type
+  type t_global  =
+    | C_Global
+    
+end
+module C949_Main
+  use prelude.Int32
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant8 (self : Core_Option_Option_Type.t_option int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant8 (self : Core_Option_Option_Type.t_option int32) : bool
+    ensures { result = invariant8 self }
+    
+  predicate inv8 (_x : Core_Option_Option_Type.t_option int32)
+  val inv8 (_x : Core_Option_Option_Type.t_option int32) : bool
+    ensures { result = inv8 _x }
+    
+  axiom inv8 : forall x : Core_Option_Option_Type.t_option int32 . inv8 x = true
+  predicate invariant7 (self : int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant7 (self : int32) : bool
+    ensures { result = invariant7 self }
+    
+  predicate inv7 (_x : int32)
+  val inv7 (_x : int32) : bool
+    ensures { result = inv7 _x }
+    
+  axiom inv7 : forall x : int32 . inv7 x = true
+  use prelude.Opaque
+  use map.Map
+  predicate invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+    ensures { result = invariant6 self }
+    
+  predicate inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32))
+  val inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+    ensures { result = inv6 _x }
+    
+  axiom inv6 : forall x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32) . inv6 x = true
+  predicate invariant5 (self : int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant5 (self : int32) : bool
+    ensures { result = invariant5 self }
+    
+  predicate inv5 (_x : int32)
+  val inv5 (_x : int32) : bool
+    ensures { result = inv5 _x }
+    
+  axiom inv5 : forall x : int32 . inv5 x = true
+  predicate invariant4 (self : opaque_ptr) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant4 (self : opaque_ptr) : bool
+    ensures { result = invariant4 self }
+    
+  predicate inv4 (_x : opaque_ptr)
+  val inv4 (_x : opaque_ptr) : bool
+    ensures { result = inv4 _x }
+    
+  axiom inv4 : forall x : opaque_ptr . inv4 x = true
+  use CreusotContracts_Logic_Fmap_FMap_Type as CreusotContracts_Logic_Fmap_FMap_Type
+  predicate invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+    ensures { result = invariant3 self }
+    
+  predicate inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32)
+  val inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+    ensures { result = inv3 _x }
+    
+  axiom inv3 : forall x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . inv3 x = true
+  predicate invariant2 (self : int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant2 (self : int32) : bool
+    ensures { result = invariant2 self }
+    
+  predicate inv2 (_x : int32)
+  val inv2 (_x : int32) : bool
+    ensures { result = inv2 _x }
+    
+  use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
+  axiom inv2 : forall x : int32 . inv2 x = true
+  use CreusotContracts_GhostPtr_GhostPtrToken_Type as CreusotContracts_GhostPtr_GhostPtrToken_Type
+  use prelude.Borrow
+  predicate invariant1 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant1 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv1 (_x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32))
+  val inv1 (_x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) . inv1 x = true
+  predicate invariant0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) =
+    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
+  val invariant0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : bool
+    ensures { result = invariant0 self }
+    
+  predicate inv0 (_x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)
+  val inv0 (_x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : bool
+    ensures { result = inv0 _x }
+    
+  axiom inv0 : forall x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32 . inv0 x = true
+  predicate resolve1 (self : int32) =
+    [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
+  val resolve1 (self : int32) : bool
+    ensures { result = resolve1 self }
+    
+  predicate resolve0 (self : int32) =
+    [#"../../../../../creusot-contracts/src/resolve.rs" 34 8 34 31] resolve1 self
+  val resolve0 (self : int32) : bool
+    ensures { result = resolve0 self }
+    
+  use prelude.Int
+  use map.Map
+  function mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = mk0 _m }
+    
+  function view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
+    
+  val view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self}
+    ensures { result = view0 self }
+    
+  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv6 (view0 self)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
+  function get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
+    
+   =
+    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 55 8 55 26] Map.get (view0 self) k
+  val get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
+    ensures { result = get0 self k }
+    
+  function contains0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool =
+    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 77 8 77 27] get0 self k <> Core_Option_Option_Type.C_None
+  val contains0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
+    ensures { result = contains0 self k }
+    
+  function len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
+  val len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self}
+    ensures { result = len0 self }
+    
+  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
+  use map.Map
+  function remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k}
+    ensures { result = remove0 self k }
+    
+  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv3 (remove0 self k)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
+    len0 self - 1
+  else
+    len0 self
+  )) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 45 14 45 55] view0 (remove0 self k) = Map.set (view0 self) k (Core_Option_Option_Type.C_None))
+  function unreachable0 (_1 : ()) : int32
+  val unreachable0 (_1 : ()) : int32
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false}
+    ensures { result = unreachable0 _1 }
+    
+  axiom unreachable0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv2 (unreachable0 _1)) && ([#"../../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
+  function unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
+  val unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None}
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv8 op}
+    ensures { result = unwrap0 op }
+    
+  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv8 op) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv2 (unwrap0 op)) && ([#"../../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
+  function lookup_unsized0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+    
+   =
+    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 61 8 61 27] unwrap0 (get0 self k)
+  val lookup_unsized0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+    ensures { result = lookup_unsized0 self k }
+    
+  function shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = shallow_model0 self }
+    
+  val ptr_to_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (ptr : opaque_ptr) : int32
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 106 4 106 39] contains0 (shallow_model0 ( * self)) ptr}
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 109 27 109 31] inv1 self}
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 107 14 107 54] result = lookup_unsized0 (shallow_model0 ( * self)) ptr }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 108 14 108 46] shallow_model0 ( ^ self) = remove0 (shallow_model0 ( * self)) ptr }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 109 4 109 57] inv2 result }
+    
+  function make_sized0 (self : int32) : int32
+  val make_sized0 (self : int32) : int32
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv7 self}
+    ensures { result = make_sized0 self }
+    
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv2 (make_sized0 self)) && ([#"../../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
+  function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    
+  val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v}
+    ensures { result = insert0 self k v }
+    
+  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv3 (insert0 self k v)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
+  val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 57 29 57 33] inv1 self}
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 57 35 57 38] inv2 val'}
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 53 4 53 42] not contains0 (shallow_model0 ( * self)) result }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 56 14 56 55] shallow_model0 ( ^ self) = insert0 (shallow_model0 ( * self)) result val' }
+    
+  use map.Const
+  function empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+  val empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
+    ensures { result = empty0 _1 }
+    
+  axiom empty0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 85 4 85 26] inv3 (empty0 _1)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 84 14 84 49] view0 (empty0 _1) = Const.const (Core_Option_Option_Type.C_None)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 83 14 83 31] len0 (empty0 _1) = 0)
+  val new0 (_1 : ()) : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 27 14 27 38] shallow_model0 result = empty0 () }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 28 4 28 24] inv0 result }
+    
+  let rec cfg main [#"../949.rs" 4 0 4 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : ();
+  var tok : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32;
+  var b : int32;
+  var p : opaque_ptr;
+  var _4 : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+  var r : int32;
+  var _7 : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../949.rs" 5 18 5 38] tok <- ([#"../949.rs" 5 18 5 38] new0 ());
+    goto BB1
+  }
+  BB1 {
+    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 21 6 22] [#"../949.rs" 6 21 6 22] (1 : int32));
+    goto BB2
+  }
+  BB2 {
+    [#"../949.rs" 7 12 7 15] _4 <- Borrow.borrow_mut tok;
+    [#"../949.rs" 7 12 7 15] tok <-  ^ _4;
+    [#"../949.rs" 7 12 7 31] p <- ([#"../949.rs" 7 12 7 31] ptr_from_box0 _4 ([#"../949.rs" 7 29 7 30] b));
+    _4 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+    [#"../949.rs" 7 29 7 30] b <- any int32;
+    goto BB3
+  }
+  BB3 {
+    [#"../949.rs" 8 16 8 19] _7 <- Borrow.borrow_mut tok;
+    [#"../949.rs" 8 16 8 19] tok <-  ^ _7;
+    [#"../949.rs" 8 16 8 33] r <- ([#"../949.rs" 8 16 8 33] ptr_to_box0 _7 ([#"../949.rs" 8 31 8 32] p));
+    _7 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
+    goto BB4
+  }
+  BB4 {
+    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + ([#"../949.rs" 9 10 9 11] [#"../949.rs" 9 10 9 11] (5 : int32)));
+    assume { resolve0 r };
+    [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] ());
+    goto BB5
+  }
+  BB5 {
+    goto BB6
+  }
+  BB6 {
+    return _0
+  }
+  
+end
diff --git a/creusot/tests/should_succeed/bug/949.rs b/creusot/tests/should_succeed/bug/949.rs
new file mode 100644
index 0000000000..2022939229
--- /dev/null
+++ b/creusot/tests/should_succeed/bug/949.rs
@@ -0,0 +1,10 @@
+extern crate creusot_contracts;
+use creusot_contracts::ghost_ptr::GhostPtrToken;
+
+pub fn main() {
+    let mut tok = GhostPtrToken::new();
+    let b = Box::new(1);
+    let p = tok.ptr_from_box(b);
+    let mut r = tok.ptr_to_box(p);
+    *r += 5;
+}

From 08982df6cad00d0b043a74a421061982dc53bc8c Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Thu, 22 Feb 2024 11:41:25 -0800
Subject: [PATCH 16/66] Blessed tests

---
 creusot/tests/should_succeed/bug/949.mlcfg    | 159 ++++++--------
 .../should_succeed/ghost_ptr_token.mlcfg      | 197 +++++++++---------
 .../should_succeed/iterators/01_range.mlcfg   |  66 +++---
 .../should_succeed/iterators/04_skip.mlcfg    |  48 ++---
 .../should_succeed/iterators/07_fuse.mlcfg    |   4 +-
 .../should_succeed/iterators/09_empty.mlcfg   |   2 +-
 .../should_succeed/iterators/10_once.mlcfg    |  46 ++--
 .../should_succeed/iterators/14_copied.mlcfg  |  72 +++----
 .../iterators/15_enumerate.mlcfg              |  76 +++----
 9 files changed, 324 insertions(+), 346 deletions(-)

diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
index b537986375..360f62446d 100644
--- a/creusot/tests/should_succeed/bug/949.mlcfg
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -43,38 +43,16 @@ end
 module C949_Main
   use prelude.Int32
   use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant8 (self : Core_Option_Option_Type.t_option int32) =
+  predicate invariant6 (self : Core_Option_Option_Type.t_option int32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant8 (self : Core_Option_Option_Type.t_option int32) : bool
-    ensures { result = invariant8 self }
-    
-  predicate inv8 (_x : Core_Option_Option_Type.t_option int32)
-  val inv8 (_x : Core_Option_Option_Type.t_option int32) : bool
-    ensures { result = inv8 _x }
-    
-  axiom inv8 : forall x : Core_Option_Option_Type.t_option int32 . inv8 x = true
-  predicate invariant7 (self : int32) =
-    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant7 (self : int32) : bool
-    ensures { result = invariant7 self }
-    
-  predicate inv7 (_x : int32)
-  val inv7 (_x : int32) : bool
-    ensures { result = inv7 _x }
-    
-  axiom inv7 : forall x : int32 . inv7 x = true
-  use prelude.Opaque
-  use map.Map
-  predicate invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) =
-    [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+  val invariant6 (self : Core_Option_Option_Type.t_option int32) : bool
     ensures { result = invariant6 self }
     
-  predicate inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32))
-  val inv6 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
+  predicate inv6 (_x : Core_Option_Option_Type.t_option int32)
+  val inv6 (_x : Core_Option_Option_Type.t_option int32) : bool
     ensures { result = inv6 _x }
     
-  axiom inv6 : forall x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32) . inv6 x = true
+  axiom inv6 : forall x : Core_Option_Option_Type.t_option int32 . inv6 x = true
   predicate invariant5 (self : int32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant5 (self : int32) : bool
@@ -85,60 +63,60 @@ module C949_Main
     ensures { result = inv5 _x }
     
   axiom inv5 : forall x : int32 . inv5 x = true
-  predicate invariant4 (self : opaque_ptr) =
+  use prelude.Opaque
+  use map.Map
+  predicate invariant4 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant4 (self : opaque_ptr) : bool
+  val invariant4 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
     ensures { result = invariant4 self }
     
-  predicate inv4 (_x : opaque_ptr)
-  val inv4 (_x : opaque_ptr) : bool
+  predicate inv4 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32))
+  val inv4 (_x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : bool
     ensures { result = inv4 _x }
     
-  axiom inv4 : forall x : opaque_ptr . inv4 x = true
-  use CreusotContracts_Logic_Fmap_FMap_Type as CreusotContracts_Logic_Fmap_FMap_Type
-  predicate invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) =
+  axiom inv4 : forall x : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32) . inv4 x = true
+  predicate invariant3 (self : int32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant3 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+  val invariant3 (self : int32) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32)
-  val inv3 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
+  predicate inv3 (_x : int32)
+  val inv3 (_x : int32) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . inv3 x = true
-  predicate invariant2 (self : int32) =
+  axiom inv3 : forall x : int32 . inv3 x = true
+  predicate invariant2 (self : opaque_ptr) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant2 (self : int32) : bool
+  val invariant2 (self : opaque_ptr) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : int32)
-  val inv2 (_x : int32) : bool
+  predicate inv2 (_x : opaque_ptr)
+  val inv2 (_x : opaque_ptr) : bool
     ensures { result = inv2 _x }
     
-  use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
-  axiom inv2 : forall x : int32 . inv2 x = true
-  use CreusotContracts_GhostPtr_GhostPtrToken_Type as CreusotContracts_GhostPtr_GhostPtrToken_Type
-  use prelude.Borrow
-  predicate invariant1 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) =
+  axiom inv2 : forall x : opaque_ptr . inv2 x = true
+  use CreusotContracts_Logic_Fmap_FMap_Type as CreusotContracts_Logic_Fmap_FMap_Type
+  predicate invariant1 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant1 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : bool
+  val invariant1 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32))
-  val inv1 (_x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : bool
+  predicate inv1 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32)
+  val inv1 (_x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) . inv1 x = true
-  predicate invariant0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) =
+  axiom inv1 : forall x : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . inv1 x = true
+  predicate invariant0 (self : int32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : bool
+  val invariant0 (self : int32) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)
-  val inv0 (_x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : bool
+  predicate inv0 (_x : int32)
+  val inv0 (_x : int32) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32 . inv0 x = true
+  use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
+  axiom inv0 : forall x : int32 . inv0 x = true
   predicate resolve1 (self : int32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve1 (self : int32) : bool
@@ -149,6 +127,7 @@ module C949_Main
   val resolve0 (self : int32) : bool
     ensures { result = resolve0 self }
     
+  use CreusotContracts_GhostPtr_GhostPtrToken_Type as CreusotContracts_GhostPtr_GhostPtrToken_Type
   use prelude.Int
   use map.Map
   function mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -159,10 +138,10 @@ module C949_Main
   function view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
     
   val view0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv1 self}
     ensures { result = view0 self }
     
-  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv6 (view0 self)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
+  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv4 (view0 self)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
   function get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
     
    =
@@ -170,26 +149,28 @@ module C949_Main
   val get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
     ensures { result = get0 self k }
     
-  function contains0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool =
-    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 77 8 77 27] get0 self k <> Core_Option_Option_Type.C_None
-  val contains0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
+  function contains0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
+    
+   =
+    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 79 8 79 27] get0 self k <> Core_Option_Option_Type.C_None
+  val contains0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : bool
     ensures { result = contains0 self k }
     
   function len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
   val len0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) : int
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv1 self}
     ensures { result = len0 self }
     
-  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
+  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
   use map.Map
   function remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self}
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv1 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv2 k}
     ensures { result = remove0 self k }
     
-  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv3 (remove0 self k)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
+  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv2 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv1 (remove0 self k)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
     len0 self - 1
   else
     len0 self
@@ -199,19 +180,19 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false}
     ensures { result = unreachable0 _1 }
     
-  axiom unreachable0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv2 (unreachable0 _1)) && ([#"../../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
+  axiom unreachable0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
   function unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
   val unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
     requires {[#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None}
-    requires {[#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv8 op}
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv6 op}
     ensures { result = unwrap0 op }
     
-  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv8 op) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv2 (unwrap0 op)) && ([#"../../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
-  function lookup_unsized0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv6 op) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
+  function lookup_unsized0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
     
    =
-    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 61 8 61 27] unwrap0 (get0 self k)
-  val lookup_unsized0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
+    [#"../../../../../creusot-contracts/src/logic/fmap.rs" 62 8 62 27] unwrap0 (get0 self k)
+  val lookup_unsized0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
     ensures { result = lookup_unsized0 self k }
     
   function shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -219,43 +200,41 @@ module C949_Main
   val shallow_model0 (self : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     ensures { result = shallow_model0 self }
     
+  use prelude.Borrow
   val ptr_to_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (ptr : opaque_ptr) : int32
-    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 106 4 106 39] contains0 (shallow_model0 ( * self)) ptr}
-    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 109 27 109 31] inv1 self}
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 107 14 107 54] result = lookup_unsized0 (shallow_model0 ( * self)) ptr }
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 108 14 108 46] shallow_model0 ( ^ self) = remove0 (shallow_model0 ( * self)) ptr }
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 109 4 109 57] inv2 result }
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 96 4 96 39] contains0 (shallow_model0 ( * self)) ptr}
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 97 14 97 54] result = lookup_unsized0 (shallow_model0 ( * self)) ptr }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 98 14 98 46] shallow_model0 ( ^ self) = remove0 (shallow_model0 ( * self)) ptr }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 99 4 99 57] inv0 result }
     
   function make_sized0 (self : int32) : int32
   val make_sized0 (self : int32) : int32
-    requires {[#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv7 self}
+    requires {[#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv5 self}
     ensures { result = make_sized0 self }
     
-  axiom make_sized0_spec : forall self : int32 . ([#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv2 (make_sized0 self)) && ([#"../../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
   function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self}
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k}
-    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv1 self}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv2 k}
+    requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv3 v}
     ensures { result = insert0 self k v }
     
-  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv3 (insert0 self k v)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
+  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv2 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv3 v) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv1 (insert0 self k v)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
   val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr
-    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 57 29 57 33] inv1 self}
-    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 57 35 57 38] inv2 val'}
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 53 4 53 42] not contains0 (shallow_model0 ( * self)) result }
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 56 14 56 55] shallow_model0 ( ^ self) = insert0 (shallow_model0 ( * self)) result val' }
+    requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 71 35 71 38] inv0 val'}
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 67 4 67 42] not contains0 (shallow_model0 ( * self)) result }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 70 14 70 55] shallow_model0 ( ^ self) = insert0 (shallow_model0 ( * self)) result val' }
     
   use map.Const
   function empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
   val empty0 (_1 : ()) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     ensures { result = empty0 _1 }
     
-  axiom empty0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 85 4 85 26] inv3 (empty0 _1)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 84 14 84 49] view0 (empty0 _1) = Const.const (Core_Option_Option_Type.C_None)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 83 14 83 31] len0 (empty0 _1) = 0)
+  axiom empty0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 87 4 87 26] inv1 (empty0 _1)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 86 14 86 49] view0 (empty0 _1) = Const.const (Core_Option_Option_Type.C_None)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 85 14 85 31] len0 (empty0 _1) = 0)
   val new0 (_1 : ()) : CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 27 14 27 38] shallow_model0 result = empty0 () }
-    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 28 4 28 24] inv0 result }
+    ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () }
     
   let rec cfg main [#"../949.rs" 4 0 4 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index c32dc89e82..58dd13058a 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -52,7 +52,6 @@ module Alloc_Alloc_Global_Type
 end
 module GhostPtrToken_Test
   use prelude.Int32
-  use prelude.Opaque
   use Core_Option_Option_Type as Core_Option_Option_Type
   predicate invariant7 (self : Core_Option_Option_Type.t_option int32) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
@@ -64,6 +63,7 @@ module GhostPtrToken_Test
     ensures { result = inv7 _x }
     
   axiom inv7 : forall x : Core_Option_Option_Type.t_option int32 . inv7 x = true
+  use prelude.Opaque
   use map.Map
   predicate invariant6 (self : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
@@ -138,8 +138,6 @@ module GhostPtrToken_Test
     
   use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
   axiom inv0 : forall x : int32 . inv0 x = true
-  use prelude.Opaque
-  use Core_Panicking_AssertKind_Type as Core_Panicking_AssertKind_Type
   use CreusotContracts_GhostPtr_GhostPtrToken_Type as CreusotContracts_GhostPtr_GhostPtrToken_Type
   function unreachable0 (_1 : ()) : int32
   val unreachable0 (_1 : ()) : int32
@@ -205,17 +203,18 @@ module GhostPtrToken_Test
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 80 14 80 51] result = lookup_unsized0 (shallow_model1 self) ptr }
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 81 4 81 49] inv2 result }
     
-  predicate resolve2 (self : borrowed int32) =
-    [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
-  val resolve2 (self : borrowed int32) : bool
-    ensures { result = resolve2 self }
-    
   val swap0 (x : borrowed int32) (y : borrowed int32) : ()
     requires {inv1 x}
     requires {inv1 y}
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 11 22 11 30]  ^ x =  * y }
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 12 22 12 30]  ^ y =  * x }
     
+  use Core_Panicking_AssertKind_Type as Core_Panicking_AssertKind_Type
+  predicate resolve2 (self : borrowed int32) =
+    [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
+  val resolve2 (self : borrowed int32) : bool
+    ensures { result = resolve2 self }
+    
   predicate resolve3 (self : int32) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve3 (self : int32) : bool
@@ -238,7 +237,7 @@ module GhostPtrToken_Test
     ensures { result = cur0 self }
     
   predicate resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) =
-    [#"../../../../creusot-contracts/src/ghost_ptr.rs" 261 8 261 32] cur0 self = fin0 self
+    [#"../../../../creusot-contracts/src/ghost_ptr.rs" 263 8 263 32] cur0 self = fin0 self
   val resolve0 (self : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32) : bool
     ensures { result = resolve0 self }
     
@@ -252,10 +251,10 @@ module GhostPtrToken_Test
   use map.Map
   function make_sized0 (self : int32) : int32
   val make_sized0 (self : int32) : int32
-    requires {[#"../../../../creusot-contracts/src/util.rs" 16 18 16 22] inv5 self}
+    requires {[#"../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv2 self}
     ensures { result = make_sized0 self }
     
-  axiom make_sized0_spec : forall self : int32 . ([#"../../../../creusot-contracts/src/util.rs" 16 18 16 22] inv5 self) -> ([#"../../../../creusot-contracts/src/util.rs" 16 4 16 39] inv0 (make_sized0 self)) && ([#"../../../../creusot-contracts/src/util.rs" 15 14 15 29] make_sized0 self = self)
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv2 self) -> ([#"../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
   function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -278,16 +277,16 @@ module GhostPtrToken_Test
     len0 self
   )) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 45 14 45 55] view0 (remove0 self k) = Map.set (view0 self) k (Core_Option_Option_Type.C_None))
   val take_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32)) (ptr : opaque_ptr) : borrowed int32
-    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 227 15 227 42] contains0 (cur0 ( * self)) ptr}
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 228 14 228 59]  * result = lookup_unsized0 (cur0 ( * self)) ptr }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 229 14 229 56] cur0 ( ^ self) = remove0 (cur0 ( * self)) ptr }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 230 14 230 65] fin0 ( * self) = insert0 (fin0 ( ^ self)) ptr ( ^ result) }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 231 14 231 42] not contains0 (fin0 ( ^ self)) ptr }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 232 4 232 58] inv1 result }
+    requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 229 15 229 42] contains0 (cur0 ( * self)) ptr}
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 230 14 230 59]  * result = lookup_unsized0 (cur0 ( * self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 231 14 231 56] cur0 ( ^ self) = remove0 (cur0 ( * self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 232 14 232 65] fin0 ( * self) = insert0 (fin0 ( ^ self)) ptr ( ^ result) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 233 14 233 42] not contains0 (fin0 ( ^ self)) ptr }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 234 4 234 58] inv1 result }
     
   val borrow_mut0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) : CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 123 14 123 38] cur0 result = shallow_model0 ( * self) }
-    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 124 14 124 38] fin0 result = shallow_model0 ( ^ self) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 124 14 124 38] cur0 result = shallow_model0 ( * self) }
+    ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 125 14 125 38] fin0 result = shallow_model0 ( ^ self) }
     
   val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr
     requires {[#"../../../../creusot-contracts/src/ghost_ptr.rs" 71 35 71 38] inv0 val'}
@@ -329,35 +328,35 @@ module GhostPtrToken_Test
   var left_val : int32;
   var right_val : int32;
   var kind : Core_Panicking_AssertKind_Type.t_assertkind;
-  var _32 : int32;
-  var _34 : int32;
-  var _37 : (int32, int32);
+  var _31 : int32;
+  var _33 : int32;
+  var _36 : (int32, int32);
   var left_val1 : int32;
   var right_val1 : int32;
   var kind1 : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _50 : int32;
   var _52 : int32;
-  var _54 : int32;
-  var _56 : ();
-  var _57 : borrowed int32;
-  var _58 : borrowed int32;
-  var _60 : (int32, int32);
-  var _62 : int32;
+  var _54 : ();
+  var _55 : borrowed int32;
+  var _56 : borrowed int32;
+  var _58 : (int32, int32);
+  var _60 : int32;
   var left_val2 : int32;
   var right_val2 : int32;
   var kind2 : Core_Panicking_AssertKind_Type.t_assertkind;
-  var _78 : int32;
-  var _80 : int32;
-  var _83 : (int32, int32);
-  var _85 : int32;
+  var _75 : int32;
+  var _77 : int32;
+  var _80 : (int32, int32);
+  var _82 : int32;
   var left_val3 : int32;
   var right_val3 : int32;
   var kind3 : Core_Panicking_AssertKind_Type.t_assertkind;
+  var _97 : int32;
+  var _99 : int32;
   var _101 : int32;
+  var _102 : int32;
   var _103 : int32;
-  var _105 : int32;
-  var _106 : int32;
-  var _107 : int32;
-  var _108 : int32;
+  var _104 : int32;
   {
     goto BB0
   }
@@ -366,8 +365,8 @@ module GhostPtrToken_Test
     goto BB1
   }
   BB1 {
-    [#"../ghost_ptr_token.rs" 5 15 5 46] _3 <- Borrow.borrow_mut token;
-    [#"../ghost_ptr_token.rs" 5 15 5 46] token <-  ^ _3;
+    [#"../ghost_ptr_token.rs" 5 15 5 20] _3 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 5 15 5 20] token <-  ^ _3;
     goto BB2
   }
   BB2 {
@@ -376,8 +375,8 @@ module GhostPtrToken_Test
     goto BB3
   }
   BB3 {
-    [#"../ghost_ptr_token.rs" 6 15 6 46] _6 <- Borrow.borrow_mut token;
-    [#"../ghost_ptr_token.rs" 6 15 6 46] token <-  ^ _6;
+    [#"../ghost_ptr_token.rs" 6 15 6 20] _6 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 6 15 6 20] token <-  ^ _6;
     goto BB4
   }
   BB4 {
@@ -386,124 +385,124 @@ module GhostPtrToken_Test
     goto BB5
   }
   BB5 {
-    [#"../ghost_ptr_token.rs" 8 24 8 42] _9 <- Borrow.borrow_mut token;
-    [#"../ghost_ptr_token.rs" 8 24 8 42] token <-  ^ _9;
+    [#"../ghost_ptr_token.rs" 8 24 8 29] _9 <- Borrow.borrow_mut token;
+    [#"../ghost_ptr_token.rs" 8 24 8 29] token <-  ^ _9;
     [#"../ghost_ptr_token.rs" 8 24 8 42] token_mut <- ([#"../ghost_ptr_token.rs" 8 24 8 42] borrow_mut0 _9);
     _9 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB6
   }
   BB6 {
-    [#"../ghost_ptr_token.rs" 9 13 9 37] _11 <- Borrow.borrow_mut token_mut;
-    [#"../ghost_ptr_token.rs" 9 13 9 37] token_mut <-  ^ _11;
+    [#"../ghost_ptr_token.rs" 9 13 9 22] _11 <- Borrow.borrow_mut token_mut;
+    [#"../ghost_ptr_token.rs" 9 13 9 22] token_mut <-  ^ _11;
     [#"../ghost_ptr_token.rs" 9 13 9 37] m1 <- ([#"../ghost_ptr_token.rs" 9 13 9 37] take_mut0 _11 ([#"../ghost_ptr_token.rs" 9 32 9 36] ptr1));
     _11 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
     goto BB7
   }
   BB7 {
-    [#"../ghost_ptr_token.rs" 10 13 10 37] _14 <- Borrow.borrow_mut token_mut;
-    [#"../ghost_ptr_token.rs" 10 13 10 37] token_mut <-  ^ _14;
+    [#"../ghost_ptr_token.rs" 10 13 10 22] _14 <- Borrow.borrow_mut token_mut;
+    [#"../ghost_ptr_token.rs" 10 13 10 22] token_mut <-  ^ _14;
     [#"../ghost_ptr_token.rs" 10 13 10 37] m2 <- ([#"../ghost_ptr_token.rs" 10 13 10 37] take_mut0 _14 ([#"../ghost_ptr_token.rs" 10 32 10 36] ptr2));
     _14 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
     goto BB8
   }
   BB8 {
     assume { resolve0 token_mut };
-    _108 <- promoted3;
-    _17 <- ( * m1, _108);
+    _104 <- promoted3;
+    _17 <- ( * m1, _104);
     left_val <- (let (a, _) = _17 in a);
     right_val <- (let (_, a) = _17 in a);
     assume { resolve1 _17 };
-    switch (not left_val = right_val)
+    switch (left_val = right_val)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
+    _103 <- promoted2;
+    _36 <- ( * m2, _103);
+    left_val1 <- (let (a, _) = _36 in a);
+    right_val1 <- (let (_, a) = _36 in a);
+    assume { resolve1 _36 };
+    switch (left_val1 = right_val1)
+      | False -> goto BB12
+      | True -> goto BB11
+      end
+  }
+  BB10 {
     assume { resolve2 m2 };
     kind <- Core_Panicking_AssertKind_Type.C_Eq;
-    _32 <- left_val;
-    _34 <- right_val;
+    _31 <- left_val;
+    _33 <- right_val;
     assert { false };
     absurd
   }
-  BB10 {
-    _107 <- promoted2;
-    _37 <- ( * m2, _107);
-    left_val1 <- (let (a, _) = _37 in a);
-    right_val1 <- (let (_, a) = _37 in a);
-    assume { resolve1 _37 };
-    switch (not left_val1 = right_val1)
-      | False -> goto BB12
-      | True -> goto BB11
-      end
-  }
   BB11 {
+    [#"../ghost_ptr_token.rs" 15 20 15 22] _55 <- Borrow.borrow_final ( * m1) (Borrow.get_id m1);
+    [#"../ghost_ptr_token.rs" 15 20 15 22] m1 <- { m1 with current = ( ^ _55) ; };
+    [#"../ghost_ptr_token.rs" 15 24 15 26] _56 <- Borrow.borrow_final ( * m2) (Borrow.get_id m2);
+    [#"../ghost_ptr_token.rs" 15 24 15 26] m2 <- { m2 with current = ( ^ _56) ; };
+    [#"../ghost_ptr_token.rs" 15 4 15 27] _54 <- ([#"../ghost_ptr_token.rs" 15 4 15 27] swap0 _55 _56);
+    _55 <- any borrowed int32;
+    _56 <- any borrowed int32;
+    goto BB13
+  }
+  BB12 {
     assume { resolve2 m1 };
     kind1 <- Core_Panicking_AssertKind_Type.C_Eq;
-    _52 <- left_val1;
-    _54 <- right_val1;
+    _50 <- left_val1;
+    _52 <- right_val1;
     assert { false };
     absurd
   }
-  BB12 {
-    [#"../ghost_ptr_token.rs" 15 20 15 22] _57 <- Borrow.borrow_mut ( * m1);
-    [#"../ghost_ptr_token.rs" 15 20 15 22] m1 <- { m1 with current =  ^ _57 };
-    [#"../ghost_ptr_token.rs" 15 24 15 26] _58 <- Borrow.borrow_mut ( * m2);
-    [#"../ghost_ptr_token.rs" 15 24 15 26] m2 <- { m2 with current =  ^ _58 };
-    [#"../ghost_ptr_token.rs" 15 4 15 27] _56 <- ([#"../ghost_ptr_token.rs" 15 4 15 27] swap0 _57 _58);
-    _57 <- any borrowed int32;
-    _58 <- any borrowed int32;
-    goto BB13
-  }
   BB13 {
     assume { resolve2 m2 };
     assume { resolve2 m1 };
-    [#"../ghost_ptr_token.rs" 16 16 16 38] _62 <- ([#"../ghost_ptr_token.rs" 16 16 16 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 16 16 16 38] token) ([#"../ghost_ptr_token.rs" 16 33 16 37] ptr1));
+    [#"../ghost_ptr_token.rs" 16 16 16 38] _60 <- ([#"../ghost_ptr_token.rs" 16 16 16 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 16 16 16 21] token) ([#"../ghost_ptr_token.rs" 16 33 16 37] ptr1));
     goto BB14
   }
   BB14 {
-    _106 <- promoted1;
-    _60 <- (_62, _106);
-    left_val2 <- (let (a, _) = _60 in a);
-    right_val2 <- (let (_, a) = _60 in a);
-    assume { resolve1 _60 };
-    switch (not left_val2 = right_val2)
+    _102 <- promoted1;
+    _58 <- (_60, _102);
+    left_val2 <- (let (a, _) = _58 in a);
+    right_val2 <- (let (_, a) = _58 in a);
+    assume { resolve1 _58 };
+    switch (left_val2 = right_val2)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
+    [#"../ghost_ptr_token.rs" 17 16 17 38] _82 <- ([#"../ghost_ptr_token.rs" 17 16 17 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 17 16 17 21] token) ([#"../ghost_ptr_token.rs" 17 33 17 37] ptr2));
+    goto BB17
+  }
+  BB16 {
     kind2 <- Core_Panicking_AssertKind_Type.C_Eq;
-    _78 <- left_val2;
-    _80 <- right_val2;
+    _75 <- left_val2;
+    _77 <- right_val2;
     assert { false };
     absurd
   }
-  BB16 {
-    [#"../ghost_ptr_token.rs" 17 16 17 38] _85 <- ([#"../ghost_ptr_token.rs" 17 16 17 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 17 16 17 38] token) ([#"../ghost_ptr_token.rs" 17 33 17 37] ptr2));
-    goto BB17
-  }
   BB17 {
-    _105 <- promoted0;
-    _83 <- (_85, _105);
-    left_val3 <- (let (a, _) = _83 in a);
-    right_val3 <- (let (_, a) = _83 in a);
-    assume { resolve1 _83 };
-    switch (not left_val3 = right_val3)
+    _101 <- promoted0;
+    _80 <- (_82, _101);
+    left_val3 <- (let (a, _) = _80 in a);
+    right_val3 <- (let (_, a) = _80 in a);
+    assume { resolve1 _80 };
+    switch (left_val3 = right_val3)
       | False -> goto BB19
       | True -> goto BB18
       end
   }
   BB18 {
+    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ());
+    return _0
+  }
+  BB19 {
     kind3 <- Core_Panicking_AssertKind_Type.C_Eq;
-    _101 <- left_val3;
-    _103 <- right_val3;
+    _97 <- left_val3;
+    _99 <- right_val3;
     assert { false };
     absurd
   }
-  BB19 {
-    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ());
-    return _0
-  }
   
 end
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index e9dc99bf9f..571f08d22c 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -314,56 +314,46 @@ module C01Range_Impl0
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Seq.seq isize . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option isize) =
+  use C01Range_Range_Type as C01Range_Range_Type
+  predicate invariant2 (self : C01Range_Range_Type.t_range) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant2 (self : Core_Option_Option_Type.t_option isize) : bool
+  val invariant2 (self : C01Range_Range_Type.t_range) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Core_Option_Option_Type.t_option isize)
-  val inv2 (_x : Core_Option_Option_Type.t_option isize) : bool
+  predicate inv2 (_x : C01Range_Range_Type.t_range)
+  val inv2 (_x : C01Range_Range_Type.t_range) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option isize . inv2 x = true
-  use C01Range_Range_Type as C01Range_Range_Type
-  use prelude.Borrow
-  predicate invariant1 (self : borrowed (C01Range_Range_Type.t_range)) =
+  axiom inv2 : forall x : C01Range_Range_Type.t_range . inv2 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant1 (self : Core_Option_Option_Type.t_option isize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant1 (self : borrowed (C01Range_Range_Type.t_range)) : bool
+  val invariant1 (self : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (C01Range_Range_Type.t_range))
-  val inv1 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
+  predicate inv1 (_x : Core_Option_Option_Type.t_option isize)
+  val inv1 (_x : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (C01Range_Range_Type.t_range) . inv1 x = true
-  predicate invariant0 (self : C01Range_Range_Type.t_range) =
+  axiom inv1 : forall x : Core_Option_Option_Type.t_option isize . inv1 x = true
+  use prelude.Borrow
+  predicate invariant0 (self : borrowed (C01Range_Range_Type.t_range)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant0 (self : C01Range_Range_Type.t_range) : bool
+  val invariant0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : C01Range_Range_Type.t_range)
-  val inv0 (_x : C01Range_Range_Type.t_range) : bool
+  predicate inv0 (_x : borrowed (C01Range_Range_Type.t_range))
+  val inv0 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : C01Range_Range_Type.t_range . inv0 x = true
+  axiom inv0 : forall x : borrowed (C01Range_Range_Type.t_range) . inv0 x = true
   use seq.Seq
   use seq.Seq
-  use prelude.Int
-  predicate resolve0 (self : borrowed (C01Range_Range_Type.t_range)) =
-    [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
-  val resolve0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
-    ensures { result = resolve0 self }
-    
-  predicate completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) =
-    [#"../01_range.rs" 25 12 25 52] resolve0 self /\ C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self)
-  val completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) : bool
-    ensures { result = completed0 self }
-    
   use seq.Seq
   use seq.Seq
   use prelude.IntSize
   use seq.Seq
+  use prelude.Int
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
@@ -372,13 +362,23 @@ module C01Range_Impl0
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv1 self -> (forall result : Core_Option_Option_Type.t_option isize . match result with
+  predicate resolve0 (self : borrowed (C01Range_Range_Type.t_range)) =
+    [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
+  val resolve0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
+    ensures { result = resolve0 self }
+    
+  predicate completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) =
+    [#"../01_range.rs" 25 12 25 52] resolve0 self /\ C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self)
+  val completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) : bool
+    ensures { result = completed0 self }
+    
+  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv0 self -> (forall result : Core_Option_Option_Type.t_option isize . match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv2 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index 247a964a99..a4c042ee4e 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -529,36 +529,36 @@ module C04Skip_Impl0
     
   axiom inv4 : forall x : borrowed i . inv4 x = true
   type item0
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option item0)
-  val invariant3 (self : Core_Option_Option_Type.t_option item0) : bool
+  use seq.Seq
+  predicate invariant3 (self : Seq.seq item0)
+  val invariant3 (self : Seq.seq item0) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option item0)
-  val inv3 (_x : Core_Option_Option_Type.t_option item0) : bool
+  predicate inv3 (_x : Seq.seq item0)
+  val inv3 (_x : Seq.seq item0) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option item0 . inv3 x = true
-  use C04Skip_Skip_Type as C04Skip_Skip_Type
-  predicate invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i))
-  val invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  axiom inv3 : forall x : Seq.seq item0 . inv3 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant2 (self : Core_Option_Option_Type.t_option item0)
+  val invariant2 (self : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
-  val inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  predicate inv2 (_x : Core_Option_Option_Type.t_option item0)
+  val inv2 (_x : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 x = true
-  use seq.Seq
-  predicate invariant1 (self : Seq.seq item0)
-  val invariant1 (self : Seq.seq item0) : bool
+  axiom inv2 : forall x : Core_Option_Option_Type.t_option item0 . inv2 x = true
+  use C04Skip_Skip_Type as C04Skip_Skip_Type
+  predicate invariant1 (self : borrowed (C04Skip_Skip_Type.t_skip i))
+  val invariant1 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Seq.seq item0)
-  val inv1 (_x : Seq.seq item0) : bool
+  predicate inv1 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
+  val inv1 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Seq.seq item0 . inv1 x = true
+  axiom inv1 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv1 x = true
   predicate invariant0 (self : C04Skip_Skip_Type.t_skip i)
   val invariant0 (self : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = invariant0 self }
@@ -569,6 +569,7 @@ module C04Skip_Impl0
     
   axiom inv0 : forall x : C04Skip_Skip_Type.t_skip i . inv0 x = true
   use seq.Seq
+  use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -586,27 +587,26 @@ module C04Skip_Impl0
   use seq.Seq
   use prelude.UIntSize
   predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
-    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv1 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
+    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv3 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
   val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv3 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
+  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index 97a236a7b1..8eac620b79 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -636,13 +636,13 @@ module C07Fuse_Impl0
   val completed0 [#"../07_fuse.rs" 16 4 16 35] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) : bool
     ensures { result = completed0 self }
     
+  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
-  use seq.Seq
   predicate produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i)
     
    =
@@ -656,8 +656,8 @@ module C07Fuse_Impl0
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
   goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
   goal next_refn : [#"../07_fuse.rs" 39 4 39 44] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index d0d7618fea..8bc18d71fb 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -183,8 +183,8 @@ module C09Empty_Impl0
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 self -> (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
diff --git a/creusot/tests/should_succeed/iterators/10_once.mlcfg b/creusot/tests/should_succeed/iterators/10_once.mlcfg
index 95da1af9bf..3536ac79a0 100644
--- a/creusot/tests/should_succeed/iterators/10_once.mlcfg
+++ b/creusot/tests/should_succeed/iterators/10_once.mlcfg
@@ -216,37 +216,37 @@ module C10Once_Impl0
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : t . inv4 x = true
-  use seq.Seq
-  predicate invariant3 (self : Seq.seq t)
-  val invariant3 (self : Seq.seq t) : bool
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
+  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq t)
-  val inv3 (_x : Seq.seq t) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
+  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq t . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option t)
-  val invariant2 (self : Core_Option_Option_Type.t_option t) : bool
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
+  use C10Once_Once_Type as C10Once_Once_Type
+  use prelude.Borrow
+  predicate invariant2 (self : borrowed (C10Once_Once_Type.t_once t))
+  val invariant2 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Core_Option_Option_Type.t_option t)
-  val inv2 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv2 (_x : borrowed (C10Once_Once_Type.t_once t))
+  val inv2 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option t . inv2 x = true
-  use C10Once_Once_Type as C10Once_Once_Type
-  use prelude.Borrow
-  predicate invariant1 (self : borrowed (C10Once_Once_Type.t_once t))
-  val invariant1 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
+  axiom inv2 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv2 x = true
+  use seq.Seq
+  predicate invariant1 (self : Seq.seq t)
+  val invariant1 (self : Seq.seq t) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (C10Once_Once_Type.t_once t))
-  val inv1 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
+  predicate inv1 (_x : Seq.seq t)
+  val inv1 (_x : Seq.seq t) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv1 x = true
+  axiom inv1 : forall x : Seq.seq t . inv1 x = true
   predicate invariant0 (self : C10Once_Once_Type.t_once t)
   val invariant0 (self : C10Once_Once_Type.t_once t) : bool
     ensures { result = invariant0 self }
@@ -257,7 +257,6 @@ module C10Once_Impl0
     
   axiom inv0 : forall x : C10Once_Once_Type.t_once t . inv0 x = true
   use seq.Seq
-  use seq.Seq
   predicate resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
@@ -268,6 +267,7 @@ module C10Once_Impl0
   val completed0 [#"../10_once.rs" 15 4 15 35] (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = completed0 self }
     
+  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t)
@@ -277,13 +277,13 @@ module C10Once_Impl0
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
+  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
+  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/14_copied.mlcfg b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
index bf7ebba998..e1d7b69948 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.mlcfg
+++ b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
@@ -368,55 +368,45 @@ module C14Copied_Impl0
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : Seq.seq t . inv4 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
-  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
+  predicate invariant3 (self : Seq.seq t)
+  val invariant3 (self : Seq.seq t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
-  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv3 (_x : Seq.seq t)
+  val inv3 (_x : Seq.seq t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
+  axiom inv3 : forall x : Seq.seq t . inv3 x = true
   use C14Copied_Copied_Type as C14Copied_Copied_Type
-  use prelude.Borrow
-  predicate invariant2 (self : borrowed (C14Copied_Copied_Type.t_copied i))
-  val invariant2 (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+  predicate invariant2 (self : C14Copied_Copied_Type.t_copied i)
+  val invariant2 (self : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : borrowed (C14Copied_Copied_Type.t_copied i))
-  val inv2 (_x : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+  predicate inv2 (_x : C14Copied_Copied_Type.t_copied i)
+  val inv2 (_x : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 x = true
-  predicate invariant1 (self : Seq.seq t)
-  val invariant1 (self : Seq.seq t) : bool
+  axiom inv2 : forall x : C14Copied_Copied_Type.t_copied i . inv2 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant1 (self : Core_Option_Option_Type.t_option t)
+  val invariant1 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Seq.seq t)
-  val inv1 (_x : Seq.seq t) : bool
+  predicate inv1 (_x : Core_Option_Option_Type.t_option t)
+  val inv1 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Seq.seq t . inv1 x = true
-  predicate invariant0 (self : C14Copied_Copied_Type.t_copied i)
-  val invariant0 (self : C14Copied_Copied_Type.t_copied i) : bool
+  axiom inv1 : forall x : Core_Option_Option_Type.t_option t . inv1 x = true
+  use prelude.Borrow
+  predicate invariant0 (self : borrowed (C14Copied_Copied_Type.t_copied i))
+  val invariant0 (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : C14Copied_Copied_Type.t_copied i)
-  val inv0 (_x : C14Copied_Copied_Type.t_copied i) : bool
+  predicate inv0 (_x : borrowed (C14Copied_Copied_Type.t_copied i))
+  val inv0 (_x : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : C14Copied_Copied_Type.t_copied i . inv0 x = true
-  use seq.Seq
-  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
-  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
-    ensures { result = completed1 self }
-    
-  predicate completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) =
-    [#"../14_copied.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C14Copied_Copied_Type.copied_iter ( * self)) (C14Copied_Copied_Type.copied_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
-  val completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
-    ensures { result = completed0 self }
-    
+  axiom inv0 : forall x : borrowed (C14Copied_Copied_Type.t_copied i) . inv0 x = true
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -436,13 +426,23 @@ module C14Copied_Impl0
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  use seq.Seq
+  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
+  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
+    ensures { result = completed1 self }
+    
+  predicate completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) =
+    [#"../14_copied.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C14Copied_Copied_Type.copied_iter ( * self)) (C14Copied_Copied_Type.copied_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
+  val completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+    ensures { result = completed0 self }
+    
+  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option t . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index c328782b34..58aefb3144 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -610,6 +610,30 @@ module C15Enumerate_Impl0
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Seq.seq (usize, item0) . inv3 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant2 (self : Core_Option_Option_Type.t_option (usize, item0))
+  val invariant2 (self : Core_Option_Option_Type.t_option (usize, item0)) : bool
+    ensures { result = invariant2 self }
+    
+  predicate inv2 (_x : Core_Option_Option_Type.t_option (usize, item0))
+  val inv2 (_x : Core_Option_Option_Type.t_option (usize, item0)) : bool
+    ensures { result = inv2 _x }
+    
+  axiom inv2 : forall x : Core_Option_Option_Type.t_option (usize, item0) . inv2 x = true
+  use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
+  predicate invariant1 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+  val invariant1 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv0 (_x : C15Enumerate_Enumerate_Type.t_enumerate i)
+  val inv0 (_x : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
+    ensures { result = inv0 _x }
+    
+  predicate inv1 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+  val inv1 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv1 x = (inv0 ( * x) /\ inv0 ( ^ x))
   use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
@@ -624,40 +648,22 @@ module C15Enumerate_Impl0
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
-  use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
-  predicate invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
+  predicate invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
     [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv5 i -> inv4 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv6 i -> completed1 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
-  val invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
-    ensures { result = invariant2 self }
-    
-  predicate inv2 (_x : C15Enumerate_Enumerate_Type.t_enumerate i)
-  val inv2 (_x : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
-    ensures { result = inv2 _x }
+  val invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
+    ensures { result = invariant0 self }
     
-  axiom inv2 : forall x : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 x = (invariant2 x /\ match x with
+  axiom inv0 : forall x : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 x = (invariant0 x /\ match x with
     | C15Enumerate_Enumerate_Type.C_Enumerate iter count -> true
     end)
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant1 (self : Core_Option_Option_Type.t_option (usize, item0))
-  val invariant1 (self : Core_Option_Option_Type.t_option (usize, item0)) : bool
-    ensures { result = invariant1 self }
-    
-  predicate inv1 (_x : Core_Option_Option_Type.t_option (usize, item0))
-  val inv1 (_x : Core_Option_Option_Type.t_option (usize, item0)) : bool
-    ensures { result = inv1 _x }
-    
-  axiom inv1 : forall x : Core_Option_Option_Type.t_option (usize, item0) . inv1 x = true
-  predicate invariant0 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-  val invariant0 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = invariant0 self }
-    
-  predicate inv0 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-  val inv0 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = inv0 _x }
-    
-  axiom inv0 : forall x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 x = (inv2 ( * x) /\ inv2 ( ^ x))
   use seq.Seq
   use seq.Seq
+  predicate completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+   =
+    [#"../15_enumerate.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C15Enumerate_Enumerate_Type.enumerate_iter ( * self)) (C15Enumerate_Enumerate_Type.enumerate_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
+  val completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = completed0 self }
+    
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -670,21 +676,15 @@ module C15Enumerate_Impl0
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  predicate completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-   =
-    [#"../15_enumerate.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C15Enumerate_Enumerate_Type.enumerate_iter ( * self)) (C15Enumerate_Enumerate_Type.enumerate_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
-  val completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = completed0 self }
-    
-  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv1 result /\ match result with
+  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv1 result /\ match result with
+    end -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
 module C15Enumerate_Impl1
   type i

From 1252d4579fd369140895603b698ac55b96f3764b Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Thu, 22 Feb 2024 11:45:58 -0800
Subject: [PATCH 17/66] Revert some blessed tests

---
 .../should_succeed/iterators/01_range.mlcfg   | 66 ++++++++--------
 .../should_succeed/iterators/04_skip.mlcfg    | 48 ++++++------
 .../should_succeed/iterators/07_fuse.mlcfg    |  4 +-
 .../should_succeed/iterators/09_empty.mlcfg   |  2 +-
 .../should_succeed/iterators/10_once.mlcfg    | 46 +++++------
 .../should_succeed/iterators/14_copied.mlcfg  | 72 +++++++++---------
 .../iterators/15_enumerate.mlcfg              | 76 +++++++++----------
 7 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 571f08d22c..e9dc99bf9f 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -314,46 +314,56 @@ module C01Range_Impl0
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Seq.seq isize . inv3 x = true
-  use C01Range_Range_Type as C01Range_Range_Type
-  predicate invariant2 (self : C01Range_Range_Type.t_range) =
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant2 (self : Core_Option_Option_Type.t_option isize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant2 (self : C01Range_Range_Type.t_range) : bool
+  val invariant2 (self : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : C01Range_Range_Type.t_range)
-  val inv2 (_x : C01Range_Range_Type.t_range) : bool
+  predicate inv2 (_x : Core_Option_Option_Type.t_option isize)
+  val inv2 (_x : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : C01Range_Range_Type.t_range . inv2 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant1 (self : Core_Option_Option_Type.t_option isize) =
+  axiom inv2 : forall x : Core_Option_Option_Type.t_option isize . inv2 x = true
+  use C01Range_Range_Type as C01Range_Range_Type
+  use prelude.Borrow
+  predicate invariant1 (self : borrowed (C01Range_Range_Type.t_range)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant1 (self : Core_Option_Option_Type.t_option isize) : bool
+  val invariant1 (self : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Core_Option_Option_Type.t_option isize)
-  val inv1 (_x : Core_Option_Option_Type.t_option isize) : bool
+  predicate inv1 (_x : borrowed (C01Range_Range_Type.t_range))
+  val inv1 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Core_Option_Option_Type.t_option isize . inv1 x = true
-  use prelude.Borrow
-  predicate invariant0 (self : borrowed (C01Range_Range_Type.t_range)) =
+  axiom inv1 : forall x : borrowed (C01Range_Range_Type.t_range) . inv1 x = true
+  predicate invariant0 (self : C01Range_Range_Type.t_range) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
+  val invariant0 (self : C01Range_Range_Type.t_range) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : borrowed (C01Range_Range_Type.t_range))
-  val inv0 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
+  predicate inv0 (_x : C01Range_Range_Type.t_range)
+  val inv0 (_x : C01Range_Range_Type.t_range) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : borrowed (C01Range_Range_Type.t_range) . inv0 x = true
+  axiom inv0 : forall x : C01Range_Range_Type.t_range . inv0 x = true
   use seq.Seq
   use seq.Seq
+  use prelude.Int
+  predicate resolve0 (self : borrowed (C01Range_Range_Type.t_range)) =
+    [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
+  val resolve0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
+    ensures { result = resolve0 self }
+    
+  predicate completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) =
+    [#"../01_range.rs" 25 12 25 52] resolve0 self /\ C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self)
+  val completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) : bool
+    ensures { result = completed0 self }
+    
   use seq.Seq
   use seq.Seq
   use prelude.IntSize
   use seq.Seq
-  use prelude.Int
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
@@ -362,23 +372,13 @@ module C01Range_Impl0
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  predicate resolve0 (self : borrowed (C01Range_Range_Type.t_range)) =
-    [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
-  val resolve0 (self : borrowed (C01Range_Range_Type.t_range)) : bool
-    ensures { result = resolve0 self }
-    
-  predicate completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) =
-    [#"../01_range.rs" 25 12 25 52] resolve0 self /\ C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self)
-  val completed0 [#"../01_range.rs" 23 4 23 35] (self : borrowed (C01Range_Range_Type.t_range)) : bool
-    ensures { result = completed0 self }
-    
-  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv0 self -> (forall result : Core_Option_Option_Type.t_option isize . match result with
+  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv1 self -> (forall result : Core_Option_Option_Type.t_option isize . match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv1 result /\ match result with
+    end -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv2 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index a4c042ee4e..247a964a99 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -529,36 +529,36 @@ module C04Skip_Impl0
     
   axiom inv4 : forall x : borrowed i . inv4 x = true
   type item0
-  use seq.Seq
-  predicate invariant3 (self : Seq.seq item0)
-  val invariant3 (self : Seq.seq item0) : bool
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option item0)
+  val invariant3 (self : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq item0)
-  val inv3 (_x : Seq.seq item0) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option item0)
+  val inv3 (_x : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq item0 . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option item0)
-  val invariant2 (self : Core_Option_Option_Type.t_option item0) : bool
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option item0 . inv3 x = true
+  use C04Skip_Skip_Type as C04Skip_Skip_Type
+  predicate invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i))
+  val invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Core_Option_Option_Type.t_option item0)
-  val inv2 (_x : Core_Option_Option_Type.t_option item0) : bool
+  predicate inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
+  val inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option item0 . inv2 x = true
-  use C04Skip_Skip_Type as C04Skip_Skip_Type
-  predicate invariant1 (self : borrowed (C04Skip_Skip_Type.t_skip i))
-  val invariant1 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  axiom inv2 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 x = true
+  use seq.Seq
+  predicate invariant1 (self : Seq.seq item0)
+  val invariant1 (self : Seq.seq item0) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
-  val inv1 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  predicate inv1 (_x : Seq.seq item0)
+  val inv1 (_x : Seq.seq item0) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv1 x = true
+  axiom inv1 : forall x : Seq.seq item0 . inv1 x = true
   predicate invariant0 (self : C04Skip_Skip_Type.t_skip i)
   val invariant0 (self : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = invariant0 self }
@@ -569,7 +569,6 @@ module C04Skip_Impl0
     
   axiom inv0 : forall x : C04Skip_Skip_Type.t_skip i . inv0 x = true
   use seq.Seq
-  use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -587,26 +586,27 @@ module C04Skip_Impl0
   use seq.Seq
   use prelude.UIntSize
   predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
-    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv3 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
+    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv1 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
   val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = completed0 self }
     
+  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv3 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
+  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv2 result /\ match result with
+  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index 8eac620b79..97a236a7b1 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -636,13 +636,13 @@ module C07Fuse_Impl0
   val completed0 [#"../07_fuse.rs" 16 4 16 35] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
+  use seq.Seq
   predicate produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i)
     
    =
@@ -656,8 +656,8 @@ module C07Fuse_Impl0
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal next_refn : [#"../07_fuse.rs" 39 4 39 44] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index 8bc18d71fb..d0d7618fea 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -183,8 +183,8 @@ module C09Empty_Impl0
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
   goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
   goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 self -> (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
diff --git a/creusot/tests/should_succeed/iterators/10_once.mlcfg b/creusot/tests/should_succeed/iterators/10_once.mlcfg
index 3536ac79a0..95da1af9bf 100644
--- a/creusot/tests/should_succeed/iterators/10_once.mlcfg
+++ b/creusot/tests/should_succeed/iterators/10_once.mlcfg
@@ -216,37 +216,37 @@ module C10Once_Impl0
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : t . inv4 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
-  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
+  use seq.Seq
+  predicate invariant3 (self : Seq.seq t)
+  val invariant3 (self : Seq.seq t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
-  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv3 (_x : Seq.seq t)
+  val inv3 (_x : Seq.seq t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
-  use C10Once_Once_Type as C10Once_Once_Type
-  use prelude.Borrow
-  predicate invariant2 (self : borrowed (C10Once_Once_Type.t_once t))
-  val invariant2 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
+  axiom inv3 : forall x : Seq.seq t . inv3 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant2 (self : Core_Option_Option_Type.t_option t)
+  val invariant2 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : borrowed (C10Once_Once_Type.t_once t))
-  val inv2 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
+  predicate inv2 (_x : Core_Option_Option_Type.t_option t)
+  val inv2 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv2 x = true
-  use seq.Seq
-  predicate invariant1 (self : Seq.seq t)
-  val invariant1 (self : Seq.seq t) : bool
+  axiom inv2 : forall x : Core_Option_Option_Type.t_option t . inv2 x = true
+  use C10Once_Once_Type as C10Once_Once_Type
+  use prelude.Borrow
+  predicate invariant1 (self : borrowed (C10Once_Once_Type.t_once t))
+  val invariant1 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Seq.seq t)
-  val inv1 (_x : Seq.seq t) : bool
+  predicate inv1 (_x : borrowed (C10Once_Once_Type.t_once t))
+  val inv1 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Seq.seq t . inv1 x = true
+  axiom inv1 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv1 x = true
   predicate invariant0 (self : C10Once_Once_Type.t_once t)
   val invariant0 (self : C10Once_Once_Type.t_once t) : bool
     ensures { result = invariant0 self }
@@ -257,6 +257,7 @@ module C10Once_Impl0
     
   axiom inv0 : forall x : C10Once_Once_Type.t_once t . inv0 x = true
   use seq.Seq
+  use seq.Seq
   predicate resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
@@ -267,7 +268,6 @@ module C10Once_Impl0
   val completed0 [#"../10_once.rs" 15 4 15 35] (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t)
@@ -277,13 +277,13 @@ module C10Once_Impl0
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/14_copied.mlcfg b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
index e1d7b69948..bf7ebba998 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.mlcfg
+++ b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
@@ -368,45 +368,55 @@ module C14Copied_Impl0
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : Seq.seq t . inv4 x = true
-  predicate invariant3 (self : Seq.seq t)
-  val invariant3 (self : Seq.seq t) : bool
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
+  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq t)
-  val inv3 (_x : Seq.seq t) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
+  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq t . inv3 x = true
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
   use C14Copied_Copied_Type as C14Copied_Copied_Type
-  predicate invariant2 (self : C14Copied_Copied_Type.t_copied i)
-  val invariant2 (self : C14Copied_Copied_Type.t_copied i) : bool
+  use prelude.Borrow
+  predicate invariant2 (self : borrowed (C14Copied_Copied_Type.t_copied i))
+  val invariant2 (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : C14Copied_Copied_Type.t_copied i)
-  val inv2 (_x : C14Copied_Copied_Type.t_copied i) : bool
+  predicate inv2 (_x : borrowed (C14Copied_Copied_Type.t_copied i))
+  val inv2 (_x : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : C14Copied_Copied_Type.t_copied i . inv2 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant1 (self : Core_Option_Option_Type.t_option t)
-  val invariant1 (self : Core_Option_Option_Type.t_option t) : bool
+  axiom inv2 : forall x : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 x = true
+  predicate invariant1 (self : Seq.seq t)
+  val invariant1 (self : Seq.seq t) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Core_Option_Option_Type.t_option t)
-  val inv1 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv1 (_x : Seq.seq t)
+  val inv1 (_x : Seq.seq t) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Core_Option_Option_Type.t_option t . inv1 x = true
-  use prelude.Borrow
-  predicate invariant0 (self : borrowed (C14Copied_Copied_Type.t_copied i))
-  val invariant0 (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+  axiom inv1 : forall x : Seq.seq t . inv1 x = true
+  predicate invariant0 (self : C14Copied_Copied_Type.t_copied i)
+  val invariant0 (self : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : borrowed (C14Copied_Copied_Type.t_copied i))
-  val inv0 (_x : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+  predicate inv0 (_x : C14Copied_Copied_Type.t_copied i)
+  val inv0 (_x : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : borrowed (C14Copied_Copied_Type.t_copied i) . inv0 x = true
+  axiom inv0 : forall x : C14Copied_Copied_Type.t_copied i . inv0 x = true
+  use seq.Seq
+  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
+  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
+    ensures { result = completed1 self }
+    
+  predicate completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) =
+    [#"../14_copied.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C14Copied_Copied_Type.copied_iter ( * self)) (C14Copied_Copied_Type.copied_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
+  val completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
+    ensures { result = completed0 self }
+    
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -426,23 +436,13 @@ module C14Copied_Impl0
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
-  use seq.Seq
-  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
-  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
-    ensures { result = completed1 self }
-    
-  predicate completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) =
-    [#"../14_copied.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C14Copied_Copied_Type.copied_iter ( * self)) (C14Copied_Copied_Type.copied_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
-  val completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
-    ensures { result = completed0 self }
-    
-  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option t . inv1 result /\ match result with
+  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv1 result /\ match result with
+    end -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index 58aefb3144..c328782b34 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -610,30 +610,6 @@ module C15Enumerate_Impl0
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Seq.seq (usize, item0) . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option (usize, item0))
-  val invariant2 (self : Core_Option_Option_Type.t_option (usize, item0)) : bool
-    ensures { result = invariant2 self }
-    
-  predicate inv2 (_x : Core_Option_Option_Type.t_option (usize, item0))
-  val inv2 (_x : Core_Option_Option_Type.t_option (usize, item0)) : bool
-    ensures { result = inv2 _x }
-    
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option (usize, item0) . inv2 x = true
-  use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
-  predicate invariant1 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-  val invariant1 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = invariant1 self }
-    
-  predicate inv0 (_x : C15Enumerate_Enumerate_Type.t_enumerate i)
-  val inv0 (_x : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
-    ensures { result = inv0 _x }
-    
-  predicate inv1 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-  val inv1 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = inv1 _x }
-    
-  axiom inv1 : forall x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv1 x = (inv0 ( * x) /\ inv0 ( ^ x))
   use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
@@ -648,22 +624,40 @@ module C15Enumerate_Impl0
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
-  predicate invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
+  use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
+  predicate invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
     [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv5 i -> inv4 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv6 i -> completed1 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
-  val invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
-    ensures { result = invariant0 self }
+  val invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
+    ensures { result = invariant2 self }
     
-  axiom inv0 : forall x : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 x = (invariant0 x /\ match x with
+  predicate inv2 (_x : C15Enumerate_Enumerate_Type.t_enumerate i)
+  val inv2 (_x : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
+    ensures { result = inv2 _x }
+    
+  axiom inv2 : forall x : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 x = (invariant2 x /\ match x with
     | C15Enumerate_Enumerate_Type.C_Enumerate iter count -> true
     end)
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant1 (self : Core_Option_Option_Type.t_option (usize, item0))
+  val invariant1 (self : Core_Option_Option_Type.t_option (usize, item0)) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv1 (_x : Core_Option_Option_Type.t_option (usize, item0))
+  val inv1 (_x : Core_Option_Option_Type.t_option (usize, item0)) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : Core_Option_Option_Type.t_option (usize, item0) . inv1 x = true
+  predicate invariant0 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+  val invariant0 (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = invariant0 self }
+    
+  predicate inv0 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+  val inv0 (_x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = inv0 _x }
+    
+  axiom inv0 : forall x : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 x = (inv2 ( * x) /\ inv2 ( ^ x))
   use seq.Seq
   use seq.Seq
-  predicate completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
-   =
-    [#"../15_enumerate.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C15Enumerate_Enumerate_Type.enumerate_iter ( * self)) (C15Enumerate_Enumerate_Type.enumerate_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
-  val completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
-    ensures { result = completed0 self }
-    
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -676,15 +670,21 @@ module C15Enumerate_Impl0
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv2 result /\ match result with
+  predicate completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i))
+   =
+    [#"../15_enumerate.rs" 23 8 23 43] completed1 (Borrow.borrow_logic (C15Enumerate_Enumerate_Type.enumerate_iter ( * self)) (C15Enumerate_Enumerate_Type.enumerate_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1))
+  val completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
+    ensures { result = completed0 self }
+    
+  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
 end
 module C15Enumerate_Impl1
   type i

From 4b6434e1b3011b5e2aaa1abf22a6d235389994f8 Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Fri, 23 Feb 2024 10:06:08 -0800
Subject: [PATCH 18/66] Added why3 tracking to ghostptrtoken test

---
 .../ghost_ptr_token/why3session.xml               |  14 ++++++++++++++
 .../should_succeed/ghost_ptr_token/why3shapes.gz  | Bin 0 -> 774 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
 create mode 100644 creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz

diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
new file mode 100644
index 0000000000..d911bffbbc
--- /dev/null
+++ b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
+"https://www.why3.org/why3session.dtd">
+<why3session shape_version="6">
+<prover id="0" name="Z3" version="4.12.4" timelimit="5" steplimit="0" memlimit="1000"/>
+<file format="mlcfg" proved="true">
+<path name=".."/><path name="ghost_ptr_token.mlcfg"/>
+<theory name="GhostPtrToken_Test" proved="true">
+ <goal name="test&#39;vc" expl="VC for test" proved="true">
+ <proof prover="0"><result status="valid" time="0.207467" steps="87303"/></proof>
+ </goal>
+</theory>
+</file>
+</why3session>
diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz b/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a75a8d77246a7295398bfc43c6450c7416be6f86
GIT binary patch
literal 774
zcmV+h1Nr<PiwFP!00000|BY0^irX*{z2_@(+cu>j*&4|%q!1R24P`Gab8Ju?xf|ld
zsqG}RU*C~rd7WmL7DRY@nt3x%n)uyf-aYG+>E;*HcDv^IX)foB_p|<|-W@LrSvEk4
zJV3xGK!I_9F^T{qgaA3p02!)mR;?V==VNPh`K&j!VVD$EHq%S}xc=H444qwDePWnm
zIz|sn;k!zUC%wd!5}ul)ak+;*)0dsOGURr-L^(2r?~s!n{duWtb0n6RBhS5t-kWu|
z`)#&#8qpfc-|~gG$Rn5IDiG6|wx?6l639V!rVqs}6|CJT!Akp9?$dpPaX|rPbL?$E
zQ2N%M&D)6|LTbtF9leolP2c4f{%r?9j0m?APn@>q&|K)vI1PlF+H`yWAY*$s!MmX~
zsXqo(^4k`j#-zoY{Lq#PZAsUbD`XC*{ujk1C0mWHj-)No^<#5RdOXZ#yQ-*GRYBFd
zroNa61>952Q=Yfervxgxsuw`IeH=Z|FHzGCj5=I@JD+NjQ?z223<R<u6L}P);wuX%
zig}9bQ`;Pxo(9Jg3}u=PqbSoax^9~N`LsSC{d8&iSJ!oOT_2jQsX4|m#_npy+kQ2|
zT|UW6g)%87VB$xr=_a{1Cjq5&$q9ih$bd%@rLg8~ly@%0XpVa#Mj4IfqW>`$!N1H!
z;LJ_l6q3nCa_jOtN~RYGYUMVdXe0f{gueh#u1l^rP1`nCvwb-1eQLEk>YC<9@3!>o
z%`gP}QcKH0s(+Y%?M`ipg=H2Y6q3Ibss5nIoT7hwPzZ8Vl%paW6s1*UnT-?(Zbk!`
zyc|qt6keH8pyg&1fIt>x{ER}3;ARw}N&hcX8rkw9MPS7QOe%_WTAtmP7Yc<NL0|;3
zK}IN#5){&w7s{J;q#VoJb_YSqb}j^<5PqmQq1DaTafXlcs%huF>H67B3!SpE+_1Q+
zjFNQuERHm*V8d0ZR5a%*=Q8JzbCL5n=TXji&RL%3Nv?94LoV_-CpKrZKbH_BRAL7J
E07LtBfB*mh

literal 0
HcmV?d00001


From 6ad931f887db60a1d686b3f28fba70dae788d8d1 Mon Sep 17 00:00:00 2001
From: dewert99 <dewert10@gmail.com>
Date: Fri, 23 Feb 2024 10:26:37 -0800
Subject: [PATCH 19/66] Reran with correct z3 version

---
 creusot/tests/should_succeed/ghost_ptr_token/why3session.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
index d911bffbbc..4a59f5af0c 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
+++ b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="ghost_ptr_token.mlcfg"/>
 <theory name="GhostPtrToken_Test" proved="true">
  <goal name="test&#39;vc" expl="VC for test" proved="true">
- <proof prover="0"><result status="valid" time="0.207467" steps="87303"/></proof>
+ <proof prover="0"><result status="valid" time="0.172351" steps="93422"/></proof>
  </goal>
 </theory>
 </file>

From 4037c1ae84a5783b94e9aea9f25bccb99d224e90 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 23 Feb 2024 22:59:30 +0100
Subject: [PATCH 20/66] Update session

---
 .../ghost_ptr_token/why3session.xml             |   2 +-
 .../ghost_ptr_token/why3shapes.gz               | Bin 774 -> 775 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
index 4a59f5af0c..5692257551 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
+++ b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="ghost_ptr_token.mlcfg"/>
 <theory name="GhostPtrToken_Test" proved="true">
  <goal name="test&#39;vc" expl="VC for test" proved="true">
- <proof prover="0"><result status="valid" time="0.172351" steps="93422"/></proof>
+ <proof prover="0"><result status="valid" time="0.031281" steps="93422"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz b/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz
index a75a8d77246a7295398bfc43c6450c7416be6f86..9971c808685c2af25d79de29a05bb20364d21df4 100644
GIT binary patch
literal 775
zcmV+i1Ni(OiwFP!00000|BX~pYuhjoe$TJSTepmXWa%Vp&_O5|8%AF??r}j)lr_|e
zGuuhoe*I38<vL5t1|od=bobqT(#7u<^X}0eT{l0ww%av_PjfY2yr1<y?e1{a$ch0f
z<Ou?12}%?R3X}<E2nljj2{P2hY`YB5o(`?E>qq-gJBE3+EoS!C-mShidq-!_tvxa{
zXvXM)sbW{Ay0^DzDB-?2xRASlV)ndq&kVU=AyJJ?6+7f)$9}%GwL1{Y*CWrPhJA9Y
zZui@5=rp4>l)vPwXpv_jCsZJ&b8Szjq$QDq?OdOVdn#GGP=ck6tz4(a21P{y>*mn=
zfTZ-TJ-N3NKcv((_jmM0wl{s1TgA5>05LM%j+i)Y-M%@~n{gTlJ+&G3@j=G+E`oPM
zYs!91Xw5HM3>uRbFY;4cI<=)jTcMEKANyYvm#^7!Y;`1kiLM`;3)16ZG23mc?Q&aD
zwXUhpE<*{|6pK{k{q$*xny%^vkZv!s8~P<`x`9!L+i$01O>&x+2+2U8NHSSO0ySTH
zKv67G+#cIz-}E#%kzlAyF^r-zUu@kpPp9MRbcoYs>0e#f&GTyCY+TJz2o&LJ#@l{1
zB3wSnD~&3zCSc-6>FFlFHm3lU3duQvBFR8R3YGNcd{lI<<Y<mZLZHe<bJ_ox%iv$;
zG6?1-ZwmQjqqukZ9Tl?+1icI!(6mwUW5Qnm=+Gs%4^7)P&u(+Ge~PKw-NDv0KX$jF
z-)M#*_?No%92on<^{a5|ODsIINTHDbrAYM$MHUp}+k-|>qoNuW*`TPrA}f5PL<lpQ
zz~tp%I-~H)i~_ANqW}boBok*81VWfm$R_>2OljuJOM}3w37AxrW?G(ImzNr47(rkJ
zia|!|h;o$5mzO%44Wt^&`*sIG$__3hpp<c_IHBdm*Kvk-^KH}4d)M`|nb0N|Mz28_
z1!kRFV;&4-dIS2w!bZ-yF1ac>lw6ivlsqdrFF7ksnU}g$C6uxhC9x%&{Q>RDQ6gdo
F005N8cJu%M

literal 774
zcmV+h1Nr<PiwFP!00000|BY0^irX*{z2_@(+cu>j*&4|%q!1R24P`Gab8Ju?xf|ld
zsqG}RU*C~rd7WmL7DRY@nt3x%n)uyf-aYG+>E;*HcDv^IX)foB_p|<|-W@LrSvEk4
zJV3xGK!I_9F^T{qgaA3p02!)mR;?V==VNPh`K&j!VVD$EHq%S}xc=H444qwDePWnm
zIz|sn;k!zUC%wd!5}ul)ak+;*)0dsOGURr-L^(2r?~s!n{duWtb0n6RBhS5t-kWu|
z`)#&#8qpfc-|~gG$Rn5IDiG6|wx?6l639V!rVqs}6|CJT!Akp9?$dpPaX|rPbL?$E
zQ2N%M&D)6|LTbtF9leolP2c4f{%r?9j0m?APn@>q&|K)vI1PlF+H`yWAY*$s!MmX~
zsXqo(^4k`j#-zoY{Lq#PZAsUbD`XC*{ujk1C0mWHj-)No^<#5RdOXZ#yQ-*GRYBFd
zroNa61>952Q=Yfervxgxsuw`IeH=Z|FHzGCj5=I@JD+NjQ?z223<R<u6L}P);wuX%
zig}9bQ`;Pxo(9Jg3}u=PqbSoax^9~N`LsSC{d8&iSJ!oOT_2jQsX4|m#_npy+kQ2|
zT|UW6g)%87VB$xr=_a{1Cjq5&$q9ih$bd%@rLg8~ly@%0XpVa#Mj4IfqW>`$!N1H!
z;LJ_l6q3nCa_jOtN~RYGYUMVdXe0f{gueh#u1l^rP1`nCvwb-1eQLEk>YC<9@3!>o
z%`gP}QcKH0s(+Y%?M`ipg=H2Y6q3Ibss5nIoT7hwPzZ8Vl%paW6s1*UnT-?(Zbk!`
zyc|qt6keH8pyg&1fIt>x{ER}3;ARw}N&hcX8rkw9MPS7QOe%_WTAtmP7Yc<NL0|;3
zK}IN#5){&w7s{J;q#VoJb_YSqb}j^<5PqmQq1DaTafXlcs%huF>H67B3!SpE+_1Q+
zjFNQuERHm*V8d0ZR5a%*=Q8JzbCL5n=TXji&RL%3Nv?94LoV_-CpKrZKbH_BRAL7J
E07LtBfB*mh


From 16f4b49c27c256eb925d8c19b62d5df2a44a2b92 Mon Sep 17 00:00:00 2001
From: arnaudgolfouse <arnaud.golfouse@laposte.net>
Date: Mon, 26 Feb 2024 13:54:33 +0100
Subject: [PATCH 21/66] Make TranslationCtx::error/warn return a
 DiagnosticBuilder

This adds more control to the display of errors/warnings, like notes, 'help' sections...
---
 creusot/src/ctx.rs                             | 12 ++++++++----
 creusot/src/run_why3.rs                        |  4 ++--
 creusot/src/translation/function/terminator.rs |  5 +++--
 creusot/src/validate.rs                        | 11 ++++++-----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/creusot/src/ctx.rs b/creusot/src/ctx.rs
index bdf9a6b9e9..b38cb6749e 100644
--- a/creusot/src/ctx.rs
+++ b/creusot/src/ctx.rs
@@ -243,16 +243,20 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
         )
     }
 
-    pub(crate) fn error(&self, span: Span, msg: &str) {
-        self.tcx.sess.span_err_with_code(
+    pub(crate) fn error(
+        &self,
+        span: Span,
+        msg: &str,
+    ) -> DiagnosticBuilder<'tcx, rustc_errors::ErrorGuaranteed> {
+        self.tcx.sess.struct_span_err_with_code(
             span,
             msg.to_string(),
             DiagnosticId::Error(String::from("creusot")),
         )
     }
 
-    pub(crate) fn warn(&self, span: Span, msg: &str) {
-        self.tcx.sess.span_warn_with_code(
+    pub(crate) fn warn(&self, span: Span, msg: &str) -> DiagnosticBuilder<'tcx, ()> {
+        self.tcx.sess.struct_span_warn_with_code(
             span,
             msg.to_string(),
             DiagnosticId::Lint {
diff --git a/creusot/src/run_why3.rs b/creusot/src/run_why3.rs
index f0b95c89bb..a77b80b08f 100644
--- a/creusot/src/run_why3.rs
+++ b/creusot/src/run_why3.rs
@@ -76,7 +76,7 @@ pub(super) fn run_why3<'tcx>(ctx: &Why3Generator<'tcx>, file: Option<PathBuf>) {
                             "Prover reported {answer:?} (time: {time:?}, steps: {step:?}) when trying to solve goal {:?} {:?}",
                             x.term.goal_name, x.term.explanations
                         );
-                        ctx.error(span.unwrap_or_default(), &msg);
+                        ctx.error(span.unwrap_or_default(), &msg).emit();
                         for model in x.prover_result.model_elems() {
                             let span = span_map.decode_span(&model.location);
                             let mut msg = format!("Model Element for {}\n", model.lsymbol.name);
@@ -94,7 +94,7 @@ pub(super) fn run_why3<'tcx>(ctx: &Why3Generator<'tcx>, file: Option<PathBuf>) {
                 }
                 Err(err) => {
                     let msg = format!("error parsing why3 output {err:?}");
-                    ctx.error(DUMMY_SP, &msg)
+                    ctx.error(DUMMY_SP, &msg).emit();
                 }
             }
         }
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index c09d670a25..7b96d6fcea 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -202,7 +202,7 @@ pub(crate) fn resolve_function<'tcx>(
                 .expect("could not find instance");
 
             if !method.0.is_local() && ctx.sig(method.0).contract.is_false() {
-                ctx.warn(sp, "calling an external function with no contract will yield an impossible precondition");
+                ctx.warn(sp, "calling an external function with no contract will yield an impossible precondition").emit();
             }
 
             return method;
@@ -213,7 +213,8 @@ pub(crate) fn resolve_function<'tcx>(
         ctx.warn(
             sp,
             "calling an external function with no contract will yield an impossible precondition",
-        );
+        )
+        .emit();
     }
     // ctx.translate(def_id);
 
diff --git a/creusot/src/validate.rs b/creusot/src/validate.rs
index e01c00e888..d57a5e7a47 100644
--- a/creusot/src/validate.rs
+++ b/creusot/src/validate.rs
@@ -33,7 +33,7 @@ pub(crate) fn validate_opacity(ctx: &mut TranslationCtx, item: DefId) -> Option<
                     "Cannot make `{:?}` transparent in `{:?}` as it would call a less-visible item.",
                     self.ctx.def_path_str(id), self.ctx.def_path_str(self.source_item)
                 ),
-            )
+            ).emit();
         }
     }
 
@@ -69,7 +69,7 @@ pub(crate) fn validate_opacity(ctx: &mut TranslationCtx, item: DefId) -> Option<
     if ctx.visibility(item) != Visibility::Restricted(parent_module(ctx.tcx, item))
         && util::opacity_witness_name(ctx.tcx, item).is_none()
     {
-        ctx.error(ctx.def_span(item), "Non private definitions must have an explicit transparency. Please add #[open(..)] to your definition", );
+        ctx.error(ctx.def_span(item), "Non private definitions must have an explicit transparency. Please add #[open(..)] to your definition").emit();
     }
 
     let opacity = ctx.opacity(item).scope();
@@ -93,7 +93,7 @@ pub(crate) fn validate_traits(ctx: &mut TranslationCtx) {
     }
 
     for (_, sp) in law_violations {
-        ctx.error(sp, "Laws cannot have additional generic parameters");
+        ctx.error(sp, "Laws cannot have additional generic parameters").emit();
     }
 }
 
@@ -120,7 +120,7 @@ pub(crate) fn validate_impls(ctx: &TranslationCtx) {
                     trait_ref.print_only_trait_name()
                 )
             };
-            ctx.error(ctx.def_span(impl_id.to_def_id()), &msg)
+            ctx.error(ctx.def_span(impl_id.to_def_id()), &msg).emit();
         }
 
         let implementors = ctx.impl_item_implementor_ids(impl_id.to_def_id());
@@ -145,7 +145,8 @@ pub(crate) fn validate_impls(ctx: &TranslationCtx) {
                         ctx.item_name(*impl_item),
                         util::item_type(ctx.tcx, *impl_item).to_str()
                     ),
-                );
+                )
+                .emit();
             }
         }
     }

From dbd44843fe40f4599cf2d34d2e027ef520a6e5c7 Mon Sep 17 00:00:00 2001
From: arnaudgolfouse <arnaud.golfouse@laposte.net>
Date: Mon, 26 Feb 2024 14:08:16 +0100
Subject: [PATCH 22/66] Rename the `Ghost` type to `Snapshot`

---
 README.md                                     |  2 +-
 creusot-contracts-dummy/src/lib.rs            |  5 ++-
 creusot-contracts-proc/src/invariant.rs       |  6 +--
 creusot-contracts-proc/src/lib.rs             |  8 ++--
 creusot-contracts/src/lib.rs                  | 22 ++++-----
 creusot-contracts/src/logic/ops.rs            |  2 +-
 .../src/{ghost.rs => snapshot.rs}             | 28 ++++++------
 creusot-contracts/src/std/iter.rs             |  8 ++--
 creusot-contracts/src/std/iter/map_inv.rs     | 36 +++++++--------
 creusot-contracts/src/stubs.rs                |  4 +-
 creusot/src/backend/program.rs                |  2 +-
 creusot/src/backend/ty.rs                     |  4 +-
 creusot/src/cleanup_spec_closures.rs          |  2 +-
 creusot/src/gather_spec_closures.rs           | 45 +++++++++++--------
 creusot/src/translation/function.rs           | 18 ++++----
 creusot/src/translation/function/statement.rs |  4 +-
 .../src/translation/function/terminator.rs    |  5 +--
 creusot/src/translation/pearlite.rs           | 20 ++++-----
 creusot/src/translation/specification.rs      |  8 ++--
 creusot/src/util.rs                           | 16 ++++---
 exercises/04_all_zero.rs                      |  2 +-
 prelude/prelude.mlw                           | 10 ++---
 22 files changed, 133 insertions(+), 124 deletions(-)
 rename creusot-contracts/src/{ghost.rs => snapshot.rs} (52%)

diff --git a/README.md b/README.md
index 91ff22aa29..097641ed0a 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ Contracts and logic functions are written in Pearlite, a specification language
 We also provide three new attributes on Rust functions: `ghost`, `logic` and `predicate`.
 
 A ghost function is marked with `#[ghost]`. It can be used in ghost code, to assign ghost
-variables of the `Ghost<T>` type.
+variables of the `Snapshot<T>` type.
 
 Marked  `#[logic]` or `#[predicate]`, a function can be used in specs and other logical conditions (`requires`/`ensures` and `invariant`). They can use ghost functions.
 The two attributes have the following difference.
diff --git a/creusot-contracts-dummy/src/lib.rs b/creusot-contracts-dummy/src/lib.rs
index 34da7077b9..c7a952d901 100644
--- a/creusot-contracts-dummy/src/lib.rs
+++ b/creusot-contracts-dummy/src/lib.rs
@@ -28,8 +28,9 @@ pub fn proof_assert(_: TS1) -> TS1 {
 }
 
 #[proc_macro]
-pub fn gh(_: TS1) -> TS1 {
-    quote::quote! { creusot_contracts::ghost::Ghost::from_fn(|| std::process::abort()) }.into()
+pub fn snapshot(_: TS1) -> TS1 {
+    quote::quote! { creusot_contracts::snapshot::Snapshot::from_fn(|| std::process::abort()) }
+        .into()
 }
 
 #[proc_macro_attribute]
diff --git a/creusot-contracts-proc/src/invariant.rs b/creusot-contracts-proc/src/invariant.rs
index bce8c2bcb3..dd09700161 100644
--- a/creusot-contracts-proc/src/invariant.rs
+++ b/creusot-contracts-proc/src/invariant.rs
@@ -144,8 +144,8 @@ fn desugar_for(mut invariants: Vec<Invariant>, f: ExprForLoop) -> TokenStream {
 
     quote! { {
         let mut #it = ::std::iter::IntoIterator::into_iter(#iter);
-        let #iter_old = gh! { #it };
-        let mut #produced = gh! { ::creusot_contracts::logic::Seq::EMPTY };
+        let #iter_old = snapshot! { #it };
+        let mut #produced = snapshot! { ::creusot_contracts::logic::Seq::EMPTY };
         #(#invariants;)*
         #(#outer)*
         #lbl
@@ -153,7 +153,7 @@ fn desugar_for(mut invariants: Vec<Invariant>, f: ExprForLoop) -> TokenStream {
             #(#inner)*
             match ::std::iter::Iterator::next(&mut #it) {
                 Some(#elem) => {
-                    #produced = gh! { #produced.inner().concat(::creusot_contracts::logic::Seq::singleton(#elem)) };
+                    #produced = snapshot! { #produced.inner().concat(::creusot_contracts::logic::Seq::singleton(#elem)) };
                     let #pat = #elem;
                     #body
                 },
diff --git a/creusot-contracts-proc/src/lib.rs b/creusot-contracts-proc/src/lib.rs
index 9a4cc1b018..bf4a3cf717 100644
--- a/creusot-contracts-proc/src/lib.rs
+++ b/creusot-contracts-proc/src/lib.rs
@@ -405,17 +405,17 @@ pub fn proof_assert(assertion: TS1) -> TS1 {
 }
 
 #[proc_macro]
-pub fn gh(assertion: TS1) -> TS1 {
+pub fn snapshot(assertion: TS1) -> TS1 {
     let assert = parse_macro_input!(assertion as Assertion);
     let assert_body = pretyping::encode_block(&assert.0).unwrap();
 
     TS1::from(quote! {
         {
-            ::creusot_contracts::__stubs::ghost_from_fn(
+            ::creusot_contracts::__stubs::snapshot_from_fn(
                 #[creusot::no_translate]
                 #[creusot::spec]
-                #[creusot::spec::ghost]
-                || { ::creusot_contracts::ghost::Ghost::new (#assert_body) }
+                #[creusot::spec::snapshot]
+                || { ::creusot_contracts::snapshot::Snapshot::new (#assert_body) }
             )
         }
     })
diff --git a/creusot-contracts/src/lib.rs b/creusot-contracts/src/lib.rs
index 44b345dedb..5ef8b382e1 100644
--- a/creusot-contracts/src/lib.rs
+++ b/creusot-contracts/src/lib.rs
@@ -20,7 +20,7 @@ mod macros {
     /// A post-condition of a function or trait item
     pub use creusot_contracts_proc::ensures;
 
-    pub use creusot_contracts_proc::gh;
+    pub use creusot_contracts_proc::snapshot;
 
     /// A loop invariant
     /// The first argument should be a name for the invariant
@@ -97,7 +97,7 @@ mod macros {
     /// A post-condition of a function or trait item
     pub use creusot_contracts_dummy::ensures;
 
-    pub use creusot_contracts_dummy::gh;
+    pub use creusot_contracts_dummy::snapshot;
 
     /// A loop invariant
     /// The first argument should be a name for the invariant
@@ -179,27 +179,27 @@ pub mod std;
 pub mod num_rational;
 
 #[cfg(creusot)]
-pub mod ghost;
+pub mod snapshot;
 
 #[cfg(not(creusot))]
-pub mod ghost {
-    pub struct Ghost<T>(std::marker::PhantomData<T>)
+pub mod snapshot {
+    pub struct Snapshot<T>(std::marker::PhantomData<T>)
     where
         T: ?Sized;
 
-    impl<T: ?Sized> Ghost<T> {
+    impl<T: ?Sized> Snapshot<T> {
         pub fn from_fn(_: fn() -> T) -> Self {
-            Ghost(std::marker::PhantomData)
+            Snapshot(std::marker::PhantomData)
         }
     }
 
-    impl<T: ?Sized> Clone for Ghost<T> {
+    impl<T: ?Sized> Clone for Snapshot<T> {
         fn clone(&self) -> Self {
-            Ghost(std::marker::PhantomData)
+            Snapshot(std::marker::PhantomData)
         }
     }
 
-    impl<T: ?Sized> Copy for Ghost<T> {}
+    impl<T: ?Sized> Copy for Snapshot<T> {}
 }
 
 pub mod ghost_ptr;
@@ -211,11 +211,11 @@ pub mod well_founded;
 
 // We add some common things at the root of the creusot-contracts library
 pub use crate::{
-    ghost::Ghost,
     logic::{IndexLogic as _, Int, OrdLogic, Seq},
     macros::*,
     model::{DeepModel, ShallowModel},
     resolve::Resolve,
+    snapshot::Snapshot,
     std::{
         // Shadow std::prelude by our version.
         // For Clone and PartialEq, this is important for the derive macro.
diff --git a/creusot-contracts/src/logic/ops.rs b/creusot-contracts/src/logic/ops.rs
index 9a9b09fefb..80339c0be6 100644
--- a/creusot-contracts/src/logic/ops.rs
+++ b/creusot-contracts/src/logic/ops.rs
@@ -77,7 +77,7 @@ impl<T, const N: usize> IndexLogic<usize> for [T; N] {
     }
 }
 
-impl<T> IndexLogic<Int> for Ghost<Seq<T>> {
+impl<T> IndexLogic<Int> for Snapshot<Seq<T>> {
     type Item = T;
 
     #[ghost]
diff --git a/creusot-contracts/src/ghost.rs b/creusot-contracts/src/snapshot.rs
similarity index 52%
rename from creusot-contracts/src/ghost.rs
rename to creusot-contracts/src/snapshot.rs
index f9fae61c9d..b0da99475c 100644
--- a/creusot-contracts/src/ghost.rs
+++ b/creusot-contracts/src/snapshot.rs
@@ -1,24 +1,24 @@
 use crate::{std::ops::Deref, *};
 
-#[cfg_attr(creusot, creusot::builtins = "prelude.Ghost.ghost_ty")]
-pub struct Ghost<T>(std::marker::PhantomData<T>)
+#[cfg_attr(creusot, creusot::builtins = "prelude.Snapshot.snap_ty")]
+pub struct Snapshot<T>(pub(crate) std::marker::PhantomData<T>)
 where
     T: ?Sized;
 
-impl<T: ?Sized> Deref for Ghost<T> {
+impl<T: ?Sized> Deref for Snapshot<T> {
     type Target = T;
 
     #[trusted]
     #[ghost]
     #[open(self)]
-    #[rustc_diagnostic_item = "ghost_deref"]
-    #[creusot::builtins = "prelude.Ghost.inner"]
+    #[rustc_diagnostic_item = "snapshot_deref"]
+    #[creusot::builtins = "prelude.Snapshot.inner"]
     fn deref(&self) -> &Self::Target {
         pearlite! { absurd }
     }
 }
 
-impl<T: ShallowModel + ?Sized> ShallowModel for Ghost<T> {
+impl<T: ShallowModel + ?Sized> ShallowModel for Snapshot<T> {
     type ShallowModelTy = T::ShallowModelTy;
 
     #[ghost]
@@ -28,28 +28,28 @@ impl<T: ShallowModel + ?Sized> ShallowModel for Ghost<T> {
     }
 }
 
-impl<T: ?Sized> Clone for Ghost<T> {
+impl<T: ?Sized> Clone for Snapshot<T> {
     fn clone(&self) -> Self {
-        gh! { **self }
+        snapshot! { **self }
     }
 }
 
-impl<T: ?Sized> Copy for Ghost<T> {}
+impl<T: ?Sized> Copy for Snapshot<T> {}
 
-impl<T: ?Sized> Ghost<T> {
+impl<T: ?Sized> Snapshot<T> {
     #[trusted]
     #[ghost]
     #[open(self)]
-    #[creusot::builtins = "prelude.Ghost.new"]
-    pub fn new(_: T) -> Ghost<T> {
+    #[creusot::builtins = "prelude.Snapshot.new"]
+    pub fn new(_: T) -> Snapshot<T> {
         pearlite! { absurd }
     }
 
     #[trusted]
     #[ghost]
     #[open(self)]
-    #[rustc_diagnostic_item = "ghost_inner"]
-    #[creusot::builtins = "prelude.Ghost.inner"]
+    #[rustc_diagnostic_item = "snapshot_inner"]
+    #[creusot::builtins = "prelude.Snapshot.inner"]
     pub fn inner(self) -> T
     where
         T: Sized, // TODO: don't require T: Sized here. Problem: return type is T.
diff --git a/creusot-contracts/src/std/iter.rs b/creusot-contracts/src/std/iter.rs
index 05c9871b5d..e2618d2bfb 100644
--- a/creusot-contracts/src/std/iter.rs
+++ b/creusot-contracts/src/std/iter.rs
@@ -40,16 +40,16 @@ pub trait Iterator: ::std::iter::Iterator {
     #[ensures(a.produces(ab.concat(bc), c))]
     fn produces_trans(a: Self, ab: Seq<Self::Item>, b: Self, bc: Seq<Self::Item>, c: Self);
 
-    #[requires(forall<e : Self::Item, i2 : Self> self.produces(Seq::singleton(e), i2) ==> func.precondition((e, Ghost::new(Seq::EMPTY))))]
+    #[requires(forall<e : Self::Item, i2 : Self> self.produces(Seq::singleton(e), i2) ==> func.precondition((e, Snapshot::new(Seq::EMPTY))))]
     #[requires(MapInv::<Self, _, F>::reinitialize())]
     #[requires(MapInv::<Self, Self::Item, F>::preservation(self, func))]
-    #[ensures(result == MapInv { iter: self, func, produced: Ghost::new(Seq::EMPTY) })]
+    #[ensures(result == MapInv { iter: self, func, produced: Snapshot::new(Seq::EMPTY) })]
     fn map_inv<B, F>(self, func: F) -> MapInv<Self, Self::Item, F>
     where
         Self: Sized,
-        F: FnMut(Self::Item, Ghost<Seq<Self::Item>>) -> B,
+        F: FnMut(Self::Item, Snapshot<Seq<Self::Item>>) -> B,
     {
-        MapInv { iter: self, func, produced: gh! {Seq::EMPTY} }
+        MapInv { iter: self, func, produced: snapshot! {Seq::EMPTY} }
     }
 }
 
diff --git a/creusot-contracts/src/std/iter/map_inv.rs b/creusot-contracts/src/std/iter/map_inv.rs
index 355637eee6..406f74abf7 100644
--- a/creusot-contracts/src/std/iter/map_inv.rs
+++ b/creusot-contracts/src/std/iter/map_inv.rs
@@ -3,10 +3,10 @@ use crate::{invariant::Invariant, *};
 pub struct MapInv<I, B, F> {
     pub iter: I,
     pub func: F,
-    pub produced: Ghost<Seq<B>>,
+    pub produced: Snapshot<Seq<B>>,
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Iterator
     for MapInv<I, I::Item, F>
 {
     #[open]
@@ -44,8 +44,8 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator
                else { *fs[0] == self.func &&  ^fs[visited.len() - 1] == succ.func }
             && forall<i : Int> 0 <= i && i < visited.len() ==>
                  self.func.unnest(*fs[i])
-                 && (*fs[i]).precondition((s[i], Ghost::new(self.produced.concat(s.subsequence(0, i)))))
-                 && fs[i].postcondition_mut((s[i], Ghost::new(self.produced.concat(s.subsequence(0, i)))), visited[i])
+                 && (*fs[i]).precondition((s[i], Snapshot::new(self.produced.concat(s.subsequence(0, i)))))
+                 && fs[i].postcondition_mut((s[i], Snapshot::new(self.produced.concat(s.subsequence(0, i)))), visited[i])
         }
     }
 }
@@ -59,7 +59,7 @@ impl<I, B, F> Resolve for MapInv<I, B, F> {
     }
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Invariant
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Invariant
     for MapInv<I, I::Item, F>
 {
     // Should not quantify over self or the `invariant` cannot be made into a type invariant
@@ -74,7 +74,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Invariant
     }
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> ::std::iter::Iterator
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> ::std::iter::Iterator
     for MapInv<I, I::Item, F>
 {
     type Item = B;
@@ -84,35 +84,35 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> ::std::iter::I
       Some(v) => (*self).produces_one(v, ^self)
     })]
     fn next(&mut self) -> Option<Self::Item> {
-        let old_self: Ghost<Self> = gh! { *self };
+        let old_self: Snapshot<Self> = snapshot! { *self };
         match self.iter.next() {
             Some(v) => {
                 proof_assert! { self.func.precondition((v, self.produced)) };
-                let produced = gh! { self.produced.push(v) };
+                let produced = snapshot! { self.produced.push(v) };
                 let r = (self.func)(v, self.produced);
                 self.produced = produced;
                 #[allow(path_statements)]
-                let _: Ghost<()> = gh! { { Self::produces_one_invariant; () } };
+                let _: Snapshot<()> = snapshot! { { Self::produces_one_invariant; () } };
                 proof_assert! { old_self.produces_one(r, *self) };
                 let _ = self; // Make sure self is not resolve until here.
                 Some(r)
             }
             None => {
-                self.produced = gh! { Seq::EMPTY };
+                self.produced = snapshot! { Seq::EMPTY };
                 None
             }
         }
     }
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> MapInv<I, I::Item, F> {
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I::Item, F> {
     #[open]
     #[predicate]
     pub fn next_precondition(iter: I, func: F, produced: Seq<I::Item>) -> bool {
         pearlite! {
             forall<e: I::Item, i: I>
                 iter.produces(Seq::singleton(e), i) ==>
-                func.precondition((e, Ghost::new(produced)))
+                func.precondition((e, Snapshot::new(produced)))
         }
     }
 
@@ -123,9 +123,9 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> MapInv<I, I::I
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
                 func.unnest(*f) ==>
                 iter.produces(s.push(e1).push(e2), i) ==>
-                (*f).precondition((e1, Ghost::new(produced.concat(s)))) ==>
-                f.postcondition_mut((e1, Ghost::new(produced.concat(s))), b) ==>
-                (^f).precondition((e2, Ghost::new(produced.concat(s).push(e1))))
+                (*f).precondition((e1, Snapshot::new(produced.concat(s)))) ==>
+                f.postcondition_mut((e1, Snapshot::new(produced.concat(s))), b) ==>
+                (^f).precondition((e2, Snapshot::new(produced.concat(s).push(e1))))
         }
     }
 
@@ -136,9 +136,9 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> MapInv<I, I::I
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
                 func.unnest(*f) ==>
                 iter.produces(s.push(e1).push(e2), i) ==>
-                (*f).precondition((e1, Ghost::new(s))) ==>
-                f.postcondition_mut((e1, Ghost::new(s)), b) ==>
-                (^f).precondition((e2, Ghost::new(s.push(e1))))
+                (*f).precondition((e1, Snapshot::new(s))) ==>
+                f.postcondition_mut((e1, Snapshot::new(s)), b) ==>
+                (^f).precondition((e2, Snapshot::new(s.push(e1))))
         }
     }
 
diff --git a/creusot-contracts/src/stubs.rs b/creusot-contracts/src/stubs.rs
index dacfcf1604..af1e7a3868 100644
--- a/creusot-contracts/src/stubs.rs
+++ b/creusot-contracts/src/stubs.rs
@@ -58,8 +58,8 @@ pub fn variant_check<R: crate::well_founded::WellFounded + ?Sized>(_: R) -> Box<
 pub fn closure_result<R: ?Sized>(_: R, _: R) {}
 
 #[creusot::no_translate]
-#[rustc_diagnostic_item = "ghost_from_fn"]
-pub fn ghost_from_fn<T: ?Sized, F: Fn() -> crate::Ghost<T>>(_: F) -> crate::Ghost<T> {
+#[rustc_diagnostic_item = "snapshot_from_fn"]
+pub fn snapshot_from_fn<T: ?Sized, F: Fn() -> crate::Snapshot<T>>(_: F) -> crate::Snapshot<T> {
     panic!()
 }
 
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index 131f97d1d5..17589b051c 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -189,7 +189,7 @@ fn collect_body_ids<'tcx>(ctx: &mut TranslationCtx<'tcx>, def_id: DefId) -> Opti
         .collect::<Vec<_>>();
 
     ids.extend(promoted.iter().filter_map(|(p, p_ty)| {
-        if util::ghost_closure_id(ctx.tcx, *p_ty).is_none() {
+        if util::snapshot_closure_id(ctx.tcx, *p_ty).is_none() {
             Some(BodyId::new(def_id.expect_local(), Some(*p)))
         } else {
             None
diff --git a/creusot/src/backend/ty.rs b/creusot/src/backend/ty.rs
index c74558f1e4..ae04467845 100644
--- a/creusot/src/backend/ty.rs
+++ b/creusot/src/backend/ty.rs
@@ -481,7 +481,7 @@ fn field_ty<'tcx>(
     let ty = ctx.try_normalize_erasing_regions(param_env, ty).unwrap_or(ty);
 
     if !validate_field_ty(ctx, did, ty) {
-        ctx.crash_and_error(ctx.def_span(field.did), "Illegal use of the Ghost type")
+        ctx.crash_and_error(ctx.def_span(field.did), "Illegal use of the Snapshot type")
     }
 
     translate_ty_inner(TyTranslation::Declaration(did), ctx, names, ctx.def_span(field.did), ty)
@@ -492,7 +492,7 @@ fn validate_field_ty<'tcx>(ctx: &mut Why3Generator<'tcx>, adt_did: DefId, ty: Ty
     let bg = ctx.binding_group(adt_did);
 
     !ty.walk().filter_map(ty::GenericArg::as_type).any(|ty| {
-        util::is_ghost_ty(tcx, ty)
+        util::is_snap_ty(tcx, ty)
             && ty.walk().filter_map(ty::GenericArg::as_type).any(|ty| match ty.kind() {
                 TyKind::Adt(adt_def, _) => bg.contains(&adt_def.did()),
                 // TyKind::Param(_) => true,
diff --git a/creusot/src/cleanup_spec_closures.rs b/creusot/src/cleanup_spec_closures.rs
index b62c5d5b62..f009d0cf70 100644
--- a/creusot/src/cleanup_spec_closures.rs
+++ b/creusot/src/cleanup_spec_closures.rs
@@ -81,7 +81,7 @@ impl<'tcx> MutVisitor<'tcx> for NoTranslateNoMoves<'tcx> {
         match rvalue {
             Rvalue::Aggregate(box AggregateKind::Closure(def_id, _), substs) => {
                 if util::is_no_translate(self.tcx, *def_id)
-                    || util::is_ghost_closure(self.tcx, *def_id)
+                    || util::is_snapshot_closure(self.tcx, *def_id)
                 {
                     substs.iter_mut().for_each(|p| {
                         if p.is_move() {
diff --git a/creusot/src/gather_spec_closures.rs b/creusot/src/gather_spec_closures.rs
index 76376d169d..af957da5cd 100644
--- a/creusot/src/gather_spec_closures.rs
+++ b/creusot/src/gather_spec_closures.rs
@@ -3,7 +3,7 @@ use indexmap::{IndexMap, IndexSet};
 use crate::{
     ctx::TranslationCtx,
     pearlite::Term,
-    util::{self, ghost_closure_id},
+    util::{self, snapshot_closure_id},
 };
 use rustc_data_structures::graph::WithSuccessors;
 use rustc_hir::def_id::DefId;
@@ -18,25 +18,32 @@ pub enum LoopSpecKind {
     Variant,
 }
 
-pub(crate) fn assertions_and_ghosts<'tcx>(
-    ctx: &mut TranslationCtx<'tcx>,
-    body: &Body<'tcx>,
-) -> IndexMap<DefId, Term<'tcx>> {
-    let mut visitor = Closures::new(ctx.tcx);
-    visitor.visit_body(&body);
-
-    let mut assertions: IndexMap<_, _> = Default::default();
-    for clos in visitor.closures.into_iter() {
-        if util::is_assertion(ctx.tcx, clos) {
-            let term = ctx.term(clos).unwrap().clone();
-            assertions.insert(clos, term);
-        } else if util::is_ghost_closure(ctx.tcx, clos) {
-            let term = ctx.term(clos).unwrap().clone();
-            // A hack should probably be separately tracked
-            assertions.insert(clos, term);
+/// Collect spec-related special closures in a mir [`Body`].
+pub(crate) struct SpecClosures<'tcx> {
+    /// Closures generated by `proof_assert!`
+    pub(crate) assertions: IndexMap<DefId, Term<'tcx>>,
+    /// Closures generated by `snapshot!`
+    pub(crate) snapshots: IndexMap<DefId, Term<'tcx>>,
+}
+
+impl<'tcx> SpecClosures<'tcx> {
+    pub(crate) fn collect(ctx: &mut TranslationCtx<'tcx>, body: &Body<'tcx>) -> Self {
+        let mut visitor = Closures::new(ctx.tcx);
+        visitor.visit_body(&body);
+
+        let mut assertions = IndexMap::new();
+        let mut snapshots = IndexMap::new();
+        for clos in visitor.closures.into_iter() {
+            if util::is_assertion(ctx.tcx, clos) {
+                let term = ctx.term(clos).unwrap().clone();
+                assertions.insert(clos, term);
+            } else if util::is_snapshot_closure(ctx.tcx, clos) {
+                let term = ctx.term(clos).unwrap().clone();
+                snapshots.insert(clos, term);
+            }
         }
+        Self { assertions, snapshots }
     }
-    assertions
 }
 
 // Collect the closures in thir, so that we can do typechecking ourselves, and
@@ -59,7 +66,7 @@ impl<'tcx> Visitor<'tcx> for Closures<'tcx> {
                 self.closures.insert(*id);
             }
             Rvalue::Use(Operand::Constant(box ck)) => {
-                if let Some(def_id) = ghost_closure_id(self.tcx, ck.const_.ty()) {
+                if let Some(def_id) = snapshot_closure_id(self.tcx, ck.const_.ty()) {
                     self.closures.insert(def_id);
                 }
             }
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index 49c8a5fa5f..c1d835d8e3 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -8,9 +8,7 @@ use crate::{
     backend::ty::closure_accessors,
     ctx::*,
     fmir::{self, Expr},
-    gather_spec_closures::{
-        assertions_and_ghosts, corrected_invariant_names_and_locations, LoopSpecKind,
-    },
+    gather_spec_closures::{corrected_invariant_names_and_locations, LoopSpecKind, SpecClosures},
     resolve::EagerResolver,
     translation::{
         fmir::LocalDecl,
@@ -61,7 +59,7 @@ pub struct BodyTranslator<'body, 'tcx> {
 
     resolver: Option<EagerResolver<'body, 'tcx>>,
 
-    // Spec / Ghost variables
+    // Spec / Snapshot variables
     erased_locals: BitSet<Local>,
 
     // Current block being generated
@@ -77,7 +75,10 @@ pub struct BodyTranslator<'body, 'tcx> {
 
     invariants: IndexMap<BasicBlock, Vec<(LoopSpecKind, Term<'tcx>)>>,
 
+    /// Map of the `proof_assert!` blocks to their translated version.
     assertions: IndexMap<DefId, Term<'tcx>>,
+    /// Map of the `snapshot!` blocks to their translated version.
+    snapshots: IndexMap<DefId, Term<'tcx>>,
 
     borrows: Option<Rc<BorrowSet<'tcx>>>,
 
@@ -95,12 +96,12 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
         body_id: BodyId,
     ) -> Self {
         let invariants = corrected_invariant_names_and_locations(ctx, &body);
-        let assertions = assertions_and_ghosts(ctx, &body);
+        let SpecClosures { assertions, snapshots } = SpecClosures::collect(ctx, &body);
         let mut erased_locals = BitSet::new_empty(body.local_decls.len());
 
         body.local_decls.iter_enumerated().for_each(|(local, decl)| {
             if let TyKind::Closure(def_id, _) = decl.ty.peel_refs().kind() {
-                if crate::util::is_spec(tcx, *def_id) || util::is_ghost_closure(tcx, *def_id) {
+                if crate::util::is_spec(tcx, *def_id) || util::is_snapshot_closure(tcx, *def_id) {
                     erased_locals.insert(local);
                 }
             }
@@ -117,9 +118,6 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
                     with_facts.region_inference_context.clone(),
                 );
 
-                // eprintln!("body of {}", tcx.def_path_str(body_id.def_id()));
-                // resolver.debug(with_facts.regioncx.clone());
-
                 (Some(resolver), Some(borrows))
             }
             Some(_) => (None, None),
@@ -141,6 +139,7 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
             fresh_id: body.basic_blocks.len(),
             invariants,
             assertions,
+            snapshots,
             borrows,
         }
     }
@@ -151,6 +150,7 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
         let arg_count = self.body.arg_count;
 
         assert!(self.assertions.is_empty(), "unused assertions");
+        assert!(self.snapshots.is_empty(), "unused snapshots");
         assert!(self.invariants.is_empty(), "unused invariants");
 
         fmir::Body { locals: self.vars, arg_count, blocks: self.past_blocks }
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index 5f65ee8008..f59e977f42 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -6,7 +6,7 @@ use crate::{
         fmir::{self, Expr, ExprKind, RValue},
         specification::inv_subst,
     },
-    util::{self, ghost_closure_id},
+    util::{self, snapshot_closure_id},
 };
 use rustc_borrowck::borrow_set::TwoPhaseActivation;
 use rustc_middle::{
@@ -79,7 +79,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             Rvalue::Use(op) => match op {
                 Move(_pl) | Copy(_pl) => self.translate_operand(op).kind,
                 Constant(box c) => {
-                    if ghost_closure_id(self.tcx, c.const_.ty()).is_some() {
+                    if snapshot_closure_id(self.tcx, c.const_.ty()).is_some() {
                         return;
                     };
                     crate::constant::from_mir_constant(self.param_env(), self.ctx, c).kind
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index 7b96d6fcea..f6b2052e95 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -69,11 +69,10 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 }
 
                 let (fun_def_id, subst) = func_defid(func).expect("expected call with function");
-                if Some(fun_def_id) == self.tcx.get_diagnostic_item(Symbol::intern("ghost_from_fn"))
-                {
+                if self.tcx.is_diagnostic_item(Symbol::intern("snapshot_from_fn"), fun_def_id) {
                     let GenericArgKind::Type(ty) = subst.get(1).unwrap().unpack() else { panic!() };
                     let TyKind::Closure(def_id, _) = ty.kind() else { panic!() };
-                    let mut assertion = self.assertions.remove(def_id).unwrap();
+                    let mut assertion = self.snapshots.remove(def_id).unwrap();
                     assertion.subst(&inv_subst(self.body, &self.locals, terminator.source_info));
                     self.check_ghost_term(&assertion, location);
                     self.emit_ghost_assign(*destination, assertion, span);
diff --git a/creusot/src/translation/pearlite.rs b/creusot/src/translation/pearlite.rs
index 690f71e7bc..5a8d286781 100644
--- a/creusot/src/translation/pearlite.rs
+++ b/creusot/src/translation/pearlite.rs
@@ -15,7 +15,7 @@ use crate::{
     error::{CrErr, CreusotResult, Error},
     projection_vec::{visit_projections, visit_projections_mut, ProjectionVec},
     translation::TranslationCtx,
-    util::{self, is_ghost_ty},
+    util::{self, is_snap_ty},
 };
 use itertools::Itertools;
 use log::*;
@@ -840,16 +840,16 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
                 ))
             }
             ExprKind::Deref { arg } => {
-                // Detect * ghost_deref & and treat that as a single 'projection'
-                if self.is_ghost_deref(*arg) {
+                // Detect * snapshot_deref & and treat that as a single 'projection'
+                if self.is_snapshot_deref(*arg) {
                     let ExprKind::Call { args, .. } = &self.thir[*arg].kind else { unreachable!() };
                     let ExprKind::Borrow { borrow_kind: BorrowKind::Shared, arg } = self.thir[args[0]].kind else { unreachable!() };
 
                     let (cur, fin) = self.logical_reborrow_inner(arg)?;
                     let deref_method =
-                        self.ctx.get_diagnostic_item(Symbol::intern("ghost_inner")).unwrap();
-                    // Extract the `T` from `Ghost<T>`
-                    let TyKind::Adt(_, subst) = self.thir[arg].ty.peel_refs().kind() else {unreachable!()};
+                        self.ctx.get_diagnostic_item(Symbol::intern("snapshot_inner")).unwrap();
+                    // Extract the `T` from `Snapshot<T>`
+                    let TyKind::Adt(_, subst) = self.thir[arg].ty.peel_refs().kind() else { unreachable!() };
                     return Ok((
                         Term::call(self.ctx.tcx, deref_method, subst, vec![cur]),
                         Term::call(self.ctx.tcx, deref_method, subst, vec![fin]),
@@ -918,8 +918,8 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
                 Ok(res)
             }
             ExprKind::Deref { arg } => {
-                // Detect * ghost_deref & and treat that as a single 'projection'
-                if self.is_ghost_deref(*arg) {
+                // Detect * snapshot_deref & and treat that as a single 'projection'
+                if self.is_snapshot_deref(*arg) {
                     let ExprKind::Call { args, .. } = &self.thir[*arg].kind else { unreachable!() };
                     let ExprKind::Borrow { borrow_kind: BorrowKind::Shared, arg } = self.thir[args[0]].kind else { unreachable!() };
 
@@ -956,7 +956,7 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
         }
     }
 
-    pub(crate) fn is_ghost_deref(&self, expr_id: ExprId) -> bool {
+    pub(crate) fn is_snapshot_deref(&self, expr_id: ExprId) -> bool {
         let ExprKind::Call { ty, .. } = &self.thir[expr_id].kind else { return false };
 
         let TyKind::FnDef(id, sub) = ty.kind() else { panic!("expected function type") };
@@ -965,7 +965,7 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
             return false;
         }
 
-        sub[0].as_type().map(|ty| is_ghost_ty(self.ctx.tcx, ty)).unwrap_or(false)
+        sub[0].as_type().map(|ty| is_snap_ty(self.ctx.tcx, ty)).unwrap_or(false)
     }
 
     fn mk_projection(&self, lhs: Term<'tcx>, name: FieldIdx) -> Result<TermKind<'tcx>, Error> {
diff --git a/creusot/src/translation/specification.rs b/creusot/src/translation/specification.rs
index 23907d2737..5929eabae7 100644
--- a/creusot/src/translation/specification.rs
+++ b/creusot/src/translation/specification.rs
@@ -302,7 +302,7 @@ pub(crate) fn is_overloaded_item(tcx: TyCtxt, def_id: DefId) -> bool {
         || def_path.ends_with("::boxed::Box::<T>::new")
         || def_path.ends_with("::ops::Deref::deref")
         || def_path.ends_with("::ops::DerefMut::deref_mut")
-        || def_path.ends_with("Ghost::<T>::from_fn")
+        || def_path.ends_with("Snapshot::<T>::from_fn")
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -314,13 +314,13 @@ pub(crate) enum Purity {
 
 impl Purity {
     pub(crate) fn of_def_id<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Self {
-        let is_ghost = util::is_ghost_closure(tcx, def_id);
+        let is_snapshot = util::is_snapshot_closure(tcx, def_id);
         if util::is_predicate(tcx, def_id)
             || util::is_logic(tcx, def_id)
-            || (util::is_spec(tcx, def_id) && !is_ghost)
+            || (util::is_spec(tcx, def_id) && !is_snapshot)
         {
             Purity::Logic
-        } else if util::is_ghost(tcx, def_id) || is_ghost {
+        } else if util::is_ghost(tcx, def_id) || is_snapshot {
             Purity::Ghost
         } else {
             Purity::Program
diff --git a/creusot/src/util.rs b/creusot/src/util.rs
index da12223eb5..dc81964b52 100644
--- a/creusot/src/util.rs
+++ b/creusot/src/util.rs
@@ -65,21 +65,23 @@ pub(crate) fn is_assertion(tcx: TyCtxt, def_id: DefId) -> bool {
     get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "spec", "assert"]).is_some()
 }
 
-pub(crate) fn is_ghost_closure(tcx: TyCtxt, def_id: DefId) -> bool {
-    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "spec", "ghost"]).is_some()
+pub(crate) fn is_snapshot_closure(tcx: TyCtxt, def_id: DefId) -> bool {
+    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "spec", "snapshot"]).is_some()
 }
 
-pub(crate) fn ghost_closure_id<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<DefId> {
-    if let TyKind::Closure(def_id, _) = ty.peel_refs().kind() && is_ghost_closure(tcx, *def_id)  {
+pub(crate) fn snapshot_closure_id<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<DefId> {
+    if let TyKind::Closure(def_id, _) = ty.peel_refs().kind() && is_snapshot_closure(tcx, *def_id) {
         Some(*def_id)
-    } else { None }
+    } else {
+        None
+    }
 }
 
-pub(crate) fn is_ghost_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
+pub(crate) fn is_snap_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
     let r: Option<bool> = try {
         let adt = ty.ty_adt_def()?;
         let builtin = get_builtin(tcx, adt.did())?;
-        builtin.as_str() == "prelude.Ghost.ghost_ty"
+        builtin.as_str() == "prelude.Snapshot.snap_ty"
     };
     r.unwrap_or(false)
 }
diff --git a/exercises/04_all_zero.rs b/exercises/04_all_zero.rs
index 2395529747..12b2aeef44 100644
--- a/exercises/04_all_zero.rs
+++ b/exercises/04_all_zero.rs
@@ -5,7 +5,7 @@ use creusot_contracts::*;
 // Also show that no elements were added or removed
 pub fn all_zero(v: &mut Vec<u32>) {
     let mut i = 0;
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
     // Until https://gitlab.inria.fr/why3/why3/-/merge_requests/667 is merged
     // the following invariant is needed to allow Why3 to remember prophecies dont change
     #[invariant(proph_const, ^v == ^old_v.inner())]
diff --git a/prelude/prelude.mlw b/prelude/prelude.mlw
index a132033874..44aeeb6fd8 100644
--- a/prelude/prelude.mlw
+++ b/prelude/prelude.mlw
@@ -214,12 +214,12 @@ module Char
   axiom chr_code: forall c. chr (code c) = c
 end
 
-module Ghost
-  type ghost_ty 't
-  val function new (ghost x : 't) : ghost_ty 't
-  val function inner (x : ghost_ty 't) : 't
+module Snapshot
+  type snap_ty 't
+  val function new (ghost x : 't) : snap_ty 't
+  val function inner (x : snap_ty 't) : 't
   axiom new_spec: forall x: 't [new x]. inner (new x) = x
-  axiom inner_spec: forall x: ghost_ty 't [inner x]. new (inner x) = x
+  axiom inner_spec: forall x: snap_ty 't [inner x]. new (inner x) = x
 end
 
 module Slice

From d41f576a577faed5688d3752421242b915955e5c Mon Sep 17 00:00:00 2001
From: arnaudgolfouse <arnaud.golfouse@laposte.net>
Date: Wed, 28 Feb 2024 11:22:18 +0100
Subject: [PATCH 23/66] rename ghost, logic and predicate functions

`#[ghost]` -> `#[logic]`
`#[logic]` -> `#[logic(prophetic)]`
`#[predicate]` -> `#[predicate]` and `#[predicate(prophetic)]`
---
 ARCHITECTURE.md                               |  2 +-
 README.md                                     |  7 +-
 creusot-contracts-dummy/src/lib.rs            |  5 --
 .../src/derive/deep_model.rs                  |  2 +-
 creusot-contracts-proc/src/derive/resolve.rs  |  2 +-
 creusot-contracts-proc/src/lib.rs             | 84 ++++++++-----------
 creusot-contracts/src/ghost_ptr.rs            | 16 ++--
 creusot-contracts/src/invariant.rs            |  2 +-
 creusot-contracts/src/lib.rs                  | 82 +++++++++++++-----
 creusot-contracts/src/logic/fmap.rs           | 36 ++++----
 creusot-contracts/src/logic/fset.rs           | 16 ++--
 creusot-contracts/src/logic/int.rs            | 12 +--
 creusot-contracts/src/logic/mapping.rs        |  6 +-
 creusot-contracts/src/logic/ops.rs            | 16 ++--
 creusot-contracts/src/logic/ord.rs            | 34 ++++----
 creusot-contracts/src/logic/seq.rs            | 22 ++---
 creusot-contracts/src/logic/set.rs            | 12 +--
 creusot-contracts/src/model.rs                | 22 ++---
 creusot-contracts/src/num_rational.rs         | 16 ++--
 creusot-contracts/src/resolve.rs              |  8 +-
 creusot-contracts/src/snapshot.rs             |  8 +-
 creusot-contracts/src/std/array.rs            |  4 +-
 creusot-contracts/src/std/boxed.rs            |  4 +-
 creusot-contracts/src/std/cmp.rs              |  4 +-
 creusot-contracts/src/std/default.rs          |  2 +-
 creusot-contracts/src/std/deque.rs            | 12 +--
 creusot-contracts/src/std/iter.rs             |  6 +-
 creusot-contracts/src/std/iter/cloned.rs      | 10 +--
 creusot-contracts/src/std/iter/copied.rs      | 10 +--
 creusot-contracts/src/std/iter/empty.rs       |  2 +-
 creusot-contracts/src/std/iter/enumerate.rs   | 16 ++--
 creusot-contracts/src/std/iter/fuse.rs        |  6 +-
 creusot-contracts/src/std/iter/map_inv.rs     | 20 ++---
 creusot-contracts/src/std/iter/once.rs        |  4 +-
 creusot-contracts/src/std/iter/range.rs       |  6 +-
 creusot-contracts/src/std/iter/repeat.rs      |  2 +-
 creusot-contracts/src/std/iter/skip.rs        | 14 ++--
 creusot-contracts/src/std/iter/take.rs        | 18 ++--
 creusot-contracts/src/std/iter/zip.rs         | 12 +--
 creusot-contracts/src/std/num.rs              |  4 +-
 creusot-contracts/src/std/ops.rs              | 12 +--
 creusot-contracts/src/std/option.rs           | 16 ++--
 creusot-contracts/src/std/result.rs           |  2 +-
 creusot-contracts/src/std/slice.rs            | 28 +++----
 creusot-contracts/src/std/time.rs             | 16 ++--
 creusot-contracts/src/std/tuples.rs           |  6 +-
 creusot-contracts/src/std/vec.rs              | 12 +--
 creusot-contracts/src/util.rs                 |  8 +-
 creusot/src/backend.rs                        |  9 +-
 creusot/src/backend/logic.rs                  |  4 +-
 creusot/src/backend/ty.rs                     |  2 +-
 creusot/src/ctx.rs                            |  2 +-
 creusot/src/translation.rs                    |  1 -
 creusot/src/translation/pearlite.rs           |  2 +-
 creusot/src/translation/specification.rs      | 44 ++++++----
 creusot/src/util.rs                           | 53 ++++++------
 creusot/src/validate.rs                       | 11 +--
 57 files changed, 416 insertions(+), 378 deletions(-)

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index eafaf886d0..b23aa48468 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -151,7 +151,7 @@ Instead, we replace the `discriminant` / `switchInt` pair with a match directly
 
 ## Logical functions
 
-Logical functions are created by `#[ghost]`, `#[logic]`, or `#[predicate]`.
+Logical functions are created by `#[logic]` or `#[predicate]`.
 
 ## Specifications
 
diff --git a/README.md b/README.md
index 097641ed0a..657c4eaab8 100644
--- a/README.md
+++ b/README.md
@@ -152,15 +152,14 @@ Contracts and logic functions are written in Pearlite, a specification language
 - Logical Expressions: quantifiers (`forall` and `exists`), logical implication `==>`, *logical* equality `a == b`, labels
 - Rust specific logical expressions: access to the **final** value of a mutable reference `^`, access to the *model* of an object `@`
 
-We also provide three new attributes on Rust functions: `ghost`, `logic` and `predicate`.
-
-A ghost function is marked with `#[ghost]`. It can be used in ghost code, to assign ghost
-variables of the `Snapshot<T>` type.
+We also provide two new attributes on Rust functions: `logic` and `predicate`.
 
 Marked  `#[logic]` or `#[predicate]`, a function can be used in specs and other logical conditions (`requires`/`ensures` and `invariant`). They can use ghost functions.
 The two attributes have the following difference.
 - A `logic` function can freely have logical, non-executable operations, such as quantifiers, logic equalities, etc. Instead, this function can't be called in normal Rust code (the function body of a `logic` function is replaced with a panic).
   You can use pearlite syntax for any part in the logic function by marking that part with the `pearlite! { ... }` macro.
+
+  If you need to use the prophecy operator `^` on a mutable reference, you need to mark the function `#[logic(prophetic)]`.
 - A `predicate` is a logical function which returns a proposition (in practice, returns a boolean value).
 
 When you write *recursive* `ghost`, `logic` or `predicate` functions, you have to show that the function terminates.
diff --git a/creusot-contracts-dummy/src/lib.rs b/creusot-contracts-dummy/src/lib.rs
index c7a952d901..9e1f60b1dd 100644
--- a/creusot-contracts-dummy/src/lib.rs
+++ b/creusot-contracts-dummy/src/lib.rs
@@ -43,11 +43,6 @@ pub fn pearlite(_: TS1) -> TS1 {
     TS1::new()
 }
 
-#[proc_macro_attribute]
-pub fn ghost(_: TS1, _: TS1) -> TS1 {
-    TS1::new()
-}
-
 #[proc_macro_attribute]
 pub fn predicate(_: TS1, _: TS1) -> TS1 {
     TS1::new()
diff --git a/creusot-contracts-proc/src/derive/deep_model.rs b/creusot-contracts-proc/src/derive/deep_model.rs
index 6dd6807924..7171b82fd9 100644
--- a/creusot-contracts-proc/src/derive/deep_model.rs
+++ b/creusot-contracts-proc/src/derive/deep_model.rs
@@ -47,7 +47,7 @@ pub fn derive_deep_model(input: proc_macro::TokenStream) -> proc_macro::TokenStr
         impl #impl_generics ::creusot_contracts::DeepModel for #name #ty_generics #where_clause {
             type DeepModelTy = #deep_model_ty_name #ty_generics;
 
-            #[ghost]
+            #[logic]
             #open
             fn deep_model(self) -> Self::DeepModelTy {
                 #eq
diff --git a/creusot-contracts-proc/src/derive/resolve.rs b/creusot-contracts-proc/src/derive/resolve.rs
index 1b081e2daf..3888b8ebc6 100644
--- a/creusot-contracts-proc/src/derive/resolve.rs
+++ b/creusot-contracts-proc/src/derive/resolve.rs
@@ -14,7 +14,7 @@ pub fn derive_resolve(input: proc_macro::TokenStream) -> proc_macro::TokenStream
     let expanded = quote! {
         #[::creusot_contracts::trusted]
         impl #impl_generics ::creusot_contracts::Resolve for #name #ty_generics #where_clause {
-            #[::creusot_contracts::predicate]
+            #[::creusot_contracts::predicate(prophetic)]
             #[::creusot_contracts::open]
             fn resolve(self) -> bool {
                 use ::creusot_contracts::Resolve;
diff --git a/creusot-contracts-proc/src/lib.rs b/creusot-contracts-proc/src/lib.rs
index bf4a3cf717..6209c692da 100644
--- a/creusot-contracts-proc/src/lib.rs
+++ b/creusot-contracts-proc/src/lib.rs
@@ -467,59 +467,35 @@ impl Parse for LogicInput {
 }
 
 #[proc_macro_attribute]
-pub fn ghost(_: TS1, tokens: TS1) -> TS1 {
-    let log = parse_macro_input!(tokens as LogicInput);
-    match log {
-        LogicInput::Item(log) => ghost_item(log),
-        LogicInput::Sig(sig) => ghost_sig(sig),
-    }
-}
-
-fn ghost_sig(sig: TraitItemSignature) -> TS1 {
-    let span = sig.span();
-    TS1::from(quote_spanned! {span=>
-        #[creusot::decl::ghost]
-        #sig
-    })
-}
-
-fn ghost_item(log: LogicItem) -> TS1 {
-    let span = log.sig.span();
-
-    let term = log.body;
-    let vis = log.vis;
-    let def = log.defaultness;
-    let sig = log.sig;
-    let attrs = log.attrs;
-    let req_body = pretyping::encode_block(&term.stmts).unwrap();
-
-    TS1::from(quote_spanned! {span=>
-        #[creusot::decl::ghost]
-        #(#attrs)*
-        #vis #def #sig {
-            #req_body
+pub fn logic(prophetic: TS1, tokens: TS1) -> TS1 {
+    let prophetic = if prophetic.is_empty() {
+        None
+    } else {
+        let t = parse_macro_input!(prophetic as Ident);
+        if t.to_string() == "prophetic" {
+            Some(quote!(#[creusot::decl::logic::prophetic]))
+        } else {
+            None
         }
-    })
-}
-
-#[proc_macro_attribute]
-pub fn logic(_: TS1, tokens: TS1) -> TS1 {
+    };
     let log = parse_macro_input!(tokens as LogicInput);
     match log {
-        LogicInput::Item(log) => logic_item(log),
-        LogicInput::Sig(sig) => logic_sig(sig),
+        LogicInput::Item(log) => logic_item(log, prophetic),
+        LogicInput::Sig(sig) => logic_sig(sig, prophetic),
     }
 }
 
-fn logic_sig(sig: TraitItemSignature) -> TS1 {
+fn logic_sig(sig: TraitItemSignature, prophetic: Option<TokenStream>) -> TS1 {
     let span = sig.span();
-    TS1::from(quote_spanned! {span=>
+
+    TS1::from(quote_spanned! {span =>
         #[creusot::decl::logic]
+        #prophetic
         #sig
     })
 }
 
-fn logic_item(log: LogicItem) -> TS1 {
+fn logic_item(log: LogicItem, prophetic: Option<TokenStream>) -> TS1 {
     let span = log.sig.span();
 
     let term = log.body;
@@ -529,8 +505,9 @@ fn logic_item(log: LogicItem) -> TS1 {
     let attrs = log.attrs;
     let req_body = pretyping::encode_block(&term.stmts).unwrap();
 
-    TS1::from(quote_spanned! {span=>
+    TS1::from(quote_spanned! {span =>
         #[creusot::decl::logic]
+        #prophetic
         #(#attrs)*
         #vis #def #sig {
             #req_body
@@ -550,7 +527,18 @@ pub fn law(_: TS1, tokens: TS1) -> TS1 {
 }
 
 #[proc_macro_attribute]
-pub fn predicate(_: TS1, tokens: TS1) -> TS1 {
+pub fn predicate(prophetic: TS1, tokens: TS1) -> TS1 {
+    let prophetic = if prophetic.is_empty() {
+        None
+    } else {
+        let t = parse_macro_input!(prophetic as Ident);
+        if t.to_string() == "prophetic" {
+            Some(quote!(#[creusot::decl::logic::prophetic]))
+        } else {
+            None
+        }
+    };
+
     let pred = parse_macro_input!(tokens as LogicInput);
 
     let sig = match &pred {
@@ -573,20 +561,21 @@ pub fn predicate(_: TS1, tokens: TS1) -> TS1 {
     };
 
     match pred {
-        LogicInput::Item(log) => predicate_item(log),
-        LogicInput::Sig(sig) => predicate_sig(sig),
+        LogicInput::Item(log) => predicate_item(log, prophetic),
+        LogicInput::Sig(sig) => predicate_sig(sig, prophetic),
     }
 }
 
-fn predicate_sig(sig: TraitItemSignature) -> TS1 {
+fn predicate_sig(sig: TraitItemSignature, prophetic: Option<TokenStream>) -> TS1 {
     let span = sig.span();
     TS1::from(quote_spanned! {span=>
         #[creusot::decl::predicate]
+        #prophetic
         #sig
     })
 }
 
-fn predicate_item(log: LogicItem) -> TS1 {
+fn predicate_item(log: LogicItem, prophetic: Option<TokenStream>) -> TS1 {
     let span = log.sig.span();
     let term = log.body;
     let vis = log.vis;
@@ -598,6 +587,7 @@ fn predicate_item(log: LogicItem) -> TS1 {
 
     TS1::from(quote_spanned! {span=>
         #[creusot::decl::predicate]
+        #prophetic
         #(#attrs)*
         #vis #def #sig {
             #req_body
diff --git a/creusot-contracts/src/ghost_ptr.rs b/creusot-contracts/src/ghost_ptr.rs
index 44f2158ed0..64041cec16 100644
--- a/creusot-contracts/src/ghost_ptr.rs
+++ b/creusot-contracts/src/ghost_ptr.rs
@@ -29,7 +29,7 @@ impl<T: ?Sized> ShallowModel for GhostPtrToken<T> {
     type ShallowModelTy = FMap<GhostPtr<T>, T>;
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn shallow_model(self) -> Self::ShallowModelTy {
         absurd
@@ -131,7 +131,7 @@ impl<T: ?Sized> GhostPtrToken<T> {
 impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
     #[trusted]
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[ensures(forall<t: GhostPtrToken<T>> !t@.contains(result))]
     #[ensures(result.addr_logic() == 0)]
     #[ensures(forall<ptr: GhostPtr<T>> ptr.addr_logic() == result.addr_logic() ==> ptr == result)]
@@ -140,7 +140,7 @@ impl<T: ?Sized> GhostPtrExt<T> for GhostPtr<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn addr_logic(self) -> Int {
         absurd
@@ -151,7 +151,7 @@ impl<'a, T: ?Sized> ShallowModel for GhostPtrTokenRef<'a, T> {
     type ShallowModelTy = FMap<GhostPtr<T>, T>;
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn shallow_model(self) -> Self::ShallowModelTy {
         absurd
@@ -174,14 +174,14 @@ impl<'a, T: ?Sized> GhostPtrTokenRef<'a, T> {
     #[requires(new_model.subset(self@))]
     #[ensures(result@ == *new_model)]
     #[allow(unused_variables)]
-    pub fn shrink_token_ref(self, new_model: Ghost<FMap<*const T, T>>) -> Self {
+    pub fn shrink_token_ref(self, new_model: Snapshot<FMap<*const T, T>>) -> Self {
         self
     }
 }
 
 impl<'a, T: ?Sized> GhostPtrTokenMut<'a, T> {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     pub fn cur(self) -> FMap<GhostPtr<T>, T> {
         absurd
@@ -265,9 +265,9 @@ impl<'a, T> Resolve for GhostPtrTokenMut<'a, T> {
 }
 
 pub trait GhostPtrExt<T: ?Sized>: Sized {
-    #[ghost]
+    #[logic]
     fn null_logic() -> Self;
-    #[ghost]
+    #[logic]
     fn addr_logic(self) -> Int;
 }
 
diff --git a/creusot-contracts/src/invariant.rs b/creusot-contracts/src/invariant.rs
index ff9fdae4c4..51aa0d047a 100644
--- a/creusot-contracts/src/invariant.rs
+++ b/creusot-contracts/src/invariant.rs
@@ -1,7 +1,7 @@
 use crate::*;
 
 pub trait Invariant {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     #[rustc_diagnostic_item = "creusot_invariant_user"]
     fn invariant(self) -> bool {
diff --git a/creusot-contracts/src/lib.rs b/creusot-contracts/src/lib.rs
index 5ef8b382e1..fd324b72dc 100644
--- a/creusot-contracts/src/lib.rs
+++ b/creusot-contracts/src/lib.rs
@@ -32,20 +32,41 @@ mod macros {
     pub use creusot_contracts_proc::law;
 
     /// Declare a function as being a logical function, this declaration must be pure and
-    /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
+    /// total. It cannot be called from Rust programs, but in exchange it can use logical
+    /// operations and syntax with the help of the [`pearlite!`] macro.
+    ///
+    /// # `prophetic`
+    ///
+    /// If you wish to use the `^` operator on mutable borrows to get the final value, you need to
+    /// specify that the function is _prophetic_, like so:
+    /// ```ignore
+    /// #[logic(prophetic)]
+    /// fn uses_prophecies(x: &mut Int) -> Int {
+    ///     pearlite! { if ^x == 0 { 0 } else { 1 } }
+    /// }
+    /// ```
+    /// Such a logic function cannot be used in [`snapshot!`] anymore, and cannot be
+    /// called from a regular [`logic`] or [`predicate`] function.
     pub use creusot_contracts_proc::logic;
 
-    /// Declare a function as being a ghost function, this declaration must be pure and
-    /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
-    /// Unlike functions marked with the `[logic]` attribute, `[ghost]` functions cannot
-    /// use the final value operator (^), nor call other `[predicate]` or `[logic]` functions.
-    pub use creusot_contracts_proc::ghost;
-
     /// Declare a function as being a logical function, this declaration must be pure and
     /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
+    /// use logical operations and syntax with the help of the [`pearlite!`] macro.
+    ///
+    /// It **must** return a boolean.
+    ///
+    /// # `prophetic`
+    ///
+    /// If you wish to use the `^` operator on mutable borrows to get the final value, you need to
+    /// specify that the function is _prophetic_, like so:
+    /// ```ignore
+    /// #[predicate(prophetic)]
+    /// fn uses_prophecies(x: &mut Int) -> bool {
+    ///     pearlite! { ^x == 0 }
+    /// }
+    /// ```
+    /// Such a predicate function cannot be used in [`snapshot!`] anymore, and cannot be
+    /// called from a regular [`logic`] or [`predicate`] function.
     pub use creusot_contracts_proc::predicate;
 
     /// Inserts a *logical* assertion into the code. This assertion will not be checked at runtime
@@ -109,20 +130,41 @@ mod macros {
     pub use creusot_contracts_dummy::law;
 
     /// Declare a function as being a logical function, this declaration must be pure and
-    /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
+    /// total. It cannot be called from Rust programs, but in exchange it can use logical
+    /// operations and syntax with the help of the [`pearlite!`] macro.
+    ///
+    /// # `prophetic`
+    ///
+    /// If you wish to use the `^` operator on mutable borrows to get the final value, you need to
+    /// specify that the function is _prophetic_, like so:
+    /// ```ignore
+    /// #[logic(prophetic)]
+    /// fn uses_prophecies(x: &mut Int) -> Int {
+    ///     pearlite! { if ^x == 0 { 0 } else { 1 } }
+    /// }
+    /// ```
+    /// Such a logic function cannot be used in [`snapshot!`] anymore, and cannot be
+    /// called from a regular [`logic`] or [`predicate`] function.
     pub use creusot_contracts_dummy::logic;
 
-    /// Declare a function as being a ghost function, this declaration must be pure and
-    /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
-    /// Unlike functions marked with the `[logic]` attribute, `[ghost]` functions cannot
-    /// use the final value operator (^), nor call other `[predicate]` or `[logic]` functions.
-    pub use creusot_contracts_dummy::ghost;
-
     /// Declare a function as being a logical function, this declaration must be pure and
     /// total. It cannot be called from Rust programs as it is *ghost*, in exchange it can
-    /// use logical operations and syntax with the help of the [pearlite] macro.
+    /// use logical operations and syntax with the help of the [`pearlite!`] macro.
+    ///
+    /// It **must** return a boolean.
+    ///
+    /// # `prophetic`
+    ///
+    /// If you wish to use the `^` operator on mutable borrows to get the final value, you need to
+    /// specify that the function is _prophetic_, like so:
+    /// ```ignore
+    /// #[predicate(prophetic)]
+    /// fn uses_prophecies(x: &mut Int) -> bool {
+    ///     pearlite! { ^x == 0 }
+    /// }
+    /// ```
+    /// Such a predicate function cannot be used in [`snapshot!`] anymore, and cannot be
+    /// called from a regular [`logic`] or [`predicate`] function.
     pub use creusot_contracts_dummy::predicate;
 
     /// Inserts a *logical* assertion into the code. This assertion will not be checked at runtime
diff --git a/creusot-contracts/src/logic/fmap.rs b/creusot-contracts/src/logic/fmap.rs
index 796190aac6..04357dd532 100644
--- a/creusot-contracts/src/logic/fmap.rs
+++ b/creusot-contracts/src/logic/fmap.rs
@@ -7,7 +7,7 @@ pub struct FMap<K, V: ?Sized>(PMap<K, V>);
 
 impl<K, V: ?Sized> FMap<K, V> {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[ensures(result >= 0)]
     pub fn len(self) -> Int {
@@ -15,7 +15,7 @@ impl<K, V: ?Sized> FMap<K, V> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     pub fn mk(_m: PMap<K, V>) -> Self {
         absurd
@@ -23,7 +23,7 @@ impl<K, V: ?Sized> FMap<K, V> {
 
     #[trusted]
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[ensures(Self::mk(result) == self)] // injectivity
     pub fn view(self) -> PMap<K, V> {
         absurd
@@ -31,7 +31,7 @@ impl<K, V: ?Sized> FMap<K, V> {
 
     #[trusted]
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[ensures(result.view() == self.view().set(k, Some(v.make_sized())))]
     #[ensures(self.contains(k) ==> result.len() == self.len())]
     #[ensures(!self.contains(k) ==> result.len() == self.len() + 1)]
@@ -41,28 +41,28 @@ impl<K, V: ?Sized> FMap<K, V> {
 
     #[trusted]
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[ensures(result.view() == self.view().set(k, None))]
     #[ensures(result.len() == if self.contains(k) {self.len() - 1} else {self.len()})]
     pub fn remove(self, k: K) -> Self {
         absurd
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     pub fn get(self, k: K) -> Option<SizedW<V>> {
         self.view().get(k)
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     pub fn lookup_unsized(self, k: K) -> SizedW<V> {
         unwrap(self.get(k))
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     pub fn lookup(self, k: K) -> V
@@ -72,7 +72,7 @@ impl<K, V: ?Sized> FMap<K, V> {
         *self.lookup_unsized(k)
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     pub fn contains(self, k: K) -> bool {
@@ -80,7 +80,7 @@ impl<K, V: ?Sized> FMap<K, V> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[ensures(result.len() == 0)]
     #[ensures(result.view() == Mapping::cst(None))]
@@ -88,26 +88,26 @@ impl<K, V: ?Sized> FMap<K, V> {
         absurd
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn is_empty(self) -> bool {
         self.ext_eq(FMap::empty())
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn disjoint(self, other: Self) -> bool {
         pearlite! {forall<k: K> !self.contains(k) || !other.contains(k)}
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn subset(self, other: Self) -> bool {
         pearlite! {forall<k: K> self.contains(k) ==> other.get(k) == self.get(k)}
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[requires(self.disjoint(other))]
     #[ensures(forall<k: K> result.get(k) == if self.contains(k) {
@@ -123,15 +123,15 @@ impl<K, V: ?Sized> FMap<K, V> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[ensures(forall<k: K> result.get(k) == if other.contains(k) {None} else {self.get(k)})]
     pub fn subtract_keys(self, other: Self) -> Self {
         absurd
     }
 
-    #[ghost]
-    #[open(self)]
+    #[logic]
+    #[open]
     #[requires(other.subset(self))]
     #[ensures(result.disjoint(other))]
     #[ensures(other.union(result).ext_eq(self))]
@@ -140,7 +140,7 @@ impl<K, V: ?Sized> FMap<K, V> {
         self.subtract_keys(other)
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     #[ensures(result ==> self == other)]
     #[ensures((forall<k: K> self.get(k) == other.get(k)) ==> result)]
diff --git a/creusot-contracts/src/logic/fset.rs b/creusot-contracts/src/logic/fset.rs
index c500edcde6..7b3dfb65b4 100644
--- a/creusot-contracts/src/logic/fset.rs
+++ b/creusot-contracts/src/logic/fset.rs
@@ -17,7 +17,7 @@ impl<T: ?Sized> FSet<T> {
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.mem"]
     pub fn mem(_: T, _: Self) -> bool {
@@ -25,14 +25,14 @@ impl<T: ?Sized> FSet<T> {
     }
 
     #[open]
-    #[ghost]
+    #[logic]
     #[why3::attr = "inline:trivial"]
     pub fn insert(self, e: T) -> Self {
         Self::add(e, self)
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.add"]
     pub fn add(_: T, _: Self) -> Self {
@@ -47,21 +47,21 @@ impl<T: ?Sized> FSet<T> {
     }
 
     #[open]
-    #[ghost]
+    #[logic]
     #[why3::attr = "inline:trivial"]
     pub fn remove(self, a: T) -> Self {
         Self::rem(a, self)
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.remove"]
     pub fn rem(_: T, _: Self) -> Self {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.union"]
     pub fn union(self, _: Self) -> Self {
@@ -82,14 +82,14 @@ impl<T: ?Sized> FSet<T> {
         Self::is_subset(other, self)
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.cardinal"]
     pub fn len(self) -> Int {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Fset.pick"]
     pub fn peek(self) -> T
diff --git a/creusot-contracts/src/logic/int.rs b/creusot-contracts/src/logic/int.rs
index 7fb8a8de44..1a7725f5f7 100644
--- a/creusot-contracts/src/logic/int.rs
+++ b/creusot-contracts/src/logic/int.rs
@@ -8,7 +8,7 @@ pub struct Int(*mut ());
 
 impl Int {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "int.Power.power"]
     pub fn pow(self, _: Int) -> Int {
@@ -16,7 +16,7 @@ impl Int {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "int.MinMax.max"]
     pub fn max(self, _: Int) -> Int {
@@ -24,7 +24,7 @@ impl Int {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "int.MinMax.min"]
     pub fn min(self, _: Int) -> Int {
@@ -32,7 +32,7 @@ impl Int {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "int.EuclideanDivision.div"]
     pub fn div_euclid(self, _: Int) -> Int {
@@ -40,14 +40,14 @@ impl Int {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "int.EuclideanDivision.mod"]
     pub fn rem_euclid(self, _: Int) -> Int {
         absurd
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn abs_diff(self, other: Int) -> Int {
         if self < other {
diff --git a/creusot-contracts/src/logic/mapping.rs b/creusot-contracts/src/logic/mapping.rs
index 7fb7be6089..b53c838370 100644
--- a/creusot-contracts/src/logic/mapping.rs
+++ b/creusot-contracts/src/logic/mapping.rs
@@ -5,7 +5,7 @@ pub struct Mapping<A, B>(std::marker::PhantomData<(A, B)>);
 
 impl<A, B> Mapping<A, B> {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "map.Map.get"]
     pub fn get(self, _: A) -> B {
@@ -13,7 +13,7 @@ impl<A, B> Mapping<A, B> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "map.Map.set"]
     pub fn set(self, _: A, _: B) -> Self {
@@ -21,7 +21,7 @@ impl<A, B> Mapping<A, B> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "map.Const.const"]
     pub fn cst(_: B) -> Self {
diff --git a/creusot-contracts/src/logic/ops.rs b/creusot-contracts/src/logic/ops.rs
index 80339c0be6..3deff865dd 100644
--- a/creusot-contracts/src/logic/ops.rs
+++ b/creusot-contracts/src/logic/ops.rs
@@ -5,7 +5,7 @@ use crate::*;
 pub trait IndexLogic<I> {
     type Item;
 
-    #[ghost]
+    #[logic]
     #[rustc_diagnostic_item = "index_logic_method"]
     fn index_logic(self, idx: I) -> Self::Item;
 }
@@ -13,7 +13,7 @@ pub trait IndexLogic<I> {
 impl<T, A: Allocator> IndexLogic<Int> for Vec<T, A> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: Int) -> Self::Item {
@@ -24,7 +24,7 @@ impl<T, A: Allocator> IndexLogic<Int> for Vec<T, A> {
 impl<T, A: Allocator> IndexLogic<usize> for Vec<T, A> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: usize) -> Self::Item {
@@ -35,7 +35,7 @@ impl<T, A: Allocator> IndexLogic<usize> for Vec<T, A> {
 impl<T> IndexLogic<Int> for [T] {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     #[rustc_diagnostic_item = "slice_index_logic"]
@@ -47,7 +47,7 @@ impl<T> IndexLogic<Int> for [T] {
 impl<T> IndexLogic<usize> for [T] {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: usize) -> Self::Item {
@@ -58,7 +58,7 @@ impl<T> IndexLogic<usize> for [T] {
 impl<T, const N: usize> IndexLogic<Int> for [T; N] {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: Int) -> Self::Item {
@@ -69,7 +69,7 @@ impl<T, const N: usize> IndexLogic<Int> for [T; N] {
 impl<T, const N: usize> IndexLogic<usize> for [T; N] {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: usize) -> Self::Item {
@@ -80,7 +80,7 @@ impl<T, const N: usize> IndexLogic<usize> for [T; N] {
 impl<T> IndexLogic<Int> for Snapshot<Seq<T>> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: Int) -> Self::Item {
diff --git a/creusot-contracts/src/logic/ord.rs b/creusot-contracts/src/logic/ord.rs
index e5f9177019..76bda7b493 100644
--- a/creusot-contracts/src/logic/ord.rs
+++ b/creusot-contracts/src/logic/ord.rs
@@ -2,10 +2,10 @@ use crate::{std::cmp::Ordering, *};
 
 #[allow(unused)]
 pub trait OrdLogic {
-    #[ghost]
+    #[logic]
     fn cmp_log(self, _: Self) -> Ordering;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn le_log(self, o: Self) -> bool {
         pearlite! { self.cmp_log(o) != Ordering::Greater }
@@ -15,7 +15,7 @@ pub trait OrdLogic {
     #[ensures(x.le_log(y) == (x.cmp_log(y) != Ordering::Greater))]
     fn cmp_le_log(x: Self, y: Self);
 
-    #[ghost]
+    #[logic]
     #[open]
     fn lt_log(self, o: Self) -> bool {
         pearlite! { self.cmp_log(o) == Ordering::Less }
@@ -25,7 +25,7 @@ pub trait OrdLogic {
     #[ensures(x.lt_log(y) == (x.cmp_log(y) == Ordering::Less))]
     fn cmp_lt_log(x: Self, y: Self);
 
-    #[ghost]
+    #[logic]
     #[open]
     fn ge_log(self, o: Self) -> bool {
         pearlite! { self.cmp_log(o) != Ordering::Less }
@@ -35,7 +35,7 @@ pub trait OrdLogic {
     #[ensures(x.ge_log(y) == (x.cmp_log(y) != Ordering::Less))]
     fn cmp_ge_log(x: Self, y: Self);
 
-    #[ghost]
+    #[logic]
     #[open]
     fn gt_log(self, o: Self) -> bool {
         pearlite! { self.cmp_log(o) == Ordering::Greater }
@@ -134,7 +134,7 @@ pub use ord_laws_impl;
 macro_rules! ord_logic_impl {
     ($t:ty) => {
         impl OrdLogic for $t {
-            #[ghost]
+            #[logic]
             #[open]
             fn cmp_log(self, o: Self) -> Ordering {
                 if self < o {
@@ -148,7 +148,7 @@ macro_rules! ord_logic_impl {
 
             #[trusted]
             #[open]
-            #[ghost]
+            #[logic]
             #[creusot::builtins = "int.Int.(<=)"]
             fn le_log(self, _: Self) -> bool {
                 true
@@ -156,7 +156,7 @@ macro_rules! ord_logic_impl {
 
             #[trusted]
             #[open]
-            #[ghost]
+            #[logic]
             #[creusot::builtins = "int.Int.(<)"]
             fn lt_log(self, _: Self) -> bool {
                 true
@@ -164,7 +164,7 @@ macro_rules! ord_logic_impl {
 
             #[trusted]
             #[open]
-            #[ghost]
+            #[logic]
             #[creusot::builtins = "int.Int.(>=)"]
             fn ge_log(self, _: Self) -> bool {
                 true
@@ -172,7 +172,7 @@ macro_rules! ord_logic_impl {
 
             #[trusted]
             #[open]
-            #[ghost]
+            #[logic]
             #[creusot::builtins = "int.Int.(>)"]
             fn gt_log(self, _: Self) -> bool {
                 true
@@ -201,7 +201,7 @@ ord_logic_impl!(isize);
 
 impl OrdLogic for bool {
     #[open]
-    #[ghost]
+    #[logic]
     fn cmp_log(self, o: Self) -> Ordering {
         match (self, o) {
             (false, false) => Ordering::Equal,
@@ -215,7 +215,7 @@ impl OrdLogic for bool {
 }
 
 impl<A: OrdLogic, B: OrdLogic> OrdLogic for (A, B) {
-    #[ghost]
+    #[logic]
     #[open]
     fn cmp_log(self, o: Self) -> Ordering {
         pearlite! { {
@@ -228,25 +228,25 @@ impl<A: OrdLogic, B: OrdLogic> OrdLogic for (A, B) {
         } }
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     fn le_log(self, o: Self) -> bool {
         pearlite! { (self.0 == o.0 && self.1 <= o.1) || self.0 <= o.0 }
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     fn lt_log(self, o: Self) -> bool {
         pearlite! { (self.0 == o.0 && self.1 < o.1) || self.0 < o.0 }
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     fn ge_log(self, o: Self) -> bool {
         pearlite! { (self.0 == o.0 && self.1 >= o.1) || self.0 >= o.0 }
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     fn gt_log(self, o: Self) -> bool {
         pearlite! { (self.0 == o.0 && self.1 > o.1) || self.0 > o.0 }
@@ -256,7 +256,7 @@ impl<A: OrdLogic, B: OrdLogic> OrdLogic for (A, B) {
 }
 
 impl<T: OrdLogic> OrdLogic for Option<T> {
-    #[ghost]
+    #[logic]
     #[open]
     fn cmp_log(self, o: Self) -> Ordering {
         match (self, o) {
diff --git a/creusot-contracts/src/logic/seq.rs b/creusot-contracts/src/logic/seq.rs
index 31f3860705..cbeba88a70 100644
--- a/creusot-contracts/src/logic/seq.rs
+++ b/creusot-contracts/src/logic/seq.rs
@@ -13,14 +13,14 @@ impl<T> Seq<T> {
     pub const EMPTY: Self = { Seq(std::marker::PhantomData) };
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Seq.create"]
     pub fn new(_: Int, _: Mapping<Int, T>) -> Self {
         absurd
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn get(self, ix: Int) -> Option<T> {
         if 0 <= ix && ix < self.len() {
@@ -31,7 +31,7 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq_ext.SeqExt.subsequence"]
     pub fn subsequence(self, _: Int, _: Int) -> Self {
@@ -39,21 +39,21 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Seq.singleton"]
     pub fn singleton(_: T) -> Self {
         absurd
     }
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn tail(self) -> Self {
         self.subsequence(1, self.len())
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[rustc_diagnostic_item = "seq_len"]
     #[creusot::builtins = "seq.Seq.length"]
@@ -62,7 +62,7 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Seq.set"]
     pub fn set(self, _: Int, _: T) -> Self {
@@ -78,7 +78,7 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Seq.snoc"]
     pub fn push(self, _: T) -> Self {
@@ -86,7 +86,7 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Seq.(++)"]
     pub fn concat(self, _: Self) -> Self {
@@ -94,7 +94,7 @@ impl<T> Seq<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "seq.Reverse.reverse"]
     pub fn reverse(self) -> Self {
@@ -163,7 +163,7 @@ impl<T> Seq<&T> {
 impl<T> IndexLogic<Int> for Seq<T> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[rustc_diagnostic_item = "seq_index"]
diff --git a/creusot-contracts/src/logic/set.rs b/creusot-contracts/src/logic/set.rs
index ec36252a28..f4bc35d3ea 100644
--- a/creusot-contracts/src/logic/set.rs
+++ b/creusot-contracts/src/logic/set.rs
@@ -17,7 +17,7 @@ impl<T: ?Sized> Set<T> {
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Set.mem"]
     pub fn mem(_: T, _: Self) -> bool {
@@ -25,14 +25,14 @@ impl<T: ?Sized> Set<T> {
     }
 
     #[open]
-    #[ghost]
+    #[logic]
     #[why3::attr = "inline:trivial"]
     pub fn insert(self, e: T) -> Self {
         Self::add(e, self)
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Set.add"]
     pub fn add(_: T, _: Self) -> Self {
@@ -47,14 +47,14 @@ impl<T: ?Sized> Set<T> {
     }
 
     #[open]
-    #[ghost]
+    #[logic]
     #[why3::attr = "inline:trivial"]
     pub fn remove(self, a: T) -> Self {
         Self::rem(a, self)
     }
 
     #[doc(hidden)]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "set.Set.remove"]
     pub fn rem(_: T, _: Self) -> Self {
@@ -62,7 +62,7 @@ impl<T: ?Sized> Set<T> {
     }
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[creusot::builtins = "set.Set.union"]
     pub fn union(self, _: Self) -> Self {
         pearlite! { absurd}
diff --git a/creusot-contracts/src/model.rs b/creusot-contracts/src/model.rs
index 91835cf59a..eea2b3cba6 100644
--- a/creusot-contracts/src/model.rs
+++ b/creusot-contracts/src/model.rs
@@ -8,7 +8,7 @@ use crate::*;
 /// Models of inner types are typically not involved.
 pub trait ShallowModel {
     type ShallowModelTy;
-    #[ghost]
+    #[logic]
     fn shallow_model(self) -> Self::ShallowModelTy;
 }
 
@@ -24,13 +24,13 @@ pub use creusot_contracts_dummy::DeepModel;
 /// Typically, such a model recursively calls deep models of inner types.
 pub trait DeepModel {
     type DeepModelTy;
-    #[ghost]
+    #[logic]
     fn deep_model(self) -> Self::DeepModelTy;
 }
 
 impl<T: DeepModel> DeepModel for Rc<T> {
     type DeepModelTy = T::DeepModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! { self.shallow_model().deep_model() }
@@ -39,7 +39,7 @@ impl<T: DeepModel> DeepModel for Rc<T> {
 
 impl<T> ShallowModel for Rc<T> {
     type ShallowModelTy = T;
-    #[ghost]
+    #[logic]
     #[open]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
@@ -49,7 +49,7 @@ impl<T> ShallowModel for Rc<T> {
 
 impl<T: DeepModel> DeepModel for Arc<T> {
     type DeepModelTy = T::DeepModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! { self@.deep_model() }
@@ -58,7 +58,7 @@ impl<T: DeepModel> DeepModel for Arc<T> {
 
 impl<T> ShallowModel for Arc<T> {
     type ShallowModelTy = T;
-    #[ghost]
+    #[logic]
     #[open]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
@@ -68,7 +68,7 @@ impl<T> ShallowModel for Arc<T> {
 
 impl<T: DeepModel + ?Sized> DeepModel for &T {
     type DeepModelTy = T::DeepModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         (*self).deep_model()
@@ -77,7 +77,7 @@ impl<T: DeepModel + ?Sized> DeepModel for &T {
 
 impl<T: ShallowModel + ?Sized> ShallowModel for &T {
     type ShallowModelTy = T::ShallowModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn shallow_model(self) -> Self::ShallowModelTy {
         (*self).shallow_model()
@@ -86,7 +86,7 @@ impl<T: ShallowModel + ?Sized> ShallowModel for &T {
 
 impl<T: DeepModel + ?Sized> DeepModel for &mut T {
     type DeepModelTy = T::DeepModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         (*self).deep_model()
@@ -95,7 +95,7 @@ impl<T: DeepModel + ?Sized> DeepModel for &mut T {
 
 impl<T: ShallowModel + ?Sized> ShallowModel for &mut T {
     type ShallowModelTy = T::ShallowModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn shallow_model(self) -> Self::ShallowModelTy {
         (*self).shallow_model()
@@ -105,7 +105,7 @@ impl<T: ShallowModel + ?Sized> ShallowModel for &mut T {
 impl DeepModel for bool {
     type DeepModelTy = bool;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         self
diff --git a/creusot-contracts/src/num_rational.rs b/creusot-contracts/src/num_rational.rs
index be700d066e..95cf6e595f 100644
--- a/creusot-contracts/src/num_rational.rs
+++ b/creusot-contracts/src/num_rational.rs
@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use crate::{ghost, open, pearlite, trusted, DeepModel, Int, OrdLogic};
+use crate::{logic, open, pearlite, trusted, DeepModel, Int, OrdLogic};
 use num_rational::BigRational;
 use std::cmp::Ordering;
 
@@ -12,7 +12,7 @@ pub struct Real(PhantomData<*mut ()>);
 impl DeepModel for BigRational {
     type DeepModelTy = Real;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn deep_model(self) -> Self::DeepModelTy {
@@ -21,7 +21,7 @@ impl DeepModel for BigRational {
 }
 
 impl Real {
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     pub fn from_int(_: Int) -> Self {
@@ -30,7 +30,7 @@ impl Real {
 }
 
 impl OrdLogic for Real {
-    #[ghost]
+    #[logic]
     #[open]
     fn cmp_log(self, o: Self) -> Ordering {
         if self < o {
@@ -44,7 +44,7 @@ impl OrdLogic for Real {
 
     #[trusted]
     #[open]
-    #[ghost]
+    #[logic]
     #[creusot::builtins = "prelude.Real.(<=)"]
     fn le_log(self, _: Self) -> bool {
         true
@@ -52,7 +52,7 @@ impl OrdLogic for Real {
 
     #[trusted]
     #[open]
-    #[ghost]
+    #[logic]
     #[creusot::builtins = "prelude.Real.(<)"]
     fn lt_log(self, _: Self) -> bool {
         true
@@ -60,7 +60,7 @@ impl OrdLogic for Real {
 
     #[trusted]
     #[open]
-    #[ghost]
+    #[logic]
     #[creusot::builtins = "prelude.Real.(>=)"]
     fn ge_log(self, _: Self) -> bool {
         true
@@ -68,7 +68,7 @@ impl OrdLogic for Real {
 
     #[trusted]
     #[open]
-    #[ghost]
+    #[logic]
     #[creusot::builtins = "prelude.Real.(>)"]
     fn gt_log(self, _: Self) -> bool {
         true
diff --git a/creusot-contracts/src/resolve.rs b/creusot-contracts/src/resolve.rs
index f2dc879bcc..ed297eb976 100644
--- a/creusot-contracts/src/resolve.rs
+++ b/creusot-contracts/src/resolve.rs
@@ -3,14 +3,14 @@ use crate::*;
 #[cfg_attr(creusot, rustc_diagnostic_item = "creusot_resolve")]
 #[trusted]
 pub trait Resolve {
-    #[predicate]
+    #[predicate(prophetic)]
     #[rustc_diagnostic_item = "creusot_resolve_method"]
     fn resolve(self) -> bool;
 }
 
 #[trusted]
 impl<T1, T2: ?Sized> Resolve for (T1, T2) {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         Resolve::resolve(self.0) && Resolve::resolve(self.1)
@@ -19,7 +19,7 @@ impl<T1, T2: ?Sized> Resolve for (T1, T2) {
 
 #[trusted]
 impl<T: ?Sized> Resolve for &mut T {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         pearlite! { ^self == *self }
@@ -28,7 +28,7 @@ impl<T: ?Sized> Resolve for &mut T {
 
 #[trusted]
 impl<T: ?Sized> Resolve for Box<T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         Resolve::resolve(*self)
diff --git a/creusot-contracts/src/snapshot.rs b/creusot-contracts/src/snapshot.rs
index b0da99475c..4ba6827948 100644
--- a/creusot-contracts/src/snapshot.rs
+++ b/creusot-contracts/src/snapshot.rs
@@ -9,7 +9,7 @@ impl<T: ?Sized> Deref for Snapshot<T> {
     type Target = T;
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[rustc_diagnostic_item = "snapshot_deref"]
     #[creusot::builtins = "prelude.Snapshot.inner"]
@@ -21,7 +21,7 @@ impl<T: ?Sized> Deref for Snapshot<T> {
 impl<T: ShallowModel + ?Sized> ShallowModel for Snapshot<T> {
     type ShallowModelTy = T::ShallowModelTy;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! { self.deref().shallow_model() }
@@ -38,7 +38,7 @@ impl<T: ?Sized> Copy for Snapshot<T> {}
 
 impl<T: ?Sized> Snapshot<T> {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[creusot::builtins = "prelude.Snapshot.new"]
     pub fn new(_: T) -> Snapshot<T> {
@@ -46,7 +46,7 @@ impl<T: ?Sized> Snapshot<T> {
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[rustc_diagnostic_item = "snapshot_inner"]
     #[creusot::builtins = "prelude.Snapshot.inner"]
diff --git a/creusot-contracts/src/std/array.rs b/creusot-contracts/src/std/array.rs
index dc2f2d2501..d4badf497c 100644
--- a/creusot-contracts/src/std/array.rs
+++ b/creusot-contracts/src/std/array.rs
@@ -3,7 +3,7 @@ use crate::*;
 impl<T, const N: usize> ShallowModel for [T; N] {
     type ShallowModelTy = Seq<T>;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open]
     #[creusot::builtins = "prelude.Slice.id"]
@@ -18,7 +18,7 @@ impl<T, const N: usize> ShallowModel for [T; N] {
 impl<T: DeepModel, const N: usize> DeepModel for [T; N] {
     type DeepModelTy = Seq<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     // TODO
diff --git a/creusot-contracts/src/std/boxed.rs b/creusot-contracts/src/std/boxed.rs
index 2e65842d17..cd686e68f5 100644
--- a/creusot-contracts/src/std/boxed.rs
+++ b/creusot-contracts/src/std/boxed.rs
@@ -4,7 +4,7 @@ pub use ::std::boxed::*;
 #[cfg(creusot)]
 impl<T: DeepModel + ?Sized, A: Allocator> DeepModel for Box<T, A> {
     type DeepModelTy = Box<T::DeepModelTy>;
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         Box::new((*self).deep_model())
@@ -14,7 +14,7 @@ impl<T: DeepModel + ?Sized, A: Allocator> DeepModel for Box<T, A> {
 #[cfg(creusot)]
 impl<T: ShallowModel + ?Sized, A: Allocator> ShallowModel for Box<T, A> {
     type ShallowModelTy = T::ShallowModelTy;
-    #[ghost]
+    #[logic]
     #[open]
     fn shallow_model(self) -> Self::ShallowModelTy {
         (*self).shallow_model()
diff --git a/creusot-contracts/src/std/cmp.rs b/creusot-contracts/src/std/cmp.rs
index ea8c76d6ea..9db3799cce 100644
--- a/creusot-contracts/src/std/cmp.rs
+++ b/creusot-contracts/src/std/cmp.rs
@@ -64,7 +64,7 @@ extern_spec! {
 impl<T: DeepModel> DeepModel for Reverse<T> {
     type DeepModelTy = Reverse<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! { Reverse(self.0.deep_model()) }
@@ -72,7 +72,7 @@ impl<T: DeepModel> DeepModel for Reverse<T> {
 }
 
 impl<T: OrdLogic> OrdLogic for Reverse<T> {
-    #[ghost]
+    #[logic]
     #[open]
     fn cmp_log(self, o: Self) -> Ordering {
         match self.0.cmp_log(o.0) {
diff --git a/creusot-contracts/src/std/default.rs b/creusot-contracts/src/std/default.rs
index e95565db1e..b1770f27ab 100644
--- a/creusot-contracts/src/std/default.rs
+++ b/creusot-contracts/src/std/default.rs
@@ -2,7 +2,7 @@ use crate::*;
 pub use ::std::default::*;
 
 pub trait Default: ::std::default::Default {
-    #[predicate]
+    #[predicate(prophetic)]
     fn is_default(self) -> bool;
 }
 
diff --git a/creusot-contracts/src/std/deque.rs b/creusot-contracts/src/std/deque.rs
index 8dace155aa..3d06232b86 100644
--- a/creusot-contracts/src/std/deque.rs
+++ b/creusot-contracts/src/std/deque.rs
@@ -5,7 +5,7 @@ pub use ::std::collections::VecDeque;
 impl<T, A: Allocator> ShallowModel for VecDeque<T, A> {
     type ShallowModelTy = Seq<T>;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[ensures(result.len() <= usize::MAX@)]
@@ -17,7 +17,7 @@ impl<T, A: Allocator> ShallowModel for VecDeque<T, A> {
 impl<T: DeepModel, A: Allocator> DeepModel for VecDeque<T, A> {
     type DeepModelTy = Seq<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[ensures(self.shallow_model().len() == result.len())]
@@ -31,7 +31,7 @@ impl<T: DeepModel, A: Allocator> DeepModel for VecDeque<T, A> {
 impl<T, A: Allocator> IndexLogic<Int> for VecDeque<T, A> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: Int) -> Self::Item {
@@ -42,7 +42,7 @@ impl<T, A: Allocator> IndexLogic<Int> for VecDeque<T, A> {
 impl<T, A: Allocator> IndexLogic<usize> for VecDeque<T, A> {
     type Item = T;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[why3::attr = "inline:trivial"]
     fn index_logic(self, ix: usize) -> Self::Item {
@@ -115,7 +115,7 @@ impl<T, A: Allocator> IntoIterator for &VecDeque<T, A> {
 impl<'a, T> ShallowModel for Iter<'a, T> {
     type ShallowModelTy = &'a [T];
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
@@ -126,7 +126,7 @@ impl<'a, T> ShallowModel for Iter<'a, T> {
 impl<'a, T> Invariant for Iter<'a, T> {}
 
 impl<'a, T> Iterator for Iter<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() && (*self@)@ == Seq::EMPTY }
diff --git a/creusot-contracts/src/std/iter.rs b/creusot-contracts/src/std/iter.rs
index e2618d2bfb..e7d6544f14 100644
--- a/creusot-contracts/src/std/iter.rs
+++ b/creusot-contracts/src/std/iter.rs
@@ -24,10 +24,10 @@ pub use take::TakeExt;
 pub use zip::ZipExt;
 
 pub trait Iterator: ::std::iter::Iterator {
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool;
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool;
 
     #[law]
@@ -63,7 +63,7 @@ where
         pearlite! { true }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn into_iter_post(self, res: Self::IntoIter) -> bool;
 }
 
diff --git a/creusot-contracts/src/std/iter/cloned.rs b/creusot-contracts/src/std/iter/cloned.rs
index 514b3abe13..09cef10136 100644
--- a/creusot-contracts/src/std/iter/cloned.rs
+++ b/creusot-contracts/src/std/iter/cloned.rs
@@ -1,13 +1,13 @@
 use crate::{std::iter::Cloned, *};
 
 pub trait ClonedExt<I> {
-    #[ghost]
+    #[logic]
     fn iter(self) -> I;
 }
 
 impl<I> ClonedExt<I> for Cloned<I> {
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn iter(self) -> I {
         pearlite! { absurd }
@@ -17,7 +17,7 @@ impl<I> ClonedExt<I> for Cloned<I> {
 #[trusted]
 impl<I> Resolve for Cloned<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         pearlite! {
             self.iter().resolve()
@@ -31,13 +31,13 @@ where
     T: Clone,
 {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { exists<inner : &mut _> *inner == self.iter() && ^inner == (^self).iter() && inner.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             exists<s: Seq<&'a T>> self.iter().produces(s, o.iter())
diff --git a/creusot-contracts/src/std/iter/copied.rs b/creusot-contracts/src/std/iter/copied.rs
index 0460d5178c..9944f4b4b6 100644
--- a/creusot-contracts/src/std/iter/copied.rs
+++ b/creusot-contracts/src/std/iter/copied.rs
@@ -1,13 +1,13 @@
 use crate::{std::iter::Copied, *};
 
 pub trait CopiedExt<I> {
-    #[ghost]
+    #[logic]
     fn iter(self) -> I;
 }
 
 impl<I> CopiedExt<I> for Copied<I> {
     #[open]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn iter(self) -> I {
         pearlite! { absurd }
@@ -17,7 +17,7 @@ impl<I> CopiedExt<I> for Copied<I> {
 #[trusted]
 impl<I> Resolve for Copied<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         pearlite! {
             self.iter().resolve()
@@ -31,13 +31,13 @@ where
     T: Copy,
 {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { exists<inner : &mut _> *inner == self.iter() && ^inner == (^self).iter() && inner.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             exists<s: Seq<&'a T>> self.iter().produces(s, o.iter())
diff --git a/creusot-contracts/src/std/iter/empty.rs b/creusot-contracts/src/std/iter/empty.rs
index 9fdc551ec7..52def108b0 100644
--- a/creusot-contracts/src/std/iter/empty.rs
+++ b/creusot-contracts/src/std/iter/empty.rs
@@ -2,7 +2,7 @@ use crate::{std::iter::Empty, *};
 
 impl<T> Iterator for Empty<T> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() }
     }
diff --git a/creusot-contracts/src/std/iter/enumerate.rs b/creusot-contracts/src/std/iter/enumerate.rs
index f2d0172950..662f3cc642 100644
--- a/creusot-contracts/src/std/iter/enumerate.rs
+++ b/creusot-contracts/src/std/iter/enumerate.rs
@@ -1,23 +1,23 @@
 use crate::{invariant::Invariant, std::iter::Enumerate, *};
 
 pub trait EnumerateExt<I> {
-    #[ghost]
+    #[logic]
     fn iter(self) -> I;
 
-    #[ghost]
+    #[logic]
     fn n(self) -> Int;
 }
 
 impl<I> EnumerateExt<I> for Enumerate<I> {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn iter(self) -> I {
         absurd
     }
 
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn n(self) -> Int {
         absurd
@@ -27,7 +27,7 @@ impl<I> EnumerateExt<I> for Enumerate<I> {
 #[trusted]
 impl<I> Resolve for Enumerate<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         pearlite! {
             self.iter().resolve()
@@ -37,7 +37,7 @@ impl<I> Resolve for Enumerate<I> {
 
 impl<I: Iterator> Invariant for Enumerate<I> {
     #[open(self)]
-    #[predicate]
+    #[predicate(prophetic)]
     fn invariant(self) -> bool {
         pearlite! {
             (forall<s: Seq<I::Item>, i: I> self.iter().produces(s, i) ==> self.n() + s.len() < std::usize::MAX@)
@@ -51,13 +51,13 @@ where
     I: Iterator,
 {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { exists<inner : &mut _> *inner == self.iter() && ^inner == (^self).iter() && inner.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             visited.len() == o.n() - self.n()
diff --git a/creusot-contracts/src/std/iter/fuse.rs b/creusot-contracts/src/std/iter/fuse.rs
index 1893a0a124..2ac534497a 100644
--- a/creusot-contracts/src/std/iter/fuse.rs
+++ b/creusot-contracts/src/std/iter/fuse.rs
@@ -3,7 +3,7 @@ use crate::{std::iter::Fuse, *};
 impl<I: Iterator> ShallowModel for Fuse<I> {
     type ShallowModelTy = Option<I>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn shallow_model(self) -> Option<I> {
@@ -13,7 +13,7 @@ impl<I: Iterator> ShallowModel for Fuse<I> {
 
 impl<I: Iterator> Iterator for Fuse<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             (self@ == None || exists<it:&mut I> it.completed() && self@ == Some(*it)) &&
@@ -22,7 +22,7 @@ impl<I: Iterator> Iterator for Fuse<I> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, prod: Seq<Self::Item>, other: Self) -> bool {
         pearlite! {
             match self@ {
diff --git a/creusot-contracts/src/std/iter/map_inv.rs b/creusot-contracts/src/std/iter/map_inv.rs
index 406f74abf7..d71b1cc7e9 100644
--- a/creusot-contracts/src/std/iter/map_inv.rs
+++ b/creusot-contracts/src/std/iter/map_inv.rs
@@ -10,7 +10,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Iterator
     for MapInv<I, I::Item, F>
 {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             *(^self).produced == Seq::EMPTY &&
@@ -31,7 +31,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Iterator
     fn produces_trans(a: Self, ab: Seq<Self::Item>, b: Self, bc: Seq<Self::Item>, c: Self) {}
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     #[why3::attr = "inline:trivial"]
     fn produces(self, visited: Seq<Self::Item>, succ: Self) -> bool {
         pearlite! {
@@ -53,7 +53,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Iterator
 #[trusted]
 impl<I, B, F> Resolve for MapInv<I, B, F> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         self.iter.resolve() && self.func.resolve()
     }
@@ -64,7 +64,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Invariant
 {
     // Should not quantify over self or the `invariant` cannot be made into a type invariant
     #[open(self)]
-    #[predicate]
+    #[predicate(prophetic)]
     fn invariant(self) -> bool {
         pearlite! {
             Self::reinitialize() &&
@@ -107,7 +107,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> ::std::iter
 
 impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I::Item, F> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     pub fn next_precondition(iter: I, func: F, produced: Seq<I::Item>) -> bool {
         pearlite! {
             forall<e: I::Item, i: I>
@@ -116,7 +116,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     #[ensures(produced == Seq::EMPTY ==> result == Self::preservation(iter, func))]
     fn preservation_inv(iter: I, func: F, produced: Seq<I::Item>) -> bool {
         pearlite! {
@@ -130,7 +130,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     pub fn preservation(iter: I, func: F) -> bool {
         pearlite! {
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
@@ -143,7 +143,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     pub fn reinitialize() -> bool {
         pearlite! {
             forall<iter: &mut I, func: F>
@@ -153,7 +153,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.iter.produces(Seq::singleton(e), iter))]
     #[requires(*f == self.func)]
     #[requires(f.postcondition_mut((e, self.produced), r) )]
@@ -168,7 +168,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> MapInv<I, I
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     #[ensures(result == self.produces(Seq::singleton(visited), succ))]
     fn produces_one(self, visited: B, succ: Self) -> bool {
         pearlite! {
diff --git a/creusot-contracts/src/std/iter/once.rs b/creusot-contracts/src/std/iter/once.rs
index ad96988263..000d18ca89 100644
--- a/creusot-contracts/src/std/iter/once.rs
+++ b/creusot-contracts/src/std/iter/once.rs
@@ -3,7 +3,7 @@ use crate::{std::iter::Once, *};
 impl<T> ShallowModel for Once<T> {
     type ShallowModelTy = Option<T>;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     fn shallow_model(self) -> Option<T> {
@@ -13,7 +13,7 @@ impl<T> ShallowModel for Once<T> {
 
 impl<T> Iterator for Once<T> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { (*self)@ == None && self.resolve() }
     }
diff --git a/creusot-contracts/src/std/iter/range.rs b/creusot-contracts/src/std/iter/range.rs
index db68337ff0..2a21d42f9e 100644
--- a/creusot-contracts/src/std/iter/range.rs
+++ b/creusot-contracts/src/std/iter/range.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 
 impl<Idx: DeepModel<DeepModelTy = Int> + Step> Iterator for Range<Idx> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! {
@@ -40,7 +40,7 @@ impl<Idx: DeepModel<DeepModelTy = Int> + Step> Iterator for Range<Idx> {
     fn produces_trans(a: Self, ab: Seq<Self::Item>, b: Self, bc: Seq<Self::Item>, c: Self) {}
 }
 
-#[ghost]
+#[logic]
 #[open]
 #[ensures(r.is_empty_log() == (result == 0))]
 pub fn range_inclusive_len<Idx: DeepModel<DeepModelTy = Int>>(r: RangeInclusive<Idx>) -> Int {
@@ -51,7 +51,7 @@ pub fn range_inclusive_len<Idx: DeepModel<DeepModelTy = Int>>(r: RangeInclusive<
 }
 
 impl<Idx: DeepModel<DeepModelTy = Int> + Step> Iterator for RangeInclusive<Idx> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! {
diff --git a/creusot-contracts/src/std/iter/repeat.rs b/creusot-contracts/src/std/iter/repeat.rs
index 2dd172cec5..156c00b34c 100644
--- a/creusot-contracts/src/std/iter/repeat.rs
+++ b/creusot-contracts/src/std/iter/repeat.rs
@@ -3,7 +3,7 @@ use crate::{std::iter::Repeat, *};
 impl<T> ShallowModel for Repeat<T> {
     type ShallowModelTy = T;
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     fn shallow_model(self) -> T {
diff --git a/creusot-contracts/src/std/iter/skip.rs b/creusot-contracts/src/std/iter/skip.rs
index 830306e384..0c3acd035d 100644
--- a/creusot-contracts/src/std/iter/skip.rs
+++ b/creusot-contracts/src/std/iter/skip.rs
@@ -1,22 +1,22 @@
 use crate::{std::iter::Skip, *};
 
 pub trait SkipExt<I> {
-    #[ghost]
+    #[logic]
     fn iter(self) -> I;
 
-    #[ghost]
+    #[logic]
     fn n(self) -> Int;
 }
 
 impl<I> SkipExt<I> for Skip<I> {
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn iter(self) -> I {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result >= 0 && result <= usize::MAX@)]
@@ -28,7 +28,7 @@ impl<I> SkipExt<I> for Skip<I> {
 #[trusted]
 impl<I> Resolve for Skip<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         pearlite! {
             self.iter().resolve()
@@ -38,7 +38,7 @@ impl<I> Resolve for Skip<I> {
 
 impl<I: Iterator> Iterator for Skip<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             (^self).n() == 0 &&
@@ -52,7 +52,7 @@ impl<I: Iterator> Iterator for Skip<I> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             visited == Seq::EMPTY && self == o ||
diff --git a/creusot-contracts/src/std/iter/take.rs b/creusot-contracts/src/std/iter/take.rs
index f4d7b57185..25d76f10b9 100644
--- a/creusot-contracts/src/std/iter/take.rs
+++ b/creusot-contracts/src/std/iter/take.rs
@@ -1,25 +1,25 @@
 use crate::{std::iter::Take, *};
 
 pub trait TakeExt<I> {
-    #[ghost]
+    #[logic]
     fn iter(self) -> I;
 
-    #[ghost]
+    #[logic]
     fn iter_mut(&mut self) -> &mut I;
 
-    #[ghost]
+    #[logic]
     fn n(self) -> Int;
 }
 
 impl<I> TakeExt<I> for Take<I> {
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     fn iter(self) -> I {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[ensures((*self).iter() == *result && (^self).iter() == ^result)]
@@ -27,7 +27,7 @@ impl<I> TakeExt<I> for Take<I> {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[ensures(result >= 0 && result <= usize::MAX@)]
@@ -39,7 +39,7 @@ impl<I> TakeExt<I> for Take<I> {
 #[trusted]
 impl<I> Resolve for Take<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         pearlite! {
             self.iter().resolve()
@@ -49,7 +49,7 @@ impl<I> Resolve for Take<I> {
 
 impl<I: Iterator> Iterator for Take<I> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             self.n() == 0 && self.resolve() ||
@@ -58,7 +58,7 @@ impl<I: Iterator> Iterator for Take<I> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             self.n() == o.n() + visited.len() && self.iter().produces(visited, o.iter())
diff --git a/creusot-contracts/src/std/iter/zip.rs b/creusot-contracts/src/std/iter/zip.rs
index 409f2fa485..a5f1069ad2 100644
--- a/creusot-contracts/src/std/iter/zip.rs
+++ b/creusot-contracts/src/std/iter/zip.rs
@@ -1,22 +1,22 @@
 use crate::{std::iter::Zip, *};
 
 pub trait ZipExt<A: Iterator, B: Iterator> {
-    #[ghost]
+    #[logic]
     fn itera(self) -> A;
 
-    #[ghost]
+    #[logic]
     fn iterb(self) -> B;
 }
 
 impl<A: Iterator, B: Iterator> ZipExt<A, B> for Zip<A, B> {
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn itera(self) -> A {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn iterb(self) -> B {
@@ -26,7 +26,7 @@ impl<A: Iterator, B: Iterator> ZipExt<A, B> for Zip<A, B> {
 
 impl<A: Iterator, B: Iterator> Iterator for Zip<A, B> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             exists<a: &mut A, b: &mut B>
@@ -39,7 +39,7 @@ impl<A: Iterator, B: Iterator> Iterator for Zip<A, B> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             // Using an `unzip` definition doesn't work well because of issues related to datatypes and `match`
diff --git a/creusot-contracts/src/std/num.rs b/creusot-contracts/src/std/num.rs
index 6ea805cfae..5eadb2b86d 100644
--- a/creusot-contracts/src/std/num.rs
+++ b/creusot-contracts/src/std/num.rs
@@ -5,7 +5,7 @@ macro_rules! mach_int {
     ($t:ty, $ty_nm:expr, $zero:expr) => {
         impl ShallowModel for $t {
             type ShallowModelTy = Int;
-            #[ghost]
+            #[logic]
             #[open]
             #[trusted]
             #[creusot::builtins = concat!($ty_nm, ".to_int")]
@@ -16,7 +16,7 @@ macro_rules! mach_int {
 
         impl DeepModel for $t {
             type DeepModelTy = Int;
-            #[ghost]
+            #[logic]
             #[open]
             fn deep_model(self) -> Self::DeepModelTy {
                 pearlite! { self@ }
diff --git a/creusot-contracts/src/std/ops.rs b/creusot-contracts/src/std/ops.rs
index e07157388d..d4c0912267 100644
--- a/creusot-contracts/src/std/ops.rs
+++ b/creusot-contracts/src/std/ops.rs
@@ -172,13 +172,13 @@ extern_spec! {
 }
 
 pub trait RangeInclusiveExt<Idx> {
-    #[ghost]
+    #[logic]
     fn start_log(self) -> Idx;
 
-    #[ghost]
+    #[logic]
     fn end_log(self) -> Idx;
 
-    #[ghost]
+    #[logic]
     fn is_empty_log(self) -> bool
     where
         Idx: DeepModel,
@@ -187,21 +187,21 @@ pub trait RangeInclusiveExt<Idx> {
 
 impl<Idx> RangeInclusiveExt<Idx> for RangeInclusive<Idx> {
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn start_log(self) -> Idx {
         pearlite! { absurd }
     }
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn end_log(self) -> Idx {
         pearlite! { absurd }
     }
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     #[ensures(!result ==> self.start_log().deep_model() <= self.end_log().deep_model())]
     fn is_empty_log(self) -> bool
diff --git a/creusot-contracts/src/std/option.rs b/creusot-contracts/src/std/option.rs
index 3470d856f4..accd4a752f 100644
--- a/creusot-contracts/src/std/option.rs
+++ b/creusot-contracts/src/std/option.rs
@@ -4,7 +4,7 @@ pub use ::std::option::*;
 impl<T: DeepModel> DeepModel for Option<T> {
     type DeepModelTy = Option<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         match self {
@@ -137,7 +137,7 @@ impl<T> ShallowModel for IntoIter<T> {
     type ShallowModelTy = Option<T>;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn shallow_model(self) -> Option<T> {
         pearlite! { absurd }
@@ -145,7 +145,7 @@ impl<T> ShallowModel for IntoIter<T> {
 }
 
 impl<T> Iterator for IntoIter<T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { (*self)@ == None && self.resolve() }
@@ -191,7 +191,7 @@ impl<'a, T> ShallowModel for Iter<'a, T> {
     type ShallowModelTy = Option<&'a T>;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn shallow_model(self) -> Option<&'a T> {
         pearlite! { absurd }
@@ -199,7 +199,7 @@ impl<'a, T> ShallowModel for Iter<'a, T> {
 }
 
 impl<'a, T> Iterator for Iter<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { (*self)@ == None && self.resolve() }
@@ -247,7 +247,7 @@ impl<'a, T> IntoIterator for &'a Option<T> {
 impl<'a, T> ShallowModel for IterMut<'a, T> {
     type ShallowModelTy = Option<&'a mut T>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn shallow_model(self) -> Option<&'a mut T> {
@@ -256,7 +256,7 @@ impl<'a, T> ShallowModel for IterMut<'a, T> {
 }
 
 impl<'a, T> Iterator for IterMut<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { (*self)@ == None && self.resolve() }
@@ -291,7 +291,7 @@ impl<'a, T> IntoIterator for &'a mut Option<T> {
         pearlite! { true }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn into_iter_post(self, res: Self::IntoIter) -> bool {
         pearlite! {
diff --git a/creusot-contracts/src/std/result.rs b/creusot-contracts/src/std/result.rs
index 9fd665d826..0a746d8f4b 100644
--- a/creusot-contracts/src/std/result.rs
+++ b/creusot-contracts/src/std/result.rs
@@ -5,7 +5,7 @@ use ::std::fmt::Debug;
 impl<T: DeepModel, E: DeepModel> DeepModel for Result<T, E> {
     type DeepModelTy = Result<T::DeepModelTy, E::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         match self {
diff --git a/creusot-contracts/src/std/slice.rs b/creusot-contracts/src/std/slice.rs
index 96ecb87765..a1d67f0e7b 100644
--- a/creusot-contracts/src/std/slice.rs
+++ b/creusot-contracts/src/std/slice.rs
@@ -11,7 +11,7 @@ impl<T> ShallowModel for [T] {
     type ShallowModelTy = Seq<T>;
 
     // We define this as trusted because builtins and ensures are incompatible
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result.len() <= usize::MAX@)]
@@ -24,7 +24,7 @@ impl<T> ShallowModel for [T] {
 impl<T: DeepModel> DeepModel for [T] {
     type DeepModelTy = Seq<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures((&self)@.len() == result.len())]
@@ -34,14 +34,14 @@ impl<T: DeepModel> DeepModel for [T] {
     }
 }
 
-#[ghost]
+#[logic]
 #[trusted]
 #[creusot::builtins = "prelude.Slice.id"]
 fn slice_model<T>(_: &[T]) -> Seq<T> {
     pearlite! { absurd }
 }
 
-#[ghost]
+#[logic]
 #[open]
 #[rustc_diagnostic_item = "slice_len_logic"]
 pub fn slice_len<T>(x: [T]) -> Int {
@@ -50,7 +50,7 @@ pub fn slice_len<T>(x: [T]) -> Int {
 
 impl<T> Default for &mut [T] {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn is_default(self) -> bool {
         pearlite! { self@ == Seq::EMPTY && (^self)@ == Seq::EMPTY }
     }
@@ -65,15 +65,15 @@ impl<T> Default for &[T] {
 }
 
 pub trait SliceExt<T> {
-    #[ghost]
+    #[logic]
     fn to_mut_seq(&mut self) -> Seq<&mut T>;
 
-    #[ghost]
+    #[logic]
     fn to_ref_seq(&self) -> Seq<&T>;
 }
 
 impl<T> SliceExt<T> for [T] {
-    #[ghost]
+    #[logic]
     #[trusted]
     #[open(self)]
     #[ensures(result.len() == self@.len())]
@@ -83,7 +83,7 @@ impl<T> SliceExt<T> for [T] {
         pearlite! { absurd }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result.len() == self@.len())]
@@ -364,7 +364,7 @@ impl<T> IntoIterator for &mut [T] {
 impl<'a, T> ShallowModel for Iter<'a, T> {
     type ShallowModelTy = &'a [T];
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
@@ -373,7 +373,7 @@ impl<'a, T> ShallowModel for Iter<'a, T> {
 }
 
 impl<'a, T> Iterator for Iter<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() && (*self@)@ == Seq::EMPTY }
@@ -403,7 +403,7 @@ impl<'a, T> Iterator for Iter<'a, T> {
 impl<'a, T> ShallowModel for IterMut<'a, T> {
     type ShallowModelTy = &'a mut [T];
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures((^result)@.len() == (*result)@.len())]
@@ -414,7 +414,7 @@ impl<'a, T> ShallowModel for IterMut<'a, T> {
 
 #[trusted]
 impl<'a, T> Resolve for IterMut<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         pearlite! { *self@ == ^self@ }
@@ -422,7 +422,7 @@ impl<'a, T> Resolve for IterMut<'a, T> {
 }
 
 impl<'a, T> Iterator for IterMut<'a, T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() && (*self@)@ == Seq::EMPTY }
diff --git a/creusot-contracts/src/std/time.rs b/creusot-contracts/src/std/time.rs
index 3178c16e9c..6b087f06b6 100644
--- a/creusot-contracts/src/std/time.rs
+++ b/creusot-contracts/src/std/time.rs
@@ -7,7 +7,7 @@ pub use ::std::{
 impl ShallowModel for Duration {
     type ShallowModelTy = Int;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result >= 0 && result <= secs_to_nanos(u64::MAX@) + 999_999_999)]
@@ -19,7 +19,7 @@ impl ShallowModel for Duration {
 impl DeepModel for Duration {
     type DeepModelTy = Int;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result >= 0 && result <= secs_to_nanos(u64::MAX@) + 999_999_999)]
@@ -29,21 +29,21 @@ impl DeepModel for Duration {
     }
 }
 
-#[ghost]
+#[logic]
 fn nanos_to_micros(nanos: Int) -> Int {
     nanos / 1_000
 }
-#[ghost]
+#[logic]
 fn nanos_to_millis(nanos: Int) -> Int {
     nanos / 1_000_000
 }
 
-#[ghost]
+#[logic]
 fn nanos_to_secs(nanos: Int) -> Int {
     nanos / 1_000_000_000
 }
 
-#[ghost]
+#[logic]
 fn secs_to_nanos(secs: Int) -> Int {
     secs * 1_000_000_000
 }
@@ -51,7 +51,7 @@ fn secs_to_nanos(secs: Int) -> Int {
 impl ShallowModel for Instant {
     type ShallowModelTy = Int;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result >= 0)]
@@ -63,7 +63,7 @@ impl ShallowModel for Instant {
 impl DeepModel for Instant {
     type DeepModelTy = Int;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(result >= 0)]
diff --git a/creusot-contracts/src/std/tuples.rs b/creusot-contracts/src/std/tuples.rs
index 74d29bdf97..0aa1ed6c60 100644
--- a/creusot-contracts/src/std/tuples.rs
+++ b/creusot-contracts/src/std/tuples.rs
@@ -3,7 +3,7 @@ use crate::{Default, *};
 impl DeepModel for () {
     type DeepModelTy = ();
 
-    #[ghost]
+    #[logic]
     #[open]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! { () }
@@ -23,7 +23,7 @@ macro_rules! tuple_impls {
         impl<$($name: DeepModel),+> DeepModel for ($($name,)+) {
             type DeepModelTy = ($($name::DeepModelTy,)+);
 
-            #[ghost]
+            #[logic]
             #[open]
             fn deep_model(self) -> Self::DeepModelTy {
                 pearlite! { ($(self.$idx.deep_model(),)+) }
@@ -31,7 +31,7 @@ macro_rules! tuple_impls {
         }
 
         impl<$($name: Default),+> Default for ($($name,)+) {
-            #[predicate]
+            #[predicate(prophetic)]
             #[open]
             fn is_default(self) -> bool {
                 pearlite! { $(self.$idx.is_default())&&+ }
diff --git a/creusot-contracts/src/std/vec.rs b/creusot-contracts/src/std/vec.rs
index b2251ecaa4..efacdeaa04 100644
--- a/creusot-contracts/src/std/vec.rs
+++ b/creusot-contracts/src/std/vec.rs
@@ -13,7 +13,7 @@ impl<T, A: Allocator> ShallowModel for Vec<T, A> {
     type ShallowModelTy = Seq<T>;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     #[ensures(result.len() <= usize::MAX@)]
     fn shallow_model(self) -> Seq<T> {
@@ -24,7 +24,7 @@ impl<T, A: Allocator> ShallowModel for Vec<T, A> {
 impl<T: DeepModel, A: Allocator> DeepModel for Vec<T, A> {
     type DeepModelTy = Seq<T::DeepModelTy>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(self.shallow_model().len() == result.len())]
@@ -45,7 +45,7 @@ impl<T> Default for Vec<T> {
 
 #[trusted]
 impl<T> Resolve for Vec<T> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         pearlite! { forall<i : Int> 0 <= i && i < self@.len() ==> self[i].resolve() }
@@ -207,7 +207,7 @@ impl<T, A: Allocator> ShallowModel for std::vec::IntoIter<T, A> {
     type ShallowModelTy = Seq<T>;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
         absurd
@@ -216,7 +216,7 @@ impl<T, A: Allocator> ShallowModel for std::vec::IntoIter<T, A> {
 
 #[trusted]
 impl<T, A: Allocator> Resolve for std::vec::IntoIter<T, A> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn resolve(self) -> bool {
         pearlite! { forall<i: Int> 0 <= i && i < self@.len() ==> self@[i].resolve() }
@@ -224,7 +224,7 @@ impl<T, A: Allocator> Resolve for std::vec::IntoIter<T, A> {
 }
 
 impl<T, A: Allocator> Iterator for std::vec::IntoIter<T, A> {
-    #[predicate]
+    #[predicate(prophetic)]
     #[open]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() && self@ == Seq::EMPTY }
diff --git a/creusot-contracts/src/util.rs b/creusot-contracts/src/util.rs
index a719a9cb15..da7ea0126d 100644
--- a/creusot-contracts/src/util.rs
+++ b/creusot-contracts/src/util.rs
@@ -3,14 +3,14 @@ use crate::*;
 pub type SizedW<T> = Box<T>;
 
 pub trait MakeSized {
-    #[ghost]
+    #[logic]
     #[why3::attr = "inline:trivial"]
     fn make_sized(&self) -> SizedW<Self>;
 }
 
 impl<T: ?Sized> MakeSized for T {
     #[trusted]
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[ensures(*result == *self)]
     fn make_sized(&self) -> SizedW<Self> {
@@ -19,7 +19,7 @@ impl<T: ?Sized> MakeSized for T {
 }
 
 #[allow(unconditional_recursion)]
-#[ghost]
+#[logic]
 #[open(self)]
 #[requires(false)]
 #[ensures(false)]
@@ -28,7 +28,7 @@ pub fn unreachable<T>() -> T {
     unreachable()
 }
 
-#[ghost]
+#[logic]
 #[open(self)]
 #[requires(op != None)]
 #[ensures(Some(result) == op)]
diff --git a/creusot/src/backend.rs b/creusot/src/backend.rs
index 71ffbf4434..f04ad83442 100644
--- a/creusot/src/backend.rs
+++ b/creusot/src/backend.rs
@@ -140,9 +140,8 @@ impl<'tcx> Why3Generator<'tcx> {
                     self.finish(def_id);
                 }
             }
-            ItemType::Ghost
-            | ItemType::Logic
-            | ItemType::Predicate
+            ItemType::Logic { .. }
+            | ItemType::Predicate { .. }
             | ItemType::Program
             | ItemType::Closure => {
                 self.start(def_id);
@@ -200,7 +199,7 @@ impl<'tcx> Why3Generator<'tcx> {
         }
 
         let translated = match util::item_type(self.tcx, def_id) {
-            ItemType::Ghost | ItemType::Logic | ItemType::Predicate => {
+            ItemType::Logic { .. } | ItemType::Predicate { .. } => {
                 debug!("translating {:?} as logical", def_id);
                 let (proof_modl, deps) = logic::translate_logic_or_predicate(self, def_id);
                 self.dependencies.insert(def_id.into(), deps);
@@ -340,7 +339,7 @@ impl<'tcx> Why3Generator<'tcx> {
     fn is_logical(&self, item: DefId) -> bool {
         matches!(
             util::item_type(self.tcx, item),
-            ItemType::Logic | ItemType::Predicate | ItemType::Ghost
+            ItemType::Logic { .. } | ItemType::Predicate { .. }
         )
     }
 
diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index 54149df259..f12938d782 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -334,11 +334,11 @@ fn proof_module(ctx: &mut Why3Generator, def_id: DefId) -> Option<Module> {
     decls.extend(clones);
 
     let kind = match util::item_type(ctx.tcx, def_id) {
-        ItemType::Predicate => {
+        ItemType::Predicate { .. } => {
             sig.retty = None;
             Some(LetKind::Predicate)
         }
-        ItemType::Ghost | ItemType::Logic => Some(LetKind::Function),
+        ItemType::Logic { .. } => Some(LetKind::Function),
         _ => unreachable!(),
     };
 
diff --git a/creusot/src/backend/ty.rs b/creusot/src/backend/ty.rs
index ae04467845..3d981be8b3 100644
--- a/creusot/src/backend/ty.rs
+++ b/creusot/src/backend/ty.rs
@@ -156,7 +156,7 @@ fn translate_ty_inner<'tcx, N: Namer<'tcx>>(
         Closure(id, subst) => {
             ctx.translate(*id);
 
-            if util::is_ghost(ctx.tcx, *id) {
+            if util::is_logic(ctx.tcx, *id) {
                 return MlT::Tuple(Vec::new());
             }
 
diff --git a/creusot/src/ctx.rs b/creusot/src/ctx.rs
index b38cb6749e..69832951a8 100644
--- a/creusot/src/ctx.rs
+++ b/creusot/src/ctx.rs
@@ -318,7 +318,7 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
     fn mk_opacity(&self, item: DefId) -> Opacity {
         if !matches!(
             util::item_type(self.tcx, item),
-            ItemType::Predicate | ItemType::Logic | ItemType::Ghost
+            ItemType::Predicate { .. } | ItemType::Logic { .. }
         ) {
             return Opacity(Visibility::Public);
         };
diff --git a/creusot/src/translation.rs b/creusot/src/translation.rs
index 2c5c35eb61..eb7886735a 100644
--- a/creusot/src/translation.rs
+++ b/creusot/src/translation.rs
@@ -34,7 +34,6 @@ pub(crate) fn before_analysis(ctx: &mut TranslationCtx) -> Result<(), Box<dyn Er
 
         let def_id = def_id.to_def_id();
         if crate::util::is_spec(ctx.tcx, def_id)
-            || crate::util::is_ghost(ctx.tcx, def_id)
             || crate::util::is_predicate(ctx.tcx, def_id)
             || crate::util::is_logic(ctx.tcx, def_id)
         {
diff --git a/creusot/src/translation/pearlite.rs b/creusot/src/translation/pearlite.rs
index 5a8d286781..ac32907cfe 100644
--- a/creusot/src/translation/pearlite.rs
+++ b/creusot/src/translation/pearlite.rs
@@ -1,6 +1,6 @@
 // A poorly named module.
 //
-// Entrypoint for translation of all Pearlite specifications and code: #[ghost] / #[logic], contracts, proof_assert!
+// Entrypoint for translation of all Pearlite specifications and code: #[logic], contracts, proof_assert!
 //
 // Transforms THIR into a Term which may be serialized in Creusot metadata files for usage by dependent crates
 // The `lower` module then transforms a `Term` into a WhyML expression.
diff --git a/creusot/src/translation/specification.rs b/creusot/src/translation/specification.rs
index 5929eabae7..b6c3427c8c 100644
--- a/creusot/src/translation/specification.rs
+++ b/creusot/src/translation/specification.rs
@@ -308,20 +308,19 @@ pub(crate) fn is_overloaded_item(tcx: TyCtxt, def_id: DefId) -> bool {
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub(crate) enum Purity {
     Program,
-    Ghost,
-    Logic,
+    Logic { prophetic: bool },
 }
 
 impl Purity {
     pub(crate) fn of_def_id<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Self {
         let is_snapshot = util::is_snapshot_closure(tcx, def_id);
-        if util::is_predicate(tcx, def_id)
-            || util::is_logic(tcx, def_id)
+        if (util::is_predicate(tcx, def_id) && util::is_prophetic(tcx, def_id))
+            || (util::is_logic(tcx, def_id) && util::is_prophetic(tcx, def_id))
             || (util::is_spec(tcx, def_id) && !is_snapshot)
         {
-            Purity::Logic
-        } else if util::is_ghost(tcx, def_id) || is_snapshot {
-            Purity::Ghost
+            Purity::Logic { prophetic: true }
+        } else if util::is_predicate(tcx, def_id) || util::is_logic(tcx, def_id) || is_snapshot {
+            Purity::Logic { prophetic: false }
         } else {
             Purity::Program
         }
@@ -329,12 +328,22 @@ impl Purity {
 
     fn can_call(self, other: Purity) -> bool {
         match (self, other) {
-            (Purity::Logic, Purity::Ghost) => true,
+            (Purity::Logic { prophetic: true }, Purity::Logic { prophetic: false }) => true,
             (ctx, call) => ctx == call,
         }
     }
 }
 
+impl std::fmt::Display for Purity {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.write_str(match self {
+            Purity::Program => "program",
+            Purity::Logic { prophetic: false } => "logic",
+            Purity::Logic { prophetic: true } => "prophetic logic",
+        })
+    }
+}
+
 pub(crate) struct PurityVisitor<'a, 'tcx> {
     pub(crate) tcx: TyCtxt<'tcx>,
     pub(crate) thir: &'a Thir<'tcx>,
@@ -346,15 +355,16 @@ impl<'a, 'tcx> PurityVisitor<'a, 'tcx> {
         let stub = pearlite_stub(self.tcx, self.thir[fun].ty);
 
         if matches!(stub, Some(Stub::Fin))
-            || util::is_predicate(self.tcx, func_did)
-            || util::is_logic(self.tcx, func_did)
+            || (util::is_predicate(self.tcx, func_did) && util::is_prophetic(self.tcx, func_did))
+            || (util::is_logic(self.tcx, func_did) && util::is_prophetic(self.tcx, func_did))
         {
-            Purity::Logic
-        } else if util::is_ghost(self.tcx, func_did)
+            Purity::Logic { prophetic: true }
+        } else if util::is_predicate(self.tcx, func_did)
+            || util::is_logic(self.tcx, func_did)
             || util::get_builtin(self.tcx, func_did).is_some()
             || stub.is_some()
         {
-            Purity::Ghost
+            Purity::Logic { prophetic: false }
         } else {
             Purity::Program
         }
@@ -373,11 +383,13 @@ impl<'a, 'tcx> thir::visit::Visitor<'a, 'tcx> for PurityVisitor<'a, 'tcx> {
                     let fn_purity = self.purity(fun, func_did);
                     if !self.context.can_call(fn_purity) && !is_overloaded_item(self.tcx, func_did)
                     {
-                        let msg =
-                            format!("called {fn_purity:?} function in {:?} context", self.context);
                         self.tcx.sess.span_err_with_code(
                             self.thir[fun].span,
-                            format!("{} {:?}", msg, self.tcx.def_path_str(func_did)),
+                            format!(
+                                "called {fn_purity} function {:?} in {} context",
+                                self.tcx.def_path_str(func_did),
+                                self.context,
+                            ),
                             rustc_errors::DiagnosticId::Error(String::from("creusot")),
                         );
                     }
diff --git a/creusot/src/util.rs b/creusot/src/util.rs
index dc81964b52..808a5dad66 100644
--- a/creusot/src/util.rs
+++ b/creusot/src/util.rs
@@ -35,10 +35,7 @@ use why3::{
 };
 
 pub(crate) fn no_mir(tcx: TyCtxt, def_id: DefId) -> bool {
-    crate::util::is_no_translate(tcx, def_id)
-        || crate::util::is_ghost(tcx, def_id)
-        || crate::util::is_predicate(tcx, def_id)
-        || crate::util::is_logic(tcx, def_id)
+    is_no_translate(tcx, def_id) || is_predicate(tcx, def_id) || is_logic(tcx, def_id)
 }
 
 pub(crate) fn is_no_translate(tcx: TyCtxt, def_id: DefId) -> bool {
@@ -90,12 +87,12 @@ pub(crate) fn is_logic(tcx: TyCtxt, def_id: DefId) -> bool {
     get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "decl", "logic"]).is_some()
 }
 
-pub(crate) fn is_predicate(tcx: TyCtxt, def_id: DefId) -> bool {
-    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "decl", "predicate"]).is_some()
+pub(crate) fn is_prophetic(tcx: TyCtxt, def_id: DefId) -> bool {
+    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "decl", "logic", "prophetic"]).is_some()
 }
 
-pub(crate) fn is_ghost(tcx: TyCtxt, def_id: DefId) -> bool {
-    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "decl", "ghost"]).is_some()
+pub(crate) fn is_predicate(tcx: TyCtxt, def_id: DefId) -> bool {
+    get_attr(tcx.get_attrs_unchecked(def_id), &["creusot", "decl", "predicate"]).is_some()
 }
 
 pub(crate) fn is_trusted(tcx: TyCtxt, def_id: DefId) -> bool {
@@ -180,7 +177,7 @@ pub(crate) fn has_body(ctx: &mut TranslationCtx, def_id: DefId) -> bool {
         ctx.tcx.hir().maybe_body_owned_by(local_id).is_some()
     } else {
         match item_type(ctx.tcx, def_id) {
-            ItemType::Ghost | ItemType::Logic | ItemType::Predicate => ctx.term(def_id).is_some(),
+            ItemType::Logic { .. } | ItemType::Predicate { .. } => ctx.term(def_id).is_some(),
             _ => false,
         }
     }
@@ -296,9 +293,8 @@ fn ident_path(tcx: TyCtxt, def_id: DefId) -> Ident {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ItemType {
-    Logic,
-    Predicate,
-    Ghost,
+    Logic { prophetic: bool },
+    Predicate { prophetic: bool },
     Program,
     Closure,
     Trait,
@@ -312,8 +308,8 @@ pub enum ItemType {
 impl ItemType {
     pub(crate) fn let_kind(&self) -> Option<LetKind> {
         match self {
-            ItemType::Logic | ItemType::Ghost => Some(LetKind::Function),
-            ItemType::Predicate => Some(LetKind::Predicate),
+            ItemType::Logic { .. } => Some(LetKind::Function),
+            ItemType::Predicate { .. } => Some(LetKind::Predicate),
             ItemType::Program | ItemType::Closure => None,
             ItemType::Constant => Some(LetKind::Constant),
             _ => None,
@@ -322,10 +318,10 @@ impl ItemType {
 
     pub(crate) fn val(&self, mut sig: Signature) -> ValDecl {
         match self {
-            ItemType::Logic | ItemType::Ghost => {
+            ItemType::Logic { .. } => {
                 ValDecl { sig, ghost: false, val: false, kind: Some(LetKind::Function) }
             }
-            ItemType::Predicate => {
+            ItemType::Predicate { .. } => {
                 sig.retty = None;
                 ValDecl { sig, ghost: false, val: false, kind: Some(LetKind::Predicate) }
             }
@@ -341,9 +337,10 @@ impl ItemType {
 
     pub(crate) fn to_str(&self) -> &str {
         match self {
-            ItemType::Logic => "logic function",
-            ItemType::Predicate => "predicate",
-            ItemType::Ghost => "ghost function",
+            ItemType::Logic { prophetic: false } => "logic function",
+            ItemType::Logic { prophetic: true } => "prophetic logic function",
+            ItemType::Predicate { prophetic: false } => "predicate",
+            ItemType::Predicate { prophetic: true } => "prophetic predicate",
             ItemType::Program => "program function",
             ItemType::Closure => "closure",
             ItemType::Trait => "trait declaration",
@@ -354,6 +351,16 @@ impl ItemType {
             ItemType::Unsupported(_) => "[OTHER]",
         }
     }
+
+    pub(crate) fn can_implement(self, trait_type: Self) -> bool {
+        match (self, trait_type) {
+            (ItemType::Logic { prophetic: false }, ItemType::Logic { prophetic: true }) => true,
+            (ItemType::Predicate { prophetic: false }, ItemType::Predicate { prophetic: true }) => {
+                true
+            }
+            _ => self == trait_type,
+        }
+    }
 }
 
 pub(crate) fn item_type(tcx: TyCtxt<'_>, def_id: DefId) -> ItemType {
@@ -362,11 +369,9 @@ pub(crate) fn item_type(tcx: TyCtxt<'_>, def_id: DefId) -> ItemType {
         DefKind::Impl { .. } => ItemType::Impl,
         DefKind::Fn | DefKind::AssocFn => {
             if is_predicate(tcx, def_id) {
-                ItemType::Predicate
-            } else if is_ghost(tcx, def_id) {
-                ItemType::Ghost
+                ItemType::Predicate { prophetic: is_prophetic(tcx, def_id) }
             } else if is_logic(tcx, def_id) {
-                ItemType::Logic
+                ItemType::Logic { prophetic: is_prophetic(tcx, def_id) }
             } else {
                 ItemType::Program
             }
@@ -522,7 +527,7 @@ fn elaborate_type_invariants<'tcx>(
 ) {
     if is_user_tyinv(ctx.tcx, def_id)
         || is_inv_internal(ctx.tcx, def_id)
-        || (is_predicate(ctx.tcx, def_id) || is_ghost(ctx.tcx, def_id) || is_logic(ctx.tcx, def_id))
+        || (is_predicate(ctx.tcx, def_id) || is_logic(ctx.tcx, def_id))
             && pre_sig.contract.ensures.is_empty()
     {
         return;
diff --git a/creusot/src/validate.rs b/creusot/src/validate.rs
index d57a5e7a47..895efe5283 100644
--- a/creusot/src/validate.rs
+++ b/creusot/src/validate.rs
@@ -132,18 +132,15 @@ pub(crate) fn validate_impls(ctx: &TranslationCtx) {
                 continue;
             };
 
-            if util::item_type(ctx.tcx, *trait_item) != util::item_type(ctx.tcx, *impl_item) {
-                eprintln!(
-                    "{:?} != {:?}",
-                    util::item_type(ctx.tcx, *trait_item),
-                    util::item_type(ctx.tcx, *impl_item)
-                );
+            let item_type = util::item_type(ctx.tcx, *impl_item);
+            let trait_type = util::item_type(ctx.tcx, *trait_item);
+            if !item_type.can_implement(trait_type) {
                 ctx.error(
                     ctx.def_span(impl_item),
                     &format!(
                         "Expected `{}` to be a {} as specified by the trait declaration",
                         ctx.item_name(*impl_item),
-                        util::item_type(ctx.tcx, *impl_item).to_str()
+                        trait_type.to_str()
                     ),
                 )
                 .emit();

From 04ef3b24aa19c33de48b617fec3c7c998277d340 Mon Sep 17 00:00:00 2001
From: arnaudgolfouse <arnaud.golfouse@laposte.net>
Date: Mon, 26 Feb 2024 14:57:32 +0100
Subject: [PATCH 24/66] Update tests

---
 creusot/tests/should_fail/bad_law.stderr      |   3 +-
 creusot/tests/should_fail/bug/222.rs          |   4 +-
 creusot/tests/should_fail/bug/436_0.rs        |   8 +-
 creusot/tests/should_fail/bug/436_0.stderr    |  10 +-
 creusot/tests/should_fail/bug/436_1.rs        |   6 +-
 creusot/tests/should_fail/bug/436_1.stderr    |  10 +-
 creusot/tests/should_fail/bug/436_2.rs        |   4 +-
 creusot/tests/should_fail/bug/436_2.stderr    |   6 +-
 creusot/tests/should_fail/bug/869.mlcfg       |  74 +-
 creusot/tests/should_fail/bug/869.rs          |  12 +-
 .../tests/should_fail/bug/borrowed_ghost.rs   |   8 +-
 .../should_fail/bug/borrowed_ghost.stderr     |   6 +-
 .../should_fail/builtin_with_contract.rs      |   2 +-
 creusot/tests/should_fail/ghost_mapping.rs    |   8 +-
 .../tests/should_fail/ghost_mapping.stderr    |   4 +-
 creusot/tests/should_fail/impure_functions.rs |   2 +-
 .../tests/should_fail/impure_functions.stderr |   4 +-
 .../tests/should_fail/logic_ghost_impl.stderr |   9 -
 ..._ghost_impl.rs => logic_prophetic_impl.rs} |   2 +-
 .../should_fail/logic_prophetic_impl.stderr   |   8 +
 .../trait_item_types_mismatch.stderr          |   3 +-
 .../should_fail/traits/17_impl_refinement.rs  |   4 +-
 creusot/tests/should_succeed/100doors.mlcfg   |  30 +-
 creusot/tests/should_succeed/all_zero.mlcfg   |  14 +-
 creusot/tests/should_succeed/all_zero.rs      |   6 +-
 creusot/tests/should_succeed/bdd.mlcfg        | 132 ++--
 creusot/tests/should_succeed/bdd.rs           |  42 +-
 creusot/tests/should_succeed/binary_search.rs |   6 +-
 creusot/tests/should_succeed/bug/181_ident.rs |   2 +-
 creusot/tests/should_succeed/bug/206.rs       |   4 +-
 creusot/tests/should_succeed/bug/217.rs       |   2 +-
 creusot/tests/should_succeed/bug/265.rs       |   4 +-
 creusot/tests/should_succeed/bug/269.rs       |   2 +-
 creusot/tests/should_succeed/bug/564.rs       |   6 +-
 creusot/tests/should_succeed/bug/570.rs       |   2 +-
 creusot/tests/should_succeed/bug/594.rs       |   2 +-
 creusot/tests/should_succeed/bug/682.mlcfg    |  12 +-
 creusot/tests/should_succeed/bug/682.rs       |   2 +-
 creusot/tests/should_succeed/bug/768.rs       |   2 +-
 creusot/tests/should_succeed/bug/797.rs       |   2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/pure_neq.rs  |   2 +-
 creusot/tests/should_succeed/cell/02.mlcfg    |  14 +-
 creusot/tests/should_succeed/cell/02.rs       |  10 +-
 creusot/tests/should_succeed/clones/02.rs     |   4 +-
 creusot/tests/should_succeed/clones/03.rs     |   2 +-
 creusot/tests/should_succeed/clones/04.rs     |   6 +-
 .../tests/should_succeed/filter_positive.rs   |   6 +-
 creusot/tests/should_succeed/hashmap.mlcfg    | 110 +--
 creusot/tests/should_succeed/hashmap.rs       |  18 +-
 .../should_succeed/heapsort_generic.mlcfg     |  66 +-
 .../tests/should_succeed/heapsort_generic.rs  |   8 +-
 creusot/tests/should_succeed/hillel.mlcfg     | 312 +++++----
 creusot/tests/should_succeed/hillel.rs        |  24 +-
 .../inplace_list_reversal.mlcfg               |  26 +-
 .../should_succeed/inplace_list_reversal.rs   |   4 +-
 creusot/tests/should_succeed/ite_normalize.rs |   2 +-
 .../should_succeed/iterators/01_range.mlcfg   |  32 +-
 .../should_succeed/iterators/01_range.rs      |   8 +-
 .../iterators/02_iter_mut.mlcfg               |  39 +-
 .../should_succeed/iterators/02_iter_mut.rs   |  12 +-
 .../iterators/03_std_iterators.mlcfg          | 342 ++++-----
 .../iterators/03_std_iterators.rs             |   2 +-
 .../should_succeed/iterators/04_skip.mlcfg    |  68 +-
 .../tests/should_succeed/iterators/04_skip.rs |  10 +-
 .../should_succeed/iterators/05_map.mlcfg     |  12 +-
 .../tests/should_succeed/iterators/05_map.rs  |  18 +-
 .../iterators/06_map_precond.mlcfg            | 663 +++++++++---------
 .../iterators/06_map_precond.rs               |  62 +-
 .../tests/should_succeed/iterators/07_fuse.rs |   4 +-
 .../iterators/08_collect_extend.mlcfg         | 183 ++---
 .../iterators/08_collect_extend.rs            |   6 +-
 .../should_succeed/iterators/09_empty.rs      |   2 +-
 .../tests/should_succeed/iterators/10_once.rs |   2 +-
 .../tests/should_succeed/iterators/12_zip.rs  |   4 +-
 .../should_succeed/iterators/13_cloned.rs     |   4 +-
 .../should_succeed/iterators/14_copied.rs     |   4 +-
 .../should_succeed/iterators/15_enumerate.rs  |   6 +-
 .../tests/should_succeed/iterators/16_take.rs |   4 +-
 .../tests/should_succeed/iterators/common.rs  |   4 +-
 creusot/tests/should_succeed/knapsack.rs      |   2 +-
 .../tests/should_succeed/knapsack_full.mlcfg  |  60 +-
 creusot/tests/should_succeed/knapsack_full.rs |   6 +-
 .../tests/should_succeed/lang/assoc_type.rs   |   2 +-
 .../tests/should_succeed/list_index_mut.mlcfg |  32 +-
 .../tests/should_succeed/list_index_mut.rs    |   8 +-
 .../should_succeed/list_reversal_lasso.mlcfg  | 138 ++--
 .../should_succeed/list_reversal_lasso.rs     |  30 +-
 .../tests/should_succeed/mapping_test.mlcfg   |  18 +-
 creusot/tests/should_succeed/mapping_test.rs  |   4 +-
 creusot/tests/should_succeed/mutex.mlcfg      |  24 +-
 creusot/tests/should_succeed/mutex.rs         |   8 +-
 .../tests/should_succeed/red_black_tree.mlcfg | 194 ++---
 .../tests/should_succeed/red_black_tree.rs    |  44 +-
 creusot/tests/should_succeed/result/own.rs    |   2 +-
 .../rusthorn/inc_max_repeat.mlcfg             |  34 +-
 .../rusthorn/inc_some_2_list.mlcfg            |   8 +-
 .../rusthorn/inc_some_2_list.rs               |   6 +-
 .../rusthorn/inc_some_2_tree.rs               |   4 +-
 .../rusthorn/inc_some_list.mlcfg              |   8 +-
 .../should_succeed/rusthorn/inc_some_list.rs  |   6 +-
 .../should_succeed/rusthorn/inc_some_tree.rs  |   4 +-
 .../selection_sort_generic.mlcfg              |  91 +--
 .../should_succeed/selection_sort_generic.rs  |   2 +-
 .../tests/should_succeed/sparse_array.mlcfg   |  12 +-
 creusot/tests/should_succeed/sparse_array.rs  |   8 +-
 .../specification/logic_call.rs               |   2 +-
 .../specification/logic_functions.rs          |  10 +-
 .../should_succeed/specification/model.rs     |   4 +-
 creusot/tests/should_succeed/sum.mlcfg        |  34 +-
 .../tests/should_succeed/sum_of_odds.mlcfg    |  34 +-
 creusot/tests/should_succeed/sum_of_odds.rs   |   6 +-
 .../should_succeed/syntax/02_operators.rs     |  18 +-
 .../should_succeed/syntax/05_pearlite.mlcfg   |  28 +-
 .../should_succeed/syntax/05_pearlite.rs      |  30 +-
 .../syntax/06_logic_function_contracts.rs     |   2 +-
 .../tests/should_succeed/syntax/08_const.rs   |   2 +-
 .../should_succeed/syntax/12_ghost_code.mlcfg |  88 +--
 .../should_succeed/syntax/12_ghost_code.rs    |  22 +-
 .../should_succeed/syntax/13_vec_macro.mlcfg  |   2 +-
 .../should_succeed/syntax/derive_macros.rs    |   4 +-
 creusot/tests/should_succeed/traits/08.rs     |   2 +-
 creusot/tests/should_succeed/traits/11.rs     |   2 +-
 .../traits/12_default_method.rs               |   2 +-
 .../traits/14_assoc_in_logic.rs               |   4 +-
 .../traits/15_impl_interfaces.rs              |   2 +-
 .../should_succeed/traits/16_impl_cloning.rs  |   2 +-
 .../should_succeed/traits/18_trait_laws.rs    |   8 +-
 creusot/tests/should_succeed/vector/01.mlcfg  |  48 +-
 creusot/tests/should_succeed/vector/01.rs     |   2 +-
 .../should_succeed/vector/02_gnome.mlcfg      |  31 +-
 .../tests/should_succeed/vector/02_gnome.rs   |   2 +-
 .../vector/03_knuth_shuffle.mlcfg             |  59 +-
 .../should_succeed/vector/03_knuth_shuffle.rs |   2 +-
 .../vector/06_knights_tour.mlcfg              | 180 ++---
 .../should_succeed/vector/06_knights_tour.rs  |   4 +-
 .../should_succeed/vector/08_haystack.mlcfg   |  60 +-
 137 files changed, 2023 insertions(+), 2008 deletions(-)
 delete mode 100644 creusot/tests/should_fail/logic_ghost_impl.stderr
 rename creusot/tests/should_fail/{logic_ghost_impl.rs => logic_prophetic_impl.rs} (85%)
 create mode 100644 creusot/tests/should_fail/logic_prophetic_impl.stderr

diff --git a/creusot/tests/should_fail/bad_law.stderr b/creusot/tests/should_fail/bad_law.stderr
index 0fa9046af0..0c45878833 100644
--- a/creusot/tests/should_fail/bad_law.stderr
+++ b/creusot/tests/should_fail/bad_law.stderr
@@ -4,8 +4,7 @@ error[creusot]: Laws cannot have additional generic parameters
 6 |     fn my_law<T>(x: T);
   |     ^^^^^^^^^^^^^^^^^^^
 
-Logic != Program
-error[creusot]: Expected `my_law` to be a program function as specified by the trait declaration
+error[creusot]: Expected `my_law` to be a logic function as specified by the trait declaration
   --> bad_law.rs:10:5
    |
 10 |     fn my_law<T>(_: T) {}
diff --git a/creusot/tests/should_fail/bug/222.rs b/creusot/tests/should_fail/bug/222.rs
index 26d339bc30..09688138ff 100644
--- a/creusot/tests/should_fail/bug/222.rs
+++ b/creusot/tests/should_fail/bug/222.rs
@@ -3,7 +3,7 @@ extern crate creusot_contracts;
 use creusot_contracts::{logic::Int, *};
 
 trait A {
-    #[ghost]
+    #[logic]
     fn mktrue() -> Int {
         pearlite! { 5 }
     }
@@ -17,7 +17,7 @@ trait A {
 }
 
 impl A for () {
-    #[ghost]
+    #[logic]
     fn mktrue() -> Int {
         pearlite! { 6 }
     }
diff --git a/creusot/tests/should_fail/bug/436_0.rs b/creusot/tests/should_fail/bug/436_0.rs
index a2eb958c4b..1fa6e050af 100644
--- a/creusot/tests/should_fail/bug/436_0.rs
+++ b/creusot/tests/should_fail/bug/436_0.rs
@@ -2,16 +2,16 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 struct S {
-    g: Ghost<i32>,
+    g: Snapshot<i32>,
 }
 
-#[ghost]
+#[logic(prophetic)]
 fn prophecy(x: &mut S) -> i32 {
     pearlite! { *(^x).g }
 }
 
 pub fn f() {
-    let b = &mut S { g: gh! { 1i32 } };
-    b.g = gh! { prophecy(b) + 1i32 };
+    let b = &mut S { g: snapshot! { 1i32 } };
+    b.g = snapshot! { prophecy(b) + 1i32 };
     proof_assert! { false }
 }
diff --git a/creusot/tests/should_fail/bug/436_0.stderr b/creusot/tests/should_fail/bug/436_0.stderr
index 180377c7a3..4154f9c419 100644
--- a/creusot/tests/should_fail/bug/436_0.stderr
+++ b/creusot/tests/should_fail/bug/436_0.stderr
@@ -1,10 +1,8 @@
-error[creusot]: called Logic function in Ghost context "creusot_contracts::__stubs::fin"
-  --> 436_0.rs:10:5
+error[creusot]: called prophetic logic function "prophecy" in logic context
+  --> 436_0.rs:15:23
    |
-10 |     pearlite! { *(^x).g }
-   |     ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: this error originates in the macro `pearlite` (in Nightly builds, run with -Z macro-backtrace for more info)
+15 |     b.g = snapshot! { prophecy(b) + 1i32 };
+   |                       ^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/creusot/tests/should_fail/bug/436_1.rs b/creusot/tests/should_fail/bug/436_1.rs
index e2b6bc1ebb..1ac4dc2c73 100644
--- a/creusot/tests/should_fail/bug/436_1.rs
+++ b/creusot/tests/should_fail/bug/436_1.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 struct S {
-    g: Ghost<bool>,
+    g: Snapshot<bool>,
 }
 
 #[predicate]
@@ -11,7 +11,7 @@ fn prophecy(x: &mut S) -> bool {
 }
 
 pub fn f() {
-    let b = &mut S { g: gh! { true } };
-    b.g = gh! { !prophecy(b) };
+    let b = &mut S { g: snapshot! { true } };
+    b.g = snapshot! { !prophecy(b) };
     proof_assert! { false }
 }
diff --git a/creusot/tests/should_fail/bug/436_1.stderr b/creusot/tests/should_fail/bug/436_1.stderr
index 832ef17013..dec51b306a 100644
--- a/creusot/tests/should_fail/bug/436_1.stderr
+++ b/creusot/tests/should_fail/bug/436_1.stderr
@@ -1,8 +1,10 @@
-error[creusot]: called Logic function in Ghost context "prophecy"
-  --> 436_1.rs:15:18
+error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
+  --> 436_1.rs:10:5
    |
-15 |     b.g = gh! { !prophecy(b) };
-   |                  ^^^^^^^^
+10 |     pearlite! { *(^x).g }
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in the macro `pearlite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/creusot/tests/should_fail/bug/436_2.rs b/creusot/tests/should_fail/bug/436_2.rs
index 2a678e4725..b426ec20ed 100644
--- a/creusot/tests/should_fail/bug/436_2.rs
+++ b/creusot/tests/should_fail/bug/436_2.rs
@@ -3,13 +3,13 @@ use creusot_contracts::*;
 
 enum Bad<'a> {
     None,
-    Some(Ghost<&'a mut Bad<'a>>),
+    Some(Snapshot<&'a mut Bad<'a>>),
 }
 
 pub fn test_bad() {
     let mut x = Bad::None;
     let m = &mut x;
-    let g = gh!(m);
+    let g = snapshot!(m);
     *m = Bad::Some(g);
     proof_assert!(*m == Bad::Some(g));
     proof_assert!(^*g == ^m);
diff --git a/creusot/tests/should_fail/bug/436_2.stderr b/creusot/tests/should_fail/bug/436_2.stderr
index cecee78ff4..5a34046556 100644
--- a/creusot/tests/should_fail/bug/436_2.stderr
+++ b/creusot/tests/should_fail/bug/436_2.stderr
@@ -1,8 +1,8 @@
-error[creusot]: Illegal use of the Ghost type
+error[creusot]: Illegal use of the Snapshot type
  --> 436_2.rs:6:10
   |
-6 |     Some(Ghost<&'a mut Bad<'a>>),
-  |          ^^^^^^^^^^^^^^^^^^^^^^
+6 |     Some(Snapshot<&'a mut Bad<'a>>),
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/creusot/tests/should_fail/bug/869.mlcfg b/creusot/tests/should_fail/bug/869.mlcfg
index f4bf3a9e22..2353255e0c 100644
--- a/creusot/tests/should_fail/bug/869.mlcfg
+++ b/creusot/tests/should_fail/bug/869.mlcfg
@@ -1,59 +1,59 @@
 
 module C869_Unsound
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Borrow
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve0 (self : borrowed (Ghost.ghost_ty bool)) =
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve0 (self : borrowed (Snapshot.snap_ty bool)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
-  val resolve0 (self : borrowed (Ghost.ghost_ty bool)) : bool
+  val resolve0 (self : borrowed (Snapshot.snap_ty bool)) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg unsound [#"../869.rs" 4 0 4 16] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
-  var x : Ghost.ghost_ty bool;
-  var xm : borrowed (Ghost.ghost_ty bool);
-  var _4 : borrowed (Ghost.ghost_ty bool);
-  var b : borrowed (Ghost.ghost_ty bool);
-  var _6 : borrowed (Ghost.ghost_ty bool);
-  var bg : Ghost.ghost_ty (borrowed (Ghost.ghost_ty bool));
-  var evil : borrowed (Ghost.ghost_ty bool);
-  var _12 : borrowed (Ghost.ghost_ty bool);
-  var _15 : Ghost.ghost_ty bool;
+  var x : Snapshot.snap_ty bool;
+  var xm : borrowed (Snapshot.snap_ty bool);
+  var _4 : borrowed (Snapshot.snap_ty bool);
+  var b : borrowed (Snapshot.snap_ty bool);
+  var _6 : borrowed (Snapshot.snap_ty bool);
+  var bg : Snapshot.snap_ty (borrowed (Snapshot.snap_ty bool));
+  var evil : borrowed (Snapshot.snap_ty bool);
+  var _12 : borrowed (Snapshot.snap_ty bool);
+  var _15 : Snapshot.snap_ty bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../869.rs" 5 29 5 41] x <- ([#"../869.rs" 5 29 5 41] Ghost.new true);
+    [#"../869.rs" 5 32 5 50] x <- ([#"../869.rs" 5 32 5 50] Snapshot.new true);
     goto BB1
   }
   BB1 {
-    [#"../869.rs" 7 31 7 37] _4 <- Borrow.borrow_mut x;
-    [#"../869.rs" 7 31 7 37] x <-  ^ _4;
-    [#"../869.rs" 7 31 7 37] xm <- Borrow.borrow_final ( * _4) (Borrow.get_id _4);
-    [#"../869.rs" 7 31 7 37] _4 <- { _4 with current = ( ^ xm) ; };
+    [#"../869.rs" 7 34 7 40] _4 <- Borrow.borrow_mut x;
+    [#"../869.rs" 7 34 7 40] x <-  ^ _4;
+    [#"../869.rs" 7 34 7 40] xm <- Borrow.borrow_final ( * _4) (Borrow.get_id _4);
+    [#"../869.rs" 7 34 7 40] _4 <- { _4 with current = ( ^ xm) ; };
     assume { resolve0 _4 };
-    [#"../869.rs" 9 30 9 38] _6 <- Borrow.borrow_mut ( * xm);
-    [#"../869.rs" 9 30 9 38] xm <- { xm with current = ( ^ _6) ; };
-    [#"../869.rs" 9 30 9 38] b <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
-    [#"../869.rs" 9 30 9 38] _6 <- { _6 with current = ( ^ b) ; };
+    [#"../869.rs" 9 33 9 41] _6 <- Borrow.borrow_mut ( * xm);
+    [#"../869.rs" 9 33 9 41] xm <- { xm with current = ( ^ _6) ; };
+    [#"../869.rs" 9 33 9 41] b <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
+    [#"../869.rs" 9 33 9 41] _6 <- { _6 with current = ( ^ b) ; };
     assume { resolve0 b };
     assume { resolve0 _6 };
-    [#"../869.rs" 10 38 10 47] bg <- ([#"../869.rs" 10 38 10 47] Ghost.new b);
+    [#"../869.rs" 10 44 10 59] bg <- ([#"../869.rs" 10 44 10 59] Snapshot.new b);
     goto BB2
   }
   BB2 {
-    assert { [@expl:assertion] [#"../869.rs" 11 20 11 50] Ghost.inner ( * Ghost.inner bg) = true /\ Ghost.inner ( ^ Ghost.inner bg) = true };
-    [#"../869.rs" 13 33 13 41] _12 <- Borrow.borrow_final ( * xm) (Borrow.get_id xm);
-    [#"../869.rs" 13 33 13 41] xm <- { xm with current = ( ^ _12) ; };
-    [#"../869.rs" 13 33 13 41] evil <- Borrow.borrow_final ( * _12) (Borrow.get_id _12);
-    [#"../869.rs" 13 33 13 41] _12 <- { _12 with current = ( ^ evil) ; };
+    assert { [@expl:assertion] [#"../869.rs" 11 20 11 50] Snapshot.inner ( * Snapshot.inner bg) = true /\ Snapshot.inner ( ^ Snapshot.inner bg) = true };
+    [#"../869.rs" 13 36 13 44] _12 <- Borrow.borrow_final ( * xm) (Borrow.get_id xm);
+    [#"../869.rs" 13 36 13 44] xm <- { xm with current = ( ^ _12) ; };
+    [#"../869.rs" 13 36 13 44] evil <- Borrow.borrow_final ( * _12) (Borrow.get_id _12);
+    [#"../869.rs" 13 36 13 44] _12 <- { _12 with current = ( ^ evil) ; };
     assume { resolve0 _12 };
-    assert { [@expl:assertion] [#"../869.rs" 17 20 17 53] (evil = Ghost.inner bg) = (Ghost.inner ( ^ evil) = true) };
-    [#"../869.rs" 18 12 18 58] _15 <- ([#"../869.rs" 18 12 18 58] Ghost.new (if evil = Ghost.inner bg then
+    assert { [@expl:assertion] [#"../869.rs" 17 20 17 53] (evil = Snapshot.inner bg) = (Snapshot.inner ( ^ evil) = true) };
+    [#"../869.rs" 18 12 18 64] _15 <- ([#"../869.rs" 18 12 18 64] Snapshot.new (if evil = Snapshot.inner bg then
       false
     else
       true
@@ -61,12 +61,12 @@ module C869_Unsound
     goto BB3
   }
   BB3 {
-    [#"../869.rs" 18 4 18 58] evil <- { evil with current = ([#"../869.rs" 18 4 18 58] _15) ; };
-    [#"../869.rs" 18 4 18 58] _15 <- any Ghost.ghost_ty bool;
+    [#"../869.rs" 18 4 18 64] evil <- { evil with current = ([#"../869.rs" 18 4 18 64] _15) ; };
+    [#"../869.rs" 18 4 18 64] _15 <- any Snapshot.snap_ty bool;
     assume { resolve0 evil };
     assume { resolve0 xm };
-    assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Ghost.inner ( * evil) = (not Ghost.inner ( ^ evil)) };
-    assert { [@expl:assertion] [#"../869.rs" 20 20 20 37] Ghost.inner ( * evil) = (not Ghost.inner ( * evil)) };
+    assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( ^ evil)) };
+    assert { [@expl:assertion] [#"../869.rs" 20 20 20 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( * evil)) };
     [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] ());
     return _0
   }
diff --git a/creusot/tests/should_fail/bug/869.rs b/creusot/tests/should_fail/bug/869.rs
index 968f0d43cc..1c03245f58 100644
--- a/creusot/tests/should_fail/bug/869.rs
+++ b/creusot/tests/should_fail/bug/869.rs
@@ -2,20 +2,20 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 pub fn unsound() {
-    let mut x: Ghost<bool> = gh! { true };
+    let mut x: Snapshot<bool> = snapshot! { true };
     //            id(xm)   = i1
-    let xm: &mut Ghost<bool> = &mut x;
+    let xm: &mut Snapshot<bool> = &mut x;
     // Not final: id(b)    = i2
-    let b: &mut Ghost<bool> = &mut *xm;
-    let bg: Ghost<&mut Ghost<bool>> = gh! { b };
+    let b: &mut Snapshot<bool> = &mut *xm;
+    let bg: Snapshot<&mut Snapshot<bool>> = snapshot! { b };
     proof_assert! { ***bg == true && *^*bg == true };
     // Final:     id(evil) = i1
-    let evil: &mut Ghost<bool> = &mut *xm;
+    let evil: &mut Snapshot<bool> = &mut *xm;
     // This proof_assert does not pass !
     // Indeed evil != *bg (because the id do not match), which causes the next line to put `true` inside `*evil`.
     // And thus *^evil == true, disproving the assertion.
     proof_assert! { (evil == *bg) == (*^evil == true) };
-    *evil = gh! { if evil == *bg { false } else { true } };
+    *evil = snapshot! { if evil == *bg { false } else { true } };
     proof_assert! { **evil == !*^evil };
     proof_assert! { **evil == !**evil };
 }
diff --git a/creusot/tests/should_fail/bug/borrowed_ghost.rs b/creusot/tests/should_fail/bug/borrowed_ghost.rs
index 7dee17a169..a76d4866e8 100644
--- a/creusot/tests/should_fail/bug/borrowed_ghost.rs
+++ b/creusot/tests/should_fail/bug/borrowed_ghost.rs
@@ -2,9 +2,9 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 pub fn use_borrowed() {
-    let mut x = gh! { true };
-    let r = &mut x; // x = ?, r = (gh true, x)
-    *r = gh! { !x.inner() }; // r = (gh (not (inner x)), x)
-                             // resolve r: x = gh (not (inner x))
+    let mut x = snapshot! { true };
+    let r = &mut x; // x = ?, r = (snapshot true, x)
+    *r = snapshot! { !x.inner() }; // r = (snapshot (not (inner x)), x)
+                                   // resolve r: x = snapshot (not (inner x))
     proof_assert! { x.inner() == !x.inner() } // UNSOUND!
 }
diff --git a/creusot/tests/should_fail/bug/borrowed_ghost.stderr b/creusot/tests/should_fail/bug/borrowed_ghost.stderr
index bcd2ec41da..b2d362a0b3 100644
--- a/creusot/tests/should_fail/bug/borrowed_ghost.stderr
+++ b/creusot/tests/should_fail/bug/borrowed_ghost.stderr
@@ -1,10 +1,10 @@
 error[creusot]: Use of borrowed variable x
  --> borrowed_ghost.rs:7:10
   |
-7 |     *r = gh! { !x.inner() }; // r = (gh (not (inner x)), x)
-  |          ^^^^^^^^^^^^^^^^^^
+7 |     *r = snapshot! { !x.inner() }; // r = (snapshot (not (inner x)), x)
+  |          ^^^^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: this error originates in the macro `gh` (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `snapshot` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/creusot/tests/should_fail/builtin_with_contract.rs b/creusot/tests/should_fail/builtin_with_contract.rs
index 13658b1e8a..1490467a70 100644
--- a/creusot/tests/should_fail/builtin_with_contract.rs
+++ b/creusot/tests/should_fail/builtin_with_contract.rs
@@ -1,7 +1,7 @@
 extern crate creusot_contracts;
 use creusot_contracts::*;
 
-#[ghost]
+#[logic]
 #[ensures(true && false)]
 #[creusot::builtins = "dummy_function"]
 fn builtin_with_contract() {}
diff --git a/creusot/tests/should_fail/ghost_mapping.rs b/creusot/tests/should_fail/ghost_mapping.rs
index d351972ab3..9fdb87b0d4 100644
--- a/creusot/tests/should_fail/ghost_mapping.rs
+++ b/creusot/tests/should_fail/ghost_mapping.rs
@@ -1,22 +1,22 @@
 extern crate creusot_contracts;
 use creusot_contracts::{logic::Mapping, *};
 
-#[logic]
+#[logic(prophetic)]
 fn f(x: &mut i32) -> Mapping<(), i32> {
     pearlite! { |_| ^x }
 }
 
-#[ghost]
+#[logic]
 fn g(x: &mut i32) -> Mapping<(), i32> {
     pearlite! { |_| ^x }
 }
 
-#[logic]
+#[logic(prophetic)]
 fn h(y: &mut i32) -> bool {
     pearlite! { forall<_x:Int> ^y == 1i32 }
 }
 
-#[ghost]
+#[logic]
 fn i(y: &mut i32) -> bool {
     pearlite! { forall<_x:Int> ^y == 1i32 }
 }
diff --git a/creusot/tests/should_fail/ghost_mapping.stderr b/creusot/tests/should_fail/ghost_mapping.stderr
index 7d6ce9aaa4..0a40ed1ca5 100644
--- a/creusot/tests/should_fail/ghost_mapping.stderr
+++ b/creusot/tests/should_fail/ghost_mapping.stderr
@@ -1,4 +1,4 @@
-error[creusot]: called Logic function in Ghost context "creusot_contracts::__stubs::fin"
+error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
   --> ghost_mapping.rs:11:5
    |
 11 |     pearlite! { |_| ^x }
@@ -6,7 +6,7 @@ error[creusot]: called Logic function in Ghost context "creusot_contracts::__stu
    |
    = note: this error originates in the macro `pearlite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[creusot]: called Logic function in Ghost context "creusot_contracts::__stubs::fin"
+error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
   --> ghost_mapping.rs:21:5
    |
 21 |     pearlite! { forall<_x:Int> ^y == 1i32 }
diff --git a/creusot/tests/should_fail/impure_functions.rs b/creusot/tests/should_fail/impure_functions.rs
index 29f4a5ab2a..a5869b7572 100644
--- a/creusot/tests/should_fail/impure_functions.rs
+++ b/creusot/tests/should_fail/impure_functions.rs
@@ -1,7 +1,7 @@
 extern crate creusot_contracts;
 use creusot_contracts::{logic::*, *};
 
-#[ghost]
+#[logic]
 fn x<T>(v: &Vec<T>) -> Int {
     pearlite! { v.len()@ }
 }
diff --git a/creusot/tests/should_fail/impure_functions.stderr b/creusot/tests/should_fail/impure_functions.stderr
index 34403eb4d8..51ca718af7 100644
--- a/creusot/tests/should_fail/impure_functions.stderr
+++ b/creusot/tests/should_fail/impure_functions.stderr
@@ -1,10 +1,10 @@
-error[creusot]: called Program function in Ghost context "std::vec::Vec::<T, A>::len"
+error[creusot]: called program function "std::vec::Vec::<T, A>::len" in logic context
  --> impure_functions.rs:6:19
   |
 6 |     pearlite! { v.len()@ }
   |                   ^^^
 
-error[creusot]: called Ghost function in Program context "x"
+error[creusot]: called logic function "x" in program context
   --> impure_functions.rs:10:13
    |
 10 |     let _ = x(&Vec::<()>::new());
diff --git a/creusot/tests/should_fail/logic_ghost_impl.stderr b/creusot/tests/should_fail/logic_ghost_impl.stderr
deleted file mode 100644
index 6f05bea770..0000000000
--- a/creusot/tests/should_fail/logic_ghost_impl.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-Logic != Ghost
-error[creusot]: Expected `f` to be a ghost function as specified by the trait declaration
-  --> logic_ghost_impl.rs:11:5
-   |
-11 |     fn f() {
-   |     ^^^^^^
-
-error: aborting due to previous error
-
diff --git a/creusot/tests/should_fail/logic_ghost_impl.rs b/creusot/tests/should_fail/logic_prophetic_impl.rs
similarity index 85%
rename from creusot/tests/should_fail/logic_ghost_impl.rs
rename to creusot/tests/should_fail/logic_prophetic_impl.rs
index 40ab38e93c..f71bb2a3d0 100644
--- a/creusot/tests/should_fail/logic_ghost_impl.rs
+++ b/creusot/tests/should_fail/logic_prophetic_impl.rs
@@ -7,7 +7,7 @@ trait T {
 }
 
 impl T for () {
-    #[ghost]
+    #[logic(prophetic)]
     fn f() {
         ()
     }
diff --git a/creusot/tests/should_fail/logic_prophetic_impl.stderr b/creusot/tests/should_fail/logic_prophetic_impl.stderr
new file mode 100644
index 0000000000..6043a836f7
--- /dev/null
+++ b/creusot/tests/should_fail/logic_prophetic_impl.stderr
@@ -0,0 +1,8 @@
+error[creusot]: Expected `f` to be a logic function as specified by the trait declaration
+  --> logic_prophetic_impl.rs:11:5
+   |
+11 |     fn f() {
+   |     ^^^^^^
+
+error: aborting due to previous error
+
diff --git a/creusot/tests/should_fail/trait_item_types_mismatch.stderr b/creusot/tests/should_fail/trait_item_types_mismatch.stderr
index 9839639a5c..7165f39c19 100644
--- a/creusot/tests/should_fail/trait_item_types_mismatch.stderr
+++ b/creusot/tests/should_fail/trait_item_types_mismatch.stderr
@@ -4,8 +4,7 @@ error[creusot]: Expected implementation of trait `Trusted` for `()` to be marked
 7 | impl Trusted for () {}
   | ^^^^^^^^^^^^^^^^^^^
 
-Predicate != Program
-error[creusot]: Expected `my_predicate` to be a program function as specified by the trait declaration
+error[creusot]: Expected `my_predicate` to be a predicate as specified by the trait declaration
   --> trait_item_types_mismatch.rs:17:5
    |
 17 |     fn my_predicate() -> bool {
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.rs b/creusot/tests/should_fail/traits/17_impl_refinement.rs
index 47720c14e7..e80c05fb31 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.rs
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.rs
@@ -17,14 +17,14 @@ impl Tr for () {
 }
 
 trait ReqFalse {
-    #[ghost]
+    #[logic]
     #[requires(x@ >= 10)]
     fn need_false(x: u64) -> ();
 }
 
 impl ReqFalse for () {
     // This should not prove
-    #[ghost]
+    #[logic]
     #[requires(y@ >= 15)]
     fn need_false(y: u64) {}
 }
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index afcad7798f..f974b231f5 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -237,7 +237,7 @@ module C100doors_F
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve3 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve3 (self : bool) : bool
@@ -325,10 +325,10 @@ module C100doors_F
       end }
     ensures { inv5 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -358,14 +358,14 @@ module C100doors_F
   var _0 : ();
   var door_open : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
   var iter : Core_Ops_Range_Range_Type.t_range usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _11 : ();
   var _12 : Core_Option_Option_Type.t_option usize;
   var _13 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _14 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _17 : Ghost.ghost_ty (Seq.seq usize);
+  var _17 : Snapshot.snap_ty (Seq.seq usize);
   var pass : usize;
   var door : usize;
   var _26 : bool;
@@ -383,11 +383,11 @@ module C100doors_F
     goto BB2
   }
   BB2 {
-    [#"../100doors.rs" 20 4 20 41] iter_old <- ([#"../100doors.rs" 20 4 20 41] Ghost.new iter);
+    [#"../100doors.rs" 20 4 20 41] iter_old <- ([#"../100doors.rs" 20 4 20 41] Snapshot.new iter);
     goto BB3
   }
   BB3 {
-    [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] Ghost.new (Seq.empty ));
+    [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -398,7 +398,7 @@ module C100doors_F
   }
   BB6 {
     invariant { [#"../100doors.rs" 20 4 20 41] inv0 iter };
-    invariant { [#"../100doors.rs" 20 4 20 41] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../100doors.rs" 20 4 20 41] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../100doors.rs" 20 16 20 39] Seq.length (shallow_model0 door_open) = 100 };
     goto BB7
   }
@@ -432,14 +432,14 @@ module C100doors_F
     absurd
   }
   BB12 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _12);
-    [#"../100doors.rs" 20 4 20 41] _17 <- ([#"../100doors.rs" 20 4 20 41] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12);
+    [#"../100doors.rs" 20 4 20 41] _17 <- ([#"../100doors.rs" 20 4 20 41] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] _17);
-    [#"../100doors.rs" 20 4 20 41] _17 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] pass <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../100doors.rs" 20 4 20 41] _17 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../100doors.rs" 22 30 22 34] door <- ([#"../100doors.rs" 22 30 22 34] pass);
     goto BB14
   }
diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg
index 6294a3c0df..817be0c32b 100644
--- a/creusot/tests/should_succeed/all_zero.mlcfg
+++ b/creusot/tests/should_succeed/all_zero.mlcfg
@@ -26,7 +26,7 @@ end
 module AllZero_AllZero
   use AllZero_List_Type as AllZero_List_Type
   use prelude.Borrow
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (AllZero_List_Type.t_list)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (AllZero_List_Type.t_list)) : bool
@@ -43,7 +43,7 @@ module AllZero_AllZero
   val resolve0 (self : borrowed uint32) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use Core_Option_Option_Type as Core_Option_Option_Type
   use prelude.Int
   function get0 [#"../all_zero.rs" 21 4 21 40] (self : AllZero_List_Type.t_list) (ix : int) : Core_Option_Option_Type.t_option uint32
@@ -64,7 +64,7 @@ module AllZero_AllZero
   val len0 [#"../all_zero.rs" 13 4 13 23] (self : AllZero_List_Type.t_list) : int
     ensures { result = len0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg all_zero [#"../all_zero.rs" 34 0 34 29] [@cfg:stackify] [@cfg:subregion_analysis] (l : borrowed (AllZero_List_Type.t_list)) : ()
     ensures { [#"../all_zero.rs" 32 0 32 77] forall i : int . 0 <= i /\ i < len0 ( * l) -> get0 ( ^ l) i = Core_Option_Option_Type.C_Some (0 : uint32) }
     ensures { [#"../all_zero.rs" 33 10 33 34] len0 ( * l) = len0 ( ^ l) }
@@ -72,7 +72,7 @@ module AllZero_AllZero
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var l : borrowed (AllZero_List_Type.t_list) = l;
-  var old_l : Ghost.ghost_ty (borrowed (AllZero_List_Type.t_list));
+  var old_l : Snapshot.snap_ty (borrowed (AllZero_List_Type.t_list));
   var loop_l : borrowed (AllZero_List_Type.t_list);
   var value : borrowed uint32;
   var next : borrowed (AllZero_List_Type.t_list);
@@ -81,7 +81,7 @@ module AllZero_AllZero
     goto BB0
   }
   BB0 {
-    [#"../all_zero.rs" 36 16 36 25] old_l <- ([#"../all_zero.rs" 36 16 36 25] Ghost.new l);
+    [#"../all_zero.rs" 36 16 36 31] old_l <- ([#"../all_zero.rs" 36 16 36 31] Snapshot.new l);
     goto BB1
   }
   BB1 {
@@ -90,8 +90,8 @@ module AllZero_AllZero
     goto BB2
   }
   BB2 {
-    invariant { [#"../all_zero.rs" 39 4 41 88] (forall i : int . 0 <= i /\ i < len0 ( * loop_l) -> get0 ( ^ loop_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) -> (forall i : int . 0 <= i /\ i < len0 ( * Ghost.inner old_l) -> get0 ( ^ Ghost.inner old_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) };
-    invariant { [#"../all_zero.rs" 39 4 41 88] len0 ( ^ loop_l) = len0 ( * loop_l) -> len0 ( ^ Ghost.inner old_l) = len0 ( * Ghost.inner old_l) };
+    invariant { [#"../all_zero.rs" 39 4 41 88] (forall i : int . 0 <= i /\ i < len0 ( * loop_l) -> get0 ( ^ loop_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l) -> get0 ( ^ Snapshot.inner old_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) };
+    invariant { [#"../all_zero.rs" 39 4 41 88] len0 ( ^ loop_l) = len0 ( * loop_l) -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/all_zero.rs b/creusot/tests/should_succeed/all_zero.rs
index 30d2b8b62a..f48895b8ed 100644
--- a/creusot/tests/should_succeed/all_zero.rs
+++ b/creusot/tests/should_succeed/all_zero.rs
@@ -9,7 +9,7 @@ pub enum List {
 use List::*;
 
 impl List {
-    #[ghost]
+    #[logic]
     fn len(self) -> Int {
         match self {
             Cons(_, ls) => 1 + ls.len(),
@@ -17,7 +17,7 @@ impl List {
         }
     }
 
-    #[ghost]
+    #[logic]
     fn get(self, ix: Int) -> Option<u32> {
         match self {
             Cons(x, ls) => match pearlite! { ix == 0 } {
@@ -33,7 +33,7 @@ impl List {
 #[ensures((*l).len() == (^l).len())]
 pub fn all_zero(l: &mut List) {
     use List::*;
-    let old_l = gh! { l };
+    let old_l = snapshot! { l };
     let mut loop_l = l;
 
     #[invariant(
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 9dab2772aa..729da25651 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -773,11 +773,11 @@ module Bdd_Context_Type
   use prelude.Int
   use Bdd_Node_Type as Bdd_Node_Type
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   use Bdd_Bumpalo_Bump_Type as Bdd_Bumpalo_Bump_Type
   use prelude.Borrow
   type t_context  =
-    | C_Context (Bdd_Bumpalo_Bump_Type.t_bump) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd)) (Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node))) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)) uint64
+    | C_Context (Bdd_Bumpalo_Bump_Type.t_bump) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd)) (Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node))) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)) (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)) uint64
     
   let function context_hashcons (self : t_context) : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd)
     
@@ -789,7 +789,7 @@ module Bdd_Context_Type
     match self with
       | C_Context _ _ _ _ _ a -> a
       end
-  let function context_hashcons_ghost (self : t_context) : Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node))
+  let function context_hashcons_ghost (self : t_context) : Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node))
    = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_Context _ _ a _ _ _ -> a
@@ -897,7 +897,7 @@ module Bdd_Impl10_GrowsIsValidBdd_Impl
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -909,14 +909,14 @@ module Bdd_Impl10_GrowsIsValidBdd_Impl
     
   predicate invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model4 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model5 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant1 self }
@@ -1041,7 +1041,7 @@ module Bdd_Impl10_GrowsTrans_Impl
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1053,14 +1053,14 @@ module Bdd_Impl10_GrowsTrans_Impl
     
   predicate invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model3 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model4 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant1 self }
@@ -1189,7 +1189,7 @@ module Bdd_Impl10_SetIrreleventVar_Impl
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1201,14 +1201,14 @@ module Bdd_Impl10_SetIrreleventVar_Impl
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -1319,7 +1319,7 @@ module Bdd_Impl10_DiscrValuation_Impl
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1331,14 +1331,14 @@ module Bdd_Impl10_DiscrValuation_Impl
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model0 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model1 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model1 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -1505,7 +1505,7 @@ module Bdd_Impl10_BddCanonical_Impl
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1517,14 +1517,14 @@ module Bdd_Impl10_BddCanonical_Impl
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model0 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model1 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model1 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -1701,7 +1701,7 @@ module Bdd_Impl11_New
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1713,14 +1713,14 @@ module Bdd_Impl11_New
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model0 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model3 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model3 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model1 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model2 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -1733,7 +1733,7 @@ module Bdd_Impl11_New
     | Bdd_Context_Type.C_Context alloc hashcons hashcons_ghost not_memo and_memo cnt -> true
     end)
   use Bdd_Bumpalo_Bump_Type as Bdd_Bumpalo_Bump_Type
-  use prelude.Ghost
+  use prelude.Snapshot
   use map.Const
   val new3 [#"../bdd.rs" 69 8 69 28] (_1 : ()) : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)
     ensures { [#"../bdd.rs" 67 18 67 47] shallow_model2 result = Const.const (Core_Option_Option_Type.C_None) }
@@ -1742,7 +1742,7 @@ module Bdd_Impl11_New
   val new2 [#"../bdd.rs" 69 8 69 28] (_1 : ()) : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)
     ensures { [#"../bdd.rs" 67 18 67 47] shallow_model1 result = Const.const (Core_Option_Option_Type.C_None) }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use map.Const
   use map.Const
   val new0 [#"../bdd.rs" 69 8 69 28] (_1 : ()) : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd)
@@ -1758,7 +1758,7 @@ module Bdd_Impl11_New
   var alloc : Bdd_Bumpalo_Bump_Type.t_bump = alloc;
   var t : Bdd_Node_Type.t_node;
   var _5 : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd);
-  var _6 : Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+  var _6 : Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
   var _8 : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
   var _9 : Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
   var _10 : Bdd_Node_Type.t_node;
@@ -1772,7 +1772,7 @@ module Bdd_Impl11_New
     goto BB1
   }
   BB1 {
-    [#"../bdd.rs" 429 28 429 51] _6 <- ([#"../bdd.rs" 429 28 429 51] Ghost.new (Const.const t));
+    [#"../bdd.rs" 429 28 429 57] _6 <- ([#"../bdd.rs" 429 28 429 57] Snapshot.new (Const.const t));
     goto BB2
   }
   BB2 {
@@ -1786,7 +1786,7 @@ module Bdd_Impl11_New
   BB4 {
     [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context ([#"../bdd.rs" 427 12 427 17] alloc) _5 _6 _8 _9 ([#"../bdd.rs" 432 17 432 18] [#"../bdd.rs" 432 17 432 18] (0 : uint64)));
     _5 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd);
-    _6 <- any Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+    _6 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
     _8 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
     _9 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
     return _0
@@ -1879,7 +1879,7 @@ module Bdd_Impl11_Hashcons
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -1891,14 +1891,14 @@ module Bdd_Impl11_Hashcons
     
   predicate invariant7 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model3 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model0 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model0 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model7 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model8 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant7 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant7 self }
@@ -1988,8 +1988,8 @@ module Bdd_Impl11_Hashcons
   val grows0 [#"../bdd.rs" 296 4 296 35] (self : borrowed (Bdd_Context_Type.t_context)) : bool
     ensures { result = grows0 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use map.Map
   function shallow_model4 (self : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd))) : Map.map (Bdd_NodeLog_Type.t_nodelog) (Core_Option_Option_Type.t_option (Bdd_Bdd_Type.t_bdd))
     
@@ -2061,7 +2061,7 @@ module Bdd_Impl11_Hashcons
   var _19 : borrowed (Bdd_Node_Type.t_node);
   var _23 : ();
   var _24 : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd));
-  var _27 : Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+  var _27 : Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
   {
     goto BB0
   }
@@ -2101,12 +2101,12 @@ module Bdd_Impl11_Hashcons
     goto BB6
   }
   BB6 {
-    [#"../bdd.rs" 447 30 447 71] _27 <- ([#"../bdd.rs" 447 30 447 71] Ghost.new (Map.set (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost ( * self))) (Bdd_Bdd_Type.bdd_1 r1) (Bdd_Bdd_Type.bdd_0 r1)));
+    [#"../bdd.rs" 447 30 447 77] _27 <- ([#"../bdd.rs" 447 30 447 77] Snapshot.new (Map.set (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost ( * self))) (Bdd_Bdd_Type.bdd_1 r1) (Bdd_Bdd_Type.bdd_0 r1)));
     goto BB7
   }
   BB7 {
-    [#"../bdd.rs" 447 8 447 71] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 71] _27) x3 x4 x5) ; };
-    [#"../bdd.rs" 447 8 447 71] _27 <- any Ghost.ghost_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+    [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 77] _27) x3 x4 x5) ; };
+    [#"../bdd.rs" 447 8 447 77] _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
     switch ([#"../bdd.rs" 448 11 448 34] ([#"../bdd.rs" 448 11 448 19] Bdd_Context_Type.context_cnt ( * self)) > ([#"../bdd.rs" 448 22 448 34] ([#"../bdd.rs" 448 22 448 30] [#"../bdd.rs" 448 22 448 30] (18446744073709551615 : uint64)) - ([#"../bdd.rs" 448 33 448 34] [#"../bdd.rs" 448 33 448 34] (1 : uint64))))
       | False -> goto BB11
       | True -> goto BB8
@@ -2234,7 +2234,7 @@ module Bdd_Impl11_Node
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -2246,14 +2246,14 @@ module Bdd_Impl11_Node
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model2 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model3 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model3 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model7 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model8 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -2458,7 +2458,7 @@ module Bdd_Impl11_True
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -2470,14 +2470,14 @@ module Bdd_Impl11_True
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -2634,7 +2634,7 @@ module Bdd_Impl11_False
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -2646,14 +2646,14 @@ module Bdd_Impl11_False
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -2810,7 +2810,7 @@ module Bdd_Impl11_V
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -2822,14 +2822,14 @@ module Bdd_Impl11_V
     
   predicate invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model1 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model2 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model5 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model6 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant0 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant0 self }
@@ -3053,7 +3053,7 @@ module Bdd_Impl11_Not
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -3065,14 +3065,14 @@ module Bdd_Impl11_Not
     
   predicate invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model4 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model5 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model5 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model2 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model8 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant1 self }
@@ -3508,7 +3508,7 @@ module Bdd_Impl11_And
     ensures { result = is_valid_bdd0 self b }
     
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_valid_node0 [#"../bdd.rs" 316 4 316 51] (self : Bdd_Context_Type.t_context) (n : Bdd_Node_Type.t_node) =
     [#"../bdd.rs" 318 12 327 13] match n with
       | Bdd_Node_Type.C_True -> true
@@ -3520,14 +3520,14 @@ module Bdd_Impl11_And
     
   predicate invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) =
     [#"../bdd.rs" 264 12 288 19] (forall n : Bdd_NodeLog_Type.t_nodelog . match Map.get (shallow_model4 (Bdd_Context_Type.context_hashcons self)) n with
-      | Core_Option_Option_Type.C_Some b -> shallow_model5 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
+      | Core_Option_Option_Type.C_Some b -> shallow_model5 (Bdd_Bdd_Type.bdd_0 b) = n /\ is_valid_node0 self (Bdd_Bdd_Type.bdd_0 b) /\ Bdd_Bdd_Type.bdd_1 b < Bdd_Context_Type.context_cnt self /\ Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (Bdd_Bdd_Type.bdd_1 b) = Bdd_Bdd_Type.bdd_0 b
       | Core_Option_Option_Type.C_None -> true
       end) /\ (forall bm : uint64 . match Map.get (shallow_model8 (Bdd_Context_Type.context_not_memo self)) bm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
+      | Core_Option_Option_Type.C_Some n -> let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) bm) bm in is_valid_bdd0 self n /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (not interp0 b v)) /\ leastvar0 b <= leastvar0 n
       end) /\ (forall abm : (uint64, uint64) . match Map.get (shallow_model2 (Bdd_Context_Type.context_and_memo self)) abm with
       | Core_Option_Option_Type.C_None -> true
-      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Ghost.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
+      | Core_Option_Option_Type.C_Some n -> let a = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (a, _) = abm in a)) (let (a, _) = abm in a) in let b = Bdd_Bdd_Type.C_Bdd (Map.get (Snapshot.inner (Bdd_Context_Type.context_hashcons_ghost self)) (let (_, a) = abm in a)) (let (_, a) = abm in a) in is_valid_bdd0 self n /\ is_valid_bdd0 self a /\ is_valid_bdd0 self b /\ (forall v : Map.map uint64 bool . interp0 n v = (interp0 a v /\ interp0 b v)) /\ (leastvar0 a <= leastvar0 n \/ leastvar0 b <= leastvar0 n)
       end)
   val invariant1 [#"../bdd.rs" 262 4 262 30] (self : Bdd_Context_Type.t_context) : bool
     ensures { result = invariant1 self }
diff --git a/creusot/tests/should_succeed/bdd.rs b/creusot/tests/should_succeed/bdd.rs
index ba902cbec0..1c973686af 100644
--- a/creusot/tests/should_succeed/bdd.rs
+++ b/creusot/tests/should_succeed/bdd.rs
@@ -30,7 +30,7 @@ mod hashmap {
         #[ensures(result@ == Self::hash_log(self.deep_model()))]
         fn hash(&self) -> u64;
 
-        #[ghost]
+        #[logic]
         fn hash_log(_: Self::DeepModelTy) -> Int;
     }
 
@@ -40,7 +40,7 @@ mod hashmap {
     impl<K: Hash, V> ShallowModel for MyHashMap<K, V> {
         type ShallowModelTy = Mapping<K::DeepModelTy, Option<V>>;
 
-        #[ghost]
+        #[logic]
         #[open(self)]
         #[trusted]
         fn shallow_model(self) -> Self::ShallowModelTy {
@@ -78,7 +78,7 @@ mod hashmap {
         }
 
         #[open(self)]
-        #[ghost]
+        #[logic]
         fn hash_log(x: Self::DeepModelTy) -> Int {
             pearlite! { (U::hash_log(x.0) + V::hash_log(x.1) * 17) % (u64::MAX@ + 1) }
         }
@@ -124,7 +124,7 @@ impl<'arena> hashmap::Hash for Node<'arena> {
     }
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn hash_log(x: Self::DeepModelTy) -> Int {
         pearlite! {
             match x {
@@ -144,7 +144,7 @@ impl<'arena> hashmap::Hash for Bdd<'arena> {
     }
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn hash_log(x: Self::DeepModelTy) -> Int {
         pearlite! { x@ }
     }
@@ -154,7 +154,7 @@ impl<'arena> DeepModel for Node<'arena> {
     type DeepModelTy = NodeLog;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! {
             match self {
@@ -171,7 +171,7 @@ impl<'arena> ShallowModel for Node<'arena> {
     type ShallowModelTy = NodeLog;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! { self.deep_model() }
     }
@@ -181,7 +181,7 @@ impl<'arena> DeepModel for Bdd<'arena> {
     type DeepModelTy = u64;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn deep_model(self) -> Self::DeepModelTy {
         pearlite! { self.1 }
     }
@@ -191,7 +191,7 @@ impl<'arena> ShallowModel for Bdd<'arena> {
     type ShallowModelTy = u64;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! { self.deep_model() }
     }
@@ -205,7 +205,7 @@ impl<'arena> PartialEq for Bdd<'arena> {
 }
 
 impl<'arena> Bdd<'arena> {
-    #[ghost]
+    #[logic]
     fn interp(self, vars: Mapping<u64, bool>) -> bool {
         pearlite! {
             match self {
@@ -219,7 +219,7 @@ impl<'arena> Bdd<'arena> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[ensures(result >= 0)]
     fn size(self) -> Int {
         pearlite! {
@@ -235,7 +235,7 @@ impl<'arena> Bdd<'arena> {
         }
     }
 
-    #[ghost]
+    #[logic]
     fn leastvar(self) -> Int {
         pearlite! {
             match self {
@@ -250,7 +250,7 @@ impl<'arena> Bdd<'arena> {
 pub struct Context<'arena> {
     alloc: &'arena bumpalo::Bump,
     hashcons: hashmap::MyHashMap<Node<'arena>, Bdd<'arena>>,
-    hashcons_ghost: Ghost<Mapping<u64, &'arena Node<'arena>>>,
+    hashcons_ghost: Snapshot<Mapping<u64, &'arena Node<'arena>>>,
     not_memo: hashmap::MyHashMap<Bdd<'arena>, Bdd<'arena>>,
     and_memo: hashmap::MyHashMap<(Bdd<'arena>, Bdd<'arena>), Bdd<'arena>>,
     cnt: u64,
@@ -292,7 +292,7 @@ impl<'arena> Invariant for Context<'arena> {
 
 impl<'arena> Context<'arena> {
     #[open(self)]
-    #[predicate]
+    #[predicate(prophetic)]
     pub fn grows(&mut self) -> bool {
         pearlite! {
             self.cnt@ <= (^self).cnt@ &&
@@ -328,14 +328,14 @@ impl<'arena> Context<'arena> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[requires(self.grows())]
     #[requires(self.is_valid_bdd(b))]
     #[ensures((^self).is_valid_bdd(b))]
     pub fn grows_is_valid_bdd(&mut self, b: Bdd<'arena>) {}
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[requires(self.grows())]
     #[requires(o.grows())]
@@ -344,7 +344,7 @@ impl<'arena> Context<'arena> {
     #[ensures(oo.grows())]
     pub fn grows_trans(&mut self, o: &mut Self, oo: &mut Self) {}
 
-    #[ghost]
+    #[logic]
     #[requires(self.is_valid_bdd(a))]
     #[requires(x@ < a.leastvar())]
     #[ensures(a.interp(v) == a.interp(v.set(x, b)))]
@@ -360,7 +360,7 @@ impl<'arena> Context<'arena> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.is_valid_bdd(a))]
     #[requires(self.is_valid_bdd(b))]
     #[requires(a != b)]
@@ -408,7 +408,7 @@ impl<'arena> Context<'arena> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[requires(self.is_valid_bdd(a))]
     #[requires(self.is_valid_bdd(b))]
@@ -426,7 +426,7 @@ impl<'arena> Context<'arena> {
         Context {
             alloc,
             hashcons: hashmap::MyHashMap::new(),
-            hashcons_ghost: gh! { Mapping::cst(t) },
+            hashcons_ghost: snapshot! { Mapping::cst(t) },
             not_memo: hashmap::MyHashMap::new(),
             and_memo: hashmap::MyHashMap::new(),
             cnt: 0,
@@ -444,7 +444,7 @@ impl<'arena> Context<'arena> {
         }
         let r = Bdd(self.alloc.alloc(n), self.cnt);
         self.hashcons.add(n, r);
-        self.hashcons_ghost = gh! { self.hashcons_ghost.set(r.1, r.0) };
+        self.hashcons_ghost = snapshot! { self.hashcons_ghost.set(r.1, r.0) };
         if self.cnt > u64::MAX - 1 {
             loop {
                 // prevent self from being resolved
diff --git a/creusot/tests/should_succeed/binary_search.rs b/creusot/tests/should_succeed/binary_search.rs
index 16a58f13c4..3bbf583b76 100644
--- a/creusot/tests/should_succeed/binary_search.rs
+++ b/creusot/tests/should_succeed/binary_search.rs
@@ -17,7 +17,7 @@ pub enum List<T> {
 use List::*;
 
 impl<T> List<T> {
-    #[ghost]
+    #[logic]
     #[ensures(result >= 0)]
     fn len_logic(self) -> Int {
         match self {
@@ -26,7 +26,7 @@ impl<T> List<T> {
         }
     }
 
-    #[ghost]
+    #[logic]
     fn get(self, ix: Int) -> Option<T> {
         match self {
             Cons(t, ls) => {
@@ -74,7 +74,7 @@ impl<T> List<T> {
         len
     }
 
-    #[ghost]
+    #[logic]
     fn get_default(self, ix: Int, def: T) -> T {
         match self.get(ix) {
             Some(v) => v,
diff --git a/creusot/tests/should_succeed/bug/181_ident.rs b/creusot/tests/should_succeed/bug/181_ident.rs
index 202233d6b1..d601a86ee1 100644
--- a/creusot/tests/should_succeed/bug/181_ident.rs
+++ b/creusot/tests/should_succeed/bug/181_ident.rs
@@ -3,7 +3,7 @@ extern crate creusot_contracts;
 use creusot_contracts::{logic::Int, *};
 
 // Bug #181
-#[ghost]
+#[logic]
 #[open]
 pub fn max_int(a: Int, b: Int) -> Int {
     if a < b {
diff --git a/creusot/tests/should_succeed/bug/206.rs b/creusot/tests/should_succeed/bug/206.rs
index d8b329f840..1e14851c50 100644
--- a/creusot/tests/should_succeed/bug/206.rs
+++ b/creusot/tests/should_succeed/bug/206.rs
@@ -4,11 +4,11 @@ use creusot_contracts::*;
 
 pub struct A(Vec<usize>);
 
-#[ghost]
+#[logic]
 #[ensures(a.0@ == a.0@)]
 fn u2(a: A) {}
 
-#[ghost]
+#[logic]
 #[open(self)]
 pub fn u(a: A) {
     pearlite! {
diff --git a/creusot/tests/should_succeed/bug/217.rs b/creusot/tests/should_succeed/bug/217.rs
index d9474e02ed..d27344e6f6 100644
--- a/creusot/tests/should_succeed/bug/217.rs
+++ b/creusot/tests/should_succeed/bug/217.rs
@@ -6,7 +6,7 @@ use creusot_contracts::{
 };
 
 #[open]
-#[ghost]
+#[logic]
 #[variant(c.len())]
 pub fn ex(c: Seq<Int>, a: Int) -> Int {
     if c.len() == 0 {
diff --git a/creusot/tests/should_succeed/bug/265.rs b/creusot/tests/should_succeed/bug/265.rs
index 3fa3b918b8..3800d4948e 100644
--- a/creusot/tests/should_succeed/bug/265.rs
+++ b/creusot/tests/should_succeed/bug/265.rs
@@ -2,13 +2,13 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 #[open]
-#[ghost]
+#[logic]
 pub fn bool_to_bool(b: bool) -> bool {
     b
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn ex() {
     pearlite! { bool_to_bool(!true) };
 }
diff --git a/creusot/tests/should_succeed/bug/269.rs b/creusot/tests/should_succeed/bug/269.rs
index d52bf783c1..bb8730c780 100644
--- a/creusot/tests/should_succeed/bug/269.rs
+++ b/creusot/tests/should_succeed/bug/269.rs
@@ -3,5 +3,5 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 #[open]
-#[ghost]
+#[logic]
 pub fn my_lemma() {}
diff --git a/creusot/tests/should_succeed/bug/564.rs b/creusot/tests/should_succeed/bug/564.rs
index a35c8dd2db..96a649271e 100644
--- a/creusot/tests/should_succeed/bug/564.rs
+++ b/creusot/tests/should_succeed/bug/564.rs
@@ -1,7 +1,7 @@
 extern crate creusot_contracts;
 use creusot_contracts::*;
 
-#[ghost]
+#[logic]
 #[open]
 #[requires(invariants())]
 pub fn emits_pure_eq() -> bool {
@@ -10,7 +10,7 @@ pub fn emits_pure_eq() -> bool {
     }
 }
 
-#[ghost]
+#[logic]
 #[open]
 #[requires(invariants())]
 pub fn emits_pure_implies() -> bool {
@@ -19,7 +19,7 @@ pub fn emits_pure_implies() -> bool {
     }
 }
 
-#[ghost]
+#[logic]
 fn invariants() -> bool {
     true
 }
diff --git a/creusot/tests/should_succeed/bug/570.rs b/creusot/tests/should_succeed/bug/570.rs
index b05fdfb543..80a9793173 100644
--- a/creusot/tests/should_succeed/bug/570.rs
+++ b/creusot/tests/should_succeed/bug/570.rs
@@ -18,7 +18,7 @@ pub fn test_assign(mut s: S2) {
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn test_logic(s: S2) {
     s.s1.f;
 }
diff --git a/creusot/tests/should_succeed/bug/594.rs b/creusot/tests/should_succeed/bug/594.rs
index 3596bd72ae..3ad0672196 100644
--- a/creusot/tests/should_succeed/bug/594.rs
+++ b/creusot/tests/should_succeed/bug/594.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 #[open]
-#[ghost]
+#[logic]
 pub fn test_logic((x, _): (u32, u32)) -> u32 {
     x
 }
diff --git a/creusot/tests/should_succeed/bug/682.mlcfg b/creusot/tests/should_succeed/bug/682.mlcfg
index 39e923a575..f4c346d39f 100644
--- a/creusot/tests/should_succeed/bug/682.mlcfg
+++ b/creusot/tests/should_succeed/bug/682.mlcfg
@@ -30,8 +30,8 @@ module C682_AddSome
 end
 module C682_Foo
   use prelude.UInt64
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use prelude.Borrow
   predicate resolve0 (self : borrowed uint64) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -45,7 +45,7 @@ module C682_Foo
     requires {[#"../682.rs" 4 11 4 32]  * a <= div max0 (2 : uint64)}
     ensures { [#"../682.rs" 5 10 5 17]  ^ a >  * a }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg foo [#"../682.rs" 12 0 12 23] [@cfg:stackify] [@cfg:subregion_analysis] (a : borrowed uint64) : ()
     requires {[#"../682.rs" 10 11 10 21]  * a = (3 : uint64)}
     ensures { [#"../682.rs" 11 10 11 17]  ^ a >  * a }
@@ -53,14 +53,14 @@ module C682_Foo
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : borrowed uint64 = a;
-  var a_p : Ghost.ghost_ty uint64;
+  var a_p : Snapshot.snap_ty uint64;
   var _6 : ();
   var _7 : borrowed uint64;
   {
     goto BB0
   }
   BB0 {
-    [#"../682.rs" 13 26 13 33] a_p <- ([#"../682.rs" 13 26 13 33] Ghost.new ( * a));
+    [#"../682.rs" 13 29 13 42] a_p <- ([#"../682.rs" 13 29 13 42] Snapshot.new ( * a));
     goto BB1
   }
   BB1 {
@@ -72,7 +72,7 @@ module C682_Foo
   }
   BB2 {
     assume { resolve0 a };
-    assert { [@expl:assertion] [#"../682.rs" 15 18 15 27]  * a > Ghost.inner a_p };
+    assert { [@expl:assertion] [#"../682.rs" 15 18 15 27]  * a > Snapshot.inner a_p };
     [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/682.rs b/creusot/tests/should_succeed/bug/682.rs
index 869462f7e8..e26d997f37 100644
--- a/creusot/tests/should_succeed/bug/682.rs
+++ b/creusot/tests/should_succeed/bug/682.rs
@@ -10,7 +10,7 @@ fn add_some(a: &mut u64) {
 #[requires(*a == 3u64)]
 #[ensures(^a > *a)]
 pub fn foo(a: &mut u64) {
-    let a_p: Ghost<u64> = gh!(*a);
+    let a_p: Snapshot<u64> = snapshot!(*a);
     add_some(a);
     proof_assert!(*a > *a_p);
 }
diff --git a/creusot/tests/should_succeed/bug/768.rs b/creusot/tests/should_succeed/bug/768.rs
index 0baf4161d3..175c6947f2 100644
--- a/creusot/tests/should_succeed/bug/768.rs
+++ b/creusot/tests/should_succeed/bug/768.rs
@@ -8,7 +8,7 @@ pub struct A {
 
 impl A {
     #[open]
-    #[ghost]
+    #[logic]
     pub fn with_l(self, l: usize) -> Self {
         A { l, ..self }
     }
diff --git a/creusot/tests/should_succeed/bug/797.rs b/creusot/tests/should_succeed/bug/797.rs
index a65c40c744..df3951ecb4 100644
--- a/creusot/tests/should_succeed/bug/797.rs
+++ b/creusot/tests/should_succeed/bug/797.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::{logic::Mapping, *};
 
 #[open]
-#[ghost]
+#[logic]
 pub fn make_mapping() -> Mapping<(Int, Int), bool> {
     |(x, y)| x + y == 0
 }
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index 63e5f6614a..d2da1c5c95 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -290,7 +290,7 @@ module C874_CanExtend
     goto BB2
   }
   BB2 {
-    [#"../874.rs" 5 16 5 29] v <- ([#"../874.rs" 5 16 5 29] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] [#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] [#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] [#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 5 16 5 29] v <- ([#"../874.rs" 5 16 5 29] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] [#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] [#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] [#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB3
   }
   BB3 {
@@ -300,7 +300,7 @@ module C874_CanExtend
     goto BB5
   }
   BB5 {
-    [#"../874.rs" 6 12 6 25] w <- ([#"../874.rs" 6 12 6 25] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] [#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] [#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] [#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 6 12 6 25] w <- ([#"../874.rs" 6 12 6 25] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] [#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] [#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] [#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB6
   }
   BB6 {
@@ -319,7 +319,7 @@ module C874_CanExtend
     goto BB9
   }
   BB9 {
-    [#"../874.rs" 9 12 9 34] z <- ([#"../874.rs" 9 12 9 34] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] [#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] [#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] [#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] [#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] [#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] [#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp));
+    [#"../874.rs" 9 12 9 34] z <- ([#"../874.rs" 9 12 9 34] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] [#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] [#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] [#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] [#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] [#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] [#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp));
     goto BB10
   }
   BB10 {
diff --git a/creusot/tests/should_succeed/bug/pure_neq.rs b/creusot/tests/should_succeed/bug/pure_neq.rs
index 09e55673a2..feff180fa1 100644
--- a/creusot/tests/should_succeed/bug/pure_neq.rs
+++ b/creusot/tests/should_succeed/bug/pure_neq.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::{logic::Int, *};
 
 #[open]
-#[ghost]
+#[logic]
 #[ensures(result == !(x == y))]
 pub fn f(x: Option<Int>, y: Option<Int>) -> bool {
     pearlite! { x != y }
diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index a56f1f67d8..15bee105da 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -224,7 +224,7 @@ module C02_FibMemo
   val fib_cell0 [#"../02.rs" 84 0 84 32] (v : Alloc_Vec_Vec_Type.t_vec (C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = fib_cell0 v }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function fib0 [#"../02.rs" 32 0 32 25] (i : int) : int
   axiom fib0_def : forall i : int . fib0 i = ([#"../02.rs" 29 0 29 8] if i <= 0 then
     0
@@ -247,7 +247,7 @@ module C02_FibMemo
     requires {[#"../02.rs" 24 16 24 20] inv2 self}
     requires {[#"../02.rs" 24 22 24 23] inv4 v}
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use int.Power
   function lemma_fib_bound0 [#"../02.rs" 47 0 47 30] (i : int) : ()
   axiom lemma_fib_bound0_def : forall i : int . lemma_fib_bound0 i = ([#"../02.rs" 43 0 43 8] if i = 0 then
@@ -260,7 +260,7 @@ module C02_FibMemo
     ensures { result = lemma_fib_bound0 i }
     
   axiom lemma_fib_bound0_spec : forall i : int . ([#"../02.rs" 44 11 44 17] 0 <= i) -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i)
-  use prelude.Ghost
+  use prelude.Snapshot
   function lemma_max_int0 [#"../02.rs" 62 0 62 22] (_1 : ()) : () =
     [#"../02.rs" 60 0 60 8] ()
   val lemma_max_int0 [#"../02.rs" 62 0 62 22] (_1 : ()) : ()
@@ -308,8 +308,8 @@ module C02_FibMemo
   var _9 : C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib);
   var v : usize;
   var fib_i : usize;
-  var _19 : Ghost.ghost_ty ();
-  var _21 : Ghost.ghost_ty ();
+  var _19 : Snapshot.snap_ty ();
+  var _21 : Snapshot.snap_ty ();
   var _23 : usize;
   var _27 : usize;
   var _33 : ();
@@ -364,11 +364,11 @@ module C02_FibMemo
     goto BB15
   }
   BB10 {
-    [#"../02.rs" 104 16 104 37] _19 <- ([#"../02.rs" 104 16 104 37] Ghost.new ());
+    [#"../02.rs" 104 16 104 43] _19 <- ([#"../02.rs" 104 16 104 43] Snapshot.new ());
     goto BB11
   }
   BB11 {
-    [#"../02.rs" 105 16 105 39] _21 <- ([#"../02.rs" 105 16 105 39] Ghost.new ());
+    [#"../02.rs" 105 16 105 45] _21 <- ([#"../02.rs" 105 16 105 45] Snapshot.new ());
     goto BB12
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/cell/02.rs b/creusot/tests/should_succeed/cell/02.rs
index 97186b6576..5bb5e2a2e9 100644
--- a/creusot/tests/should_succeed/cell/02.rs
+++ b/creusot/tests/should_succeed/cell/02.rs
@@ -26,7 +26,7 @@ impl<T: Copy, I: Inv<T>> Cell<T, I> {
     }
 }
 
-#[ghost]
+#[logic]
 #[open]
 #[variant(i)]
 pub fn fib(i: Int) -> Int {
@@ -40,7 +40,7 @@ pub fn fib(i: Int) -> Int {
 }
 
 #[open]
-#[ghost]
+#[logic]
 #[requires(0 <= i)]
 #[ensures(fib(i) <= 2.pow(i))]
 #[variant(i)]
@@ -57,7 +57,7 @@ pub fn lemma_fib_bound(i: Int) {
 
 #[trusted]
 #[open]
-#[ghost]
+#[logic]
 #[ensures(2.pow(63) < 0xffff_ffff_ffff_ffffusize@)]
 pub fn lemma_max_int() {}
 
@@ -101,8 +101,8 @@ pub fn fib_memo(mem: &FibCache, i: usize) -> usize {
             } else if i == 1 {
                 1
             } else {
-                gh! { lemma_max_int };
-                gh! { lemma_fib_bound };
+                snapshot! { lemma_max_int };
+                snapshot! { lemma_fib_bound };
                 fib_memo(mem, i - 1) + fib_memo(mem, i - 2)
             };
             proof_assert! { fib_i@ == fib(i@)};
diff --git a/creusot/tests/should_succeed/clones/02.rs b/creusot/tests/should_succeed/clones/02.rs
index 074c8831d2..5131557d90 100644
--- a/creusot/tests/should_succeed/clones/02.rs
+++ b/creusot/tests/should_succeed/clones/02.rs
@@ -5,12 +5,12 @@ use creusot_contracts::*;
 // Here we want to ensure that `program` properly shares
 // the implementation of simple between itself and `uses_simple`.
 
-#[ghost]
+#[logic]
 fn simple() -> bool {
     true
 }
 
-#[ghost]
+#[logic]
 fn uses_simple() -> bool {
     simple()
 }
diff --git a/creusot/tests/should_succeed/clones/03.rs b/creusot/tests/should_succeed/clones/03.rs
index 85afc4d94b..acc5f3c8f6 100644
--- a/creusot/tests/should_succeed/clones/03.rs
+++ b/creusot/tests/should_succeed/clones/03.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 
 use creusot_contracts::*;
 
-#[ghost]
+#[logic]
 fn omg<T>(_x: T) -> bool {
     true
 }
diff --git a/creusot/tests/should_succeed/clones/04.rs b/creusot/tests/should_succeed/clones/04.rs
index 2c9ec822d8..0d3827e3e4 100644
--- a/creusot/tests/should_succeed/clones/04.rs
+++ b/creusot/tests/should_succeed/clones/04.rs
@@ -2,17 +2,17 @@ extern crate creusot_contracts;
 
 use creusot_contracts::*;
 
-#[ghost]
+#[logic]
 fn a(x: u32) -> bool {
     x > 0u32
 }
 
-#[ghost]
+#[logic]
 fn b(x: u32) -> bool {
     x > 10u32 && a(x)
 }
 
-#[ghost]
+#[logic]
 fn c(x: u32) -> bool {
     x < 50u32 && b(x)
 }
diff --git a/creusot/tests/should_succeed/filter_positive.rs b/creusot/tests/should_succeed/filter_positive.rs
index 40888e945a..e5fbef896d 100644
--- a/creusot/tests/should_succeed/filter_positive.rs
+++ b/creusot/tests/should_succeed/filter_positive.rs
@@ -32,7 +32,7 @@ use creusot_contracts::{
 
 // number of positive elements of `t` between `i` (included) and `j`
 // (excluded)
-#[ghost]
+#[logic]
 #[variant(j-i)]
 fn num_of_pos(i: Int, j: Int, t: Seq<i32>) -> Int {
     pearlite! {
@@ -58,7 +58,7 @@ fn num_of_pos(i: Int, j: Int, t: Seq<i32>) -> Int {
 //
 
 // lemma: `num_of_pos` is increasing
-#[ghost]
+#[logic]
 #[requires(j <= k)]
 #[ensures(num_of_pos(i,j,t) <= num_of_pos(i,k,t))]
 #[variant(k-j)]
@@ -72,7 +72,7 @@ fn lemma_num_of_pos_increasing(i: Int, j: Int, k: Int, t: Seq<i32>) {
 
 // lemma: `num_of_pos` is strictly increasing when a positive element
 // is met
-#[ghost]
+#[logic]
 #[requires(0 <= i && i < t.len())]
 #[requires(t[i]@ > 0)]
 #[ensures(num_of_pos(0,i,t) < num_of_pos(0,i+1,t))]
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index bf068bf2d6..e2130c43b3 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -445,16 +445,16 @@ module Hashmap_Impl5_Add
     ensures { result = inv5 _x }
     
   axiom inv5 : forall x : deep_model_ty0 . inv5 x = true
-  use prelude.Ghost
-  predicate invariant4 (self : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
-  val invariant4 (self : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
+  use prelude.Snapshot
+  predicate invariant4 (self : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
+  val invariant4 (self : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
     ensures { result = invariant4 self }
     
-  predicate inv4 (_x : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
-  val inv4 (_x : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
+  predicate inv4 (_x : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
+  val inv4 (_x : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
     ensures { result = inv4 _x }
     
-  axiom inv4 : forall x : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v))) . inv4 x = true
+  axiom inv4 : forall x : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v))) . inv4 x = true
   predicate invariant3 (self : borrowed (Hashmap_List_Type.t_list (k, v)))
   val invariant3 (self : borrowed (Hashmap_List_Type.t_list (k, v))) : bool
     ensures { result = invariant3 self }
@@ -497,15 +497,15 @@ module Hashmap_Impl5_Add
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . inv1 x = true
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) . inv0 x = true
   use prelude.Mapping
   function deep_model0 (self : k) : deep_model_ty0
   val deep_model0 (self : k) : deep_model_ty0
@@ -631,14 +631,14 @@ module Hashmap_Impl5_Add
     requires {inv14 other}
     ensures { [#"../../../../creusot-contracts/src/std/cmp.rs" 11 26 11 75] result = (deep_model1 self = deep_model1 other) }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
-  val resolve2 (self : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v))))
+  val resolve2 (self : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v)))) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve1 (self : borrowed (Hashmap_List_Type.t_list (k, v))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed (Hashmap_List_Type.t_list (k, v))) : bool
@@ -698,11 +698,11 @@ module Hashmap_Impl5_Add
     requires {inv13 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model3 self) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg add [#"../hashmap.rs" 106 4 106 41] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) (key : k) (val' : v) : ()
     requires {[#"../hashmap.rs" 103 15 103 36] hashmap_inv0 ( * self)}
     requires {[#"../hashmap.rs" 106 20 106 24] inv12 self}
@@ -720,7 +720,7 @@ module Hashmap_Impl5_Add
   var self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v) = self;
   var key : k = key;
   var val' : v = val';
-  var old_self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
+  var old_self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
   var length : usize;
   var index : usize;
   var _13 : uint64;
@@ -730,7 +730,7 @@ module Hashmap_Impl5_Add
   var _18 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _19 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _20 : borrowed (Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global));
-  var old_l : Ghost.ghost_ty (borrowed (Hashmap_List_Type.t_list (k, v)));
+  var old_l : Snapshot.snap_ty (borrowed (Hashmap_List_Type.t_list (k, v)));
   var k : borrowed k;
   var v : borrowed v;
   var tl : borrowed (Hashmap_List_Type.t_list (k, v));
@@ -742,7 +742,7 @@ module Hashmap_Impl5_Add
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 108 23 108 35] old_self <- ([#"../hashmap.rs" 108 23 108 35] Ghost.new self);
+    [#"../hashmap.rs" 108 23 108 41] old_self <- ([#"../hashmap.rs" 108 23 108 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -781,7 +781,7 @@ module Hashmap_Impl5_Add
     assume { inv2 ( ^ l) };
     assert { [@expl:type invariant] inv3 _18 };
     assume { resolve1 _18 };
-    [#"../hashmap.rs" 112 20 112 29] old_l <- ([#"../hashmap.rs" 112 20 112 29] Ghost.new l);
+    [#"../hashmap.rs" 112 20 112 35] old_l <- ([#"../hashmap.rs" 112 20 112 35] Snapshot.new l);
     goto BB6
   }
   BB6 {
@@ -790,12 +790,12 @@ module Hashmap_Impl5_Add
     goto BB7
   }
   BB7 {
-    invariant { [#"../hashmap.rs" 114 20 114 52] good_bucket0 ( * Ghost.inner old_self) ( * l) (UIntSize.to_int index) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] good_bucket0 ( * Ghost.inner old_self) ( ^ l) (UIntSize.to_int index) -> good_bucket0 ( * Ghost.inner old_self) ( ^ Ghost.inner old_l) (UIntSize.to_int index) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] get0 ( ^ l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' -> get0 ( ^ Ghost.inner old_l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' };
-    invariant { [#"../hashmap.rs" 114 8 114 54] forall i : deep_model_ty0 . inv5 i -> get0 ( ^ l) i = get0 ( * l) i -> get0 ( ^ Ghost.inner old_l) i = get0 ( * Ghost.inner old_l) i };
+    invariant { [#"../hashmap.rs" 114 20 114 52] good_bucket0 ( * Snapshot.inner old_self) ( * l) (UIntSize.to_int index) };
+    invariant { [#"../hashmap.rs" 114 8 114 54] good_bucket0 ( * Snapshot.inner old_self) ( ^ l) (UIntSize.to_int index) -> good_bucket0 ( * Snapshot.inner old_self) ( ^ Snapshot.inner old_l) (UIntSize.to_int index) };
+    invariant { [#"../hashmap.rs" 114 8 114 54] get0 ( ^ l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' -> get0 ( ^ Snapshot.inner old_l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' };
+    invariant { [#"../hashmap.rs" 114 8 114 54] forall i : deep_model_ty0 . inv5 i -> get0 ( ^ l) i = get0 ( * l) i -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i };
     invariant { [#"../hashmap.rs" 118 20 118 44] no_double_binding0 ( * l) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] (forall i : deep_model_ty0 . inv5 i -> get0 ( * l) i = get0 ( ^ l) i \/ i = deep_model0 key) /\ no_double_binding0 ( ^ l) -> no_double_binding0 ( ^ Ghost.inner old_l) };
+    invariant { [#"../hashmap.rs" 114 8 114 54] (forall i : deep_model_ty0 . inv5 i -> get0 ( * l) i = get0 ( ^ l) i \/ i = deep_model0 key) /\ no_double_binding0 ( ^ l) -> no_double_binding0 ( ^ Snapshot.inner old_l) };
     goto BB8
   }
   BB8 {
@@ -1474,16 +1474,16 @@ module Hashmap_Impl5_Resize
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : deep_model_ty0 . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) . inv0 x = true
   use prelude.Mapping
   function deep_model0 (self : k) : deep_model_ty0
   val deep_model0 (self : k) : deep_model_ty0
@@ -1654,7 +1654,7 @@ module Hashmap_Impl5_Resize
   val resolve1 (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model6 (self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     
    =
@@ -1662,12 +1662,12 @@ module Hashmap_Impl5_Resize
   val shallow_model6 (self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     ensures { result = shallow_model6 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model6 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model6 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     ensures { result = shallow_model1 self }
     
   val new1 [#"../hashmap.rs" 98 4 98 46] (size : usize) : Hashmap_MyHashMap_Type.t_myhashmap k v
@@ -1687,11 +1687,11 @@ module Hashmap_Impl5_Resize
     requires {inv10 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model5 self) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg resize [#"../hashmap.rs" 161 4 161 24] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v)) : ()
     requires {[#"../hashmap.rs" 156 15 156 41] Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self))) < 1000}
     requires {[#"../hashmap.rs" 157 15 157 36] hashmap_inv0 ( * self)}
@@ -1702,7 +1702,7 @@ module Hashmap_Impl5_Resize
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v) = self;
-  var old_self : Ghost.ghost_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
+  var old_self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
   var new : Hashmap_MyHashMap_Type.t_myhashmap k v;
   var _10 : usize;
   var i : usize;
@@ -1722,7 +1722,7 @@ module Hashmap_Impl5_Resize
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 162 23 162 35] old_self <- ([#"../hashmap.rs" 162 23 162 35] Ghost.new self);
+    [#"../hashmap.rs" 162 23 162 41] old_self <- ([#"../hashmap.rs" 162 23 162 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -1747,12 +1747,12 @@ module Hashmap_Impl5_Resize
     goto BB6
   }
   BB6 {
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Ghost.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i <= bucket_ix0 ( * Ghost.inner old_self) k /\ bucket_ix0 ( * Ghost.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Ghost.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall j : int . UIntSize.to_int i <= j /\ j < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Ghost.inner old_self))) -> index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) j = index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Ghost.inner old_self)) j };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i <= bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall j : int . UIntSize.to_int i <= j /\ j < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) j = index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)) j };
     invariant { [#"../hashmap.rs" 172 20 172 37] hashmap_inv0 new };
-    invariant { [#"../hashmap.rs" 173 20 173 46]  ^ Ghost.inner old_self =  ^ self };
-    invariant { [#"../hashmap.rs" 174 20 174 66] Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Ghost.inner old_self))) = Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self))) };
+    invariant { [#"../hashmap.rs" 173 20 173 46]  ^ Snapshot.inner old_self =  ^ self };
+    invariant { [#"../hashmap.rs" 174 20 174 66] Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) = Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self))) };
     invariant { [#"../hashmap.rs" 175 20 175 45] UIntSize.to_int i <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self))) };
     goto BB7
   }
@@ -1809,14 +1809,14 @@ module Hashmap_Impl5_Resize
   }
   BB17 {
     invariant { [#"../hashmap.rs" 179 24 179 41] hashmap_inv0 new };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Ghost.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i < bucket_ix0 ( * Ghost.inner old_self) k /\ bucket_ix0 ( * Ghost.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Ghost.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Ghost.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = match get1 l k with
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i < bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = match get1 l k with
       | Core_Option_Option_Type.C_None -> Map.get (shallow_model2 new) k
       | Core_Option_Option_Type.C_Some v -> Core_Option_Option_Type.C_Some v
       end };
     invariant { [#"../hashmap.rs" 186 24 186 45] no_double_binding0 l };
-    invariant { [#"../hashmap.rs" 187 24 187 51] good_bucket0 ( * Ghost.inner old_self) l (UIntSize.to_int i) };
+    invariant { [#"../hashmap.rs" 187 24 187 51] good_bucket0 ( * Snapshot.inner old_self) l (UIntSize.to_int i) };
     goto BB18
   }
   BB18 {
@@ -1863,7 +1863,7 @@ module Hashmap_Impl5_Resize
   BB25 {
     assert { [@expl:type invariant] inv5 l };
     assume { resolve4 l };
-    assert { [@expl:assertion] [#"../hashmap.rs" 192 12 192 121] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Ghost.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    assert { [@expl:assertion] [#"../hashmap.rs" 192 12 192 121] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
     goto BB27
   }
   BB26 {
diff --git a/creusot/tests/should_succeed/hashmap.rs b/creusot/tests/should_succeed/hashmap.rs
index 96ce8163e0..d844cac633 100644
--- a/creusot/tests/should_succeed/hashmap.rs
+++ b/creusot/tests/should_succeed/hashmap.rs
@@ -23,7 +23,7 @@ impl<T: Clone> Clone for List<T> {
 }
 
 impl<K: DeepModel, V> List<(K, V)> {
-    #[ghost]
+    #[logic]
     #[open]
     pub fn get(self, index: K::DeepModelTy) -> Option<V> {
         pearlite! {
@@ -50,7 +50,7 @@ trait Hash: DeepModel {
     #[ensures(result@ == Self::hash_log(self.deep_model()))]
     fn hash(&self) -> u64;
 
-    #[ghost]
+    #[logic]
     fn hash_log(_: Self::DeepModelTy) -> Int;
 }
 
@@ -60,7 +60,7 @@ impl Hash for usize {
         *self as u64
     }
 
-    #[ghost]
+    #[logic]
     fn hash_log(x: Int) -> Int {
         pearlite! { x }
     }
@@ -74,18 +74,18 @@ impl<K: Hash, V> ShallowModel for MyHashMap<K, V> {
     type ShallowModelTy = Mapping<K::DeepModelTy, Option<V>>;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! { |k| self.bucket(k).get(k) }
     }
 }
 impl<K: Hash, V> MyHashMap<K, V> {
-    #[ghost]
+    #[logic]
     fn bucket(self, k: K::DeepModelTy) -> List<(K, V)> {
         pearlite! { self.buckets[self.bucket_ix(k)] }
     }
 
-    #[ghost]
+    #[logic]
     fn bucket_ix(self, k: K::DeepModelTy) -> Int {
         pearlite! { K::hash_log(k).rem_euclid(self.buckets@.len()) }
     }
@@ -105,11 +105,11 @@ impl<K: Hash + Copy + Eq + DeepModel, V: Copy> MyHashMap<K, V> {
     #[ensures(forall<i: K::DeepModelTy> (^self)@.get(i) == (if i == key.deep_model() { Some(val) } else { self@.get(i) } ))]
     pub fn add(&mut self, key: K, val: V) {
         use List::*;
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         let length = self.buckets.len();
         let index: usize = key.hash() as usize % length;
         let mut l: &mut List<_> = &mut self.buckets[index];
-        let old_l = gh! { l };
+        let old_l = snapshot! { l };
 
         #[invariant(old_self.good_bucket(*l, index@))]
         #[invariant(old_self.good_bucket(^l, index@) ==> old_self.good_bucket(^old_l.inner(), index@))]
@@ -159,7 +159,7 @@ impl<K: Hash + Copy + Eq + DeepModel, V: Copy> MyHashMap<K, V> {
     #[ensures(forall<k : K::DeepModelTy> (^self)@.get(k) == self@.get(k))] // lets prove the extensional version for now
     #[allow(dead_code)]
     fn resize(&mut self) {
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         let mut new = Self::new(self.buckets.len() * 2);
 
         let mut i: usize = 0;
diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index e0f38b0994..72aa82241c 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -377,17 +377,17 @@ module HeapsortGeneric_SiftDown
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : deep_model_ty0 . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   function deep_model3 (self : t) : deep_model_ty0
   val deep_model3 (self : t) : deep_model_ty0
     ensures { result = deep_model3 self }
@@ -507,7 +507,7 @@ module HeapsortGeneric_SiftDown
   val deep_model0 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq deep_model_ty0
     ensures { result = deep_model0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Permut
   predicate permutation_of0 (self : Seq.seq t) (o : Seq.seq t) =
     [#"../../../../creusot-contracts/src/logic/seq.rs" 107 8 107 37] Permut.permut self o 0 (Seq.length self)
@@ -520,18 +520,19 @@ module HeapsortGeneric_SiftDown
   val shallow_model4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model4 self }
     
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model4 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model4 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model1 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg sift_down [#"../heapsort_generic.rs" 41 0 43 29] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) (start : usize) (end' : usize) : ()
     requires {[#"../heapsort_generic.rs" 31 11 31 54] heap_frag0 (deep_model0 v) (UIntSize.to_int start + 1) (UIntSize.to_int end')}
     requires {[#"../heapsort_generic.rs" 32 11 32 24] UIntSize.to_int start < UIntSize.to_int end'}
@@ -547,7 +548,7 @@ module HeapsortGeneric_SiftDown
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
   var start : usize = start;
   var end' : usize = end';
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var i : usize;
   var _28 : bool;
   var child : usize;
@@ -566,7 +567,7 @@ module HeapsortGeneric_SiftDown
     goto BB0
   }
   BB0 {
-    [#"../heapsort_generic.rs" 45 16 45 25] old_v <- ([#"../heapsort_generic.rs" 45 16 45 25] Ghost.new v);
+    [#"../heapsort_generic.rs" 45 16 45 31] old_v <- ([#"../heapsort_generic.rs" 45 16 45 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
@@ -578,8 +579,8 @@ module HeapsortGeneric_SiftDown
   BB2 {
     invariant { [#"../heapsort_generic.rs" 48 4 48 43] permutation_of0 (shallow_model0 v) (shallow_model1 old_v) };
     invariant { [#"../heapsort_generic.rs" 49 16 49 41] UIntSize.to_int start <= UIntSize.to_int i /\ UIntSize.to_int i < UIntSize.to_int end' };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . 0 <= j /\ j < UIntSize.to_int start \/ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v) -> index_logic0 ( * Ghost.inner old_v) j = index_logic0 ( * v) j };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall m : deep_model_ty0 . inv1 m -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 (Ghost.inner old_v)) j) m) -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 v) j) m) };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . 0 <= j /\ j < UIntSize.to_int start \/ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v) -> index_logic0 ( * Snapshot.inner old_v) j = index_logic0 ( * v) j };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall m : deep_model_ty0 . inv1 m -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 (Snapshot.inner old_v)) j) m) -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 v) j) m) };
     invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . UIntSize.to_int start <= parent0 j /\ j < UIntSize.to_int end' /\ UIntSize.to_int i <> parent0 j -> le_log0 (Seq.get (deep_model0 v) j) (Seq.get (deep_model0 v) (parent0 j)) };
     invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 1 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i) -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
     invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 2 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i) -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
@@ -883,17 +884,17 @@ module HeapsortGeneric_HeapSort
     ensures { result = cmp_le_log0 x y }
     
   axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../heapsort_generic.rs" 77 0 77 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) =
     [#"../heapsort_generic.rs" 78 4 80 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
@@ -1020,12 +1021,12 @@ module HeapsortGeneric_HeapSort
   val shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model5 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model1 self }
     
   function shallow_model4 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : Seq.seq t =
@@ -1037,11 +1038,12 @@ module HeapsortGeneric_HeapSort
     requires {inv5 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model4 self) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg heap_sort [#"../heapsort_generic.rs" 93 0 95 29] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {[#"../heapsort_generic.rs" 90 11 90 40] Seq.length (shallow_model0 v) < div (UIntSize.to_int max0) 2}
     requires {[#"../heapsort_generic.rs" 93 37 93 38] inv1 v}
@@ -1051,7 +1053,7 @@ module HeapsortGeneric_HeapSort
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var start : usize;
   var _8 : usize;
   var _10 : bool;
@@ -1070,7 +1072,7 @@ module HeapsortGeneric_HeapSort
     goto BB0
   }
   BB0 {
-    [#"../heapsort_generic.rs" 97 16 97 25] old_v <- ([#"../heapsort_generic.rs" 97 16 97 25] Ghost.new v);
+    [#"../heapsort_generic.rs" 97 16 97 31] old_v <- ([#"../heapsort_generic.rs" 97 16 97 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/heapsort_generic.rs b/creusot/tests/should_succeed/heapsort_generic.rs
index 93e7957cde..551c003231 100644
--- a/creusot/tests/should_succeed/heapsort_generic.rs
+++ b/creusot/tests/should_succeed/heapsort_generic.rs
@@ -6,7 +6,7 @@ use creusot_contracts::{
     *,
 };
 
-#[ghost]
+#[logic]
 fn parent(i: Int) -> Int {
     (i + 1) / 2 - 1
 }
@@ -17,7 +17,7 @@ fn heap_frag<T: OrdLogic>(s: Seq<T>, start: Int, end: Int) -> bool {
     s[i] <= s[parent(i)] }
 }
 
-#[ghost]
+#[logic]
 #[requires(heap_frag(s, 0, end))]
 #[requires(0 <= i && i < end)]
 #[ensures(s[i] <= s[0])]
@@ -42,7 +42,7 @@ fn sift_down<T: Ord + DeepModel>(v: &mut Vec<T>, start: usize, end: usize)
 where
     T::DeepModelTy: OrdLogic,
 {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
     let mut i = start;
 
     #[invariant(v@.permutation_of(old_v@))]
@@ -94,7 +94,7 @@ pub fn heap_sort<T: Ord + DeepModel>(v: &mut Vec<T>)
 where
     T::DeepModelTy: OrdLogic,
 {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
 
     let mut start = v.len() / 2;
     #[invariant(v@.permutation_of(old_v@))]
diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index 664ccbe4ac..f96c442327 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -102,17 +102,17 @@ module Hillel_RightPad
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : t . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   function shallow_model1 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
    =
@@ -143,7 +143,7 @@ module Hillel_RightPad
     requires {inv4 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model5 self) }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   function index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) (ix : int) : t
     
@@ -158,18 +158,19 @@ module Hillel_RightPad
   val shallow_model4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model4 self }
     
-  function shallow_model0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  function shallow_model0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model4 (Ghost.inner self)
-  val shallow_model0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model4 (Snapshot.inner self)
+  val shallow_model0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model0 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg right_pad [#"../hillel.rs" 16 0 16 59] [@cfg:stackify] [@cfg:subregion_analysis] (str : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) (len : usize) (pad : t) : ()
     requires {[#"../hillel.rs" 16 22 16 25] inv2 str}
     requires {[#"../hillel.rs" 16 52 16 55] inv1 pad}
@@ -185,7 +186,7 @@ module Hillel_RightPad
   var str : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = str;
   var len : usize = len;
   var pad : t = pad;
-  var old_str : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_str : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var _19 : usize;
   var _22 : ();
   var _23 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
@@ -193,7 +194,7 @@ module Hillel_RightPad
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 17 18 17 29] old_str <- ([#"../hillel.rs" 17 18 17 29] Ghost.new str);
+    [#"../hillel.rs" 17 18 17 35] old_str <- ([#"../hillel.rs" 17 18 17 35] Snapshot.new str);
     goto BB1
   }
   BB1 {
@@ -205,7 +206,7 @@ module Hillel_RightPad
     invariant { [#"../hillel.rs" 19 16 19 44] Seq.length (shallow_model0 old_str) <= Seq.length (shallow_model1 str) };
     invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
     invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model1 str) > UIntSize.to_int len -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
-    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 old_str) -> index_logic0 ( * str) i = index_logic0 ( * Ghost.inner old_str) i };
+    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 old_str) -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) i };
     invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . Seq.length (shallow_model0 old_str) <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( * str) i = pad };
     goto BB3
   }
@@ -304,18 +305,18 @@ module Hillel_LeftPad
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : t . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
-  use prelude.Ghost
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  use prelude.Snapshot
   use seq.Seq
   function index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) (ix : int) : t
     
@@ -356,16 +357,16 @@ module Hillel_LeftPad
     requires {inv4 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model7 self) }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   function shallow_model6 (self : usize) : int =
     [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] UIntSize.to_int self
   val shallow_model6 (self : usize) : int
     ensures { result = shallow_model6 self }
     
-  function shallow_model3 (self : Ghost.ghost_ty usize) : int =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model6 (Ghost.inner self)
-  val shallow_model3 (self : Ghost.ghost_ty usize) : int
+  function shallow_model3 (self : Snapshot.snap_ty usize) : int =
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model6 (Snapshot.inner self)
+  val shallow_model3 (self : Snapshot.snap_ty usize) : int
     ensures { result = shallow_model3 self }
     
   function shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
@@ -374,19 +375,20 @@ module Hillel_LeftPad
   val shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model5 self }
     
-  function shallow_model0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  function shallow_model0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model0 self }
     
-  use prelude.Ghost
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  use prelude.Snapshot
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg left_pad [#"../hillel.rs" 33 0 33 58] [@cfg:stackify] [@cfg:subregion_analysis] (str : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) (len : usize) (pad : t) : ()
     requires {[#"../hillel.rs" 33 21 33 24] inv2 str}
     requires {[#"../hillel.rs" 33 51 33 54] inv1 pad}
@@ -400,23 +402,23 @@ module Hillel_LeftPad
   var str : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = str;
   var len : usize = len;
   var pad : t = pad;
-  var old_str : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
-  var c : Ghost.ghost_ty usize;
+  var old_str : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var c : Snapshot.snap_ty usize;
   var _20 : usize;
   var _23 : ();
   var _24 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
-  var _26 : Ghost.ghost_ty usize;
+  var _26 : Snapshot.snap_ty usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 34 18 34 29] old_str <- ([#"../hillel.rs" 34 18 34 29] Ghost.new str);
+    [#"../hillel.rs" 34 18 34 35] old_str <- ([#"../hillel.rs" 34 18 34 35] Snapshot.new str);
     goto BB1
   }
   BB1 {
     assert { [@expl:type invariant] inv0 old_str };
     assume { resolve0 old_str };
-    [#"../hillel.rs" 35 30 35 44] c <- ([#"../hillel.rs" 35 30 35 44] Ghost.new (0 : usize));
+    [#"../hillel.rs" 35 33 35 53] c <- ([#"../hillel.rs" 35 33 35 53] Snapshot.new (0 : usize));
     goto BB2
   }
   BB2 {
@@ -427,7 +429,7 @@ module Hillel_LeftPad
     invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
     invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model1 str) > UIntSize.to_int len -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
     invariant { [#"../hillel.rs" 40 16 40 49] shallow_model3 c = Seq.length (shallow_model1 str) - Seq.length (shallow_model0 old_str) };
-    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . shallow_model3 c <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( * str) i = index_logic0 ( * Ghost.inner old_str) (i - shallow_model3 c) };
+    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . shallow_model3 c <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) (i - shallow_model3 c) };
     invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . 0 <= i /\ i < shallow_model3 c -> index_logic0 ( * str) i = pad };
     goto BB4
   }
@@ -450,12 +452,12 @@ module Hillel_LeftPad
     goto BB7
   }
   BB7 {
-    [#"../hillel.rs" 45 12 45 31] _26 <- ([#"../hillel.rs" 45 12 45 31] Ghost.new ((1 : usize) + Ghost.inner c));
+    [#"../hillel.rs" 45 12 45 37] _26 <- ([#"../hillel.rs" 45 12 45 37] Snapshot.new ((1 : usize) + Snapshot.inner c));
     goto BB8
   }
   BB8 {
-    [#"../hillel.rs" 45 8 45 31] c <- ([#"../hillel.rs" 45 8 45 31] _26);
-    [#"../hillel.rs" 45 8 45 31] _26 <- any Ghost.ghost_ty usize;
+    [#"../hillel.rs" 45 8 45 37] c <- ([#"../hillel.rs" 45 8 45 37] _26);
+    [#"../hillel.rs" 45 8 45 37] _26 <- any Snapshot.snap_ty usize;
     goto BB3
   }
   BB9 {
@@ -732,30 +734,30 @@ module Hillel_InsertUnique
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Core_Slice_Iter_Iter_Type.t_iter t . inv3 x = true
-  use prelude.Ghost
-  predicate invariant2 (self : Ghost.ghost_ty (Seq.seq t))
-  val invariant2 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  predicate invariant2 (self : Snapshot.snap_ty (Seq.seq t))
+  val invariant2 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Ghost.ghost_ty (Seq.seq t))
-  val inv2 (_x : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate inv2 (_x : Snapshot.snap_ty (Seq.seq t))
+  val inv2 (_x : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Ghost.ghost_ty (Seq.seq t) . inv2 x = true
+  axiom inv2 : forall x : Snapshot.snap_ty (Seq.seq t) . inv2 x = true
   predicate invariant1 (self : slice t)
   val invariant1 (self : slice t) : bool
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : slice t . inv1 x = true
-  predicate invariant0 (self : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
-  val invariant0 (self : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
+  predicate invariant0 (self : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
+  val invariant0 (self : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
-  val inv0 (_x : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
+  val inv0 (_x : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) . inv0 x = true
   function deep_model1 (self : t) : deep_model_ty0
   val deep_model1 (self : t) : deep_model_ty0
     ensures { result = deep_model1 self }
@@ -825,7 +827,7 @@ module Hillel_InsertUnique
     requires {inv12 other}
     ensures { [#"../../../../creusot-contracts/src/std/cmp.rs" 11 26 11 75] result = (deep_model4 self = deep_model4 other) }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve7 (self : t)
   val resolve7 (self : t) : bool
     ensures { result = resolve7 self }
@@ -858,24 +860,24 @@ module Hillel_InsertUnique
       end }
     ensures { inv4 result }
     
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq t)) (ix : int) : t =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq t)) (ix : int) : t
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq t)) (ix : int) : t =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq t)) (ix : int) : t
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve4 (self : Ghost.ghost_ty (Seq.seq t))
-  val resolve4 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve4 (self : Snapshot.snap_ty (Seq.seq t))
+  val resolve4 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = resolve4 self }
     
-  use prelude.Ghost
-  predicate resolve3 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t))
-  val resolve3 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
+  use prelude.Snapshot
+  predicate resolve3 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t))
+  val resolve3 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
     ensures { result = resolve3 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Slice_Iter_Iter_Type.t_iter t) (res : Core_Slice_Iter_Iter_Type.t_iter t) =
     [#"../../../../creusot-contracts/src/std/iter.rs" 80 8 80 19] self = res
   val into_iter_post0 (self : Core_Slice_Iter_Iter_Type.t_iter t) (res : Core_Slice_Iter_Iter_Type.t_iter t) : bool
@@ -910,11 +912,11 @@ module Hillel_InsertUnique
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 147 26 147 42] shallow_model0 result = shallow_model1 self }
     ensures { inv1 result }
     
-  predicate resolve1 (self : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
-  val resolve1 (self : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
+  predicate resolve1 (self : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))
+  val resolve1 (self : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) =
     [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub -> contains0 sup (Seq.get sub i)
   val is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) : bool
@@ -928,11 +930,11 @@ module Hillel_InsertUnique
   val deep_model0 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq deep_model_ty0
     ensures { result = deep_model0 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty ())
-  val resolve0 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve0 (self : Snapshot.snap_ty ())
+  val resolve0 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function subset_push0 [#"../hillel.rs" 72 0 72 37] (s : Seq.seq deep_model_ty0) (elem : deep_model_ty0) : () =
     [#"../hillel.rs" 70 0 70 8] ()
   val subset_push0 [#"../hillel.rs" 72 0 72 37] (s : Seq.seq deep_model_ty0) (elem : deep_model_ty0) : ()
@@ -954,18 +956,18 @@ module Hillel_InsertUnique
   var _0 : ();
   var vec : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = vec;
   var elem : t = elem;
-  var _8 : Ghost.ghost_ty ();
-  var ghost_vec : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
+  var _8 : Snapshot.snap_ty ();
+  var ghost_vec : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
   var iter : Core_Slice_Iter_Iter_Type.t_iter t;
   var _16 : Core_Slice_Iter_Iter_Type.t_iter t;
   var _18 : slice t;
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t);
-  var produced : Ghost.ghost_ty (Seq.seq t);
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t);
+  var produced : Snapshot.snap_ty (Seq.seq t);
   var _28 : Core_Option_Option_Type.t_option t;
   var _29 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var _30 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var __creusot_proc_iter_elem : t;
-  var _33 : Ghost.ghost_ty (Seq.seq t);
+  var _33 : Snapshot.snap_ty (Seq.seq t);
   var e : t;
   var _38 : bool;
   var _41 : t;
@@ -981,7 +983,7 @@ module Hillel_InsertUnique
     goto BB2
   }
   BB2 {
-    [#"../hillel.rs" 80 4 80 41] _8 <- ([#"../hillel.rs" 80 4 80 41] Ghost.new ());
+    [#"../hillel.rs" 80 4 80 47] _8 <- ([#"../hillel.rs" 80 4 80 47] Snapshot.new ());
     goto BB3
   }
   BB3 {
@@ -990,7 +992,7 @@ module Hillel_InsertUnique
     goto BB4
   }
   BB4 {
-    [#"../hillel.rs" 82 20 82 32] ghost_vec <- ([#"../hillel.rs" 82 20 82 32] Ghost.new ( * vec));
+    [#"../hillel.rs" 82 20 82 38] ghost_vec <- ([#"../hillel.rs" 82 20 82 38] Snapshot.new ( * vec));
     goto BB5
   }
   BB5 {
@@ -1011,12 +1013,12 @@ module Hillel_InsertUnique
     goto BB8
   }
   BB8 {
-    [#"../hillel.rs" 84 4 84 111] iter_old <- ([#"../hillel.rs" 84 4 84 111] Ghost.new iter);
+    [#"../hillel.rs" 84 4 84 111] iter_old <- ([#"../hillel.rs" 84 4 84 111] Snapshot.new iter);
     goto BB9
   }
   BB9 {
     assume { resolve3 iter_old };
-    [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] Ghost.new (Seq.empty ));
+    [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] Snapshot.new (Seq.empty ));
     goto BB10
   }
   BB10 {
@@ -1029,8 +1031,8 @@ module Hillel_InsertUnique
   }
   BB12 {
     invariant { [#"../hillel.rs" 84 4 84 111] inv3 iter };
-    invariant { [#"../hillel.rs" 84 4 84 111] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../hillel.rs" 84 4 84 111] forall j : int . 0 <= j /\ j < Seq.length (Ghost.inner produced) -> deep_model2 (index_logic0 produced j) <> deep_model1 elem };
+    invariant { [#"../hillel.rs" 84 4 84 111] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../hillel.rs" 84 4 84 111] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced) -> deep_model2 (index_logic0 produced j) <> deep_model1 elem };
     goto BB13
   }
   BB13 {
@@ -1071,21 +1073,21 @@ module Hillel_InsertUnique
     absurd
   }
   BB18 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _28);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28);
     assert { [@expl:type invariant] inv4 _28 };
     assume { resolve6 _28 };
-    [#"../hillel.rs" 84 4 84 111] _33 <- ([#"../hillel.rs" 84 4 84 111] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../hillel.rs" 84 4 84 111] _33 <- ([#"../hillel.rs" 84 4 84 111] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB19
   }
   BB19 {
     [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] _33);
-    [#"../hillel.rs" 84 4 84 111] _33 <- any Ghost.ghost_ty (Seq.seq t);
+    [#"../hillel.rs" 84 4 84 111] _33 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve4 produced };
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] e <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assert { [@expl:type invariant] inv5 __creusot_proc_iter_elem };
     assume { resolve7 __creusot_proc_iter_elem };
-    assert { [@expl:assertion] [#"../hillel.rs" 86 24 86 57] e = index_logic1 (Ghost.inner ghost_vec) (Seq.length (Ghost.inner produced) - 1) };
+    assert { [@expl:assertion] [#"../hillel.rs" 86 24 86 57] e = index_logic1 (Snapshot.inner ghost_vec) (Seq.length (Snapshot.inner produced) - 1) };
     [#"../hillel.rs" 87 16 87 21] _41 <- ([#"../hillel.rs" 87 16 87 21] elem);
     [#"../hillel.rs" 87 11 87 21] _38 <- ([#"../hillel.rs" 87 11 87 21] eq0 ([#"../hillel.rs" 87 11 87 12] e) ([#"../hillel.rs" 87 16 87 21] _41));
     goto BB20
@@ -1315,16 +1317,16 @@ module Hillel_Unique
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (Seq.seq t))
-  val invariant0 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (Seq.seq t))
+  val invariant0 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (Seq.seq t))
-  val inv0 (_x : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (Seq.seq t))
+  val inv0 (_x : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (Seq.seq t) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (Seq.seq t) . inv0 x = true
   predicate resolve2 (self : t)
   val resolve2 (self : t) : bool
     ensures { result = resolve2 self }
@@ -1360,7 +1362,7 @@ module Hillel_Unique
     ensures { result = resolve4 self }
     
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -1430,7 +1432,7 @@ module Hillel_Unique
     ensures { inv8 result }
     
   use seq_ext.SeqExt
-  use prelude.Ghost
+  use prelude.Snapshot
   function index_logic4 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model3 self) ix
   val index_logic4 [@inline:trivial] (self : slice t) (ix : int) : t
@@ -1447,10 +1449,10 @@ module Hillel_Unique
   val deep_model1 (self : slice t) : Seq.seq deep_model_ty0
     ensures { result = deep_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -1473,11 +1475,11 @@ module Hillel_Unique
     requires {inv5 self}
     ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 238 0 334 1] Seq.length (shallow_model0 self) = UIntSize.to_int result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (Seq.seq t))
-  val resolve0 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (Seq.seq t))
+  val resolve0 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   val new0 (_1 : ()) : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 68 26 68 44] Seq.length (shallow_model1 result) = 0 }
@@ -1494,16 +1496,16 @@ module Hillel_Unique
   var _0 : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
   var str : slice t = str;
   var unique : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
-  var sub_str : Ghost.ghost_ty (Seq.seq t);
+  var sub_str : Snapshot.snap_ty (Seq.seq t);
   var iter : Core_Ops_Range_Range_Type.t_range usize;
   var _11 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _23 : Core_Option_Option_Type.t_option usize;
   var _24 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _25 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _28 : Ghost.ghost_ty (Seq.seq usize);
+  var _28 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var elem : t;
   var _32 : usize;
@@ -1511,7 +1513,7 @@ module Hillel_Unique
   var _35 : ();
   var _36 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
   var _37 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
-  var _39 : Ghost.ghost_ty (Seq.seq t);
+  var _39 : Snapshot.snap_ty (Seq.seq t);
   {
     goto BB0
   }
@@ -1520,7 +1522,7 @@ module Hillel_Unique
     goto BB1
   }
   BB1 {
-    [#"../hillel.rs" 102 37 102 55] sub_str <- ([#"../hillel.rs" 102 37 102 55] Ghost.new (Seq.empty ));
+    [#"../hillel.rs" 102 40 102 64] sub_str <- ([#"../hillel.rs" 102 40 102 64] Snapshot.new (Seq.empty ));
     goto BB2
   }
   BB2 {
@@ -1535,11 +1537,11 @@ module Hillel_Unique
     goto BB4
   }
   BB4 {
-    [#"../hillel.rs" 104 4 104 48] iter_old <- ([#"../hillel.rs" 104 4 104 48] Ghost.new iter);
+    [#"../hillel.rs" 104 4 104 48] iter_old <- ([#"../hillel.rs" 104 4 104 48] Snapshot.new iter);
     goto BB5
   }
   BB5 {
-    [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] Ghost.new (Seq.empty ));
+    [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] Snapshot.new (Seq.empty ));
     goto BB6
   }
   BB6 {
@@ -1556,10 +1558,10 @@ module Hillel_Unique
   }
   BB10 {
     invariant { [#"../hillel.rs" 104 4 104 48] inv1 iter };
-    invariant { [#"../hillel.rs" 104 4 104 48] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../hillel.rs" 104 4 104 48] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../hillel.rs" 104 16 104 46] is_unique0 (deep_model0 unique) };
     invariant { [#"../hillel.rs" 105 16 105 64] is_subset0 (deep_model0 unique) (deep_model1 str) };
-    invariant { [#"../hillel.rs" 106 16 106 95] is_subset0 (SeqExt.subsequence (deep_model1 str) 0 (Seq.length (Ghost.inner produced))) (deep_model0 unique) };
+    invariant { [#"../hillel.rs" 106 16 106 95] is_subset0 (SeqExt.subsequence (deep_model1 str) 0 (Seq.length (Snapshot.inner produced))) (deep_model0 unique) };
     goto BB11
   }
   BB11 {
@@ -1596,14 +1598,14 @@ module Hillel_Unique
     absurd
   }
   BB16 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _23);
-    [#"../hillel.rs" 104 4 104 48] _28 <- ([#"../hillel.rs" 104 4 104 48] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _23);
+    [#"../hillel.rs" 104 4 104 48] _28 <- ([#"../hillel.rs" 104 4 104 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB17
   }
   BB17 {
     [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] _28);
-    [#"../hillel.rs" 104 4 104 48] _28 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../hillel.rs" 104 4 104 48] _28 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../hillel.rs" 108 26 108 27] _32 <- ([#"../hillel.rs" 108 26 108 27] i);
     [#"../hillel.rs" 108 22 108 28] _34 <- ([#"../hillel.rs" 108 22 108 28] _32 < ([#"../hillel.rs" 108 22 108 28] Slice.length str));
     assert { [@expl:index in bounds] [#"../hillel.rs" 108 22 108 28] _34 };
@@ -1626,12 +1628,12 @@ module Hillel_Unique
   BB19 {
     assert { [@expl:type invariant] inv4 _37 };
     assume { resolve3 _37 };
-    [#"../hillel.rs" 110 18 110 44] _39 <- ([#"../hillel.rs" 110 18 110 44] Ghost.new (Seq.snoc (Ghost.inner sub_str) elem));
+    [#"../hillel.rs" 110 18 110 50] _39 <- ([#"../hillel.rs" 110 18 110 50] Snapshot.new (Seq.snoc (Snapshot.inner sub_str) elem));
     goto BB20
   }
   BB20 {
-    [#"../hillel.rs" 110 8 110 44] sub_str <- ([#"../hillel.rs" 110 8 110 44] _39);
-    [#"../hillel.rs" 110 8 110 44] _39 <- any Ghost.ghost_ty (Seq.seq t);
+    [#"../hillel.rs" 110 8 110 50] sub_str <- ([#"../hillel.rs" 110 8 110 50] _39);
+    [#"../hillel.rs" 110 8 110 50] _39 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv0 sub_str };
     assume { resolve0 sub_str };
     goto BB10
@@ -1942,7 +1944,7 @@ module Hillel_Fulcrum
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : Core_Slice_Iter_Iter_Type.t_iter uint32 . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   function abs_diff1 (self : int) (other : int) : int =
     [#"../../../../creusot-contracts/src/logic/int.rs" 50 4 50 12] if self < other then other - self else self - other
   val abs_diff1 (self : int) (other : int) : int
@@ -2001,11 +2003,11 @@ module Hillel_Fulcrum
     ensures { result = score0 seq i }
     
   axiom score0_spec : forall seq : Seq.seq uint32, i : int . ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq) -> ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq -> score0 seq i = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= score0 seq i /\ score0 seq i <= sum_range0 seq 0 (Seq.length seq))
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post1 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -2052,11 +2054,11 @@ module Hillel_Fulcrum
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : slice uint32) (res : Core_Slice_Iter_Iter_Type.t_iter uint32) =
     [#"../../../../creusot-contracts/src/std/slice.rs" 346 20 346 32] self = shallow_model3 res
   val into_iter_post0 (self : slice uint32) (res : Core_Slice_Iter_Iter_Type.t_iter uint32) : bool
@@ -2083,27 +2085,27 @@ module Hillel_Fulcrum
   var s : slice uint32 = s;
   var total : uint32;
   var iter : Core_Slice_Iter_Iter_Type.t_iter uint32;
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter uint32);
-  var produced : Ghost.ghost_ty (Seq.seq uint32);
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter uint32);
+  var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _18 : ();
   var _19 : Core_Option_Option_Type.t_option uint32;
   var _20 : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32);
   var _21 : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32);
   var __creusot_proc_iter_elem : uint32;
-  var _24 : Ghost.ghost_ty (Seq.seq uint32);
+  var _24 : Snapshot.snap_ty (Seq.seq uint32);
   var x : uint32;
   var min_i : usize;
   var min_dist : uint32;
   var sum : uint32;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
   var _37 : usize;
-  var iter_old1 : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced1 : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced1 : Snapshot.snap_ty (Seq.seq usize);
   var _50 : Core_Option_Option_Type.t_option usize;
   var _51 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _52 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem1 : usize;
-  var _55 : Ghost.ghost_ty (Seq.seq usize);
+  var _55 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var dist : uint32;
   var _63 : ();
@@ -2118,11 +2120,11 @@ module Hillel_Fulcrum
     goto BB1
   }
   BB1 {
-    [#"../hillel.rs" 159 4 159 60] iter_old <- ([#"../hillel.rs" 159 4 159 60] Ghost.new iter);
+    [#"../hillel.rs" 159 4 159 60] iter_old <- ([#"../hillel.rs" 159 4 159 60] Snapshot.new iter);
     goto BB2
   }
   BB2 {
-    [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] Ghost.new (Seq.empty ));
+    [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -2130,8 +2132,8 @@ module Hillel_Fulcrum
   }
   BB4 {
     invariant { [#"../hillel.rs" 159 4 159 60] inv0 iter };
-    invariant { [#"../hillel.rs" 159 4 159 60] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../hillel.rs" 159 16 159 58] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (Ghost.inner produced)) };
+    invariant { [#"../hillel.rs" 159 4 159 60] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../hillel.rs" 159 16 159 58] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (Snapshot.inner produced)) };
     invariant { [#"../hillel.rs" 160 16 160 52] UInt32.to_int total <= sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) };
     goto BB5
   }
@@ -2167,13 +2169,13 @@ module Hillel_Fulcrum
     absurd
   }
   BB10 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _19);
-    [#"../hillel.rs" 159 4 159 60] _24 <- ([#"../hillel.rs" 159 4 159 60] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19);
+    [#"../hillel.rs" 159 4 159 60] _24 <- ([#"../hillel.rs" 159 4 159 60] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] _24);
-    [#"../hillel.rs" 159 4 159 60] _24 <- any Ghost.ghost_ty (Seq.seq uint32);
+    [#"../hillel.rs" 159 4 159 60] _24 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../hillel.rs" 161 9 161 10] x <- ([#"../hillel.rs" 161 9 161 10] __creusot_proc_iter_elem);
     [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + ([#"../hillel.rs" 162 17 162 18] x));
     [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] ());
@@ -2185,11 +2187,11 @@ module Hillel_Fulcrum
     goto BB13
   }
   BB13 {
-    [#"../hillel.rs" 171 4 171 58] iter_old1 <- ([#"../hillel.rs" 171 4 171 58] Ghost.new iter1);
+    [#"../hillel.rs" 171 4 171 58] iter_old1 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new iter1);
     goto BB14
   }
   BB14 {
-    [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] Ghost.new (Seq.empty ));
+    [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new (Seq.empty ));
     goto BB15
   }
   BB15 {
@@ -2197,12 +2199,12 @@ module Hillel_Fulcrum
   }
   BB16 {
     invariant { [#"../hillel.rs" 171 4 171 58] inv1 iter1 };
-    invariant { [#"../hillel.rs" 171 4 171 58] produces1 (Ghost.inner iter_old1) (Ghost.inner produced1) iter1 };
-    invariant { [#"../hillel.rs" 171 16 171 56] UInt32.to_int sum = sum_range0 (shallow_model1 s) 0 (Seq.length (Ghost.inner produced1)) };
+    invariant { [#"../hillel.rs" 171 4 171 58] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
+    invariant { [#"../hillel.rs" 171 16 171 56] UInt32.to_int sum = sum_range0 (shallow_model1 s) 0 (Seq.length (Snapshot.inner produced1)) };
     invariant { [#"../hillel.rs" 172 16 172 30] UInt32.to_int sum <= UInt32.to_int total };
-    invariant { [#"../hillel.rs" 173 16 173 61] UIntSize.to_int min_i <= Seq.length (Ghost.inner produced1) /\ UIntSize.to_int min_i < Seq.length (shallow_model1 s) };
+    invariant { [#"../hillel.rs" 173 16 173 61] UIntSize.to_int min_i <= Seq.length (Snapshot.inner produced1) /\ UIntSize.to_int min_i < Seq.length (shallow_model1 s) };
     invariant { [#"../hillel.rs" 174 16 174 46] UInt32.to_int min_dist = score0 (shallow_model1 s) (UIntSize.to_int min_i) };
-    invariant { [#"../hillel.rs" 171 4 171 58] forall j : int . 0 <= j /\ j < Seq.length (Ghost.inner produced1) -> score0 (shallow_model1 s) (UIntSize.to_int min_i) <= score0 (shallow_model1 s) j };
+    invariant { [#"../hillel.rs" 171 4 171 58] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced1) -> score0 (shallow_model1 s) (UIntSize.to_int min_i) <= score0 (shallow_model1 s) j };
     goto BB17
   }
   BB17 {
@@ -2229,14 +2231,14 @@ module Hillel_Fulcrum
     goto BB21
   }
   BB21 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _50);
-    [#"../hillel.rs" 171 4 171 58] _55 <- ([#"../hillel.rs" 171 4 171 58] Ghost.new (Seq.(++) (Ghost.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _50);
+    [#"../hillel.rs" 171 4 171 58] _55 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB22
   }
   BB22 {
     [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] _55);
-    [#"../hillel.rs" 171 4 171 58] _55 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1);
+    [#"../hillel.rs" 171 4 171 58] _55 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 ([#"../hillel.rs" 177 19 177 22] sum) ([#"../hillel.rs" 177 32 177 43] ([#"../hillel.rs" 177 32 177 37] total) - ([#"../hillel.rs" 177 40 177 43] sum)));
     goto BB23
   }
diff --git a/creusot/tests/should_succeed/hillel.rs b/creusot/tests/should_succeed/hillel.rs
index 4b8e81c428..667779f4ef 100644
--- a/creusot/tests/should_succeed/hillel.rs
+++ b/creusot/tests/should_succeed/hillel.rs
@@ -14,7 +14,7 @@ use creusot_contracts::{
 #[ensures(forall<i: Int> 0 <= i && i < str@.len() ==> (^str)[i] == str[i])]
 #[ensures(forall<i: Int> str@.len() <= i && i < len@ ==> (^str)[i] == pad)]
 fn right_pad<T: Copy>(str: &mut Vec<T>, len: usize, pad: T) {
-    let old_str = gh! { str };
+    let old_str = snapshot! { str };
 
     #[invariant(old_str@.len() <= str@.len())]
     #[invariant(old_str@.len() < len@ ==> str@.len() <= len@)]
@@ -31,8 +31,8 @@ fn right_pad<T: Copy>(str: &mut Vec<T>, len: usize, pad: T) {
 #[ensures(forall<i: Int> 0 <= i && i < ((^str)@.len() - str@.len()) ==> (^str)[i] == pad)]
 #[ensures(forall<i: Int> 0 <= i && i < str@.len() ==> (^str)[i + ((^str)@.len() - str@.len())] == str[i])]
 fn left_pad<T: Copy>(str: &mut Vec<T>, len: usize, pad: T) {
-    let old_str = gh! { str };
-    let mut c: Ghost<usize> = gh! { 0usize };
+    let old_str = snapshot! { str };
+    let mut c: Snapshot<usize> = snapshot! { 0usize };
 
     #[invariant(old_str@.len() <= str@.len())]
     #[invariant(old_str@.len() < len@ ==> str@.len() <= len@)]
@@ -42,7 +42,7 @@ fn left_pad<T: Copy>(str: &mut Vec<T>, len: usize, pad: T) {
     #[invariant(forall<i: Int> 0 <= i && i < c@ ==> str[i] == pad)]
     while str.len() < len {
         str.insert(0, pad);
-        c = gh! { 1usize + *c };
+        c = snapshot! { 1usize + *c };
     }
 }
 
@@ -67,7 +67,7 @@ fn is_subset<T>(sub: Seq<T>, sup: Seq<T>) -> bool {
     }
 }
 
-#[ghost]
+#[logic]
 #[ensures(is_subset(s, s.push(elem)))]
 fn subset_push<T>(s: Seq<T>, elem: T) {}
 
@@ -77,9 +77,9 @@ fn subset_push<T>(s: Seq<T>, elem: T) {}
 #[ensures(is_subset((^vec).deep_model(), vec.deep_model().push(elem.deep_model())))]
 #[ensures(contains((^vec).deep_model(), elem.deep_model()))]
 fn insert_unique<T: Eq + DeepModel>(vec: &mut Vec<T>, elem: T) {
-    gh! { subset_push::<T::DeepModelTy> };
+    snapshot! { subset_push::<T::DeepModelTy> };
     proof_assert! { is_subset(vec.deep_model(), vec.deep_model().push(elem.deep_model())) };
-    let ghost_vec = gh! { *vec };
+    let ghost_vec = snapshot! { *vec };
 
     #[invariant(forall<j: Int> 0 <= j && j < produced.len() ==> produced[j].deep_model() != elem.deep_model())]
     for e in vec.iter() {
@@ -99,7 +99,7 @@ fn insert_unique<T: Eq + DeepModel>(vec: &mut Vec<T>, elem: T) {
 #[ensures(is_subset(str.deep_model(), result.deep_model()))]
 fn unique<T: Eq + DeepModel + Copy>(str: &[T]) -> Vec<T> {
     let mut unique = Vec::new();
-    let mut sub_str: Ghost<Seq<T>> = gh! { Seq::EMPTY };
+    let mut sub_str: Snapshot<Seq<T>> = snapshot! { Seq::EMPTY };
 
     #[invariant(is_unique(unique.deep_model()))]
     #[invariant(is_subset(unique.deep_model(), str.deep_model()))]
@@ -107,7 +107,7 @@ fn unique<T: Eq + DeepModel + Copy>(str: &[T]) -> Vec<T> {
     for i in 0..str.len() {
         let elem: T = str[i];
         insert_unique(&mut unique, elem);
-        sub_str = gh! { sub_str.push(elem) };
+        sub_str = snapshot! { sub_str.push(elem) };
     }
 
     proof_assert! { is_subset(str.deep_model().subsequence(0, str@.len()), unique.deep_model()) }
@@ -115,7 +115,7 @@ fn unique<T: Eq + DeepModel + Copy>(str: &[T]) -> Vec<T> {
     unique
 }
 
-#[ghost]
+#[logic]
 #[variant(to - from)]
 #[requires(0 <= from && from <= to && to <= seq.len())]
 #[ensures(result >= 0)]
@@ -127,7 +127,7 @@ fn sum_range(seq: Seq<u32>, from: Int, to: Int) -> Int {
     }
 }
 
-#[ghost]
+#[logic]
 #[variant(i - from)]
 #[requires(0 <= from && from <= i && i <= to && to <= seq.len())]
 #[ensures(sum_range(seq, from, to) == sum_range(seq, from, i) + sum_range(seq, i, to))]
@@ -137,7 +137,7 @@ fn sum_range_split(seq: Seq<u32>, from: Int, to: Int, i: Int) {
     }
 }
 
-#[ghost]
+#[logic]
 #[requires(0 <= i && i <= seq.len())]
 #[ensures(0 <= result && result <= sum_range(seq, 0 , seq.len()))]
 #[ensures(0 == i || i == seq.len() ==> result == sum_range(seq, 0, seq.len()))]
diff --git a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
index 65a1e6a0e8..f48b7797ed 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
+++ b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
@@ -32,16 +32,16 @@ module InplaceListReversal_Rev
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : InplaceListReversal_List_Type.t_list t . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t)) . inv0 x = true
   predicate resolve2 (self : borrowed (InplaceListReversal_List_Type.t_list t)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (InplaceListReversal_List_Type.t_list t)) : bool
@@ -51,7 +51,7 @@ module InplaceListReversal_Rev
   val resolve1 (self : InplaceListReversal_List_Type.t_list t) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function rev_append0 [#"../inplace_list_reversal.rs" 16 0 16 55] (n : InplaceListReversal_List_Type.t_list t) (o : InplaceListReversal_List_Type.t_list t) : InplaceListReversal_List_Type.t_list t
     
    =
@@ -69,11 +69,11 @@ module InplaceListReversal_Rev
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 8 22 8 37] result =  * dest }
     ensures { inv1 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg rev [#"../inplace_list_reversal.rs" 24 0 24 30] [@cfg:stackify] [@cfg:subregion_analysis] (l : borrowed (InplaceListReversal_List_Type.t_list t)) : ()
     requires {[#"../inplace_list_reversal.rs" 24 14 24 15] inv2 l}
     ensures { [#"../inplace_list_reversal.rs" 23 10 23 35]  ^ l = rev_append0 ( * l) (InplaceListReversal_List_Type.C_Nil) }
@@ -81,7 +81,7 @@ module InplaceListReversal_Rev
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var l : borrowed (InplaceListReversal_List_Type.t_list t) = l;
-  var old_l : Ghost.ghost_ty (borrowed (InplaceListReversal_List_Type.t_list t));
+  var old_l : Snapshot.snap_ty (borrowed (InplaceListReversal_List_Type.t_list t));
   var prev : InplaceListReversal_List_Type.t_list t;
   var head : InplaceListReversal_List_Type.t_list t;
   var _7 : borrowed (InplaceListReversal_List_Type.t_list t);
@@ -91,7 +91,7 @@ module InplaceListReversal_Rev
     goto BB0
   }
   BB0 {
-    [#"../inplace_list_reversal.rs" 25 16 25 25] old_l <- ([#"../inplace_list_reversal.rs" 25 16 25 25] Ghost.new l);
+    [#"../inplace_list_reversal.rs" 25 16 25 31] old_l <- ([#"../inplace_list_reversal.rs" 25 16 25 31] Snapshot.new l);
     goto BB1
   }
   BB1 {
@@ -112,7 +112,7 @@ module InplaceListReversal_Rev
     goto BB4
   }
   BB4 {
-    invariant { [#"../inplace_list_reversal.rs" 28 16 28 73] rev_append0 head prev = rev_append0 ( * Ghost.inner old_l) (InplaceListReversal_List_Type.C_Nil) };
+    invariant { [#"../inplace_list_reversal.rs" 28 16 28 73] rev_append0 head prev = rev_append0 ( * Snapshot.inner old_l) (InplaceListReversal_List_Type.C_Nil) };
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/inplace_list_reversal.rs b/creusot/tests/should_succeed/inplace_list_reversal.rs
index 6aee771ec7..26607bc85c 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal.rs
+++ b/creusot/tests/should_succeed/inplace_list_reversal.rs
@@ -11,7 +11,7 @@ pub enum List<T> {
 use List::*;
 type Node<T> = Box<(T, List<T>)>;
 
-#[ghost]
+#[logic]
 #[open(self)]
 pub fn rev_append<T>(n: List<T>, o: List<T>) -> List<T> {
     match n {
@@ -22,7 +22,7 @@ pub fn rev_append<T>(n: List<T>, o: List<T>) -> List<T> {
 
 #[ensures(^l == rev_append(*l, Nil))]
 pub fn rev<T>(l: &mut List<T>) {
-    let old_l = gh! { l };
+    let old_l = snapshot! { l };
     let mut prev = Nil;
     let mut head = replace(l, Nil);
     #[invariant(rev_append(head, prev) == rev_append(*old_l.inner(), Nil))]
diff --git a/creusot/tests/should_succeed/ite_normalize.rs b/creusot/tests/should_succeed/ite_normalize.rs
index a9a960ac43..f4253b10ab 100644
--- a/creusot/tests/should_succeed/ite_normalize.rs
+++ b/creusot/tests/should_succeed/ite_normalize.rs
@@ -44,7 +44,7 @@ impl<K: Clone, V: Clone> Clone for BTreeMap<K, V> {
 impl<K: DeepModel, V> ShallowModel for BTreeMap<K, V> {
     type ShallowModelTy = creusot_contracts::logic::Mapping<K::DeepModelTy, Option<V>>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index e9dc99bf9f..490a8aa47f 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -196,7 +196,7 @@ module C01Range_SumRange
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : C01Range_Range_Type.t_range . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use Core_Option_Option_Type as Core_Option_Option_Type
   use prelude.Borrow
@@ -216,11 +216,11 @@ module C01Range_SumRange
       | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
       end }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   val into_iter0 [#"../01_range.rs" 70 4 70 34] (self : C01Range_Range_Type.t_range) : C01Range_Range_Type.t_range
     ensures { [#"../01_range.rs" 69 14 69 28] result = self }
     
@@ -233,12 +233,12 @@ module C01Range_SumRange
   var n : isize = n;
   var i : isize;
   var it : C01Range_Range_Type.t_range;
-  var iter_old : Ghost.ghost_ty (C01Range_Range_Type.t_range);
-  var produced : Ghost.ghost_ty (Seq.seq isize);
+  var iter_old : Snapshot.snap_ty (C01Range_Range_Type.t_range);
+  var produced : Snapshot.snap_ty (Seq.seq isize);
   var _17 : Core_Option_Option_Type.t_option isize;
   var _18 : borrowed (C01Range_Range_Type.t_range);
   var x : isize;
-  var _21 : Ghost.ghost_ty (Seq.seq isize);
+  var _21 : Snapshot.snap_ty (Seq.seq isize);
   {
     goto BB0
   }
@@ -248,11 +248,11 @@ module C01Range_SumRange
     goto BB1
   }
   BB1 {
-    [#"../01_range.rs" 80 19 80 29] iter_old <- ([#"../01_range.rs" 80 19 80 29] Ghost.new it);
+    [#"../01_range.rs" 80 19 80 35] iter_old <- ([#"../01_range.rs" 80 19 80 35] Snapshot.new it);
     goto BB2
   }
   BB2 {
-    [#"../01_range.rs" 81 23 81 41] produced <- ([#"../01_range.rs" 81 23 81 41] Ghost.new (Seq.empty ));
+    [#"../01_range.rs" 81 23 81 47] produced <- ([#"../01_range.rs" 81 23 81 47] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -260,8 +260,8 @@ module C01Range_SumRange
   }
   BB4 {
     invariant { [#"../01_range.rs" 82 16 82 23] inv0 it };
-    invariant { [#"../01_range.rs" 83 16 83 55] produces0 (Ghost.inner iter_old) (Ghost.inner produced) it };
-    invariant { [#"../01_range.rs" 84 16 84 46] IntSize.to_int i = Seq.length (Ghost.inner produced) /\ i <= n };
+    invariant { [#"../01_range.rs" 83 16 83 55] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) it };
+    invariant { [#"../01_range.rs" 84 16 84 46] IntSize.to_int i = Seq.length (Snapshot.inner produced) /\ i <= n };
     goto BB5
   }
   BB5 {
@@ -290,12 +290,12 @@ module C01Range_SumRange
   }
   BB10 {
     [#"../01_range.rs" 87 17 87 18] x <- ([#"../01_range.rs" 87 17 87 18] Core_Option_Option_Type.some_0 _17);
-    [#"../01_range.rs" 88 27 88 69] _21 <- ([#"../01_range.rs" 88 27 88 69] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton x)));
+    [#"../01_range.rs" 88 27 88 75] _21 <- ([#"../01_range.rs" 88 27 88 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x)));
     goto BB11
   }
   BB11 {
-    [#"../01_range.rs" 88 16 88 69] produced <- ([#"../01_range.rs" 88 16 88 69] _21);
-    [#"../01_range.rs" 88 16 88 69] _21 <- any Ghost.ghost_ty (Seq.seq isize);
+    [#"../01_range.rs" 88 16 88 75] produced <- ([#"../01_range.rs" 88 16 88 75] _21);
+    [#"../01_range.rs" 88 16 88 75] _21 <- any Snapshot.snap_ty (Seq.seq isize);
     [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + ([#"../01_range.rs" 89 21 89 22] [#"../01_range.rs" 89 21 89 22] (1 : isize)));
     goto BB4
   }
diff --git a/creusot/tests/should_succeed/iterators/01_range.rs b/creusot/tests/should_succeed/iterators/01_range.rs
index cb83e7000e..5d1e9d0330 100644
--- a/creusot/tests/should_succeed/iterators/01_range.rs
+++ b/creusot/tests/should_succeed/iterators/01_range.rs
@@ -19,7 +19,7 @@ impl Iterator for Range {
     type Item = isize;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             self.resolve() && self.start >= self.end
@@ -77,15 +77,15 @@ impl Range {
 pub fn sum_range(n: isize) -> isize {
     let mut i = 0;
     let mut it = Range { start: 0, end: n }.into_iter();
-    let iter_old = gh! { it };
-    let mut produced = gh! { Seq::EMPTY };
+    let iter_old = snapshot! { it };
+    let mut produced = snapshot! { Seq::EMPTY };
     #[invariant(inv(it))]
     #[invariant(iter_old.produces(produced.inner(), it))]
     #[invariant(i@ == produced.len() && i <= n)]
     loop {
         match it.next() {
             Some(x) => {
-                produced = gh! { produced.concat(Seq::singleton(x)) };
+                produced = snapshot! { produced.concat(Seq::singleton(x)) };
                 i += 1
             }
             None => break,
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index 44f2b567f0..ecdd711011 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -903,7 +903,7 @@ module C02IterMut_AllZero
   val shallow_model2 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : Seq.seq usize
     ensures { result = shallow_model2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve1 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -935,17 +935,18 @@ module C02IterMut_AllZero
       end }
     ensures { [#"../02_iter_mut.rs" 63 26 63 44] inv3 result }
     
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+    
    =
-    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   val into_iter0 [#"../02_iter_mut.rs" 70 4 70 30] (self : C02IterMut_IterMut_Type.t_itermut usize) : C02IterMut_IterMut_Type.t_itermut usize
     requires {[#"../02_iter_mut.rs" 70 17 70 21] inv0 self}
     ensures { [#"../02_iter_mut.rs" 69 14 69 28] result = self }
@@ -968,12 +969,12 @@ module C02IterMut_AllZero
   var it : C02IterMut_IterMut_Type.t_itermut usize;
   var _5 : C02IterMut_IterMut_Type.t_itermut usize;
   var _6 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
-  var iter_old : Ghost.ghost_ty (C02IterMut_IterMut_Type.t_itermut usize);
-  var produced : Ghost.ghost_ty (Seq.seq (borrowed usize));
+  var iter_old : Snapshot.snap_ty (C02IterMut_IterMut_Type.t_itermut usize);
+  var produced : Snapshot.snap_ty (Seq.seq (borrowed usize));
   var _15 : Core_Option_Option_Type.t_option (borrowed usize);
   var _16 : borrowed (C02IterMut_IterMut_Type.t_itermut usize);
   var x : borrowed usize;
-  var _19 : Ghost.ghost_ty (Seq.seq (borrowed usize));
+  var _19 : Snapshot.snap_ty (Seq.seq (borrowed usize));
   {
     goto BB0
   }
@@ -990,11 +991,11 @@ module C02IterMut_AllZero
     goto BB2
   }
   BB2 {
-    [#"../02_iter_mut.rs" 86 19 86 29] iter_old <- ([#"../02_iter_mut.rs" 86 19 86 29] Ghost.new it);
+    [#"../02_iter_mut.rs" 86 19 86 35] iter_old <- ([#"../02_iter_mut.rs" 86 19 86 35] Snapshot.new it);
     goto BB3
   }
   BB3 {
-    [#"../02_iter_mut.rs" 87 23 87 41] produced <- ([#"../02_iter_mut.rs" 87 23 87 41] Ghost.new (Seq.empty ));
+    [#"../02_iter_mut.rs" 87 23 87 47] produced <- ([#"../02_iter_mut.rs" 87 23 87 47] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -1002,8 +1003,8 @@ module C02IterMut_AllZero
   }
   BB5 {
     invariant { [#"../02_iter_mut.rs" 88 16 88 23] inv0 it };
-    invariant { [#"../02_iter_mut.rs" 89 16 89 55] produces0 (Ghost.inner iter_old) (Ghost.inner produced) it };
-    invariant { [#"../02_iter_mut.rs" 88 4 88 25] forall i : int . 0 <= i /\ i < Seq.length (Ghost.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
+    invariant { [#"../02_iter_mut.rs" 89 16 89 55] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) it };
+    invariant { [#"../02_iter_mut.rs" 88 4 88 25] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
     goto BB6
   }
   BB6 {
@@ -1036,12 +1037,12 @@ module C02IterMut_AllZero
   BB11 {
     [#"../02_iter_mut.rs" 93 17 93 18] x <- ([#"../02_iter_mut.rs" 93 17 93 18] Core_Option_Option_Type.some_0 _15);
     [#"../02_iter_mut.rs" 93 17 93 18] _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any borrowed usize));
-    [#"../02_iter_mut.rs" 94 27 94 69] _19 <- ([#"../02_iter_mut.rs" 94 27 94 69] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton x)));
+    [#"../02_iter_mut.rs" 94 27 94 75] _19 <- ([#"../02_iter_mut.rs" 94 27 94 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x)));
     goto BB12
   }
   BB12 {
-    [#"../02_iter_mut.rs" 94 16 94 69] produced <- ([#"../02_iter_mut.rs" 94 16 94 69] _19);
-    [#"../02_iter_mut.rs" 94 16 94 69] _19 <- any Ghost.ghost_ty (Seq.seq (borrowed usize));
+    [#"../02_iter_mut.rs" 94 16 94 75] produced <- ([#"../02_iter_mut.rs" 94 16 94 75] _19);
+    [#"../02_iter_mut.rs" 94 16 94 75] _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
     [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] [#"../02_iter_mut.rs" 95 21 95 22] (0 : usize)) ; };
     assume { resolve0 x };
     goto BB5
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.rs b/creusot/tests/should_succeed/iterators/02_iter_mut.rs
index c83d4a7a44..42e717ee55 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.rs
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.rs
@@ -16,7 +16,7 @@ struct IterMut<'a, T> {
 
 impl<'a, T> Invariant for IterMut<'a, T> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn invariant(self) -> bool {
         // Property that is always true but we must carry around..
         pearlite! { (^self.inner)@.len() == (*self.inner)@.len() }
@@ -27,13 +27,13 @@ impl<'a, T> Iterator for IterMut<'a, T> {
     type Item = &'a mut T;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.inner.resolve() && self.inner@.ext_eq(Seq::EMPTY) }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, tl: Self) -> bool {
         pearlite! {
             self.inner@.len() == visited.len() + tl.inner@.len() &&
@@ -83,15 +83,15 @@ fn iter_mut<'a, T>(v: &'a mut Vec<T>) -> IterMut<'a, T> {
 #[ensures(forall<i : _> 0 <= i && i < v@.len() ==> (^v)[i]@ == 0)]
 pub fn all_zero(v: &mut Vec<usize>) {
     let mut it = iter_mut(v).into_iter();
-    let iter_old = gh! { it };
-    let mut produced = gh! { Seq::EMPTY };
+    let iter_old = snapshot! { it };
+    let mut produced = snapshot! { Seq::EMPTY };
     #[invariant(inv(it))]
     #[invariant(iter_old.produces(produced.inner(), it))]
     #[invariant(forall<i : Int> 0 <= i && i < produced.len() ==> (^produced[i])@ == 0)]
     loop {
         match it.next() {
             Some(x) => {
-                produced = gh! { produced.concat(Seq::singleton(x)) };
+                produced = snapshot! { produced.concat(Seq::singleton(x)) };
                 *x = 0;
             }
             None => break,
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index b498071408..ef7847c07c 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -158,16 +158,16 @@ module C03StdIterators_SliceIter
     ensures { result = inv2 _x }
     
   axiom inv2 : forall x : Core_Slice_Iter_Iter_Type.t_iter t . inv2 x = true
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (Seq.seq t))
-  val invariant1 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (Seq.seq t))
+  val invariant1 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Ghost.ghost_ty (Seq.seq t))
-  val inv1 (_x : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate inv1 (_x : Snapshot.snap_ty (Seq.seq t))
+  val inv1 (_x : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Ghost.ghost_ty (Seq.seq t) . inv1 x = true
+  axiom inv1 : forall x : Snapshot.snap_ty (Seq.seq t) . inv1 x = true
   predicate invariant0 (self : slice t)
   val invariant0 (self : slice t) : bool
     ensures { result = invariant0 self }
@@ -209,19 +209,19 @@ module C03StdIterators_SliceIter
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty (Seq.seq t))
-  val resolve2 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty (Seq.seq t))
+  val resolve2 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
-  predicate resolve1 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t))
-  val resolve1 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
+  use prelude.Snapshot
+  predicate resolve1 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t))
+  val resolve1 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Slice_Iter_Iter_Type.t_iter t) (res : Core_Slice_Iter_Iter_Type.t_iter t) =
     [#"../../../../../creusot-contracts/src/std/iter.rs" 80 8 80 19] self = res
   val into_iter_post0 (self : Core_Slice_Iter_Iter_Type.t_iter t) (res : Core_Slice_Iter_Iter_Type.t_iter t) : bool
@@ -257,13 +257,13 @@ module C03StdIterators_SliceIter
   var i : usize;
   var iter : Core_Slice_Iter_Iter_Type.t_iter t;
   var _7 : Core_Slice_Iter_Iter_Type.t_iter t;
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t);
-  var produced : Ghost.ghost_ty (Seq.seq t);
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t);
+  var produced : Snapshot.snap_ty (Seq.seq t);
   var _17 : Core_Option_Option_Type.t_option t;
   var _18 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var _19 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var __creusot_proc_iter_elem : t;
-  var _22 : Ghost.ghost_ty (Seq.seq t);
+  var _22 : Snapshot.snap_ty (Seq.seq t);
   {
     goto BB0
   }
@@ -280,12 +280,12 @@ module C03StdIterators_SliceIter
     goto BB2
   }
   BB2 {
-    [#"../03_std_iterators.rs" 8 4 8 38] iter_old <- ([#"../03_std_iterators.rs" 8 4 8 38] Ghost.new iter);
+    [#"../03_std_iterators.rs" 8 4 8 38] iter_old <- ([#"../03_std_iterators.rs" 8 4 8 38] Snapshot.new iter);
     goto BB3
   }
   BB3 {
     assume { resolve1 iter_old };
-    [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -295,8 +295,8 @@ module C03StdIterators_SliceIter
   }
   BB5 {
     invariant { [#"../03_std_iterators.rs" 8 4 8 38] inv2 iter };
-    invariant { [#"../03_std_iterators.rs" 8 4 8 38] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 8 16 8 36] UIntSize.to_int i = Seq.length (Ghost.inner produced) };
+    invariant { [#"../03_std_iterators.rs" 8 4 8 38] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 8 16 8 36] UIntSize.to_int i = Seq.length (Snapshot.inner produced) };
     goto BB6
   }
   BB6 {
@@ -333,15 +333,15 @@ module C03StdIterators_SliceIter
     absurd
   }
   BB11 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
     assert { [@expl:type invariant] inv3 _17 };
     assume { resolve4 _17 };
-    [#"../03_std_iterators.rs" 8 4 8 38] _22 <- ([#"../03_std_iterators.rs" 8 4 8 38] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../03_std_iterators.rs" 8 4 8 38] _22 <- ([#"../03_std_iterators.rs" 8 4 8 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
     [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] _22);
-    [#"../03_std_iterators.rs" 8 4 8 38] _22 <- any Ghost.ghost_ty (Seq.seq t);
+    [#"../03_std_iterators.rs" 8 4 8 38] _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
@@ -530,16 +530,16 @@ module C03StdIterators_VecIter
     ensures { result = inv2 _x }
     
   axiom inv2 : forall x : Core_Slice_Iter_Iter_Type.t_iter t . inv2 x = true
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (Seq.seq t))
-  val invariant1 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (Seq.seq t))
+  val invariant1 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Ghost.ghost_ty (Seq.seq t))
-  val inv1 (_x : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate inv1 (_x : Snapshot.snap_ty (Seq.seq t))
+  val inv1 (_x : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Ghost.ghost_ty (Seq.seq t) . inv1 x = true
+  axiom inv1 : forall x : Snapshot.snap_ty (Seq.seq t) . inv1 x = true
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = invariant0 self }
@@ -590,19 +590,19 @@ module C03StdIterators_VecIter
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty (Seq.seq t))
-  val resolve2 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty (Seq.seq t))
+  val resolve2 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
-  predicate resolve1 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t))
-  val resolve1 (self : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
+  use prelude.Snapshot
+  predicate resolve1 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t))
+  val resolve1 (self : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t)) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) (res : Core_Slice_Iter_Iter_Type.t_iter t)
     
    =
@@ -634,13 +634,13 @@ module C03StdIterators_VecIter
   var vec : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) = vec;
   var i : usize;
   var iter : Core_Slice_Iter_Iter_Type.t_iter t;
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter t);
-  var produced : Ghost.ghost_ty (Seq.seq t);
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter t);
+  var produced : Snapshot.snap_ty (Seq.seq t);
   var _16 : Core_Option_Option_Type.t_option t;
   var _17 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var _18 : borrowed (Core_Slice_Iter_Iter_Type.t_iter t);
   var __creusot_proc_iter_elem : t;
-  var _21 : Ghost.ghost_ty (Seq.seq t);
+  var _21 : Snapshot.snap_ty (Seq.seq t);
   {
     goto BB0
   }
@@ -652,12 +652,12 @@ module C03StdIterators_VecIter
     goto BB1
   }
   BB1 {
-    [#"../03_std_iterators.rs" 19 4 19 38] iter_old <- ([#"../03_std_iterators.rs" 19 4 19 38] Ghost.new iter);
+    [#"../03_std_iterators.rs" 19 4 19 38] iter_old <- ([#"../03_std_iterators.rs" 19 4 19 38] Snapshot.new iter);
     goto BB2
   }
   BB2 {
     assume { resolve1 iter_old };
-    [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -667,8 +667,8 @@ module C03StdIterators_VecIter
   }
   BB4 {
     invariant { [#"../03_std_iterators.rs" 19 4 19 38] inv2 iter };
-    invariant { [#"../03_std_iterators.rs" 19 4 19 38] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 19 16 19 36] UIntSize.to_int i = Seq.length (Ghost.inner produced) };
+    invariant { [#"../03_std_iterators.rs" 19 4 19 38] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 19 16 19 36] UIntSize.to_int i = Seq.length (Snapshot.inner produced) };
     goto BB5
   }
   BB5 {
@@ -705,15 +705,15 @@ module C03StdIterators_VecIter
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _16);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _16);
     assert { [@expl:type invariant] inv3 _16 };
     assume { resolve4 _16 };
-    [#"../03_std_iterators.rs" 19 4 19 38] _21 <- ([#"../03_std_iterators.rs" 19 4 19 38] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../03_std_iterators.rs" 19 4 19 38] _21 <- ([#"../03_std_iterators.rs" 19 4 19 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] _21);
-    [#"../03_std_iterators.rs" 19 4 19 38] _21 <- any Ghost.ghost_ty (Seq.seq t);
+    [#"../03_std_iterators.rs" 19 4 19 38] _21 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
@@ -904,7 +904,7 @@ module C03StdIterators_AllZero
   val shallow_model2 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : Seq.seq usize
     ensures { result = shallow_model2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -944,17 +944,18 @@ module C03StdIterators_AllZero
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+    
    =
-    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
+    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (borrowed usize))) (ix : int) : borrowed usize
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate resolve0 (self : borrowed (slice usize)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (slice usize)) : bool
@@ -1000,13 +1001,13 @@ module C03StdIterators_AllZero
   var _6 : borrowed (slice usize);
   var _7 : borrowed (slice usize);
   var _8 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_IterMut_Type.t_itermut usize);
-  var produced : Ghost.ghost_ty (Seq.seq (borrowed usize));
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_IterMut_Type.t_itermut usize);
+  var produced : Snapshot.snap_ty (Seq.seq (borrowed usize));
   var _17 : Core_Option_Option_Type.t_option (borrowed usize);
   var _18 : borrowed (Core_Slice_Iter_IterMut_Type.t_itermut usize);
   var _19 : borrowed (Core_Slice_Iter_IterMut_Type.t_itermut usize);
   var __creusot_proc_iter_elem : borrowed usize;
-  var _22 : Ghost.ghost_ty (Seq.seq (borrowed usize));
+  var _22 : Snapshot.snap_ty (Seq.seq (borrowed usize));
   var x : borrowed usize;
   {
     goto BB0
@@ -1032,11 +1033,11 @@ module C03StdIterators_AllZero
   }
   BB3 {
     assume { resolve0 _7 };
-    [#"../03_std_iterators.rs" 29 4 29 87] iter_old <- ([#"../03_std_iterators.rs" 29 4 29 87] Ghost.new iter);
+    [#"../03_std_iterators.rs" 29 4 29 87] iter_old <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new iter);
     goto BB4
   }
   BB4 {
-    [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -1044,8 +1045,8 @@ module C03StdIterators_AllZero
   }
   BB6 {
     invariant { [#"../03_std_iterators.rs" 29 4 29 87] inv0 iter };
-    invariant { [#"../03_std_iterators.rs" 29 4 29 87] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 29 4 29 87] forall i : int . 0 <= i /\ i < Seq.length (Ghost.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
+    invariant { [#"../03_std_iterators.rs" 29 4 29 87] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 29 4 29 87] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
     goto BB7
   }
   BB7 {
@@ -1080,16 +1081,16 @@ module C03StdIterators_AllZero
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize));
-    [#"../03_std_iterators.rs" 29 4 29 87] _22 <- ([#"../03_std_iterators.rs" 29 4 29 87] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize));
+    [#"../03_std_iterators.rs" 29 4 29 87] _22 <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] _22);
-    [#"../03_std_iterators.rs" 29 4 29 87] _22 <- any Ghost.ghost_ty (Seq.seq (borrowed usize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- any borrowed usize;
+    [#"../03_std_iterators.rs" 29 4 29 87] _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any borrowed usize;
     [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] [#"../03_std_iterators.rs" 31 13 31 14] (0 : usize)) ; };
     assume { resolve2 x };
     goto BB6
@@ -1421,9 +1422,9 @@ module C03StdIterators_SkipTake
 end
 module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   type t_mapinv 'i 'b 'f =
-    | C_MapInv 'i 'f (Ghost.ghost_ty (Seq.seq 'b))
+    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
     
   let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
@@ -1433,7 +1434,7 @@ module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
     match self with
       | C_MapInv _ a _ -> a
       end
-  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Ghost.ghost_ty (Seq.seq 'b)
+  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
    = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_MapInv _ _ a -> a
@@ -1442,7 +1443,7 @@ end
 module C03StdIterators_Counter_Closure0_Type
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int16
   use prelude.UIntSize
   use prelude.Int
@@ -1455,7 +1456,7 @@ module C03StdIterators_Counter_Closure0
   use prelude.Int16
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   use prelude.UIntSize
   use prelude.Borrow
@@ -1474,16 +1475,16 @@ module C03StdIterators_Counter_Closure0
   let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     (18446744073709551615 : usize)
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.UIntSize
   predicate resolve0 (self : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = resolve0 self }
     
-  let rec cfg c03StdIterators_Counter_Closure0 [#"../03_std_iterators.rs" 48 12 48 91] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (x : uint32) (_prod : Ghost.ghost_ty (Seq.seq uint32)) : uint32
-    requires {[#"../03_std_iterators.rs" 47 23 47 65] UIntSize.to_int ( * field_00 ( * _1)) = Seq.length (Ghost.inner _prod) /\  * field_00 ( * _1) < max0}
-    ensures { [#"../03_std_iterators.rs" 48 22 48 89] UIntSize.to_int ( * field_00 ( ^ _1)) = UIntSize.to_int ( * field_00 ( * _1)) + 1 /\ UIntSize.to_int ( * field_00 ( ^ _1)) = Seq.length (Ghost.inner _prod) + 1 /\ result = x }
+  let rec cfg c03StdIterators_Counter_Closure0 [#"../03_std_iterators.rs" 48 12 48 91] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (x : uint32) (_prod : Snapshot.snap_ty (Seq.seq uint32)) : uint32
+    requires {[#"../03_std_iterators.rs" 47 23 47 65] UIntSize.to_int ( * field_00 ( * _1)) = Seq.length (Snapshot.inner _prod) /\  * field_00 ( * _1) < max0}
+    ensures { [#"../03_std_iterators.rs" 48 22 48 89] UIntSize.to_int ( * field_00 ( ^ _1)) = UIntSize.to_int ( * field_00 ( * _1)) + 1 /\ UIntSize.to_int ( * field_00 ( ^ _1)) = Seq.length (Snapshot.inner _prod) + 1 /\ result = x }
     ensures { unnest0 ( * _1) ( ^ _1) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1508,17 +1509,17 @@ end
 module C03StdIterators_Counter
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant15 (self : Ghost.ghost_ty (Seq.seq uint32)) =
+  use prelude.Snapshot
+  predicate invariant15 (self : Snapshot.snap_ty (Seq.seq uint32)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant15 (self : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  val invariant15 (self : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = invariant15 self }
     
-  predicate inv15 (_x : Ghost.ghost_ty (Seq.seq uint32))
-  val inv15 (_x : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  predicate inv15 (_x : Snapshot.snap_ty (Seq.seq uint32))
+  val inv15 (_x : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = inv15 _x }
     
-  axiom inv15 : forall x : Ghost.ghost_ty (Seq.seq uint32) . inv15 x = true
+  axiom inv15 : forall x : Snapshot.snap_ty (Seq.seq uint32) . inv15 x = true
   use prelude.Slice
   predicate invariant14 (self : slice uint32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
@@ -1631,23 +1632,23 @@ module C03StdIterators_Counter
    =
      ^ field_00 _2 =  ^ field_00 self
   use seq.Seq
-  use prelude.Ghost
-  predicate postcondition_mut0 [#"../03_std_iterators.rs" 48 12 48 91] (self : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32))) (result : uint32)
+  use prelude.Snapshot
+  predicate postcondition_mut0 [#"../03_std_iterators.rs" 48 12 48 91] (self : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32))) (result : uint32)
     
    =
-    (let (x, _prod) = args in UIntSize.to_int ( * field_00 ( ^ self)) = UIntSize.to_int ( * field_00 ( * self)) + 1 /\ UIntSize.to_int ( * field_00 ( ^ self)) = Seq.length (Ghost.inner _prod) + 1 /\ result = x) /\ unnest0 ( * self) ( ^ self)
+    (let (x, _prod) = args in UIntSize.to_int ( * field_00 ( ^ self)) = UIntSize.to_int ( * field_00 ( * self)) + 1 /\ UIntSize.to_int ( * field_00 ( ^ self)) = Seq.length (Snapshot.inner _prod) + 1 /\ result = x) /\ unnest0 ( * self) ( ^ self)
   use seq.Seq
-  predicate precondition0 [#"../03_std_iterators.rs" 48 12 48 91] (self : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32)))
+  predicate precondition0 [#"../03_std_iterators.rs" 48 12 48 91] (self : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32)))
     
    =
-    [#"../03_std_iterators.rs" 47 23 47 65] let (x, _prod) = args in UIntSize.to_int ( * field_00 self) = Seq.length (Ghost.inner _prod) /\  * field_00 self < max0
-  use prelude.Ghost
+    [#"../03_std_iterators.rs" 47 23 47 65] let (x, _prod) = args in UIntSize.to_int ( * field_00 self) = Seq.length (Snapshot.inner _prod) /\  * field_00 self < max0
+  use prelude.Snapshot
   use seq_ext.SeqExt
   use seq.Seq
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Slice
   function shallow_model5 (self : slice uint32) : Seq.seq uint32
   val shallow_model5 (self : slice uint32) : Seq.seq uint32
@@ -1689,11 +1690,11 @@ module C03StdIterators_Counter
   predicate produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (visited : Seq.seq uint32) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq uint32 . inv9 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq uint32 . inv9 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
     else
        * Seq.get fs 0 = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self /\  ^ Seq.get fs (Seq.length visited - 1) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (visited : Seq.seq uint32) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = produces1 self visited succ }
     
@@ -1749,7 +1750,7 @@ module C03StdIterators_Counter
   predicate next_precondition0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (produced : Seq.seq uint32)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -1757,7 +1758,7 @@ module C03StdIterators_Counter
   predicate preservation0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall b : uint32 . forall f : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv11 b -> inv12 f -> inv3 e2 -> inv3 e1 -> inv9 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall b : uint32 . forall f : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv11 b -> inv12 f -> inv3 e2 -> inv3 e1 -> inv9 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = preservation0 iter func }
     
@@ -1902,7 +1903,7 @@ module C03StdIterators_Counter
   predicate completed0 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 15 8 18 9] Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( * self)) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( * self) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( ^ self)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 15 8 18 9] Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( * self)) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( * self) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( ^ self)
   val completed0 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)) : bool
     ensures { result = completed0 self }
     
@@ -1923,7 +1924,7 @@ module C03StdIterators_Counter
   predicate resolve1 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 56 4 56 16] resolve3 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) /\ resolve4 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 56 4 56 27] resolve3 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) /\ resolve4 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self)
   val resolve1 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = resolve1 self }
     
@@ -1933,13 +1934,13 @@ module C03StdIterators_Counter
     ensures { inv8 result }
     
   val map_inv0 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0
-    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 138] forall i2 : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 44 15 44 51] reinitialize0 ()}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 45 15 45 70] preservation0 self func}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 21 47 25] inv2 self}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 27 47 31] inv4 func}
-    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 46 14 46 85] result = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.C_MapInv self func (Ghost.new (Seq.empty )) }
-    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 47 4 50 58] inv5 result }
+    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 46 14 46 88] result = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.C_MapInv self func (Snapshot.new (Seq.empty )) }
+    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 47 4 50 61] inv5 result }
     
   val iter0 (self : slice uint32) : Core_Slice_Iter_Iter_Type.t_iter uint32
     requires {inv1 self}
@@ -2114,7 +2115,7 @@ module C03StdIterators_SumRange
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range isize . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate resolve0 (self : borrowed (Core_Ops_Range_Range_Type.t_range isize)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -2134,11 +2135,11 @@ module C03StdIterators_SumRange
       end }
     ensures { inv2 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range isize) (res : Core_Ops_Range_Range_Type.t_range isize)
     
    =
@@ -2166,13 +2167,13 @@ module C03StdIterators_SumRange
   var n : isize = n;
   var i : isize;
   var iter : Core_Ops_Range_Range_Type.t_range isize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range isize);
-  var produced : Ghost.ghost_ty (Seq.seq isize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range isize);
+  var produced : Snapshot.snap_ty (Seq.seq isize);
   var _17 : Core_Option_Option_Type.t_option isize;
   var _18 : borrowed (Core_Ops_Range_Range_Type.t_range isize);
   var _19 : borrowed (Core_Ops_Range_Range_Type.t_range isize);
   var __creusot_proc_iter_elem : isize;
-  var _22 : Ghost.ghost_ty (Seq.seq isize);
+  var _22 : Snapshot.snap_ty (Seq.seq isize);
   {
     goto BB0
   }
@@ -2182,11 +2183,11 @@ module C03StdIterators_SumRange
     goto BB1
   }
   BB1 {
-    [#"../03_std_iterators.rs" 65 4 65 48] iter_old <- ([#"../03_std_iterators.rs" 65 4 65 48] Ghost.new iter);
+    [#"../03_std_iterators.rs" 65 4 65 48] iter_old <- ([#"../03_std_iterators.rs" 65 4 65 48] Snapshot.new iter);
     goto BB2
   }
   BB2 {
-    [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -2194,8 +2195,8 @@ module C03StdIterators_SumRange
   }
   BB4 {
     invariant { [#"../03_std_iterators.rs" 65 4 65 48] inv0 iter };
-    invariant { [#"../03_std_iterators.rs" 65 4 65 48] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 65 16 65 46] IntSize.to_int i = Seq.length (Ghost.inner produced) /\ i <= n };
+    invariant { [#"../03_std_iterators.rs" 65 4 65 48] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 65 16 65 46] IntSize.to_int i = Seq.length (Snapshot.inner produced) /\ i <= n };
     goto BB5
   }
   BB5 {
@@ -2226,13 +2227,13 @@ module C03StdIterators_SumRange
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../03_std_iterators.rs" 65 4 65 48] _22 <- ([#"../03_std_iterators.rs" 65 4 65 48] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../03_std_iterators.rs" 65 4 65 48] _22 <- ([#"../03_std_iterators.rs" 65 4 65 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] _22);
-    [#"../03_std_iterators.rs" 65 4 65 48] _22 <- any Ghost.ghost_ty (Seq.seq isize);
+    [#"../03_std_iterators.rs" 65 4 65 48] _22 <- any Snapshot.snap_ty (Seq.seq isize);
     [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + ([#"../03_std_iterators.rs" 67 13 67 14] [#"../03_std_iterators.rs" 67 13 67 14] (1 : isize)));
     goto BB4
   }
@@ -2419,7 +2420,7 @@ module C03StdIterators_EnumerateRange
   axiom inv0 : forall x : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize) . inv0 x = (invariant0 x /\ match x with
     | Core_Iter_Adapters_Enumerate_Enumerate_Type.C_Enumerate iter count -> true
     end)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve4 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve4 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -2465,16 +2466,17 @@ module C03StdIterators_EnumerateRange
       end }
     ensures { inv4 result }
     
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (usize, usize))) (ix : int) : (usize, usize) =
-    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq (usize, usize))) (ix : int) : (usize, usize)
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (usize, usize))) (ix : int) : (usize, usize)
+   =
+    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq (usize, usize))) (ix : int) : (usize, usize)
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize)) (res : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize))
     
    =
@@ -2506,13 +2508,13 @@ module C03StdIterators_EnumerateRange
   var _0 : ();
   var iter : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize);
   var _2 : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize);
-  var iter_old : Ghost.ghost_ty (Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize));
-  var produced : Ghost.ghost_ty (Seq.seq (usize, usize));
+  var iter_old : Snapshot.snap_ty (Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize));
+  var produced : Snapshot.snap_ty (Seq.seq (usize, usize));
   var _12 : Core_Option_Option_Type.t_option (usize, usize);
   var _13 : borrowed (Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize));
   var _14 : borrowed (Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize));
   var __creusot_proc_iter_elem : (usize, usize);
-  var _17 : Ghost.ghost_ty (Seq.seq (usize, usize));
+  var _17 : Snapshot.snap_ty (Seq.seq (usize, usize));
   var ix : usize;
   var x : usize;
   var _21 : (usize, usize);
@@ -2529,11 +2531,11 @@ module C03StdIterators_EnumerateRange
     goto BB2
   }
   BB2 {
-    [#"../03_std_iterators.rs" 73 4 73 96] iter_old <- ([#"../03_std_iterators.rs" 73 4 73 96] Ghost.new iter);
+    [#"../03_std_iterators.rs" 73 4 73 96] iter_old <- ([#"../03_std_iterators.rs" 73 4 73 96] Snapshot.new iter);
     goto BB3
   }
   BB3 {
-    [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -2541,8 +2543,8 @@ module C03StdIterators_EnumerateRange
   }
   BB5 {
     invariant { [#"../03_std_iterators.rs" 73 4 73 96] inv0 iter };
-    invariant { [#"../03_std_iterators.rs" 73 4 73 96] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 73 4 73 96] forall i : int . 0 <= i /\ i < Seq.length (Ghost.inner produced) -> (let (a, _) = index_logic0 produced i in a) = (let (_, a) = index_logic0 produced i in a) };
+    invariant { [#"../03_std_iterators.rs" 73 4 73 96] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 73 4 73 96] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> (let (a, _) = index_logic0 produced i in a) = (let (_, a) = index_logic0 produced i in a) };
     goto BB6
   }
   BB6 {
@@ -2580,13 +2582,13 @@ module C03StdIterators_EnumerateRange
     absurd
   }
   BB11 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _12);
-    [#"../03_std_iterators.rs" 73 4 73 96] _17 <- ([#"../03_std_iterators.rs" 73 4 73 96] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12);
+    [#"../03_std_iterators.rs" 73 4 73 96] _17 <- ([#"../03_std_iterators.rs" 73 4 73 96] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
     [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] _17);
-    [#"../03_std_iterators.rs" 73 4 73 96] _17 <- any Ghost.ghost_ty (Seq.seq (usize, usize));
+    [#"../03_std_iterators.rs" 73 4 73 96] _17 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
     [#"../03_std_iterators.rs" 74 9 74 11] ix <- ([#"../03_std_iterators.rs" 74 9 74 11] let (a, _) = __creusot_proc_iter_elem in a);
     [#"../03_std_iterators.rs" 74 13 74 14] x <- ([#"../03_std_iterators.rs" 74 13 74 14] let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve1 __creusot_proc_iter_elem };
@@ -2813,16 +2815,16 @@ module C03StdIterators_MyReverse
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize) . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (slice t)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (slice t))) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (slice t)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (slice t))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (slice t)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (slice t))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (slice t)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (slice t))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (slice t)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (slice t)) . inv0 x = true
   use seq.Seq
   use seq.Reverse
   use prelude.Slice
@@ -2909,22 +2911,22 @@ module C03StdIterators_MyReverse
   val equiv_range0 [#"../03_std_iterators.rs" 80 0 80 65] (s1 : Seq.seq t) (s2 : Seq.seq t) (l : int) (u : int) : bool
     ensures { result = equiv_range0 s1 s2 l u }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model5 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model1 self
   val shallow_model5 (self : borrowed (slice t)) : Seq.seq t
     ensures { result = shallow_model5 self }
     
-  use prelude.Ghost
-  function shallow_model2 (self : Ghost.ghost_ty (borrowed (slice t))) : Seq.seq t =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model2 (self : Ghost.ghost_ty (borrowed (slice t))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model2 (self : Snapshot.snap_ty (borrowed (slice t))) : Seq.seq t =
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model2 (self : Snapshot.snap_ty (borrowed (slice t))) : Seq.seq t
     ensures { result = shallow_model2 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post1 (self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize)) (res : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize))
     
    =
@@ -2965,11 +2967,11 @@ module C03StdIterators_MyReverse
     ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 125 26 125 62] into_iter_post0 other (iterb0 result) }
     ensures { inv1 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (slice t)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (slice t))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (slice t)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (slice t))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model4 (self : slice t) : Seq.seq t =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model3 self
   val shallow_model4 (self : slice t) : Seq.seq t
@@ -2987,18 +2989,18 @@ module C03StdIterators_MyReverse
   var _0 : ();
   var slice : borrowed (slice t) = slice;
   var n : usize;
-  var old_v : Ghost.ghost_ty (borrowed (slice t));
+  var old_v : Snapshot.snap_ty (borrowed (slice t));
   var iter : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize);
   var _8 : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize);
   var _12 : bool;
   var _16 : bool;
-  var iter_old : Ghost.ghost_ty (Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize));
-  var produced : Ghost.ghost_ty (Seq.seq (usize, usize));
+  var iter_old : Snapshot.snap_ty (Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize));
+  var produced : Snapshot.snap_ty (Seq.seq (usize, usize));
   var _28 : Core_Option_Option_Type.t_option (usize, usize);
   var _29 : borrowed (Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize));
   var _30 : borrowed (Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize));
   var __creusot_proc_iter_elem : (usize, usize);
-  var _33 : Ghost.ghost_ty (Seq.seq (usize, usize));
+  var _33 : Snapshot.snap_ty (Seq.seq (usize, usize));
   var i : usize;
   var j : usize;
   var _37 : ();
@@ -3011,7 +3013,7 @@ module C03StdIterators_MyReverse
     goto BB1
   }
   BB1 {
-    [#"../03_std_iterators.rs" 96 33 96 46] old_v <- ([#"../03_std_iterators.rs" 96 33 96 46] Ghost.new slice);
+    [#"../03_std_iterators.rs" 96 36 96 55] old_v <- ([#"../03_std_iterators.rs" 96 36 96 55] Snapshot.new slice);
     goto BB2
   }
   BB2 {
@@ -3036,11 +3038,11 @@ module C03StdIterators_MyReverse
     goto BB6
   }
   BB6 {
-    [#"../03_std_iterators.rs" 97 4 97 36] iter_old <- ([#"../03_std_iterators.rs" 97 4 97 36] Ghost.new iter);
+    [#"../03_std_iterators.rs" 97 4 97 36] iter_old <- ([#"../03_std_iterators.rs" 97 4 97 36] Snapshot.new iter);
     goto BB7
   }
   BB7 {
-    [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] Ghost.new (Seq.empty ));
+    [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] Snapshot.new (Seq.empty ));
     goto BB8
   }
   BB8 {
@@ -3048,11 +3050,11 @@ module C03StdIterators_MyReverse
   }
   BB9 {
     invariant { [#"../03_std_iterators.rs" 97 4 97 36] inv1 iter };
-    invariant { [#"../03_std_iterators.rs" 97 4 97 36] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../03_std_iterators.rs" 97 4 97 36] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../03_std_iterators.rs" 97 16 97 34] UIntSize.to_int n = Seq.length (shallow_model1 slice) };
-    invariant { [#"../03_std_iterators.rs" 98 16 98 78] equiv_range0 (shallow_model1 slice) (shallow_model2 old_v) (Seq.length (Ghost.inner produced)) (UIntSize.to_int n - Seq.length (Ghost.inner produced)) };
-    invariant { [#"../03_std_iterators.rs" 99 16 99 76] equiv_reverse_range0 (shallow_model1 slice) (shallow_model2 old_v) 0 (Seq.length (Ghost.inner produced)) (UIntSize.to_int n - 1) };
-    invariant { [#"../03_std_iterators.rs" 100 16 100 80] equiv_reverse_range0 (shallow_model1 slice) (shallow_model2 old_v) (UIntSize.to_int n - Seq.length (Ghost.inner produced)) (UIntSize.to_int n) (UIntSize.to_int n - 1) };
+    invariant { [#"../03_std_iterators.rs" 98 16 98 78] equiv_range0 (shallow_model1 slice) (shallow_model2 old_v) (Seq.length (Snapshot.inner produced)) (UIntSize.to_int n - Seq.length (Snapshot.inner produced)) };
+    invariant { [#"../03_std_iterators.rs" 99 16 99 76] equiv_reverse_range0 (shallow_model1 slice) (shallow_model2 old_v) 0 (Seq.length (Snapshot.inner produced)) (UIntSize.to_int n - 1) };
+    invariant { [#"../03_std_iterators.rs" 100 16 100 80] equiv_reverse_range0 (shallow_model1 slice) (shallow_model2 old_v) (UIntSize.to_int n - Seq.length (Snapshot.inner produced)) (UIntSize.to_int n) (UIntSize.to_int n - 1) };
     goto BB10
   }
   BB10 {
@@ -3087,13 +3089,13 @@ module C03StdIterators_MyReverse
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _28);
-    [#"../03_std_iterators.rs" 97 4 97 36] _33 <- ([#"../03_std_iterators.rs" 97 4 97 36] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28);
+    [#"../03_std_iterators.rs" 97 4 97 36] _33 <- ([#"../03_std_iterators.rs" 97 4 97 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB16
   }
   BB16 {
     [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] _33);
-    [#"../03_std_iterators.rs" 97 4 97 36] _33 <- any Ghost.ghost_ty (Seq.seq (usize, usize));
+    [#"../03_std_iterators.rs" 97 4 97 36] _33 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
     [#"../03_std_iterators.rs" 101 9 101 10] i <- ([#"../03_std_iterators.rs" 101 9 101 10] let (a, _) = __creusot_proc_iter_elem in a);
     [#"../03_std_iterators.rs" 101 12 101 13] j <- ([#"../03_std_iterators.rs" 101 12 101 13] let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve2 __creusot_proc_iter_elem };
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.rs b/creusot/tests/should_succeed/iterators/03_std_iterators.rs
index 9eacdb997d..48129ab740 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.rs
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.rs
@@ -93,7 +93,7 @@ fn equiv_reverse_range<T>(s1: Seq<T>, s2: Seq<T>, l: Int, u: Int, n: Int) -> boo
 #[ensures((^slice)@.ext_eq(slice@.reverse()))]
 pub fn my_reverse<T>(slice: &mut [T]) {
     let n = slice.len();
-    let old_v: Ghost<&mut [T]> = gh! { slice };
+    let old_v: Snapshot<&mut [T]> = snapshot! { slice };
     #[invariant(n@ == slice@.len())]
     #[invariant(equiv_range(slice@, old_v@, produced.len(), n@-produced.len()))]
     #[invariant(equiv_reverse_range(slice@, old_v@, 0, produced.len(), n@-1))]
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index 247a964a99..c8924be797 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -296,25 +296,25 @@ module C04Skip_Impl0_Next
     ensures { result = produces_refl0 self }
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant1 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant1 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv1 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv1 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv1 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv1 x = true
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
+  axiom inv1 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv1 x = true
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i)) . inv0 x = true
   predicate resolve3 (self : item0)
   val resolve3 (self : item0) : bool
     ensures { result = resolve3 self }
@@ -357,19 +357,19 @@ module C04Skip_Impl0_Next
       end }
     ensures { [#"../common.rs" 27 26 27 44] inv5 result }
     
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq item0)) (ix : int) : item0 =
-    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq item0)) (ix : int) : item0
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq item0)) (ix : int) : item0 =
+    [#"../../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq item0)) (ix : int) : item0
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty (Seq.seq item0))
-  val resolve2 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty (Seq.seq item0))
+  val resolve2 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve1 (self : borrowed usize) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed usize) : bool
@@ -386,11 +386,11 @@ module C04Skip_Impl0_Next
     ensures { [#"../../../../../creusot-contracts/src/std/mem.rs" 16 22 16 42] is_default0 ( ^ dest) }
     ensures { inv7 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg next [#"../04_skip.rs" 63 4 63 41] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : Core_Option_Option_Type.t_option item0
     requires {[#"../04_skip.rs" 63 17 63 21] inv2 self}
     ensures { [#"../04_skip.rs" 59 14 62 5] match result with
@@ -402,20 +402,20 @@ module C04Skip_Impl0_Next
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option item0;
   var self : borrowed (C04Skip_Skip_Type.t_skip i) = self;
-  var old_self : Ghost.ghost_ty (borrowed (C04Skip_Skip_Type.t_skip i));
+  var old_self : Snapshot.snap_ty (borrowed (C04Skip_Skip_Type.t_skip i));
   var n : usize;
   var _6 : borrowed usize;
   var _7 : borrowed usize;
-  var skipped : Ghost.ghost_ty (Seq.seq item0);
+  var skipped : Snapshot.snap_ty (Seq.seq item0);
   var r : Core_Option_Option_Type.t_option item0;
   var _18 : borrowed i;
   var x : item0;
-  var _25 : Ghost.ghost_ty (Seq.seq item0);
+  var _25 : Snapshot.snap_ty (Seq.seq item0);
   {
     goto BB0
   }
   BB0 {
-    [#"../04_skip.rs" 64 23 64 35] old_self <- ([#"../04_skip.rs" 64 23 64 35] Ghost.new self);
+    [#"../04_skip.rs" 64 23 64 41] old_self <- ([#"../04_skip.rs" 64 23 64 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -431,7 +431,7 @@ module C04Skip_Impl0_Next
   }
   BB2 {
     assume { resolve1 _7 };
-    [#"../04_skip.rs" 66 26 66 44] skipped <- ([#"../04_skip.rs" 66 26 66 44] Ghost.new (Seq.empty ));
+    [#"../04_skip.rs" 66 26 66 50] skipped <- ([#"../04_skip.rs" 66 26 66 50] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -440,9 +440,9 @@ module C04Skip_Impl0_Next
     goto BB4
   }
   BB4 {
-    invariant { [#"../04_skip.rs" 67 20 67 53] Seq.length (Ghost.inner skipped) + UIntSize.to_int n = UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * Ghost.inner old_self)) };
-    invariant { [#"../04_skip.rs" 67 8 67 55] produces0 (C04Skip_Skip_Type.skip_iter ( * Ghost.inner old_self)) (Ghost.inner skipped) (C04Skip_Skip_Type.skip_iter ( * self)) };
-    invariant { [#"../04_skip.rs" 67 8 67 55] forall i : int . 0 <= i /\ i < Seq.length (Ghost.inner skipped) -> resolve3 (index_logic0 skipped i) };
+    invariant { [#"../04_skip.rs" 67 20 67 53] Seq.length (Snapshot.inner skipped) + UIntSize.to_int n = UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * Snapshot.inner old_self)) };
+    invariant { [#"../04_skip.rs" 67 8 67 55] produces0 (C04Skip_Skip_Type.skip_iter ( * Snapshot.inner old_self)) (Snapshot.inner skipped) (C04Skip_Skip_Type.skip_iter ( * self)) };
+    invariant { [#"../04_skip.rs" 67 8 67 55] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner skipped) -> resolve3 (index_logic0 skipped i) };
     invariant { [#"../04_skip.rs" 70 20 70 35] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) = 0 };
     invariant { [#"../04_skip.rs" 71 20 71 29] inv2 self };
     goto BB5
@@ -491,12 +491,12 @@ module C04Skip_Impl0_Next
     assume { resolve3 x };
     assert { [@expl:type invariant] inv5 r };
     assume { resolve4 r };
-    [#"../04_skip.rs" 78 26 78 67] _25 <- ([#"../04_skip.rs" 78 26 78 67] Ghost.new (Seq.(++) (Ghost.inner skipped) (Seq.singleton x)));
+    [#"../04_skip.rs" 78 26 78 73] _25 <- ([#"../04_skip.rs" 78 26 78 73] Snapshot.new (Seq.(++) (Snapshot.inner skipped) (Seq.singleton x)));
     goto BB12
   }
   BB12 {
-    [#"../04_skip.rs" 78 16 78 67] skipped <- ([#"../04_skip.rs" 78 16 78 67] _25);
-    [#"../04_skip.rs" 78 16 78 67] _25 <- any Ghost.ghost_ty (Seq.seq item0);
+    [#"../04_skip.rs" 78 16 78 73] skipped <- ([#"../04_skip.rs" 78 16 78 73] _25);
+    [#"../04_skip.rs" 78 16 78 73] _25 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 skipped };
     assume { resolve2 skipped };
     [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - ([#"../04_skip.rs" 79 21 79 22] [#"../04_skip.rs" 79 21 79 22] (1 : usize)));
diff --git a/creusot/tests/should_succeed/iterators/04_skip.rs b/creusot/tests/should_succeed/iterators/04_skip.rs
index ff5ebbc063..792f7a31d8 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.rs
+++ b/creusot/tests/should_succeed/iterators/04_skip.rs
@@ -18,7 +18,7 @@ where
     type Item = I::Item;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             (^self).n@ == 0 &&
@@ -32,7 +32,7 @@ where
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             visited == Seq::EMPTY && self == o ||
@@ -61,9 +61,9 @@ where
       Some(v) => (*self).produces(Seq::singleton(v), ^self)
     })]
     fn next(&mut self) -> Option<I::Item> {
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         let mut n = std::mem::take(&mut self.n);
-        let mut skipped = gh! { Seq::EMPTY };
+        let mut skipped = snapshot! { Seq::EMPTY };
         #[invariant(skipped.len() + n@ == old_self.n@)]
         #[invariant(old_self.iter.produces(skipped.inner(), self.iter))]
         #[invariant(forall<i: Int> 0 <= i && i < skipped.len() ==> skipped[i].resolve())]
@@ -75,7 +75,7 @@ where
                 return r;
             }
             if let Some(x) = r {
-                skipped = gh! { skipped.concat(Seq::singleton(x)) };
+                skipped = snapshot! { skipped.concat(Seq::singleton(x)) };
                 n -= 1
             } else {
                 return r;
diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index e8ee06ea2e..f03f4055a9 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -1220,7 +1220,7 @@ module C05Map_Impl0_Next
   val completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
     ensures { result = completed0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (C05Map_Map_Type.t_map i b f)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
@@ -1233,11 +1233,11 @@ module C05Map_Impl0_Next
     ensures { [#"../../../../../creusot-contracts/src/std/ops.rs" 148 0 172 1] postcondition_mut0 self args result }
     ensures { inv8 result }
     
-  predicate resolve1 (self : Ghost.ghost_ty ())
-  val resolve1 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve1 (self : Snapshot.snap_ty ())
+  val resolve1 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function produces_one_invariant0 [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
   val produces_one_invariant0 [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
@@ -1278,7 +1278,7 @@ module C05Map_Impl0_Next
   var _3 : Core_Option_Option_Type.t_option item0;
   var _4 : borrowed i;
   var v : item0;
-  var _9 : Ghost.ghost_ty ();
+  var _9 : Snapshot.snap_ty ();
   var _11 : b;
   var _12 : borrowed f;
   {
@@ -1326,7 +1326,7 @@ module C05Map_Impl0_Next
     goto BB6
   }
   BB6 {
-    [#"../05_map.rs" 64 16 64 52] _9 <- ([#"../05_map.rs" 64 16 64 52] Ghost.new ());
+    [#"../05_map.rs" 64 16 64 58] _9 <- ([#"../05_map.rs" 64 16 64 58] Snapshot.new ());
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/iterators/05_map.rs b/creusot/tests/should_succeed/iterators/05_map.rs
index f3bd5283ab..971ea5dbe3 100644
--- a/creusot/tests/should_succeed/iterators/05_map.rs
+++ b/creusot/tests/should_succeed/iterators/05_map.rs
@@ -18,7 +18,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Iterator for Map<I, B, F> {
     type Item = B;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.iter.completed() && (*self).func == (^self).func }
     }
@@ -36,7 +36,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Iterator for Map<I, B, F> {
     fn produces_trans(a: Self, ab: Seq<Self::Item>, b: Self, bc: Seq<Self::Item>, c: Self) {}
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     #[why3::attr = "inline:trivial"]
     fn produces(self, visited: Seq<Self::Item>, succ: Self) -> bool {
         pearlite! {
@@ -61,7 +61,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Iterator for Map<I, B, F> {
         match self.iter.next() {
             Some(v) => {
                 proof_assert! { self.func.precondition((v,)) };
-                gh! { Self::produces_one_invariant };
+                snapshot! { Self::produces_one_invariant };
                 Some((self.func)(v))
             }
             None => None,
@@ -70,14 +70,14 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Iterator for Map<I, B, F> {
 }
 
 impl<I: Iterator, B, F: FnMut(I::Item) -> B> Map<I, B, F> {
-    #[predicate]
+    #[predicate(prophetic)]
     fn next_precondition(iter: I, func: F) -> bool {
         pearlite! {
             forall<e: I::Item, i: I> iter.produces(Seq::singleton(e), i) ==> func.precondition((e,))
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn preservation(iter: I, func: F) -> bool {
         pearlite! {
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
@@ -89,7 +89,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Map<I, B, F> {
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn reinitialize() -> bool {
         pearlite! {
             forall<iter: &mut I, func: F>
@@ -98,7 +98,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Map<I, B, F> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.iter.produces(Seq::singleton(e), iter))]
     #[requires(*f == self.func)]
     #[requires(f.postcondition_mut((e,), r) )]
@@ -112,7 +112,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Map<I, B, F> {
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     #[ensures(result == self.produces(Seq::singleton(visited), succ))]
     fn produces_one(self, visited: B, succ: Self) -> bool {
         pearlite! {
@@ -126,7 +126,7 @@ impl<I: Iterator, B, F: FnMut(I::Item) -> B> Map<I, B, F> {
 
 impl<I: Iterator, B, F: FnMut(I::Item) -> B> Invariant for Map<I, B, F> {
     // Should not quantify over self or the `invariant` cannot be made into a type invariant
-    #[predicate]
+    #[predicate(prophetic)]
     #[open(self)]
     fn invariant(self) -> bool {
         pearlite! {
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 034ca354fa..0a3bb325c0 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -2,11 +2,11 @@
 module C06MapPrecond_Map_Type
   type item0
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   type t_map 'i 'b 'f 'proj0 =
-    | C_Map 'i 'f (Ghost.ghost_ty (Seq.seq 'proj0))
+    | C_Map 'i 'f (Snapshot.snap_ty (Seq.seq 'proj0))
     
-  let function map_produced (self : t_map 'i 'b 'f 'proj0) : Ghost.ghost_ty (Seq.seq 'proj0)
+  let function map_produced (self : t_map 'i 'b 'f 'proj0) : Snapshot.snap_ty (Seq.seq 'proj0)
    = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_Map _ _ a -> a
@@ -26,31 +26,31 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   type f
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant6 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant6 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  use prelude.Snapshot
+  predicate invariant6 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant6 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant6 self }
     
-  predicate inv6 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv6 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv6 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv6 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv6 _x }
     
-  axiom inv6 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv6 x = true
+  axiom inv6 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv6 x = true
   predicate resolve0 (self : f)
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
   use prelude.Borrow
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   predicate inv4 (_x : borrowed f)
   val inv4 (_x : borrowed f) : bool
     ensures { result = inv4 _x }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
   predicate inv3 (_x : b)
@@ -61,14 +61,14 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   val inv1 (_x : f) : bool
     ensures { result = inv1 _x }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -89,15 +89,16 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant5 (self : item0)
   val invariant5 (self : item0) : bool
     ensures { result = invariant5 self }
@@ -165,14 +166,14 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : i . inv0 x = true
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -183,7 +184,7 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     ensures { [#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> result = preservation0 iter func }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 94 8 101 9] pure {forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))}
+    [#"../06_map_precond.rs" 94 8 101 9] pure {forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))}
 end
 module C06MapPrecond_Impl0_ProducesRefl_Impl
   type i
@@ -219,16 +220,16 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     
   axiom inv8 : forall x : b . inv8 x = true
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant7 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant7 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  use prelude.Snapshot
+  predicate invariant7 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant7 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv7 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv7 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv7 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv7 x = true
+  axiom inv7 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv7 x = true
   predicate invariant6 (self : borrowed f)
   val invariant6 (self : borrowed f) : bool
     ensures { result = invariant6 self }
@@ -238,15 +239,15 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     ensures { result = inv6 _x }
     
   axiom inv6 : forall x : borrowed f . inv6 x = true
-  predicate invariant5 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant5 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate invariant5 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant5 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant5 self }
     
-  predicate inv5 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv5 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv5 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv5 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv5 _x }
     
-  axiom inv5 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv5 x = true
+  axiom inv5 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv5 x = true
   predicate invariant4 (self : f)
   val invariant4 (self : f) : bool
     ensures { result = invariant4 self }
@@ -287,22 +288,22 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -323,15 +324,16 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -357,25 +359,25 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     ensures { result = produces_refl0 self }
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv3 i -> inv10 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv3 i -> inv10 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv3 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
@@ -383,7 +385,7 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv3 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv1 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -395,7 +397,7 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant0 self }
     
@@ -412,17 +414,17 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
   use seq.Seq
   use prelude.Int
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -468,16 +470,16 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     
   axiom inv9 : forall x : b . inv9 x = true
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant8 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant8 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  use prelude.Snapshot
+  predicate invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv8 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv8 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv8 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv8 x = true
+  axiom inv8 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv8 x = true
   predicate invariant7 (self : borrowed f)
   val invariant7 (self : borrowed f) : bool
     ensures { result = invariant7 self }
@@ -487,15 +489,15 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     ensures { result = inv7 _x }
     
   axiom inv7 : forall x : borrowed f . inv7 x = true
-  predicate invariant6 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant6 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate invariant6 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant6 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant6 self }
     
-  predicate inv6 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv6 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv6 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv6 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv6 _x }
     
-  axiom inv6 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv6 x = true
+  axiom inv6 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv6 x = true
   predicate invariant5 (self : f)
   val invariant5 (self : f) : bool
     ensures { result = invariant5 self }
@@ -536,22 +538,22 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -572,15 +574,16 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -615,25 +618,25 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : Seq.seq b . inv1 x = true
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv11 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv11 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv4 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv5 func}
@@ -641,7 +644,7 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv5 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -653,7 +656,7 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant0 self }
     
@@ -671,17 +674,17 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   use seq.Seq
   use prelude.Int
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -725,16 +728,16 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   axiom inv11 : forall x : borrowed i . inv11 x = true
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant10 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant10 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  use prelude.Snapshot
+  predicate invariant10 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant10 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant10 self }
     
-  predicate inv10 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv10 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv10 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv10 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv10 _x }
     
-  axiom inv10 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv10 x = true
+  axiom inv10 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv10 x = true
   predicate invariant9 (self : Seq.seq b)
   val invariant9 (self : Seq.seq b) : bool
     ensures { result = invariant9 self }
@@ -744,15 +747,15 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     ensures { result = inv9 _x }
     
   axiom inv9 : forall x : Seq.seq b . inv9 x = true
-  predicate invariant8 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant8 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate invariant8 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant8 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv8 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv8 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv8 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv8 x = true
+  axiom inv8 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv8 x = true
   predicate invariant7 (self : f)
   val invariant7 (self : f) : bool
     ensures { result = invariant7 self }
@@ -793,30 +796,30 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   predicate inv2 (_x : borrowed f)
   val inv2 (_x : borrowed f) : bool
     ensures { result = inv2 _x }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
   predicate inv1 (_x : b)
   val inv1 (_x : b) : bool
     ensures { result = inv1 _x }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv10 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -837,15 +840,16 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv10 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant3 (self : item0)
   val invariant3 (self : item0) : bool
     ensures { result = invariant3 self }
@@ -892,28 +896,28 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     ensures { result = inv0 _x }
     
   use seq.Seq
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq_ext.SeqExt
   use seq.Seq
   use seq.Seq
   use prelude.Int
   use seq.Seq
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -947,18 +951,18 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   axiom inv1 : forall x : b . inv1 x = true
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv6 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv6 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv6 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv7 func}
@@ -976,7 +980,7 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     ensures { result = reinitialize0 _1 }
     
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant0 self }
     
@@ -991,7 +995,7 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     ensures { [#"../06_map_precond.rs" 141 14 141 68] result = produces0 self (Seq.singleton visited) succ }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 143 8 149 9] pure {exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)}
+    [#"../06_map_precond.rs" 143 8 149 9] pure {exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)}
 end
 module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   type i
@@ -1009,25 +1013,25 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   axiom inv9 : forall x : borrowed i . inv9 x = true
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant8 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant8 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant8 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant8 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv8 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv8 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv8 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv8 x = true
-  predicate invariant7 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant7 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  axiom inv8 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv8 x = true
+  predicate invariant7 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant7 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv7 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv7 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv7 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv7 x = true
+  axiom inv7 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv7 x = true
   predicate invariant6 (self : f)
   val invariant6 (self : f) : bool
     ensures { result = invariant6 self }
@@ -1082,23 +1086,23 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : item0 . inv1 x = true
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   use seq.Seq
@@ -1108,13 +1112,13 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv4 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv6 func}
@@ -1122,7 +1126,7 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv6 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv5 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -1134,7 +1138,7 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant0 self }
     
@@ -1149,18 +1153,18 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv6 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -1177,15 +1181,16 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   function produces_trans0 [#"../common.rs" 21 4 21 91] (a : i) (ab : Seq.seq item0) (b : i) (bc : Seq.seq item0) (c : i) : ()
     
   val produces_trans0 [#"../common.rs" 21 4 21 91] (a : i) (ab : Seq.seq item0) (b : i) (bc : Seq.seq item0) (c : i) : ()
@@ -1214,8 +1219,8 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     requires {[#"../06_map_precond.rs" 132 48 132 49] inv2 r}
     requires {[#"../06_map_precond.rs" 132 54 132 55] inv3 f}
     requires {[#"../06_map_precond.rs" 132 65 132 69] inv4 iter}
-    ensures { [#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
-    ensures { [#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
+    ensures { [#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
+    ensures { [#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
     [#"../06_map_precond.rs" 126 4 126 12] let _ = let a = pure {forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i} in assert {a} in ()
@@ -1254,9 +1259,9 @@ module C06MapPrecond_Impl0_Next
     ensures { result = inv11 _x }
     
   axiom inv11 : forall x : item0 . inv11 x = true
-  use prelude.Ghost
-  predicate inv3 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv3 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate inv3 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv3 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv3 _x }
     
   predicate inv2 (_x : f)
@@ -1267,23 +1272,23 @@ module C06MapPrecond_Impl0_Next
   val inv0 (_x : i) : bool
     ensures { result = inv0 _x }
     
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv11 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv11 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   use seq.Seq
@@ -1301,13 +1306,13 @@ module C06MapPrecond_Impl0_Next
     ensures { result = inv9 _x }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv0 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv2 func}
@@ -1315,7 +1320,7 @@ module C06MapPrecond_Impl0_Next
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv12 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -1331,7 +1336,7 @@ module C06MapPrecond_Impl0_Next
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant10 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant10 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant10 self }
     
@@ -1351,22 +1356,22 @@ module C06MapPrecond_Impl0_Next
   val resolve4 (self : f) : bool
     ensures { result = resolve4 self }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
-  predicate inv8 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv8 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv8 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv8 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv8 _x }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve4 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve4 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -1383,20 +1388,21 @@ module C06MapPrecond_Impl0_Next
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
-  predicate invariant8 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant8 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  predicate invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant8 self }
     
-  axiom inv8 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv8 x = true
+  axiom inv8 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv8 x = true
   predicate invariant7 (self : borrowed f)
   val invariant7 (self : borrowed f) : bool
     ensures { result = invariant7 self }
@@ -1426,11 +1432,11 @@ module C06MapPrecond_Impl0_Next
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv4 x = (inv10 ( * x) /\ inv10 ( ^ x))
-  predicate invariant3 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant3 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate invariant3 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant3 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant3 self }
     
-  axiom inv3 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv3 x = true
+  axiom inv3 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv3 x = true
   predicate invariant2 (self : f)
   val invariant2 (self : f) : bool
     ensures { result = invariant2 self }
@@ -1469,7 +1475,7 @@ module C06MapPrecond_Impl0_Next
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : i . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use seq_ext.SeqExt
   use seq.Seq
@@ -1481,11 +1487,11 @@ module C06MapPrecond_Impl0_Next
   predicate produces1 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv12 s /\ Seq.length s = Seq.length visited /\ produces0 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv12 s /\ Seq.length s = Seq.length visited /\ produces0 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces1 self visited succ }
     
@@ -1493,7 +1499,7 @@ module C06MapPrecond_Impl0_Next
   predicate produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv7 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv11 e /\ produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
+    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv7 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv11 e /\ produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
   val produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     requires {[#"../06_map_precond.rs" 142 20 142 24] inv10 self}
     requires {[#"../06_map_precond.rs" 142 26 142 33] inv9 visited}
@@ -1503,15 +1509,15 @@ module C06MapPrecond_Impl0_Next
   axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv10 self) -> ([#"../06_map_precond.rs" 142 26 142 33] inv9 visited) -> ([#"../06_map_precond.rs" 142 38 142 42] inv10 succ) -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces1 self (Seq.singleton visited) succ)
   predicate completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
    =
-    [#"../06_map_precond.rs" 22 8 25 9] Ghost.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
+    [#"../06_map_precond.rs" 22 8 25 9] Snapshot.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
   val completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
     ensures { result = completed0 self }
     
-  predicate resolve3 (self : Ghost.ghost_ty ())
-  val resolve3 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve3 (self : Snapshot.snap_ty ())
+  val resolve3 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve3 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function produces_one_invariant0 [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
   val produces_one_invariant0 [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
@@ -1525,17 +1531,17 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../06_map_precond.rs" 132 65 132 69] inv0 iter}
     ensures { result = produces_one_invariant0 self e r f iter }
     
-  axiom produces_one_invariant0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, e : item0, r : b, f : borrowed f, iter : i . ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 132 30 132 34] inv10 self) -> ([#"../06_map_precond.rs" 132 36 132 37] inv11 e) -> ([#"../06_map_precond.rs" 132 48 132 49] inv9 r) -> ([#"../06_map_precond.rs" 132 54 132 55] inv7 f) -> ([#"../06_map_precond.rs" 132 65 132 69] inv0 iter) -> ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e))
+  axiom produces_one_invariant0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, e : item0, r : b, f : borrowed f, iter : i . ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 132 30 132 34] inv10 self) -> ([#"../06_map_precond.rs" 132 36 132 37] inv11 e) -> ([#"../06_map_precond.rs" 132 48 132 49] inv9 r) -> ([#"../06_map_precond.rs" 132 54 132 55] inv7 f) -> ([#"../06_map_precond.rs" 132 65 132 69] inv0 iter) -> ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e))
   predicate resolve2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
     ensures { result = resolve2 self }
     
-  predicate resolve1 (self : Ghost.ghost_ty (Seq.seq item0))
-  val resolve1 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate resolve1 (self : Snapshot.snap_ty (Seq.seq item0))
+  val resolve1 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = resolve1 self }
     
-  val call_mut0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) : b
+  val call_mut0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) : b
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 160 27 160 52] precondition0 ( * self) args}
     requires {inv7 self}
     requires {inv8 args}
@@ -1568,11 +1574,11 @@ module C06MapPrecond_Impl0_Next
   var _3 : Core_Option_Option_Type.t_option item0;
   var _4 : borrowed i;
   var v : item0;
-  var produced : Ghost.ghost_ty (Seq.seq item0);
+  var produced : Snapshot.snap_ty (Seq.seq item0);
   var r : b;
   var _12 : borrowed f;
-  var _17 : Ghost.ghost_ty ();
-  var _20 : Ghost.ghost_ty (Seq.seq item0);
+  var _17 : Snapshot.snap_ty ();
+  var _20 : Snapshot.snap_ty (Seq.seq item0);
   {
     goto BB0
   }
@@ -1593,7 +1599,7 @@ module C06MapPrecond_Impl0_Next
   BB2 {
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
-    [#"../06_map_precond.rs" 74 32 74 50] _20 <- ([#"../06_map_precond.rs" 74 32 74 50] Ghost.new (Seq.empty ));
+    [#"../06_map_precond.rs" 74 32 74 56] _20 <- ([#"../06_map_precond.rs" 74 32 74 56] Snapshot.new (Seq.empty ));
     goto BB14
   }
   BB3 {
@@ -1616,7 +1622,7 @@ module C06MapPrecond_Impl0_Next
     goto BB6
   }
   BB6 {
-    [#"../06_map_precond.rs" 67 31 67 60] produced <- ([#"../06_map_precond.rs" 67 31 67 60] Ghost.new (Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced ( * self))) v));
+    [#"../06_map_precond.rs" 67 31 67 66] produced <- ([#"../06_map_precond.rs" 67 31 67 66] Snapshot.new (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced ( * self))) v));
     goto BB7
   }
   BB7 {
@@ -1639,7 +1645,7 @@ module C06MapPrecond_Impl0_Next
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
     assume { resolve2 self };
-    [#"../06_map_precond.rs" 70 16 70 52] _17 <- ([#"../06_map_precond.rs" 70 16 70 52] Ghost.new ());
+    [#"../06_map_precond.rs" 70 16 70 58] _17 <- ([#"../06_map_precond.rs" 70 16 70 58] Snapshot.new ());
     goto BB10
   }
   BB10 {
@@ -1658,8 +1664,8 @@ module C06MapPrecond_Impl0_Next
     goto BB15
   }
   BB14 {
-    [#"../06_map_precond.rs" 74 16 74 50] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 74 16 74 50] _20)) ; };
-    [#"../06_map_precond.rs" 74 16 74 50] _20 <- any Ghost.ghost_ty (Seq.seq item0);
+    [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 74 16 74 56] _20)) ; };
+    [#"../06_map_precond.rs" 74 16 74 56] _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
@@ -1681,40 +1687,40 @@ module C06MapPrecond_Map
   type f
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant9 (self : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val invariant9 (self : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  use prelude.Snapshot
+  predicate invariant9 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val invariant9 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant9 self }
     
-  predicate inv9 (_x : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val inv9 (_x : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate inv9 (_x : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val inv9 (_x : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = inv9 _x }
     
-  axiom inv9 : forall x : (item0, Ghost.ghost_ty (Seq.seq item0)) . inv9 x = true
-  predicate invariant8 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant8 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  axiom inv9 : forall x : (item0, Snapshot.snap_ty (Seq.seq item0)) . inv9 x = true
+  predicate invariant8 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant8 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv8 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv8 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv8 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv8 x = true
+  axiom inv8 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv8 x = true
   predicate resolve0 (self : f)
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
     
   use prelude.Borrow
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   predicate inv6 (_x : borrowed f)
   val inv6 (_x : borrowed f) : bool
     ensures { result = inv6 _x }
     
-  predicate postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_once0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_once0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_once0 self _2 _3 }
     
   predicate inv5 (_x : b)
@@ -1725,14 +1731,14 @@ module C06MapPrecond_Map
   val inv2 (_x : f) : bool
     ensures { result = inv2 _x }
     
-  function fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val fn_mut_once0 (self : f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+  val fn_mut_once0 (self : f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -1753,15 +1759,16 @@ module C06MapPrecond_Map
     ensures { result = unnest_refl0 self }
     
   axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
-  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
-  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (res : b) : ()
+  function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
+    
+  val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args}
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Ghost.ghost_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant7 (self : Seq.seq item0)
   val invariant7 (self : Seq.seq item0) : bool
     ensures { result = invariant7 self }
@@ -1794,11 +1801,11 @@ module C06MapPrecond_Map
   val inv0 (_x : i) : bool
     ensures { result = inv0 _x }
     
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces0 self visited o }
@@ -1809,20 +1816,20 @@ module C06MapPrecond_Map
     ensures { result = inv1 _x }
     
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv0 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv2 func}
@@ -1830,7 +1837,7 @@ module C06MapPrecond_Map
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -1842,7 +1849,7 @@ module C06MapPrecond_Map
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant3 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant3 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant3 self }
     
@@ -1888,19 +1895,19 @@ module C06MapPrecond_Map
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   let rec cfg map [#"../06_map_precond.rs" 170 0 173 17] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) (func : f) : C06MapPrecond_Map_Type.t_map i b f item0
-    requires {[#"../06_map_precond.rs" 166 0 166 128] forall i2 : i . forall e : item0 . inv0 i2 -> inv1 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv0 i2 -> inv1 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv0 iter}
     requires {[#"../06_map_precond.rs" 172 4 172 8] inv2 func}
-    ensures { [#"../06_map_precond.rs" 169 10 169 72] result = C06MapPrecond_Map_Type.C_Map iter func (Ghost.new (Seq.empty )) }
+    ensures { [#"../06_map_precond.rs" 169 10 169 75] result = C06MapPrecond_Map_Type.C_Map iter func (Snapshot.new (Seq.empty )) }
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : C06MapPrecond_Map_Type.t_map i b f item0;
   var iter : i = iter;
   var func : f = func;
-  var _9 : Ghost.ghost_ty (Seq.seq item0);
+  var _9 : Snapshot.snap_ty (Seq.seq item0);
   {
     goto BB0
   }
@@ -1914,14 +1921,14 @@ module C06MapPrecond_Map
     goto BB3
   }
   BB3 {
-    [#"../06_map_precond.rs" 174 32 174 48] _9 <- ([#"../06_map_precond.rs" 174 32 174 48] Ghost.new (Seq.empty ));
+    [#"../06_map_precond.rs" 174 32 174 54] _9 <- ([#"../06_map_precond.rs" 174 32 174 54] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
-    [#"../06_map_precond.rs" 174 4 174 50] _0 <- ([#"../06_map_precond.rs" 174 4 174 50] C06MapPrecond_Map_Type.C_Map ([#"../06_map_precond.rs" 174 10 174 14] iter) ([#"../06_map_precond.rs" 174 16 174 20] func) _9);
+    [#"../06_map_precond.rs" 174 4 174 56] _0 <- ([#"../06_map_precond.rs" 174 4 174 56] C06MapPrecond_Map_Type.C_Map ([#"../06_map_precond.rs" 174 10 174 14] iter) ([#"../06_map_precond.rs" 174 16 174 20] func) _9);
     [#"../06_map_precond.rs" 174 10 174 14] iter <- any i;
     [#"../06_map_precond.rs" 174 16 174 20] func <- any f;
-    _9 <- any Ghost.ghost_ty (Seq.seq item0);
+    _9 <- any Snapshot.snap_ty (Seq.seq item0);
     goto BB5
   }
   BB5 {
@@ -1942,7 +1949,7 @@ module C06MapPrecond_Identity_Closure0_Type
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int16
   type c06mapprecond_identity_closure0 'i =
     | C06MapPrecond_Identity_Closure0
@@ -1979,16 +1986,16 @@ module C06MapPrecond_Identity_Closure0
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : item0 . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant0 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant0 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv0 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv0 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv0 x = true
   use seq.Seq
   predicate produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces0 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -2026,11 +2033,11 @@ module C06MapPrecond_Identity_Closure0
   val resolve1 (self : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)) : bool
     ensures { result = resolve1 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty (Seq.seq item0))
-  val resolve0 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (Seq.seq item0))
+  val resolve0 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = resolve0 self }
     
-  let rec cfg c06MapPrecond_Identity_Closure0 [#"../06_map_precond.rs" 178 14 178 20] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)) (x : item0) (_3 : Ghost.ghost_ty (Seq.seq item0)) : item0
+  let rec cfg c06MapPrecond_Identity_Closure0 [#"../06_map_precond.rs" 178 14 178 20] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)) (x : item0) (_3 : Snapshot.snap_ty (Seq.seq item0)) : item0
     requires {[#"../06_map_precond.rs" 178 15 178 16] inv1 x}
     requires {inv0 _3}
     ensures { unnest0 ( * _1) ( ^ _1) }
@@ -2040,7 +2047,7 @@ module C06MapPrecond_Identity_Closure0
   var _0 : item0;
   var _1 : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) = _1;
   var x : item0 = x;
-  var _3 : Ghost.ghost_ty (Seq.seq item0) = _3;
+  var _3 : Snapshot.snap_ty (Seq.seq item0) = _3;
   {
     goto BB0
   }
@@ -2061,16 +2068,16 @@ module C06MapPrecond_Identity
   type i
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant7 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant7 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant7 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant7 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv7 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv7 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv7 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv7 x = true
+  axiom inv7 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv7 x = true
   predicate invariant6 (self : Seq.seq item0)
   val invariant6 (self : Seq.seq item0) : bool
     ensures { result = invariant6 self }
@@ -2153,16 +2160,16 @@ module C06MapPrecond_Identity
     ensures { result = produces_refl0 self }
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
-  predicate precondition0 [#"../06_map_precond.rs" 178 14 178 20] (self : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (args : (item0, Ghost.ghost_ty (Seq.seq item0)))
+  predicate precondition0 [#"../06_map_precond.rs" 178 14 178 20] (self : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (args : (item0, Snapshot.snap_ty (Seq.seq item0)))
     
    =
     let (x, _3) = args in true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv1 i -> inv2 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv1 i -> inv2 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2170,7 +2177,7 @@ module C06MapPrecond_Identity
     
    =
     true
-  predicate postcondition_mut0 [#"../06_map_precond.rs" 178 14 178 20] (self : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)) (args : (item0, Ghost.ghost_ty (Seq.seq item0))) (result : item0)
+  predicate postcondition_mut0 [#"../06_map_precond.rs" 178 14 178 20] (self : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (result : item0)
     
    =
     (let (x, _3) = args in true) /\ unnest0 ( * self) ( ^ self)
@@ -2178,14 +2185,14 @@ module C06MapPrecond_Identity
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv1 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv3 func}
@@ -2193,7 +2200,7 @@ module C06MapPrecond_Identity
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv1 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv3 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv6 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -2207,7 +2214,7 @@ module C06MapPrecond_Identity
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i item0 (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) item0)
     
    =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i item0 (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) item0) : bool
     ensures { result = invariant0 self }
     
@@ -2225,12 +2232,12 @@ module C06MapPrecond_Identity
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) : C06MapPrecond_Map_Type.t_map i item0 (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) item0
-    requires {[#"../06_map_precond.rs" 166 0 166 128] forall i2 : i . forall e : item0 . inv1 i2 -> inv2 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv1 i2 -> inv2 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv1 iter}
     requires {[#"../06_map_precond.rs" 172 4 172 8] inv3 func}
-    ensures { [#"../06_map_precond.rs" 169 10 169 72] result = C06MapPrecond_Map_Type.C_Map iter func (Ghost.new (Seq.empty )) }
+    ensures { [#"../06_map_precond.rs" 169 10 169 75] result = C06MapPrecond_Map_Type.C_Map iter func (Snapshot.new (Seq.empty )) }
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv0 result }
     
   let rec cfg identity [#"../06_map_precond.rs" 177 0 177 37] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) : ()
@@ -2265,7 +2272,7 @@ end
 module C06MapPrecond_Increment_Closure2_Type
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int16
   type c06mapprecond_increment_closure2 'u =
     | C06MapPrecond_Increment_Closure2
@@ -2276,7 +2283,7 @@ module C06MapPrecond_Increment_Closure2
   use prelude.Int16
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use C06MapPrecond_Increment_Closure2_Type as C06MapPrecond_Increment_Closure2
   predicate unnest0 [#"../06_map_precond.rs" 189 8 189 35] (self : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (_2 : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)
     
@@ -2290,7 +2297,7 @@ module C06MapPrecond_Increment_Closure2
   val resolve0 (self : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) : bool
     ensures { result = resolve0 self }
     
-  let rec cfg c06MapPrecond_Increment_Closure2 [#"../06_map_precond.rs" 189 8 189 35] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) (x : uint32) (_3 : Ghost.ghost_ty (Seq.seq uint32)) : uint32
+  let rec cfg c06MapPrecond_Increment_Closure2 [#"../06_map_precond.rs" 189 8 189 35] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) (x : uint32) (_3 : Snapshot.snap_ty (Seq.seq uint32)) : uint32
     requires {[#"../06_map_precond.rs" 188 19 188 27] UInt32.to_int x <= 15}
     ensures { [#"../06_map_precond.rs" 189 18 189 33] UInt32.to_int result = UInt32.to_int x + 1 }
     ensures { unnest0 ( * _1) ( ^ _1) }
@@ -2317,17 +2324,17 @@ module C06MapPrecond_Increment
   type u
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant8 (self : Ghost.ghost_ty (Seq.seq uint32)) =
+  use prelude.Snapshot
+  predicate invariant8 (self : Snapshot.snap_ty (Seq.seq uint32)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant8 (self : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  val invariant8 (self : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : Ghost.ghost_ty (Seq.seq uint32))
-  val inv8 (_x : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  predicate inv8 (_x : Snapshot.snap_ty (Seq.seq uint32))
+  val inv8 (_x : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : Ghost.ghost_ty (Seq.seq uint32) . inv8 x = true
+  axiom inv8 : forall x : Snapshot.snap_ty (Seq.seq uint32) . inv8 x = true
   use prelude.Int16
   use C06MapPrecond_Increment_Closure2_Type as C06MapPrecond_Increment_Closure2
   use prelude.Borrow
@@ -2437,30 +2444,30 @@ module C06MapPrecond_Increment
     true
   use prelude.UInt32
   use prelude.Int
-  predicate postcondition_mut0 [#"../06_map_precond.rs" 189 8 189 35] (self : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32))) (result : uint32)
+  predicate postcondition_mut0 [#"../06_map_precond.rs" 189 8 189 35] (self : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32))) (result : uint32)
     
    =
     (let (x, _3) = args in UInt32.to_int result = UInt32.to_int x + 1) /\ unnest0 ( * self) ( ^ self)
-  predicate precondition0 [#"../06_map_precond.rs" 189 8 189 35] (self : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32)))
+  predicate precondition0 [#"../06_map_precond.rs" 189 8 189 35] (self : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32)))
     
    =
     [#"../06_map_precond.rs" 188 19 188 27] let (x, _3) = args in UInt32.to_int x <= 15
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq_ext.SeqExt
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) (visited : Seq.seq uint32) (succ : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq uint32 . inv5 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) . inv6 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq uint32 . inv5 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) . inv6 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) (visited : Seq.seq uint32) (succ : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) : bool
     ensures { result = produces0 self visited succ }
     
@@ -2492,7 +2499,7 @@ module C06MapPrecond_Increment
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : u . forall e : uint32 . inv2 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : u . forall e : uint32 . inv2 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2500,14 +2507,14 @@ module C06MapPrecond_Increment
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv2 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
@@ -2527,7 +2534,7 @@ module C06MapPrecond_Increment
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32)
     
    =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) : bool
     ensures { result = invariant0 self }
     
@@ -2540,12 +2547,12 @@ module C06MapPrecond_Increment
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32
-    requires {[#"../06_map_precond.rs" 166 0 166 128] forall i2 : u . forall e : uint32 . inv2 i2 -> inv3 e -> produces1 iter (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : u . forall e : uint32 . inv2 i2 -> inv3 e -> produces1 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv2 iter}
     requires {[#"../06_map_precond.rs" 172 4 172 8] inv4 func}
-    ensures { [#"../06_map_precond.rs" 169 10 169 72] result = C06MapPrecond_Map_Type.C_Map iter func (Ghost.new (Seq.empty )) }
+    ensures { [#"../06_map_precond.rs" 169 10 169 75] result = C06MapPrecond_Map_Type.C_Map iter func (Snapshot.new (Seq.empty )) }
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv0 result }
     
   let rec cfg increment [#"../06_map_precond.rs" 185 0 185 50] [@cfg:stackify] [@cfg:subregion_analysis] (iter : u) : ()
@@ -2589,7 +2596,7 @@ end
 module C06MapPrecond_Counter_Closure2_Type
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int16
   use prelude.UIntSize
   use prelude.Int
@@ -2603,7 +2610,7 @@ module C06MapPrecond_Counter_Closure2
   use prelude.Int16
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   use prelude.UIntSize
   use prelude.Borrow
@@ -2622,15 +2629,15 @@ module C06MapPrecond_Counter_Closure2
   let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     (18446744073709551615 : usize)
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.UIntSize
   predicate resolve0 (self : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) : bool
     ensures { result = resolve0 self }
     
-  let rec cfg c06MapPrecond_Counter_Closure2 [#"../06_map_precond.rs" 206 8 206 41] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) (x : uint32) (_prod : Ghost.ghost_ty (Seq.seq uint32)) : uint32
-    requires {[#"../06_map_precond.rs" 205 19 205 61] UIntSize.to_int ( * field_00 ( * _1)) = Seq.length (Ghost.inner _prod) /\  * field_00 ( * _1) < max0}
+  let rec cfg c06MapPrecond_Counter_Closure2 [#"../06_map_precond.rs" 206 8 206 41] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) (x : uint32) (_prod : Snapshot.snap_ty (Seq.seq uint32)) : uint32
+    requires {[#"../06_map_precond.rs" 205 19 205 61] UIntSize.to_int ( * field_00 ( * _1)) = Seq.length (Snapshot.inner _prod) /\  * field_00 ( * _1) < max0}
     ensures { [#"../06_map_precond.rs" 206 18 206 39] UIntSize.to_int ( * field_00 ( ^ _1)) = UIntSize.to_int ( * field_00 ( * _1)) + 1 }
     ensures { unnest0 ( * _1) ( ^ _1) }
     
@@ -2657,17 +2664,17 @@ module C06MapPrecond_Counter
   type i
   use prelude.UInt32
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant7 (self : Ghost.ghost_ty (Seq.seq uint32)) =
+  use prelude.Snapshot
+  predicate invariant7 (self : Snapshot.snap_ty (Seq.seq uint32)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant7 (self : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  val invariant7 (self : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : Ghost.ghost_ty (Seq.seq uint32))
-  val inv7 (_x : Ghost.ghost_ty (Seq.seq uint32)) : bool
+  predicate inv7 (_x : Snapshot.snap_ty (Seq.seq uint32))
+  val inv7 (_x : Snapshot.snap_ty (Seq.seq uint32)) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : Ghost.ghost_ty (Seq.seq uint32) . inv7 x = true
+  axiom inv7 : forall x : Snapshot.snap_ty (Seq.seq uint32) . inv7 x = true
   predicate invariant6 (self : Seq.seq uint32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant6 (self : Seq.seq uint32) : bool
@@ -2759,7 +2766,7 @@ module C06MapPrecond_Counter
   let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     (18446744073709551615 : usize)
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.UIntSize
   function field_00 [#"../06_map_precond.rs" 206 8 206 41] (self : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : borrowed usize
     
@@ -2768,16 +2775,16 @@ module C06MapPrecond_Counter
   val field_00 [#"../06_map_precond.rs" 206 8 206 41] (self : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : borrowed usize
     ensures { result = field_00 self }
     
-  predicate precondition0 [#"../06_map_precond.rs" 206 8 206 41] (self : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32)))
+  predicate precondition0 [#"../06_map_precond.rs" 206 8 206 41] (self : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32)))
     
    =
-    [#"../06_map_precond.rs" 205 19 205 61] let (x, _prod) = args in UIntSize.to_int ( * field_00 self) = Seq.length (Ghost.inner _prod) /\  * field_00 self < max0
-  use prelude.Ghost
+    [#"../06_map_precond.rs" 205 19 205 61] let (x, _prod) = args in UIntSize.to_int ( * field_00 self) = Seq.length (Snapshot.inner _prod) /\  * field_00 self < max0
+  use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2785,7 +2792,7 @@ module C06MapPrecond_Counter
     
    =
      ^ field_00 _2 =  ^ field_00 self
-  predicate postcondition_mut0 [#"../06_map_precond.rs" 206 8 206 41] (self : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) (args : (uint32, Ghost.ghost_ty (Seq.seq uint32))) (result : uint32)
+  predicate postcondition_mut0 [#"../06_map_precond.rs" 206 8 206 41] (self : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)) (args : (uint32, Snapshot.snap_ty (Seq.seq uint32))) (result : uint32)
     
    =
     (let (x, _prod) = args in UIntSize.to_int ( * field_00 ( ^ self)) = UIntSize.to_int ( * field_00 ( * self)) + 1) /\ unnest0 ( * self) ( ^ self)
@@ -2793,14 +2800,14 @@ module C06MapPrecond_Counter
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv2 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
@@ -2821,7 +2828,7 @@ module C06MapPrecond_Counter
   predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i uint32 (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) uint32)
     
    =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i uint32 (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) uint32) : bool
     ensures { result = invariant0 self }
     
@@ -2839,12 +2846,12 @@ module C06MapPrecond_Counter
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : C06MapPrecond_Map_Type.t_map i uint32 (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) uint32
-    requires {[#"../06_map_precond.rs" 166 0 166 128] forall i2 : i . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv2 iter}
     requires {[#"../06_map_precond.rs" 172 4 172 8] inv4 func}
-    ensures { [#"../06_map_precond.rs" 169 10 169 72] result = C06MapPrecond_Map_Type.C_Map iter func (Ghost.new (Seq.empty )) }
+    ensures { [#"../06_map_precond.rs" 169 10 169 75] result = C06MapPrecond_Map_Type.C_Map iter func (Snapshot.new (Seq.empty )) }
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv0 result }
     
   let rec cfg counter [#"../06_map_precond.rs" 201 0 201 48] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) : ()
@@ -2903,16 +2910,16 @@ module C06MapPrecond_Impl0
   axiom inv12 : forall x : borrowed i . inv12 x = true
   type item0
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant11 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant11 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant11 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant11 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant11 self }
     
-  predicate inv11 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv11 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv11 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv11 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv11 _x }
     
-  axiom inv11 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv11 x = true
+  axiom inv11 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv11 x = true
   predicate invariant10 (self : f)
   val invariant10 (self : f) : bool
     ensures { result = invariant10 self }
@@ -2985,23 +2992,23 @@ module C06MapPrecond_Impl0
     ensures { result = inv3 _x }
     
   axiom inv3 : forall x : Seq.seq b . inv3 x = true
-  predicate precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0)))
-  val precondition0 (self : f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) : bool
+  predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
+  val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv9 i -> inv6 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv9 i -> inv6 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
-  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b)
-  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Ghost.ghost_ty (Seq.seq item0))) (_3 : b) : bool
+  predicate postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b)
+  val postcondition_mut0 (self : borrowed f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) (_3 : b) : bool
     ensures { result = postcondition_mut0 self _2 _3 }
     
   use seq.Seq
@@ -3011,13 +3018,13 @@ module C06MapPrecond_Impl0
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Ghost.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv9 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv10 func}
@@ -3025,7 +3032,7 @@ module C06MapPrecond_Impl0
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv9 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv10 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -3037,7 +3044,7 @@ module C06MapPrecond_Impl0
     
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   predicate invariant2 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
-    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self))
+    [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
   val invariant2 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = invariant2 self }
     
@@ -3076,17 +3083,17 @@ module C06MapPrecond_Impl0
   use seq.Seq
   use prelude.Int
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -3094,7 +3101,7 @@ module C06MapPrecond_Impl0
   predicate produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv5 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv6 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Ghost.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Ghost.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
+    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv5 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv6 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
   val produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     requires {[#"../06_map_precond.rs" 142 20 142 24] inv2 self}
     requires {[#"../06_map_precond.rs" 142 26 142 33] inv4 visited}
@@ -3104,7 +3111,7 @@ module C06MapPrecond_Impl0
   axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv2 self) -> ([#"../06_map_precond.rs" 142 26 142 33] inv4 visited) -> ([#"../06_map_precond.rs" 142 38 142 42] inv2 succ) -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
   predicate completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
    =
-    [#"../06_map_precond.rs" 22 8 25 9] Ghost.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
+    [#"../06_map_precond.rs" 22 8 25 9] Snapshot.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
   val completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
     ensures { result = completed0 self }
     
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.rs b/creusot/tests/should_succeed/iterators/06_map_precond.rs
index edf08f99a5..c2fccaec51 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.rs
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.rs
@@ -7,17 +7,17 @@ mod common;
 use common::Iterator;
 
 // FIXME: make it Map<I, A, F> again
-pub struct Map<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> {
+pub struct Map<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> {
     iter: I,
     func: F,
-    produced: Ghost<Seq<I::Item>>,
+    produced: Snapshot<Seq<I::Item>>,
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator for Map<I, B, F> {
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Iterator for Map<I, B, F> {
     type Item = B;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             *(^self).produced == Seq::EMPTY &&
@@ -38,7 +38,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator for M
     fn produces_trans(a: Self, ab: Seq<Self::Item>, b: Self, bc: Seq<Self::Item>, c: Self) {}
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     #[why3::attr = "inline:trivial"]
     fn produces(self, visited: Seq<Self::Item>, succ: Self) -> bool {
         pearlite! {
@@ -51,8 +51,8 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator for M
                else { *fs[0] == self.func &&  ^fs[visited.len() - 1] == succ.func }
             && forall<i : Int> 0 <= i && i < visited.len() ==>
                  self.func.unnest(*fs[i])
-                 && (*fs[i]).precondition((s[i], Ghost::new(self.produced.concat(s.subsequence(0, i)))))
-                 && fs[i].postcondition_mut((s[i], Ghost::new(self.produced.concat(s.subsequence(0, i)))), visited[i])
+                 && (*fs[i]).precondition((s[i], Snapshot::new(self.produced.concat(s.subsequence(0, i)))))
+                 && fs[i].postcondition_mut((s[i], Snapshot::new(self.produced.concat(s.subsequence(0, i)))), visited[i])
         }
     }
 
@@ -64,56 +64,56 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Iterator for M
         match self.iter.next() {
             Some(v) => {
                 proof_assert! { self.func.precondition((v, self.produced)) };
-                let produced = gh! { self.produced.push(v) };
+                let produced = snapshot! { self.produced.push(v) };
                 let r = (self.func)(v, self.produced);
                 self.produced = produced;
-                gh! { Self::produces_one_invariant };
+                snapshot! { Self::produces_one_invariant };
                 Some(r)
             }
             None => {
-                self.produced = gh! { Seq::EMPTY };
+                self.produced = snapshot! { Seq::EMPTY };
                 None
             }
         }
     }
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Map<I, B, F> {
-    #[predicate]
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Map<I, B, F> {
+    #[predicate(prophetic)]
     fn next_precondition(iter: I, func: F, produced: Seq<I::Item>) -> bool {
         pearlite! {
             forall<e: I::Item, i: I>
                 iter.produces(Seq::singleton(e), i) ==>
-                func.precondition((e, Ghost::new(produced)))
+                func.precondition((e, Snapshot::new(produced)))
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     #[ensures(produced == Seq::EMPTY ==> result == Self::preservation(iter, func))]
     fn preservation_inv(iter: I, func: F, produced: Seq<I::Item>) -> bool {
         pearlite! {
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
                 func.unnest(*f) ==>
                 iter.produces(s.push(e1).push(e2), i) ==>
-                (*f).precondition((e1, Ghost::new(produced.concat(s)))) ==>
-                f.postcondition_mut((e1, Ghost::new(produced.concat(s))), b) ==>
-                (^f).precondition((e2, Ghost::new(produced.concat(s).push(e1))))
+                (*f).precondition((e1, Snapshot::new(produced.concat(s)))) ==>
+                f.postcondition_mut((e1, Snapshot::new(produced.concat(s))), b) ==>
+                (^f).precondition((e2, Snapshot::new(produced.concat(s).push(e1))))
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn preservation(iter: I, func: F) -> bool {
         pearlite! {
             forall<s: Seq<I::Item>, e1: I::Item, e2: I::Item, f: &mut F, b: B, i: I>
                 func.unnest(*f) ==>
                 iter.produces(s.push(e1).push(e2), i) ==>
-                (*f).precondition((e1, Ghost::new(s))) ==>
-                f.postcondition_mut((e1, Ghost::new(s)), b) ==>
-                (^f).precondition((e2, Ghost::new(s.push(e1))))
+                (*f).precondition((e1, Snapshot::new(s))) ==>
+                f.postcondition_mut((e1, Snapshot::new(s)), b) ==>
+                (^f).precondition((e2, Snapshot::new(s.push(e1))))
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn reinitialize() -> bool {
         pearlite! {
             forall<iter: &mut I, func: F>
@@ -123,7 +123,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Map<I, B, F> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.iter.produces(Seq::singleton(e), iter))]
     #[requires(*f == self.func)]
     #[requires(f.postcondition_mut((e, self.produced), r) )]
@@ -137,7 +137,7 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Map<I, B, F> {
         }
     }
 
-    #[predicate]
+    #[predicate(prophetic)]
     #[ensures(result == self.produces(Seq::singleton(visited), succ))]
     fn produces_one(self, visited: B, succ: Self) -> bool {
         pearlite! {
@@ -150,9 +150,9 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Map<I, B, F> {
     }
 }
 
-impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Invariant for Map<I, B, F> {
+impl<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B> Invariant for Map<I, B, F> {
     // Should not quantify over self or the `invariant` cannot be made into a type invariant
-    #[predicate]
+    #[predicate(prophetic)]
     #[open(self)]
     fn invariant(self) -> bool {
         pearlite! {
@@ -163,15 +163,15 @@ impl<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B> Invariant for
     }
 }
 
-#[requires(forall<e : I::Item, i2 : I> iter.produces(Seq::singleton(e), i2) ==> func.precondition((e, Ghost::new(Seq::EMPTY))))]
+#[requires(forall<e : I::Item, i2 : I> iter.produces(Seq::singleton(e), i2) ==> func.precondition((e, Snapshot::new(Seq::EMPTY))))]
 #[requires(Map::<I, B, F>::reinitialize())]
 #[requires(Map::<I, B, F>::preservation(iter, func))]
-#[ensures(result == Map { iter, func, produced: Ghost::new(Seq::EMPTY) })]
-pub fn map<I: Iterator, B, F: FnMut(I::Item, Ghost<Seq<I::Item>>) -> B>(
+#[ensures(result == Map { iter, func, produced: Snapshot::new(Seq::EMPTY) })]
+pub fn map<I: Iterator, B, F: FnMut(I::Item, Snapshot<Seq<I::Item>>) -> B>(
     iter: I,
     func: F,
 ) -> Map<I, B, F> {
-    Map { iter, func, produced: gh! {Seq::EMPTY} }
+    Map { iter, func, produced: snapshot! {Seq::EMPTY} }
 }
 
 pub fn identity<I: Iterator>(iter: I) {
@@ -204,7 +204,7 @@ pub fn counter<I: Iterator<Item = u32>>(iter: I) {
         iter,
         #[requires(cnt@ == (*_prod).len() && cnt < usize::MAX)]
         #[ensures(cnt@ == old(cnt)@ + 1)]
-        |x, _prod: Ghost<Seq<_>>| {
+        |x, _prod: Snapshot<Seq<_>>| {
             cnt += 1;
             x
         },
diff --git a/creusot/tests/should_succeed/iterators/07_fuse.rs b/creusot/tests/should_succeed/iterators/07_fuse.rs
index 878ec75dba..c8bc3eb543 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.rs
+++ b/creusot/tests/should_succeed/iterators/07_fuse.rs
@@ -12,7 +12,7 @@ impl<I: Iterator> Iterator for Fuse<I> {
     type Item = I::Item;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             (self.iter == None || exists<it:&mut I> it.completed() && self.iter == Some(*it)) &&
@@ -21,7 +21,7 @@ impl<I: Iterator> Iterator for Fuse<I> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, prod: Seq<Self::Item>, other: Self) -> bool {
         match self.iter {
             None => prod == Seq::EMPTY && other.iter == self.iter,
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index cf85fe4f6a..ab943e1f82 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -157,35 +157,35 @@ module C08CollectExtend_Extend
     ensures { result = invariant3 self }
     
   axiom inv3 : forall x : i . inv3 x = true
-  use prelude.Ghost
-  predicate invariant2 (self : Ghost.ghost_ty (Seq.seq t))
-  val invariant2 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  predicate invariant2 (self : Snapshot.snap_ty (Seq.seq t))
+  val invariant2 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Ghost.ghost_ty (Seq.seq t))
-  val inv2 (_x : Ghost.ghost_ty (Seq.seq t)) : bool
+  predicate inv2 (_x : Snapshot.snap_ty (Seq.seq t))
+  val inv2 (_x : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Ghost.ghost_ty (Seq.seq t) . inv2 x = true
-  predicate invariant1 (self : Ghost.ghost_ty i)
-  val invariant1 (self : Ghost.ghost_ty i) : bool
+  axiom inv2 : forall x : Snapshot.snap_ty (Seq.seq t) . inv2 x = true
+  predicate invariant1 (self : Snapshot.snap_ty i)
+  val invariant1 (self : Snapshot.snap_ty i) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Ghost.ghost_ty i)
-  val inv1 (_x : Ghost.ghost_ty i) : bool
+  predicate inv1 (_x : Snapshot.snap_ty i)
+  val inv1 (_x : Snapshot.snap_ty i) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Ghost.ghost_ty i . inv1 x = true
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  axiom inv1 : forall x : Snapshot.snap_ty i . inv1 x = true
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   predicate completed0 (self : borrowed i)
   val completed0 (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -230,33 +230,33 @@ module C08CollectExtend_Extend
     ensures { inv5 result }
     
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
    =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model0 self
   val shallow_model3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model3 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model3 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model3 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty (Seq.seq t))
-  val resolve2 (self : Ghost.ghost_ty (Seq.seq t)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty (Seq.seq t))
+  val resolve2 (self : Snapshot.snap_ty (Seq.seq t)) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
-  predicate resolve1 (self : Ghost.ghost_ty i)
-  val resolve1 (self : Ghost.ghost_ty i) : bool
+  use prelude.Snapshot
+  predicate resolve1 (self : Snapshot.snap_ty i)
+  val resolve1 (self : Snapshot.snap_ty i) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate into_iter_post0 (self : i) (res : i) =
     [#"../../../../../creusot-contracts/src/std/iter.rs" 80 8 80 19] self = res
   val into_iter_post0 (self : i) (res : i) : bool
@@ -273,11 +273,12 @@ module C08CollectExtend_Extend
     ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 89 0 166 1] into_iter_post0 self result }
     ensures { inv3 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg extend [#"../08_collect_extend.rs" 25 0 25 66] [@cfg:stackify] [@cfg:subregion_analysis] (vec : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) (iter : i) : ()
     requires {[#"../08_collect_extend.rs" 25 40 25 43] inv7 vec}
     requires {[#"../08_collect_extend.rs" 25 58 25 62] inv3 iter}
@@ -287,15 +288,15 @@ module C08CollectExtend_Extend
   var _0 : ();
   var vec : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = vec;
   var iter : i = iter;
-  var old_vec : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_vec : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var iter1 : i;
-  var iter_old : Ghost.ghost_ty i;
-  var produced : Ghost.ghost_ty (Seq.seq t);
+  var iter_old : Snapshot.snap_ty i;
+  var produced : Snapshot.snap_ty (Seq.seq t);
   var _17 : Core_Option_Option_Type.t_option t;
   var _18 : borrowed i;
   var _19 : borrowed i;
   var __creusot_proc_iter_elem : t;
-  var _22 : Ghost.ghost_ty (Seq.seq t);
+  var _22 : Snapshot.snap_ty (Seq.seq t);
   var x : t;
   var _25 : ();
   var _26 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
@@ -306,7 +307,7 @@ module C08CollectExtend_Extend
     goto BB1
   }
   BB1 {
-    [#"../08_collect_extend.rs" 26 18 26 29] old_vec <- ([#"../08_collect_extend.rs" 26 18 26 29] Ghost.new vec);
+    [#"../08_collect_extend.rs" 26 18 26 35] old_vec <- ([#"../08_collect_extend.rs" 26 18 26 35] Snapshot.new vec);
     goto BB2
   }
   BB2 {
@@ -317,13 +318,13 @@ module C08CollectExtend_Extend
     goto BB3
   }
   BB3 {
-    [#"../08_collect_extend.rs" 27 4 27 35] iter_old <- ([#"../08_collect_extend.rs" 27 4 27 35] Ghost.new iter1);
+    [#"../08_collect_extend.rs" 27 4 27 35] iter_old <- ([#"../08_collect_extend.rs" 27 4 27 35] Snapshot.new iter1);
     goto BB4
   }
   BB4 {
     assert { [@expl:type invariant] inv1 iter_old };
     assume { resolve1 iter_old };
-    [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] Ghost.new (Seq.empty ));
+    [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -339,9 +340,9 @@ module C08CollectExtend_Extend
   }
   BB8 {
     invariant { [#"../08_collect_extend.rs" 27 4 27 35] inv3 iter1 };
-    invariant { [#"../08_collect_extend.rs" 27 4 27 35] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter1 };
-    invariant { [#"../08_collect_extend.rs" 27 16 27 33]  ^ Ghost.inner old_vec =  ^ vec };
-    invariant { [#"../08_collect_extend.rs" 27 4 27 35] Seq.(==) (shallow_model0 vec) (Seq.(++) (shallow_model1 old_vec) (Ghost.inner produced)) };
+    invariant { [#"../08_collect_extend.rs" 27 4 27 35] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter1 };
+    invariant { [#"../08_collect_extend.rs" 27 16 27 33]  ^ Snapshot.inner old_vec =  ^ vec };
+    invariant { [#"../08_collect_extend.rs" 27 4 27 35] Seq.(==) (shallow_model0 vec) (Seq.(++) (shallow_model1 old_vec) (Snapshot.inner produced)) };
     goto BB9
   }
   BB9 {
@@ -387,20 +388,20 @@ module C08CollectExtend_Extend
     absurd
   }
   BB14 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t));
     assert { [@expl:type invariant] inv5 _17 };
     assume { resolve4 _17 };
-    [#"../08_collect_extend.rs" 27 4 27 35] _22 <- ([#"../08_collect_extend.rs" 27 4 27 35] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../08_collect_extend.rs" 27 4 27 35] _22 <- ([#"../08_collect_extend.rs" 27 4 27 35] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB15
   }
   BB15 {
     [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] _22);
-    [#"../08_collect_extend.rs" 27 4 27 35] _22 <- any Ghost.ghost_ty (Seq.seq t);
+    [#"../08_collect_extend.rs" 27 4 27 35] _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve2 produced };
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- any t;
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any t;
     [#"../08_collect_extend.rs" 30 8 30 11] _26 <- Borrow.borrow_mut ( * vec);
     [#"../08_collect_extend.rs" 30 8 30 11] vec <- { vec with current = ( ^ _26) ; };
     assume { inv6 ( ^ _26) };
@@ -540,25 +541,25 @@ module C08CollectExtend_Collect
     ensures { result = invariant2 self }
     
   axiom inv2 : forall x : i . inv2 x = true
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (Seq.seq item0))
-  val invariant1 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (Seq.seq item0))
+  val invariant1 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Ghost.ghost_ty (Seq.seq item0))
-  val inv1 (_x : Ghost.ghost_ty (Seq.seq item0)) : bool
+  predicate inv1 (_x : Snapshot.snap_ty (Seq.seq item0))
+  val inv1 (_x : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Ghost.ghost_ty (Seq.seq item0) . inv1 x = true
-  predicate invariant0 (self : Ghost.ghost_ty i)
-  val invariant0 (self : Ghost.ghost_ty i) : bool
+  axiom inv1 : forall x : Snapshot.snap_ty (Seq.seq item0) . inv1 x = true
+  predicate invariant0 (self : Snapshot.snap_ty i)
+  val invariant0 (self : Snapshot.snap_ty i) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty i)
-  val inv0 (_x : Ghost.ghost_ty i) : bool
+  predicate inv0 (_x : Snapshot.snap_ty i)
+  val inv0 (_x : Snapshot.snap_ty i) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty i . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty i . inv0 x = true
   predicate completed0 (self : borrowed i)
   val completed0 (self : borrowed i) : bool
     ensures { result = completed0 self }
@@ -616,19 +617,19 @@ module C08CollectExtend_Collect
     ensures { inv4 result }
     
   use seq.Seq
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  predicate resolve1 (self : Ghost.ghost_ty (Seq.seq item0))
-  val resolve1 (self : Ghost.ghost_ty (Seq.seq item0)) : bool
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  predicate resolve1 (self : Snapshot.snap_ty (Seq.seq item0))
+  val resolve1 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
-  predicate resolve0 (self : Ghost.ghost_ty i)
-  val resolve0 (self : Ghost.ghost_ty i) : bool
+  use prelude.Snapshot
+  predicate resolve0 (self : Snapshot.snap_ty i)
+  val resolve0 (self : Snapshot.snap_ty i) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate into_iter_post0 (self : i) (res : i) =
     [#"../../../../../creusot-contracts/src/std/iter.rs" 80 8 80 19] self = res
   val into_iter_post0 (self : i) (res : i) : bool
@@ -659,13 +660,13 @@ module C08CollectExtend_Collect
   var iter : i = iter;
   var res : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global);
   var iter1 : i;
-  var iter_old : Ghost.ghost_ty i;
-  var produced : Ghost.ghost_ty (Seq.seq item0);
+  var iter_old : Snapshot.snap_ty i;
+  var produced : Snapshot.snap_ty (Seq.seq item0);
   var _15 : Core_Option_Option_Type.t_option item0;
   var _16 : borrowed i;
   var _17 : borrowed i;
   var __creusot_proc_iter_elem : item0;
-  var _20 : Ghost.ghost_ty (Seq.seq item0);
+  var _20 : Snapshot.snap_ty (Seq.seq item0);
   var x : item0;
   var _23 : ();
   var _24 : borrowed (Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global));
@@ -685,13 +686,13 @@ module C08CollectExtend_Collect
     goto BB3
   }
   BB3 {
-    [#"../08_collect_extend.rs" 45 4 45 40] iter_old <- ([#"../08_collect_extend.rs" 45 4 45 40] Ghost.new iter1);
+    [#"../08_collect_extend.rs" 45 4 45 40] iter_old <- ([#"../08_collect_extend.rs" 45 4 45 40] Snapshot.new iter1);
     goto BB4
   }
   BB4 {
     assert { [@expl:type invariant] inv0 iter_old };
     assume { resolve0 iter_old };
-    [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] Ghost.new (Seq.empty ));
+    [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -710,8 +711,8 @@ module C08CollectExtend_Collect
   }
   BB9 {
     invariant { [#"../08_collect_extend.rs" 45 4 45 40] inv2 iter1 };
-    invariant { [#"../08_collect_extend.rs" 45 4 45 40] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter1 };
-    invariant { [#"../08_collect_extend.rs" 45 4 45 40] Seq.(==) (shallow_model0 res) (Ghost.inner produced) };
+    invariant { [#"../08_collect_extend.rs" 45 4 45 40] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter1 };
+    invariant { [#"../08_collect_extend.rs" 45 4 45 40] Seq.(==) (shallow_model0 res) (Snapshot.inner produced) };
     goto BB10
   }
   BB10 {
@@ -754,20 +755,20 @@ module C08CollectExtend_Collect
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _15);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv4 _15 };
     assume { resolve3 _15 };
-    [#"../08_collect_extend.rs" 45 4 45 40] _20 <- ([#"../08_collect_extend.rs" 45 4 45 40] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../08_collect_extend.rs" 45 4 45 40] _20 <- ([#"../08_collect_extend.rs" 45 4 45 40] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB16
   }
   BB16 {
     [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] _20);
-    [#"../08_collect_extend.rs" 45 4 45 40] _20 <- any Ghost.ghost_ty (Seq.seq item0);
+    [#"../08_collect_extend.rs" 45 4 45 40] _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve1 produced };
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- any item0;
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any item0;
     [#"../08_collect_extend.rs" 47 8 47 11] _24 <- Borrow.borrow_mut res;
     [#"../08_collect_extend.rs" 47 8 47 11] res <-  ^ _24;
     assume { inv5 ( ^ _24) };
@@ -960,7 +961,7 @@ module C08CollectExtend_ExtendIndex
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   use prelude.Slice
   function shallow_model6 (self : slice uint32) : Seq.seq uint32
@@ -974,10 +975,10 @@ module C08CollectExtend_ExtendIndex
   val shallow_model2 (self : slice uint32) : Seq.seq uint32
     ensures { result = shallow_model2 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (slice uint32)) : Seq.seq uint32 =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model2 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (slice uint32)) : Seq.seq uint32
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (slice uint32)) : Seq.seq uint32 =
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model2 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (slice uint32)) : Seq.seq uint32
     ensures { result = shallow_model1 self }
     
   predicate resolve2 (self : uint32) =
@@ -1054,7 +1055,7 @@ module C08CollectExtend_ExtendIndex
     ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 89 0 166 1] into_iter_post0 self result }
     ensures { inv3 result }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : Seq.seq uint32 =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model0 self
   val shallow_model3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : Seq.seq uint32
@@ -1071,8 +1072,8 @@ module C08CollectExtend_ExtendIndex
   var _0 : ();
   var v1 : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) = v1;
   var v2 : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) = v2;
-  var oldv1 : Ghost.ghost_ty (slice uint32);
-  var oldv2 : Ghost.ghost_ty (slice uint32);
+  var oldv1 : Snapshot.snap_ty (slice uint32);
+  var oldv2 : Snapshot.snap_ty (slice uint32);
   var _7 : ();
   var _8 : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
   var _9 : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
@@ -1081,11 +1082,11 @@ module C08CollectExtend_ExtendIndex
     goto BB0
   }
   BB0 {
-    [#"../08_collect_extend.rs" 53 16 53 27] oldv1 <- ([#"../08_collect_extend.rs" 53 16 53 27] Ghost.new (deref0 v1));
+    [#"../08_collect_extend.rs" 53 16 53 33] oldv1 <- ([#"../08_collect_extend.rs" 53 16 53 33] Snapshot.new (deref0 v1));
     goto BB1
   }
   BB1 {
-    [#"../08_collect_extend.rs" 54 16 54 27] oldv2 <- ([#"../08_collect_extend.rs" 54 16 54 27] Ghost.new (deref0 v2));
+    [#"../08_collect_extend.rs" 54 16 54 33] oldv2 <- ([#"../08_collect_extend.rs" 54 16 54 33] Snapshot.new (deref0 v2));
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.rs b/creusot/tests/should_succeed/iterators/08_collect_extend.rs
index 166950392d..1a6d1857e3 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.rs
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.rs
@@ -23,7 +23,7 @@ use creusot_contracts::{
     done.completed() && iter.produces(prod, *done) && (^vec)@ == vec@.concat(prod)
 )]
 pub fn extend<T, I: Iterator<Item = T>>(vec: &mut Vec<T>, iter: I) {
-    let old_vec = gh! { vec };
+    let old_vec = snapshot! { vec };
     #[invariant(^*old_vec == ^vec)]
     #[invariant(vec@.ext_eq(old_vec@.concat(*produced)))]
     for x in iter {
@@ -50,8 +50,8 @@ pub fn collect<I: Iterator>(iter: I) -> Vec<I::Item> {
 }
 
 pub fn extend_index(mut v1: Vec<u32>, v2: Vec<u32>) {
-    let oldv1 = gh! { *v1 };
-    let oldv2 = gh! { *v2 };
+    let oldv1 = snapshot! { *v1 };
+    let oldv2 = snapshot! { *v2 };
     extend(&mut v1, v2.into_iter());
 
     proof_assert! { v1@.ext_eq(oldv1@.concat(oldv2@)) };
diff --git a/creusot/tests/should_succeed/iterators/09_empty.rs b/creusot/tests/should_succeed/iterators/09_empty.rs
index 0fd5cb45f6..e0658ab9f2 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.rs
+++ b/creusot/tests/should_succeed/iterators/09_empty.rs
@@ -11,7 +11,7 @@ impl<T> Iterator for Empty<T> {
     type Item = T;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.resolve() }
     }
diff --git a/creusot/tests/should_succeed/iterators/10_once.rs b/creusot/tests/should_succeed/iterators/10_once.rs
index bf2e7392ce..3562488054 100644
--- a/creusot/tests/should_succeed/iterators/10_once.rs
+++ b/creusot/tests/should_succeed/iterators/10_once.rs
@@ -11,7 +11,7 @@ impl<T> Iterator for Once<T> {
     type Item = T;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { *self == Once(None) && self.resolve() }
     }
diff --git a/creusot/tests/should_succeed/iterators/12_zip.rs b/creusot/tests/should_succeed/iterators/12_zip.rs
index 38e5172a97..cf9eff0d14 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.rs
+++ b/creusot/tests/should_succeed/iterators/12_zip.rs
@@ -14,7 +14,7 @@ impl<A: Iterator, B: Iterator> Iterator for Zip<A, B> {
     type Item = (A::Item, B::Item);
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
              (self.a.completed() && (*self).b == (^self).b)
@@ -24,7 +24,7 @@ impl<A: Iterator, B: Iterator> Iterator for Zip<A, B> {
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, tl: Self) -> bool {
         pearlite! {
             // Using an `unzip` definition doesn't work well because of issues related to datatypes and `match`
diff --git a/creusot/tests/should_succeed/iterators/13_cloned.rs b/creusot/tests/should_succeed/iterators/13_cloned.rs
index d68f82990a..c7ec63276d 100644
--- a/creusot/tests/should_succeed/iterators/13_cloned.rs
+++ b/creusot/tests/should_succeed/iterators/13_cloned.rs
@@ -18,13 +18,13 @@ where
     type Item = T;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.iter.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             exists<s: Seq<&'a T>> self.iter.produces(s, o.iter)
diff --git a/creusot/tests/should_succeed/iterators/14_copied.rs b/creusot/tests/should_succeed/iterators/14_copied.rs
index c29d7aa0dc..4a63babd9b 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.rs
+++ b/creusot/tests/should_succeed/iterators/14_copied.rs
@@ -18,13 +18,13 @@ where
     type Item = T;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.iter.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             exists<s: Seq<&'a T>> self.iter.produces(s, o.iter)
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.rs b/creusot/tests/should_succeed/iterators/15_enumerate.rs
index f0f7c28c7f..d800aecd7c 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.rs
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.rs
@@ -18,13 +18,13 @@ where
     type Item = (usize, I::Item);
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! { self.iter.completed() }
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             visited.len() == o.count@ - self.count@
@@ -67,7 +67,7 @@ where
     I: Iterator,
 {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn invariant(self) -> bool {
         pearlite! {
             (forall<s: Seq<I::Item>, i: I> self.iter.produces(s, i) ==> self.count@ + s.len() < std::usize::MAX@)
diff --git a/creusot/tests/should_succeed/iterators/16_take.rs b/creusot/tests/should_succeed/iterators/16_take.rs
index 77a3350d59..7563da5509 100644
--- a/creusot/tests/should_succeed/iterators/16_take.rs
+++ b/creusot/tests/should_succeed/iterators/16_take.rs
@@ -18,7 +18,7 @@ where
     type Item = I::Item;
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool {
         pearlite! {
             (*self).n@ == 0 && self.resolve() ||
@@ -27,7 +27,7 @@ where
     }
 
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool {
         pearlite! {
             self.n@ == o.n@ + visited.len() && self.iter.produces(visited, o.iter)
diff --git a/creusot/tests/should_succeed/iterators/common.rs b/creusot/tests/should_succeed/iterators/common.rs
index fb815fb51c..17f5e5e258 100644
--- a/creusot/tests/should_succeed/iterators/common.rs
+++ b/creusot/tests/should_succeed/iterators/common.rs
@@ -4,10 +4,10 @@ use creusot_contracts::{logic::Seq, *};
 pub trait Iterator {
     type Item;
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn produces(self, visited: Seq<Self::Item>, o: Self) -> bool;
 
-    #[predicate]
+    #[predicate(prophetic)]
     fn completed(&mut self) -> bool;
 
     #[law]
diff --git a/creusot/tests/should_succeed/knapsack.rs b/creusot/tests/should_succeed/knapsack.rs
index 90ddb4b5c0..bbbf0c160c 100644
--- a/creusot/tests/should_succeed/knapsack.rs
+++ b/creusot/tests/should_succeed/knapsack.rs
@@ -26,7 +26,7 @@ fn max(a: usize, b: usize) -> usize {
 /// *   $m[0,\,w]=0$
 /// *   $m[i,\,w]=m[i-1,\,w]$ if $w_i > w\,\!$ (the new item is more than the current weight limit)
 /// *   $m[i,\,w]=\max(m[i-1,\,w],\,m[i-1,w-w_i]+v_i)$ if $w_i \leqslant w$.
-#[ghost]
+#[logic]
 #[variant(i)]
 #[requires(0 <= i && i <= items.len())]
 #[requires(0 <= w)]
diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 72f2c91618..a45e9fe18e 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -666,7 +666,7 @@ module KnapsackFull_Knapsack01Dyn
   val index_logic4 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : KnapsackFull_Item_Type.t_item name
     ensures { result = index_logic4 self ix }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   function shallow_model10 (self : borrowed (Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))) : Seq.seq (KnapsackFull_Item_Type.t_item name)
     
@@ -895,8 +895,8 @@ module KnapsackFull_Knapsack01Dyn
       end }
     ensures { inv13 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post1 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (res : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize)
     
    =
@@ -989,11 +989,11 @@ module KnapsackFull_Knapsack01Dyn
     ensures { result = m0 items i w }
     
   axiom m0_spec : forall items : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int, w : int . ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items) -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) -> ([#"../knapsack_full.rs" 66 11 66 16] inv11 items) -> ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= m0 items i w) && ([#"../knapsack_full.rs" 62 10 62 21] m0 items i w >= 0)
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -1047,26 +1047,26 @@ module KnapsackFull_Knapsack01Dyn
   var _14 : usize;
   var iter : Core_Ops_Range_Range_Type.t_range usize;
   var _19 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _31 : ();
   var _32 : Core_Option_Option_Type.t_option usize;
   var _33 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _34 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _37 : Ghost.ghost_ty (Seq.seq usize);
+  var _37 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var it : KnapsackFull_Item_Type.t_item name;
   var _41 : KnapsackFull_Item_Type.t_item name;
   var iter1 : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize;
   var _45 : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize;
-  var iter_old1 : Ghost.ghost_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
-  var produced1 : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
+  var produced1 : Snapshot.snap_ty (Seq.seq usize);
   var _58 : Core_Option_Option_Type.t_option usize;
   var _59 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
   var _60 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
   var __creusot_proc_iter_elem1 : usize;
-  var _63 : Ghost.ghost_ty (Seq.seq usize);
+  var _63 : Snapshot.snap_ty (Seq.seq usize);
   var w : usize;
   var _66 : usize;
   var _70 : usize;
@@ -1118,11 +1118,11 @@ module KnapsackFull_Knapsack01Dyn
     goto BB5
   }
   BB5 {
-    [#"../knapsack_full.rs" 88 4 88 55] iter_old <- ([#"../knapsack_full.rs" 88 4 88 55] Ghost.new iter);
+    [#"../knapsack_full.rs" 88 4 88 55] iter_old <- ([#"../knapsack_full.rs" 88 4 88 55] Snapshot.new iter);
     goto BB6
   }
   BB6 {
-    [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] Ghost.new (Seq.empty ));
+    [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] Snapshot.new (Seq.empty ));
     goto BB7
   }
   BB7 {
@@ -1142,10 +1142,10 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB12 {
     invariant { [#"../knapsack_full.rs" 88 4 88 55] inv0 iter };
-    invariant { [#"../knapsack_full.rs" 88 4 88 55] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../knapsack_full.rs" 88 4 88 55] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../knapsack_full.rs" 88 16 88 53] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
     invariant { [#"../knapsack_full.rs" 88 4 88 55] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
-    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (Ghost.inner produced) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
+    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (Snapshot.inner produced) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
     invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB13
   }
@@ -1177,14 +1177,14 @@ module KnapsackFull_Knapsack01Dyn
     absurd
   }
   BB18 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _32);
-    [#"../knapsack_full.rs" 88 4 88 55] _37 <- ([#"../knapsack_full.rs" 88 4 88 55] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _32);
+    [#"../knapsack_full.rs" 88 4 88 55] _37 <- ([#"../knapsack_full.rs" 88 4 88 55] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB19
   }
   BB19 {
     [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] _37);
-    [#"../knapsack_full.rs" 88 4 88 55] _37 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../knapsack_full.rs" 88 4 88 55] _37 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../knapsack_full.rs" 96 23 96 26] _41 <- ([#"../knapsack_full.rs" 96 23 96 26] index0 ([#"../knapsack_full.rs" 96 18 96 23] items) ([#"../knapsack_full.rs" 96 24 96 25] i));
     goto BB20
   }
@@ -1201,11 +1201,11 @@ module KnapsackFull_Knapsack01Dyn
     goto BB22
   }
   BB22 {
-    [#"../knapsack_full.rs" 98 8 98 59] iter_old1 <- ([#"../knapsack_full.rs" 98 8 98 59] Ghost.new iter1);
+    [#"../knapsack_full.rs" 98 8 98 59] iter_old1 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new iter1);
     goto BB23
   }
   BB23 {
-    [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] Ghost.new (Seq.empty ));
+    [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new (Seq.empty ));
     goto BB24
   }
   BB24 {
@@ -1228,11 +1228,11 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB30 {
     invariant { [#"../knapsack_full.rs" 98 8 98 59] inv2 iter1 };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] produces1 (Ghost.inner iter_old1) (Ghost.inner produced1) iter1 };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
     invariant { [#"../knapsack_full.rs" 98 20 98 57] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
     invariant { [#"../knapsack_full.rs" 98 8 98 59] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
     invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . 0 <= ww /\ ww <= Seq.length (Ghost.inner produced1) - 1 -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . 0 <= ww /\ ww <= Seq.length (Snapshot.inner produced1) - 1 -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
     invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB31
   }
@@ -1262,14 +1262,14 @@ module KnapsackFull_Knapsack01Dyn
     goto BB35
   }
   BB35 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _58);
-    [#"../knapsack_full.rs" 98 8 98 59] _63 <- ([#"../knapsack_full.rs" 98 8 98 59] Ghost.new (Seq.(++) (Ghost.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _58);
+    [#"../knapsack_full.rs" 98 8 98 59] _63 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB36
   }
   BB36 {
     [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] _63);
-    [#"../knapsack_full.rs" 98 8 98 59] _63 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] w <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1);
+    [#"../knapsack_full.rs" 98 8 98 59] _63 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     switch ([#"../knapsack_full.rs" 111 38 111 51] ([#"../knapsack_full.rs" 111 38 111 47] KnapsackFull_Item_Type.item_weight it) > ([#"../knapsack_full.rs" 111 50 111 51] w))
       | False -> goto BB40
       | True -> goto BB37
diff --git a/creusot/tests/should_succeed/knapsack_full.rs b/creusot/tests/should_succeed/knapsack_full.rs
index 915d02bb5d..359165faae 100644
--- a/creusot/tests/should_succeed/knapsack_full.rs
+++ b/creusot/tests/should_succeed/knapsack_full.rs
@@ -20,7 +20,7 @@ fn max(a: usize, b: usize) -> usize {
     }
 }
 
-#[ghost]
+#[logic]
 #[variant(s.len()-i)]
 #[requires(0 <= i && i <= s.len())]
 #[ensures(result >= 0)]
@@ -31,7 +31,7 @@ fn sum_weights<Name>(s: Seq<&Item<Name>>, i: Int) -> Int {
     }
 }
 
-#[ghost]
+#[logic]
 #[variant(s.len()-i)]
 #[requires(i >= 0 && i <= s.len())]
 fn sum_values<Name>(s: Seq<&Item<Name>>, i: Int) -> Int {
@@ -55,7 +55,7 @@ fn subseq_rev<T>(s1: Seq<&T>, i1: Int, s2: Seq<T>, i2: Int) -> bool {
     }
 }
 
-#[ghost]
+#[logic]
 #[variant(i)]
 #[requires(0 <= i && i <= items.len())]
 #[requires(0 <= w)]
diff --git a/creusot/tests/should_succeed/lang/assoc_type.rs b/creusot/tests/should_succeed/lang/assoc_type.rs
index f738dba4f5..a64edf665a 100644
--- a/creusot/tests/should_succeed/lang/assoc_type.rs
+++ b/creusot/tests/should_succeed/lang/assoc_type.rs
@@ -43,7 +43,7 @@ pub fn uses3<T: Tr>(_: Nested<T>) {}
 
 // pub struct Map<I: Tr> {
 //     pub iter: I,
-//     pub produced: Ghost<Seq<I::A>>,
+//     pub produced: Snapshot<Seq<I::A>>,
 // }
 
 // pub fn use_map<I: Tr>(_: Map<I>) {}
diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg
index 4615644180..dfacf48032 100644
--- a/creusot/tests/should_succeed/list_index_mut.mlcfg
+++ b/creusot/tests/should_succeed/list_index_mut.mlcfg
@@ -57,7 +57,7 @@ module ListIndexMut_IndexMut
   axiom inv0 : forall x : borrowed (Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list)) . inv0 x = true
   use prelude.UInt32
   use prelude.UIntSize
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (ListIndexMut_List_Type.t_list)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (ListIndexMut_List_Type.t_list)) : bool
@@ -92,13 +92,13 @@ module ListIndexMut_IndexMut
   val shallow_model2 (self : usize) : int
     ensures { result = shallow_model2 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty usize) : int =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model2 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty usize) : int
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty usize) : int =
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model2 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty usize) : int
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   function get0 [#"../list_index_mut.rs" 18 4 18 46] (self : ListIndexMut_List_Type.t_list) (ix : int) : Core_Option_Option_Type.t_option uint32
     
@@ -122,8 +122,8 @@ module ListIndexMut_IndexMut
   val len0 [#"../list_index_mut.rs" 7 4 7 29] (self : ListIndexMut_List_Type.t_list) : int
     ensures { result = len0 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   let rec cfg index_mut [#"../list_index_mut.rs" 37 0 37 61] [@cfg:stackify] [@cfg:subregion_analysis] (l : borrowed (ListIndexMut_List_Type.t_list)) (ix : usize) : borrowed uint32
     requires {[#"../list_index_mut.rs" 32 11 32 24] UIntSize.to_int ix < len0 ( * l)}
     ensures { [#"../list_index_mut.rs" 33 10 33 37] Core_Option_Option_Type.C_Some ( * result) = get0 ( * l) (UIntSize.to_int ix) }
@@ -136,8 +136,8 @@ module ListIndexMut_IndexMut
   var l : borrowed (ListIndexMut_List_Type.t_list) = l;
   var ix : usize = ix;
   var _3 : borrowed uint32;
-  var old_l : Ghost.ghost_ty (borrowed (ListIndexMut_List_Type.t_list));
-  var old_ix : Ghost.ghost_ty usize;
+  var old_l : Snapshot.snap_ty (borrowed (ListIndexMut_List_Type.t_list));
+  var old_ix : Snapshot.snap_ty usize;
   var _22 : borrowed (ListIndexMut_List_Type.t_list);
   var _23 : borrowed (ListIndexMut_List_Type.t_list);
   var _24 : Core_Option_Option_Type.t_option (borrowed (ListIndexMut_List_Type.t_list));
@@ -147,11 +147,11 @@ module ListIndexMut_IndexMut
     goto BB0
   }
   BB0 {
-    [#"../list_index_mut.rs" 38 16 38 25] old_l <- ([#"../list_index_mut.rs" 38 16 38 25] Ghost.new l);
+    [#"../list_index_mut.rs" 38 16 38 31] old_l <- ([#"../list_index_mut.rs" 38 16 38 31] Snapshot.new l);
     goto BB1
   }
   BB1 {
-    [#"../list_index_mut.rs" 39 17 39 27] old_ix <- ([#"../list_index_mut.rs" 39 17 39 27] Ghost.new ix);
+    [#"../list_index_mut.rs" 39 17 39 33] old_ix <- ([#"../list_index_mut.rs" 39 17 39 33] Snapshot.new ix);
     goto BB2
   }
   BB2 {
@@ -159,10 +159,10 @@ module ListIndexMut_IndexMut
   }
   BB3 {
     invariant { [#"../list_index_mut.rs" 40 16 40 45] (0 : usize) <= ix /\ UIntSize.to_int ix < len0 ( * l) };
-    invariant { [#"../list_index_mut.rs" 41 16 41 52] get0 ( * l) (UIntSize.to_int ix) = get0 ( * Ghost.inner old_l) (shallow_model1 old_ix) };
-    invariant { [#"../list_index_mut.rs" 42 16 42 55] get0 ( ^ l) (UIntSize.to_int ix) = get0 ( ^ Ghost.inner old_l) (shallow_model1 old_ix) };
-    invariant { [#"../list_index_mut.rs" 40 4 40 47] len0 ( ^ l) = len0 ( * l) -> len0 ( ^ Ghost.inner old_l) = len0 ( * Ghost.inner old_l) };
-    invariant { [#"../list_index_mut.rs" 40 4 40 47] (forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( ^ l) i = get0 ( * l) i) -> (forall i : int . 0 <= i /\ i < len0 ( * Ghost.inner old_l) /\ i <> shallow_model1 old_ix -> get0 ( ^ Ghost.inner old_l) i = get0 ( * Ghost.inner old_l) i) };
+    invariant { [#"../list_index_mut.rs" 41 16 41 52] get0 ( * l) (UIntSize.to_int ix) = get0 ( * Snapshot.inner old_l) (shallow_model1 old_ix) };
+    invariant { [#"../list_index_mut.rs" 42 16 42 55] get0 ( ^ l) (UIntSize.to_int ix) = get0 ( ^ Snapshot.inner old_l) (shallow_model1 old_ix) };
+    invariant { [#"../list_index_mut.rs" 40 4 40 47] len0 ( ^ l) = len0 ( * l) -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
+    invariant { [#"../list_index_mut.rs" 40 4 40 47] (forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( ^ l) i = get0 ( * l) i) -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l) /\ i <> shallow_model1 old_ix -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i) };
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/list_index_mut.rs b/creusot/tests/should_succeed/list_index_mut.rs
index 9291581962..ddf3a8a26b 100644
--- a/creusot/tests/should_succeed/list_index_mut.rs
+++ b/creusot/tests/should_succeed/list_index_mut.rs
@@ -3,7 +3,7 @@ use creusot_contracts::{logic::Int, *};
 
 pub struct List(u32, Option<Box<List>>);
 impl List {
-    #[ghost]
+    #[logic]
     fn len(self: List) -> Int {
         {
             let List(_, ls) = self;
@@ -14,7 +14,7 @@ impl List {
         }
     }
 
-    #[ghost]
+    #[logic]
     fn get(self: List, ix: Int) -> Option<u32> {
         {
             let List(i, ls) = self;
@@ -35,8 +35,8 @@ impl List {
 #[ensures((^l).len() == (*l).len())]
 #[ensures(forall<i:Int> 0 <= i && i < l.len() && i != ix@ ==> l.get(i) == (^l).get(i))]
 pub fn index_mut(mut l: &mut List, mut ix: usize) -> &mut u32 {
-    let old_l = gh! { l };
-    let old_ix = gh! { ix };
+    let old_l = snapshot! { l };
+    let old_ix = snapshot! { ix };
     #[invariant(0usize <= ix && ix@ < l.len())]
     #[invariant(l.get(ix@) == (**old_l).get(old_ix@))]
     #[invariant((^l).get(ix@) == (^*old_l).get(old_ix@))]
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index d37be0a86a..a3f62bf56b 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -614,7 +614,7 @@ module ListReversalLasso_Impl4_ListReversalList
   val list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) : bool
     ensures { result = list0 self first s }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   predicate resolve1 (self : borrowed usize) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -641,20 +641,20 @@ module ListReversalLasso_Impl4_ListReversalList
     ensures { result = resolve0 self }
     
   use seq.Reverse
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  let rec cfg list_reversal_list [#"../list_reversal_lasso.rs" 99 4 99 79] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Ghost.ghost_ty (Seq.seq usize)) : usize
-    requires {[#"../list_reversal_lasso.rs" 97 15 97 31] list0 ( * self) l (Ghost.inner s)}
-    ensures { [#"../list_reversal_lasso.rs" 98 14 98 47] list0 ( ^ self) result (Reverse.reverse (Ghost.inner s)) }
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  let rec cfg list_reversal_list [#"../list_reversal_lasso.rs" 99 4 99 82] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Snapshot.snap_ty (Seq.seq usize)) : usize
+    requires {[#"../list_reversal_lasso.rs" 97 15 97 31] list0 ( * self) l (Snapshot.inner s)}
+    ensures { [#"../list_reversal_lasso.rs" 98 14 98 47] list0 ( ^ self) result (Reverse.reverse (Snapshot.inner s)) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : usize;
   var self : borrowed (ListReversalLasso_Memory_Type.t_memory) = self;
   var l : usize = l;
-  var s : Ghost.ghost_ty (Seq.seq usize) = s;
+  var s : Snapshot.snap_ty (Seq.seq usize) = s;
   var r : usize;
-  var n : Ghost.ghost_ty int;
+  var n : Snapshot.snap_ty int;
   var _17 : usize;
   var _18 : borrowed usize;
   var _19 : borrowed usize;
@@ -663,22 +663,22 @@ module ListReversalLasso_Impl4_ListReversalList
   var _23 : usize;
   var _24 : borrowed usize;
   var _25 : borrowed usize;
-  var _27 : Ghost.ghost_ty int;
+  var _27 : Snapshot.snap_ty int;
   {
     goto BB0
   }
   BB0 {
     [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] [#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
-    [#"../list_reversal_lasso.rs" 101 20 101 29] n <- ([#"../list_reversal_lasso.rs" 101 20 101 29] Ghost.new 0);
+    [#"../list_reversal_lasso.rs" 101 20 101 35] n <- ([#"../list_reversal_lasso.rs" 101 20 101 35] Snapshot.new 0);
     goto BB1
   }
   BB1 {
     goto BB2
   }
   BB2 {
-    invariant { [#"../list_reversal_lasso.rs" 103 20 103 44] 0 <= Ghost.inner n /\ Ghost.inner n <= Seq.length (Ghost.inner s) };
-    invariant { [#"../list_reversal_lasso.rs" 104 20 104 59] list_seg0 ( * self) l (Ghost.inner s) null0 (Ghost.inner n) (Seq.length (Ghost.inner s)) };
-    invariant { [#"../list_reversal_lasso.rs" 105 20 105 76] list_seg0 ( * self) r (Reverse.reverse (Ghost.inner s)) null0 (Seq.length (Ghost.inner s) - Ghost.inner n) (Seq.length (Ghost.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 103 20 103 44] 0 <= Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s) };
+    invariant { [#"../list_reversal_lasso.rs" 104 20 104 59] list_seg0 ( * self) l (Snapshot.inner s) null0 (Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 105 20 105 76] list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s)) null0 (Seq.length (Snapshot.inner s) - Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
     goto BB3
   }
   BB3 {
@@ -719,12 +719,12 @@ module ListReversalLasso_Impl4_ListReversalList
     assume { resolve1 _19 };
     [#"../list_reversal_lasso.rs" 108 12 108 77] l <- ([#"../list_reversal_lasso.rs" 108 12 108 77] _17);
     [#"../list_reversal_lasso.rs" 108 12 108 77] _17 <- any usize;
-    [#"../list_reversal_lasso.rs" 109 16 109 30] _27 <- ([#"../list_reversal_lasso.rs" 109 16 109 30] Ghost.new (Ghost.inner n + 1));
+    [#"../list_reversal_lasso.rs" 109 16 109 36] _27 <- ([#"../list_reversal_lasso.rs" 109 16 109 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 109 12 109 30] n <- ([#"../list_reversal_lasso.rs" 109 12 109 30] _27);
-    [#"../list_reversal_lasso.rs" 109 12 109 30] _27 <- any Ghost.ghost_ty int;
+    [#"../list_reversal_lasso.rs" 109 12 109 36] n <- ([#"../list_reversal_lasso.rs" 109 12 109 36] _27);
+    [#"../list_reversal_lasso.rs" 109 12 109 36] _27 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
@@ -836,7 +836,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
   val loop0 [#"../list_reversal_lasso.rs" 116 4 116 55] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) : bool
     ensures { result = loop0 self first s }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   predicate resolve1 (self : borrowed usize) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -866,28 +866,28 @@ module ListReversalLasso_Impl4_ListReversalLoop
     ensures { result = resolve0 self }
     
   use seq.Reverse
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq usize)) (ix : int) : usize =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq usize)) (ix : int) : usize
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize
     ensures { result = index_logic0 self ix }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
-  use prelude.Ghost
-  use prelude.Ghost
-  let rec cfg list_reversal_loop [#"../list_reversal_lasso.rs" 125 4 125 79] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Ghost.ghost_ty (Seq.seq usize)) : usize
-    requires {[#"../list_reversal_lasso.rs" 122 15 122 26] Seq.length (Ghost.inner s) > 0}
-    requires {[#"../list_reversal_lasso.rs" 123 15 123 32] loop0 ( * self) l (Ghost.inner s)}
-    ensures { [#"../list_reversal_lasso.rs" 124 14 124 101] loop0 ( ^ self) result (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Ghost.inner s) 1 (Seq.length (Ghost.inner s))))) }
+  use prelude.Snapshot
+  use prelude.Snapshot
+  let rec cfg list_reversal_loop [#"../list_reversal_lasso.rs" 125 4 125 82] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Snapshot.snap_ty (Seq.seq usize)) : usize
+    requires {[#"../list_reversal_lasso.rs" 122 15 122 26] Seq.length (Snapshot.inner s) > 0}
+    requires {[#"../list_reversal_lasso.rs" 123 15 123 32] loop0 ( * self) l (Snapshot.inner s)}
+    ensures { [#"../list_reversal_lasso.rs" 124 14 124 101] loop0 ( ^ self) result (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Snapshot.inner s) 1 (Seq.length (Snapshot.inner s))))) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : usize;
   var self : borrowed (ListReversalLasso_Memory_Type.t_memory) = self;
   var l : usize = l;
-  var s : Ghost.ghost_ty (Seq.seq usize) = s;
+  var s : Snapshot.snap_ty (Seq.seq usize) = s;
   var r : usize;
-  var n : Ghost.ghost_ty int;
+  var n : Snapshot.snap_ty int;
   var _21 : usize;
   var _22 : borrowed usize;
   var _23 : borrowed usize;
@@ -896,23 +896,23 @@ module ListReversalLasso_Impl4_ListReversalLoop
   var _27 : usize;
   var _28 : borrowed usize;
   var _29 : borrowed usize;
-  var _31 : Ghost.ghost_ty int;
+  var _31 : Snapshot.snap_ty int;
   {
     goto BB0
   }
   BB0 {
     [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] [#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
-    [#"../list_reversal_lasso.rs" 127 20 127 29] n <- ([#"../list_reversal_lasso.rs" 127 20 127 29] Ghost.new 0);
+    [#"../list_reversal_lasso.rs" 127 20 127 35] n <- ([#"../list_reversal_lasso.rs" 127 20 127 35] Snapshot.new 0);
     goto BB1
   }
   BB1 {
     goto BB2
   }
   BB2 {
-    invariant { [#"../list_reversal_lasso.rs" 129 20 129 48] 0 <= Ghost.inner n /\ Ghost.inner n <= Seq.length (Ghost.inner s) + 1 };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Ghost.inner n = Seq.length (Ghost.inner s) + 1 -> l = null0 /\ r = index_logic0 s 0 /\ nonnull_ptr0 ( * self) r /\ index_logic1 ( * self) r = index_logic0 s (Seq.length (Ghost.inner s) - 1) /\ list_seg0 ( * self) (index_logic0 s (Seq.length (Ghost.inner s) - 1)) (Reverse.reverse (Ghost.inner s)) (index_logic0 s 0) 0 (Seq.length (Ghost.inner s) - 1) };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Ghost.inner n <= Seq.length (Ghost.inner s) -> list_seg0 ( * self) l (Ghost.inner s) (index_logic0 s 0) (Ghost.inner n) (Seq.length (Ghost.inner s)) };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Ghost.inner n <= Seq.length (Ghost.inner s) -> list_seg0 ( * self) r (Reverse.reverse (Ghost.inner s)) null0 (Seq.length (Ghost.inner s) - Ghost.inner n) (Seq.length (Ghost.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 129 20 129 48] 0 <= Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s) + 1 };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n = Seq.length (Snapshot.inner s) + 1 -> l = null0 /\ r = index_logic0 s 0 /\ nonnull_ptr0 ( * self) r /\ index_logic1 ( * self) r = index_logic0 s (Seq.length (Snapshot.inner s) - 1) /\ list_seg0 ( * self) (index_logic0 s (Seq.length (Snapshot.inner s) - 1)) (Reverse.reverse (Snapshot.inner s)) (index_logic0 s 0) 0 (Seq.length (Snapshot.inner s) - 1) };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s) -> list_seg0 ( * self) l (Snapshot.inner s) (index_logic0 s 0) (Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s) -> list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s)) null0 (Seq.length (Snapshot.inner s) - Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
     goto BB3
   }
   BB3 {
@@ -922,7 +922,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
       end
   }
   BB4 {
-    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 138 12 138 77] Ghost.inner n = Seq.length (Ghost.inner s) -> l = Seq.get (Reverse.reverse (Ghost.inner s)) (Seq.length (Ghost.inner s) - 1) };
+    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 138 12 138 77] Snapshot.inner n = Seq.length (Snapshot.inner s) -> l = Seq.get (Reverse.reverse (Snapshot.inner s)) (Seq.length (Snapshot.inner s) - 1) };
     [#"../list_reversal_lasso.rs" 139 39 139 43] _25 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 139 39 139 43] self <- { self with current = ( ^ _25) ; };
     [#"../list_reversal_lasso.rs" 139 43 139 46] _24 <- ([#"../list_reversal_lasso.rs" 139 43 139 46] index_mut0 _25 ([#"../list_reversal_lasso.rs" 139 44 139 45] l));
@@ -954,20 +954,20 @@ module ListReversalLasso_Impl4_ListReversalLoop
     assume { resolve1 _23 };
     [#"../list_reversal_lasso.rs" 139 12 139 77] l <- ([#"../list_reversal_lasso.rs" 139 12 139 77] _21);
     [#"../list_reversal_lasso.rs" 139 12 139 77] _21 <- any usize;
-    [#"../list_reversal_lasso.rs" 140 16 140 30] _31 <- ([#"../list_reversal_lasso.rs" 140 16 140 30] Ghost.new (Ghost.inner n + 1));
+    [#"../list_reversal_lasso.rs" 140 16 140 36] _31 <- ([#"../list_reversal_lasso.rs" 140 16 140 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 140 12 140 30] n <- ([#"../list_reversal_lasso.rs" 140 12 140 30] _31);
-    [#"../list_reversal_lasso.rs" 140 12 140 30] _31 <- any Ghost.ghost_ty int;
+    [#"../list_reversal_lasso.rs" 140 12 140 36] n <- ([#"../list_reversal_lasso.rs" 140 12 140 36] _31);
+    [#"../list_reversal_lasso.rs" 140 12 140 36] _31 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
     assume { resolve0 self };
-    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 143 8 145 54] forall i : int . 0 <= i /\ i < Seq.length (Ghost.inner s) -> Seq.get (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Ghost.inner s) 1 (Seq.length (Ghost.inner s))))) i = (if i = 0 then
+    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 143 8 145 54] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner s) -> Seq.get (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Snapshot.inner s) 1 (Seq.length (Snapshot.inner s))))) i = (if i = 0 then
       index_logic0 s 0
     else
-      Seq.get (Reverse.reverse (Ghost.inner s)) (i - 1)
+      Seq.get (Reverse.reverse (Snapshot.inner s)) (i - 1)
     ) };
     [#"../list_reversal_lasso.rs" 146 15 146 16] _0 <- ([#"../list_reversal_lasso.rs" 146 15 146 16] r);
     return _0
@@ -1080,7 +1080,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
   val lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize) : bool
     ensures { result = lasso0 self first s1 s2 }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   predicate resolve1 (self : borrowed usize) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -1109,26 +1109,26 @@ module ListReversalLasso_Impl4_ListReversalLasso
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   use seq.Reverse
-  use prelude.Ghost
-  function index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq usize)) (ix : int) : usize =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Ghost.inner self) ix
-  val index_logic0 [@inline:trivial] (self : Ghost.ghost_ty (Seq.seq usize)) (ix : int) : usize
+  use prelude.Snapshot
+  function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 87 8 87 33] Seq.get (Snapshot.inner self) ix
+  val index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  let rec cfg list_reversal_lasso [#"../list_reversal_lasso.rs" 163 4 168 12] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s1 : Ghost.ghost_ty (Seq.seq usize)) (s2 : Ghost.ghost_ty (Seq.seq usize)) : usize
-    requires {[#"../list_reversal_lasso.rs" 161 15 161 38] lasso0 ( * self) l (Ghost.inner s1) (Ghost.inner s2)}
-    ensures { [#"../list_reversal_lasso.rs" 162 14 162 54] lasso0 ( ^ self) result (Ghost.inner s1) (Reverse.reverse (Ghost.inner s2)) }
+  use prelude.Snapshot
+  use prelude.Snapshot
+  let rec cfg list_reversal_lasso [#"../list_reversal_lasso.rs" 163 4 168 12] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s1 : Snapshot.snap_ty (Seq.seq usize)) (s2 : Snapshot.snap_ty (Seq.seq usize)) : usize
+    requires {[#"../list_reversal_lasso.rs" 161 15 161 38] lasso0 ( * self) l (Snapshot.inner s1) (Snapshot.inner s2)}
+    ensures { [#"../list_reversal_lasso.rs" 162 14 162 54] lasso0 ( ^ self) result (Snapshot.inner s1) (Reverse.reverse (Snapshot.inner s2)) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : usize;
   var self : borrowed (ListReversalLasso_Memory_Type.t_memory) = self;
   var l : usize = l;
-  var s1 : Ghost.ghost_ty (Seq.seq usize) = s1;
-  var s2 : Ghost.ghost_ty (Seq.seq usize) = s2;
+  var s1 : Snapshot.snap_ty (Seq.seq usize) = s1;
+  var s2 : Snapshot.snap_ty (Seq.seq usize) = s2;
   var r : usize;
-  var n : Ghost.ghost_ty int;
+  var n : Snapshot.snap_ty int;
   var _19 : usize;
   var _20 : borrowed usize;
   var _21 : borrowed usize;
@@ -1137,31 +1137,31 @@ module ListReversalLasso_Impl4_ListReversalLasso
   var _25 : usize;
   var _26 : borrowed usize;
   var _27 : borrowed usize;
-  var _29 : Ghost.ghost_ty int;
+  var _29 : Snapshot.snap_ty int;
   {
     goto BB0
   }
   BB0 {
     [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] [#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
-    [#"../list_reversal_lasso.rs" 170 20 170 29] n <- ([#"../list_reversal_lasso.rs" 170 20 170 29] Ghost.new 0);
+    [#"../list_reversal_lasso.rs" 170 20 170 35] n <- ([#"../list_reversal_lasso.rs" 170 20 170 35] Snapshot.new 0);
     goto BB1
   }
   BB1 {
     goto BB2
   }
   BB2 {
-    invariant { [#"../list_reversal_lasso.rs" 172 20 172 58] 0 <= Ghost.inner n /\ Ghost.inner n <= 2 * Seq.length (Ghost.inner s1) + Seq.length (Ghost.inner s2) };
-    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] let mid = if Seq.length (Ghost.inner s2) = 0 then
-      index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)
+    invariant { [#"../list_reversal_lasso.rs" 172 20 172 58] 0 <= Snapshot.inner n /\ Snapshot.inner n <= 2 * Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) };
+    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] let mid = if Seq.length (Snapshot.inner s2) = 0 then
+      index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)
     else
       index_logic0 s2 0
-     in Ghost.inner n <= Seq.length (Ghost.inner s1) -> list_seg0 ( * self) l (Ghost.inner s1) mid (Ghost.inner n) (Seq.length (Ghost.inner s1)) /\ list_seg0 ( * self) mid (Ghost.inner s2) (index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)) 0 (Seq.length (Ghost.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Ghost.inner s1)) null0 (Seq.length (Ghost.inner s1) - Ghost.inner n) (Seq.length (Ghost.inner s1)) };
-    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] Seq.length (Ghost.inner s1) < Ghost.inner n /\ Ghost.inner n <= Seq.length (Ghost.inner s1) + Seq.length (Ghost.inner s2) -> list_seg0 ( * self) l (Ghost.inner s2) (index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)) (Ghost.inner n - Seq.length (Ghost.inner s1)) (Seq.length (Ghost.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Ghost.inner s2)) (index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)) (Seq.length (Ghost.inner s1) + Seq.length (Ghost.inner s2) - Ghost.inner n) (Seq.length (Ghost.inner s2)) /\ list_seg0 ( * self) (index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)) (Reverse.reverse (Ghost.inner s1)) null0 0 (Seq.length (Ghost.inner s1)) };
-    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] let mid = if Seq.length (Ghost.inner s2) = 0 then
-      index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)
+     in Snapshot.inner n <= Seq.length (Snapshot.inner s1) -> list_seg0 ( * self) l (Snapshot.inner s1) mid (Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s1)) null0 (Seq.length (Snapshot.inner s1) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) };
+    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] Seq.length (Snapshot.inner s1) < Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) -> list_seg0 ( * self) l (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Snapshot.inner n - Seq.length (Snapshot.inner s1)) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Reverse.reverse (Snapshot.inner s1)) null0 0 (Seq.length (Snapshot.inner s1)) };
+    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] let mid = if Seq.length (Snapshot.inner s2) = 0 then
+      index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)
     else
-      index_logic0 s2 (Seq.length (Ghost.inner s2) - 1)
-     in Seq.length (Ghost.inner s1) + Seq.length (Ghost.inner s2) < Ghost.inner n -> list_seg0 ( * self) l (Reverse.reverse (Ghost.inner s1)) null0 (Ghost.inner n - Seq.length (Ghost.inner s1) - Seq.length (Ghost.inner s2)) (Seq.length (Ghost.inner s1)) /\ list_seg0 ( * self) r (Ghost.inner s1) mid (2 * Seq.length (Ghost.inner s1) + Seq.length (Ghost.inner s2) - Ghost.inner n) (Seq.length (Ghost.inner s1)) /\ list_seg0 ( * self) mid (Reverse.reverse (Ghost.inner s2)) (index_logic0 s1 (Seq.length (Ghost.inner s1) - 1)) 0 (Seq.length (Ghost.inner s2)) };
+      index_logic0 s2 (Seq.length (Snapshot.inner s2) - 1)
+     in Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) < Snapshot.inner n -> list_seg0 ( * self) l (Reverse.reverse (Snapshot.inner s1)) null0 (Snapshot.inner n - Seq.length (Snapshot.inner s1) - Seq.length (Snapshot.inner s2)) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) r (Snapshot.inner s1) mid (2 * Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) };
     goto BB3
   }
   BB3 {
@@ -1202,12 +1202,12 @@ module ListReversalLasso_Impl4_ListReversalLasso
     assume { resolve1 _21 };
     [#"../list_reversal_lasso.rs" 191 12 191 77] l <- ([#"../list_reversal_lasso.rs" 191 12 191 77] _19);
     [#"../list_reversal_lasso.rs" 191 12 191 77] _19 <- any usize;
-    [#"../list_reversal_lasso.rs" 192 16 192 30] _29 <- ([#"../list_reversal_lasso.rs" 192 16 192 30] Ghost.new (Ghost.inner n + 1));
+    [#"../list_reversal_lasso.rs" 192 16 192 36] _29 <- ([#"../list_reversal_lasso.rs" 192 16 192 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 192 12 192 30] n <- ([#"../list_reversal_lasso.rs" 192 12 192 30] _29);
-    [#"../list_reversal_lasso.rs" 192 12 192 30] _29 <- any Ghost.ghost_ty int;
+    [#"../list_reversal_lasso.rs" 192 12 192 36] n <- ([#"../list_reversal_lasso.rs" 192 12 192 36] _29);
+    [#"../list_reversal_lasso.rs" 192 12 192 36] _29 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.rs b/creusot/tests/should_succeed/list_reversal_lasso.rs
index 023e3d7dbc..c293c69ee0 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.rs
+++ b/creusot/tests/should_succeed/list_reversal_lasso.rs
@@ -16,7 +16,7 @@ impl IndexLogic<Ptr> for Memory {
     type Item = Ptr;
 
     #[open(self)]
-    #[ghost]
+    #[logic]
     fn index_logic(self, i: Ptr) -> Ptr {
         pearlite! { self.0[i] }
     }
@@ -96,9 +96,9 @@ impl Memory {
 
     #[requires(self.list(l, *s))]
     #[ensures((^self).list(result, s.reverse()))]
-    pub fn list_reversal_list(&mut self, mut l: Ptr, s: Ghost<Seq<Ptr>>) -> Ptr {
+    pub fn list_reversal_list(&mut self, mut l: Ptr, s: Snapshot<Seq<Ptr>>) -> Ptr {
         let mut r = NULL;
-        let mut n = gh! { 0 };
+        let mut n = snapshot! { 0 };
 
         #[invariant(0 <= *n && *n <= s.len())]
         #[invariant(self.list_seg(l, *s, NULL, *n, s.len()))]
@@ -106,7 +106,7 @@ impl Memory {
         // #[variant(s.len() - *n)]
         while l != NULL {
             l = std::mem::replace(&mut self[l], std::mem::replace(&mut r, l));
-            n = gh! { *n + 1 }
+            n = snapshot! { *n + 1 }
         }
         return r;
     }
@@ -122,9 +122,9 @@ impl Memory {
     #[requires(s.len() > 0)]
     #[requires(self.loop_(l, *s))]
     #[ensures((^self).loop_(result, Seq::singleton(s[0]).concat(s.subsequence(1, s.len()).reverse())))]
-    pub fn list_reversal_loop(&mut self, mut l: Ptr, s: Ghost<Seq<Ptr>>) -> Ptr {
+    pub fn list_reversal_loop(&mut self, mut l: Ptr, s: Snapshot<Seq<Ptr>>) -> Ptr {
         let mut r = NULL;
-        let mut n = gh! { 0 };
+        let mut n = snapshot! { 0 };
 
         #[invariant(0 <= *n && *n <= s.len() + 1)]
         #[invariant(*n == s.len() + 1 ==>
@@ -137,7 +137,7 @@ impl Memory {
         while l != NULL {
             proof_assert! { *n == s.len() ==> l == s.reverse()[s.len() - 1] }
             l = std::mem::replace(&mut self[l], std::mem::replace(&mut r, l));
-            n = gh! { *n + 1 }
+            n = snapshot! { *n + 1 }
         }
 
         proof_assert! { forall<i:Int> 0 <= i && i < s.len() ==>
@@ -163,11 +163,11 @@ impl Memory {
     pub fn list_reversal_lasso(
         &mut self,
         mut l: Ptr,
-        s1: Ghost<Seq<Ptr>>,
-        s2: Ghost<Seq<Ptr>>,
+        s1: Snapshot<Seq<Ptr>>,
+        s2: Snapshot<Seq<Ptr>>,
     ) -> Ptr {
         let mut r = NULL;
-        let mut n = gh! { 0 };
+        let mut n = snapshot! { 0 };
 
         #[invariant(0 <= *n && *n <= 2*s1.len() + s2.len())]
         #[invariant({
@@ -189,12 +189,12 @@ impl Memory {
         // #[variant(2*s1.len() + s2.len() - *n)]
         while l != NULL {
             l = std::mem::replace(&mut self[l], std::mem::replace(&mut r, l));
-            n = gh! { *n + 1 }
+            n = snapshot! { *n + 1 }
         }
         return r;
     }
 
-    #[ghost]
+    #[logic]
     #[requires(0 <= i && i <= s.len())]
     #[ensures(match result {
         None => forall<j: Int> i <= j && j < s.len() ==> s[j]@ != p,
@@ -209,7 +209,7 @@ impl Memory {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(0 <= n)]
     #[requires(forall<i: Int> 0 <= i && i < s.len() ==> s[i]@ < n)]
     #[requires(forall<i: Int, j: Int> 0 <= i && i < s.len() && 0 <= j && j < s.len() && i != j ==> s[i] != s[j])]
@@ -232,7 +232,7 @@ impl Memory {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.mem_is_well_formed())]
     #[requires(last == NULL || self.nonnull_ptr(last))]
     #[requires(self.list_seg(first, s, last, 0, s.len()))]
@@ -259,7 +259,7 @@ impl Memory {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[requires(self.mem_is_well_formed())]
     #[requires(first == NULL || self.nonnull_ptr(first))]
diff --git a/creusot/tests/should_succeed/mapping_test.mlcfg b/creusot/tests/should_succeed/mapping_test.mlcfg
index 4b3c7df8f1..e44734dd03 100644
--- a/creusot/tests/should_succeed/mapping_test.mlcfg
+++ b/creusot/tests/should_succeed/mapping_test.mlcfg
@@ -32,17 +32,17 @@ module MappingTest_Incr
   val shallow_model3 (self : borrowed (MappingTest_T_Type.t_t)) : Map.map int int
     ensures { result = shallow_model3 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model4 (self : borrowed (MappingTest_T_Type.t_t)) : Map.map int int =
     [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model3 self
   val shallow_model4 (self : borrowed (MappingTest_T_Type.t_t)) : Map.map int int
     ensures { result = shallow_model4 self }
     
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (MappingTest_T_Type.t_t))) : Map.map int int =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model4 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (MappingTest_T_Type.t_t))) : Map.map int int
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (MappingTest_T_Type.t_t))) : Map.map int int =
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model4 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (MappingTest_T_Type.t_t))) : Map.map int int
     ensures { result = shallow_model1 self }
     
   predicate resolve0 (self : borrowed (MappingTest_T_Type.t_t)) =
@@ -51,7 +51,7 @@ module MappingTest_Incr
     ensures { result = resolve0 self }
     
   use prelude.Int32
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg incr [#"../mapping_test.rs" 30 0 30 18] [@cfg:stackify] [@cfg:subregion_analysis] (t : borrowed (MappingTest_T_Type.t_t)) : ()
     requires {[#"../mapping_test.rs" 27 12 27 24] 0 <= Int32.to_int (MappingTest_T_Type.t_a ( * t))}
     requires {[#"../mapping_test.rs" 28 12 28 26] Int32.to_int (MappingTest_T_Type.t_a ( * t)) < 1000}
@@ -60,18 +60,18 @@ module MappingTest_Incr
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var t : borrowed (MappingTest_T_Type.t_t) = t;
-  var old_t : Ghost.ghost_ty (borrowed (MappingTest_T_Type.t_t));
+  var old_t : Snapshot.snap_ty (borrowed (MappingTest_T_Type.t_t));
   {
     goto BB0
   }
   BB0 {
-    [#"../mapping_test.rs" 31 16 31 25] old_t <- ([#"../mapping_test.rs" 31 16 31 25] Ghost.new t);
+    [#"../mapping_test.rs" 31 16 31 31] old_t <- ([#"../mapping_test.rs" 31 16 31 31] Snapshot.new t);
     goto BB1
   }
   BB1 {
     [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + ([#"../mapping_test.rs" 32 14 32 15] [#"../mapping_test.rs" 32 14 32 15] (1 : int32)))) ; };
     assume { resolve0 t };
-    assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Ghost.inner old_t))) 1 };
+    assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Snapshot.inner old_t))) 1 };
     [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/mapping_test.rs b/creusot/tests/should_succeed/mapping_test.rs
index 021c5084bf..a2481d3955 100644
--- a/creusot/tests/should_succeed/mapping_test.rs
+++ b/creusot/tests/should_succeed/mapping_test.rs
@@ -13,7 +13,7 @@ struct T {
 impl ShallowModel for T {
     type ShallowModelTy = Mapping<Int, Int>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     #[trusted]
     #[ensures(
@@ -28,7 +28,7 @@ impl ShallowModel for T {
 #[requires( (*t).a@ < 1000 )] // to prevent overflow
 #[ensures( (^t)@ == t@.set((*t).a@,1) )]
 fn incr(t: &mut T) {
-    let old_t = gh! { t };
+    let old_t = snapshot! { t };
     (*t).a += 1;
     // proving the post-consition via extensional equality of mappings
     // (notice `==` versus `==`)
diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg
index ba08106e93..fdb4f10ec5 100644
--- a/creusot/tests/should_succeed/mutex.mlcfg
+++ b/creusot/tests/should_succeed/mutex.mlcfg
@@ -16,12 +16,12 @@ module Mutex_GuardInner_Type
   type t_guardinner 't
 end
 module Mutex_MutexGuard_Type
-  use prelude.Ghost
+  use prelude.Snapshot
   use Mutex_GuardInner_Type as Mutex_GuardInner_Type
   type t_mutexguard 't 'i =
-    | C_MutexGuard (Mutex_GuardInner_Type.t_guardinner 't) (Ghost.ghost_ty 'i)
+    | C_MutexGuard (Mutex_GuardInner_Type.t_guardinner 't) (Snapshot.snap_ty 'i)
     
-  let function mutexguard_1 (self : t_mutexguard 't 'i) : Ghost.ghost_ty 'i = [@vc:do_not_keep_trace] [@vc:sp]
+  let function mutexguard_1 (self : t_mutexguard 't 'i) : Snapshot.snap_ty 'i = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_MutexGuard _ a -> a
       end
@@ -118,20 +118,20 @@ module Mutex_Impl3_Call
   val inv3 [#"../mutex.rs" 66 4 66 33] (self : Mutex_Even_Type.t_even) (x : uint32) : bool
     ensures { result = inv3 self x }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   val set0 [#"../mutex.rs" 56 4 56 27] (self : borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even))) (v : uint32) : ()
-    requires {[#"../mutex.rs" 55 4 55 30] inv3 (Ghost.inner (Mutex_MutexGuard_Type.mutexguard_1 ( * self))) v}
+    requires {[#"../mutex.rs" 55 4 55 30] inv3 (Snapshot.inner (Mutex_MutexGuard_Type.mutexguard_1 ( * self))) v}
     requires {[#"../mutex.rs" 56 16 56 20] inv5 self}
     requires {[#"../mutex.rs" 56 22 56 23] inv6 v}
     
   val deref0 [#"../mutex.rs" 50 4 50 25] (self : Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even)) : uint32
     requires {[#"../mutex.rs" 50 14 50 18] inv2 self}
-    ensures { [#"../mutex.rs" 49 4 49 35] inv3 (Ghost.inner (Mutex_MutexGuard_Type.mutexguard_1 self)) result }
+    ensures { [#"../mutex.rs" 49 4 49 35] inv3 (Snapshot.inner (Mutex_MutexGuard_Type.mutexguard_1 self)) result }
     ensures { [#"../mutex.rs" 50 23 50 25] inv4 result }
     
   val lock0 [#"../mutex.rs" 37 4 37 46] (self : Mutex_Mutex_Type.t_mutex uint32 (Mutex_Even_Type.t_even)) : Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even)
     requires {[#"../mutex.rs" 37 17 37 21] inv0 self}
-    ensures { [#"../mutex.rs" 36 14 36 33] Mutex_Mutex_Type.mutex_1 self = Ghost.inner (Mutex_MutexGuard_Type.mutexguard_1 result) }
+    ensures { [#"../mutex.rs" 36 14 36 33] Mutex_Mutex_Type.mutex_1 self = Snapshot.inner (Mutex_MutexGuard_Type.mutexguard_1 result) }
     ensures { [#"../mutex.rs" 37 26 37 46] inv1 result }
     
   use Mutex_AddsTwo_Type as Mutex_AddsTwo_Type
@@ -205,12 +205,12 @@ module Mutex_JoinHandleInner_Type
   type t_joinhandleinner 't
 end
 module Mutex_JoinHandle_Type
-  use prelude.Ghost
+  use prelude.Snapshot
   use Mutex_JoinHandleInner_Type as Mutex_JoinHandleInner_Type
   type t_joinhandle 't 'i =
-    | C_JoinHandle (Mutex_JoinHandleInner_Type.t_joinhandleinner 't) (Ghost.ghost_ty 'i)
+    | C_JoinHandle (Mutex_JoinHandleInner_Type.t_joinhandleinner 't) (Snapshot.snap_ty 'i)
     
-  let function joinhandle_1 (self : t_joinhandle 't 'i) : Ghost.ghost_ty 'i = [@vc:do_not_keep_trace] [@vc:sp]
+  let function joinhandle_1 (self : t_joinhandle 't 'i) : Snapshot.snap_ty 'i = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_JoinHandle _ a -> a
       end
@@ -358,11 +358,11 @@ module Mutex_Concurrent
   val inv8 [#"../mutex.rs" 150 4 150 39] (self : Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo)) (v : ()) : bool
     ensures { result = inv8 self v }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   val join0 [#"../mutex.rs" 121 4 121 34] (self : Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo))) : Core_Result_Result_Type.t_result () ()
     requires {[#"../mutex.rs" 121 12 121 16] inv7 self}
     ensures { [#"../mutex.rs" 117 14 120 5] match result with
-      | Core_Result_Result_Type.C_Ok v -> inv8 (Ghost.inner (Mutex_JoinHandle_Type.joinhandle_1 self)) v
+      | Core_Result_Result_Type.C_Ok v -> inv8 (Snapshot.inner (Mutex_JoinHandle_Type.joinhandle_1 self)) v
       | _ -> true
       end }
     ensures { [#"../mutex.rs" 121 21 121 34] inv9 result }
diff --git a/creusot/tests/should_succeed/mutex.rs b/creusot/tests/should_succeed/mutex.rs
index cafe5e1924..afea3c3895 100644
--- a/creusot/tests/should_succeed/mutex.rs
+++ b/creusot/tests/should_succeed/mutex.rs
@@ -35,14 +35,14 @@ impl<T, I: Inv<T>> Mutex<T, I> {
     #[trusted]
     #[ensures(self.1 == *result.1)]
     pub fn lock(&self) -> MutexGuard<'_, T, I> {
-        MutexGuard(GuardInner(self.0 .0.lock().unwrap()), gh! { self.1 })
+        MutexGuard(GuardInner(self.0 .0.lock().unwrap()), snapshot! { self.1 })
     }
 }
 
 #[trusted]
 struct GuardInner<'a, T: ?Sized + 'a>(std::sync::MutexGuard<'a, T>);
 
-pub struct MutexGuard<'a, T: ?Sized + 'a, I>(GuardInner<'a, T>, Ghost<I>);
+pub struct MutexGuard<'a, T: ?Sized + 'a, I>(GuardInner<'a, T>, Snapshot<I>);
 
 impl<'a, T, I: Inv<T>> MutexGuard<'a, T, I> {
     #[trusted]
@@ -110,7 +110,7 @@ impl<'a> FakeFnOnce for AddsTwo<'a> {
 
 #[trusted]
 struct JoinHandleInner<T>(std::thread::JoinHandle<T>);
-struct JoinHandle<T, I>(JoinHandleInner<T>, Ghost<I>);
+struct JoinHandle<T, I>(JoinHandleInner<T>, Snapshot<I>);
 
 impl<T, I: Inv<T>> JoinHandle<T, I> {
     #[trusted]
@@ -136,7 +136,7 @@ fn spawn<T: Send + 'static, F: Send + 'static + FakeFnOnce<Return = T>>(
             #[creusot::no_translate]
             || f.call(),
         )),
-        gh! { SpawnPostCond { f } },
+        snapshot! { SpawnPostCond { f } },
     )
 }
 
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index 7d943341c6..5a1b50dfbf 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -1300,16 +1300,16 @@ module RedBlackTree_Impl14_RotateRight
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v) . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)) . inv0 x = true
   use prelude.Int
   function height1 [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int =
     [#"../red_black_tree.rs" 298 12 306 13] match self with
@@ -1426,7 +1426,7 @@ module RedBlackTree_Impl14_RotateRight
   val resolve5 (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = resolve5 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve4 (self : borrowed (RedBlackTree_Color_Type.t_color)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (RedBlackTree_Color_Type.t_color)) : bool
@@ -1482,11 +1482,11 @@ module RedBlackTree_Impl14_RotateRight
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 16 22 16 42] is_default0 ( ^ dest) }
     ensures { inv1 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg rotate_right [#"../red_black_tree.rs" 412 4 412 30] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 400 15 400 43] internal_invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 401 15 401 42] color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red}
@@ -1502,7 +1502,7 @@ module RedBlackTree_Impl14_RotateRight
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var self : borrowed (RedBlackTree_Node_Type.t_node k v) = self;
-  var old_self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v));
+  var old_self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v));
   var x : RedBlackTree_Node_Type.t_node k v;
   var _14 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   var _15 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -1525,7 +1525,7 @@ module RedBlackTree_Impl14_RotateRight
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 413 23 413 35] old_self <- ([#"../red_black_tree.rs" 413 23 413 35] Ghost.new self);
+    [#"../red_black_tree.rs" 413 23 413 41] old_self <- ([#"../red_black_tree.rs" 413 23 413 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -1604,7 +1604,7 @@ module RedBlackTree_Impl14_RotateRight
   BB6 {
     assume { resolve4 _30 };
     assume { resolve4 _28 };
-    assert { [@expl:assertion] [#"../red_black_tree.rs" 441 8 441 90] has_mapping0 (RedBlackTree_Node_Type.node_left ( * Ghost.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
+    assert { [@expl:assertion] [#"../red_black_tree.rs" 441 8 441 90] has_mapping0 (RedBlackTree_Node_Type.node_left ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
     goto BB7
   }
   BB7 {
@@ -1830,16 +1830,16 @@ module RedBlackTree_Impl14_RotateLeft
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v) . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val invariant0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val invariant0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)) . inv0 x = true
   use prelude.Int
   function height1 [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int =
     [#"../red_black_tree.rs" 298 12 306 13] match self with
@@ -1956,7 +1956,7 @@ module RedBlackTree_Impl14_RotateLeft
   val resolve5 (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = resolve5 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve4 (self : borrowed (RedBlackTree_Color_Type.t_color)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (RedBlackTree_Color_Type.t_color)) : bool
@@ -2012,11 +2012,11 @@ module RedBlackTree_Impl14_RotateLeft
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 16 22 16 42] is_default0 ( ^ dest) }
     ensures { inv1 result }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg rotate_left [#"../red_black_tree.rs" 462 4 462 29] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 450 15 450 43] internal_invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 451 15 451 43] color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red}
@@ -2032,7 +2032,7 @@ module RedBlackTree_Impl14_RotateLeft
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var self : borrowed (RedBlackTree_Node_Type.t_node k v) = self;
-  var old_self : Ghost.ghost_ty (borrowed (RedBlackTree_Node_Type.t_node k v));
+  var old_self : Snapshot.snap_ty (borrowed (RedBlackTree_Node_Type.t_node k v));
   var x : RedBlackTree_Node_Type.t_node k v;
   var _14 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   var _15 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -2055,7 +2055,7 @@ module RedBlackTree_Impl14_RotateLeft
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 463 23 463 35] old_self <- ([#"../red_black_tree.rs" 463 23 463 35] Ghost.new self);
+    [#"../red_black_tree.rs" 463 23 463 41] old_self <- ([#"../red_black_tree.rs" 463 23 463 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -2134,7 +2134,7 @@ module RedBlackTree_Impl14_RotateLeft
   BB6 {
     assume { resolve4 _30 };
     assume { resolve4 _28 };
-    assert { [@expl:assertion] [#"../red_black_tree.rs" 468 8 468 91] has_mapping0 (RedBlackTree_Node_Type.node_right ( * Ghost.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
+    assert { [@expl:assertion] [#"../red_black_tree.rs" 468 8 468 91] has_mapping0 (RedBlackTree_Node_Type.node_right ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
     goto BB7
   }
   BB7 {
@@ -5447,12 +5447,12 @@ module RedBlackTree_Impl15_Insert
   val invariant0 [#"../red_black_tree.rs" 364 4 364 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant0 self }
     
-  use prelude.Ghost
-  predicate resolve2 (self : Ghost.ghost_ty ())
-  val resolve2 (self : Ghost.ghost_ty ()) : bool
+  use prelude.Snapshot
+  predicate resolve2 (self : Snapshot.snap_ty ())
+  val resolve2 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use map.Map
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
@@ -5564,7 +5564,7 @@ module RedBlackTree_Impl15_Insert
   var _12 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _13 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _14 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
-  var _15 : Ghost.ghost_ty ();
+  var _15 : Snapshot.snap_ty ();
   {
     goto BB0
   }
@@ -5600,7 +5600,7 @@ module RedBlackTree_Impl15_Insert
     assume { resolve0 _12 };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve1 self };
-    [#"../red_black_tree.rs" 629 8 629 39] _15 <- ([#"../red_black_tree.rs" 629 8 629 39] Ghost.new ());
+    [#"../red_black_tree.rs" 629 8 629 45] _15 <- ([#"../red_black_tree.rs" 629 8 629 45] Snapshot.new ());
     goto BB5
   }
   BB5 {
@@ -6594,16 +6594,16 @@ module RedBlackTree_Impl15_DeleteMax
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v) . inv1 x = true
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val invariant1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val invariant1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = invariant1 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)) . inv0 x = true
   use map.Const
   use map.Map
   function deep_model0 (self : k) : deep_model_ty0
@@ -6719,11 +6719,11 @@ module RedBlackTree_Impl15_DeleteMax
   val invariant0 [#"../red_black_tree.rs" 364 4 364 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant0 self }
     
-  predicate resolve4 (self : Ghost.ghost_ty ())
-  val resolve4 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve4 (self : Snapshot.snap_ty ())
+  val resolve4 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve4 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -6819,7 +6819,7 @@ module RedBlackTree_Impl15_DeleteMax
   val same_mappings0 [#"../red_black_tree.rs" 42 4 42 43] (self : RedBlackTree_Tree_Type.t_tree k v) (o : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = same_mappings0 self o }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : bool
@@ -6834,11 +6834,11 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 388 15 388 19] inv9 self}
     ensures { [#"../red_black_tree.rs" 387 14 387 45] result = (color0 self = RedBlackTree_Color_Type.C_Red) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val resolve0 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg delete_max [#"../red_black_tree.rs" 667 4 667 50] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) : Core_Option_Option_Type.t_option (k, v)
     requires {[#"../red_black_tree.rs" 660 15 660 34] invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 667 27 667 31] inv6 self}
@@ -6852,7 +6852,7 @@ module RedBlackTree_Impl15_DeleteMax
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option (k, v);
   var self : borrowed (RedBlackTree_Tree_Type.t_tree k v) = self;
-  var old_self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v));
+  var old_self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v));
   var _7 : ();
   var _8 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
@@ -6864,12 +6864,12 @@ module RedBlackTree_Impl15_DeleteMax
   var _23 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _24 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _25 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
-  var _26 : Ghost.ghost_ty ();
+  var _26 : Snapshot.snap_ty ();
   {
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 668 23 668 35] old_self <- ([#"../red_black_tree.rs" 668 23 668 35] Ghost.new self);
+    [#"../red_black_tree.rs" 668 23 668 41] old_self <- ([#"../red_black_tree.rs" 668 23 668 41] Snapshot.new self);
     goto BB1
   }
   BB1 {
@@ -6917,7 +6917,7 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB7
   }
   BB7 {
-    assert { [@expl:assertion] [#"../red_black_tree.rs" 676 24 676 53] same_mappings0 ( * Ghost.inner old_self) ( * self) };
+    assert { [@expl:assertion] [#"../red_black_tree.rs" 676 24 676 53] same_mappings0 ( * Snapshot.inner old_self) ( * self) };
     [#"../red_black_tree.rs" 677 16 677 20] _18 <- Borrow.borrow_mut ( * self);
     [#"../red_black_tree.rs" 677 16 677 20] self <- { self with current = ( ^ _18) ; };
     assume { inv5 ( ^ _18) };
@@ -6972,7 +6972,7 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB15
   }
   BB15 {
-    [#"../red_black_tree.rs" 681 8 681 39] _26 <- ([#"../red_black_tree.rs" 681 8 681 39] Ghost.new ());
+    [#"../red_black_tree.rs" 681 8 681 45] _26 <- ([#"../red_black_tree.rs" 681 8 681 45] Snapshot.new ());
     goto BB16
   }
   BB16 {
@@ -8045,7 +8045,7 @@ module RedBlackTree_Impl15_DeleteMin
   val invariant0 [#"../red_black_tree.rs" 364 4 364 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   val unwrap0 (self : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))) : borrowed (RedBlackTree_Node_Type.t_node k v)
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
     requires {inv11 self}
@@ -8108,11 +8108,11 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../red_black_tree.rs" 388 15 388 19] inv9 self}
     ensures { [#"../red_black_tree.rs" 387 14 387 45] result = (color0 self = RedBlackTree_Color_Type.C_Red) }
     
-  predicate resolve0 (self : Ghost.ghost_ty ())
-  val resolve0 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve0 (self : Snapshot.snap_ty ())
+  val resolve0 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -8166,7 +8166,7 @@ module RedBlackTree_Impl15_DeleteMin
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option (k, v);
   var self : borrowed (RedBlackTree_Tree_Type.t_tree k v) = self;
-  var _5 : Ghost.ghost_ty ();
+  var _5 : Snapshot.snap_ty ();
   var _7 : ();
   var _8 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
@@ -8182,7 +8182,7 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 720 8 720 39] _5 <- ([#"../red_black_tree.rs" 720 8 720 39] Ghost.new ());
+    [#"../red_black_tree.rs" 720 8 720 45] _5 <- ([#"../red_black_tree.rs" 720 8 720 45] Snapshot.new ());
     goto BB1
   }
   BB1 {
@@ -8701,7 +8701,7 @@ module RedBlackTree_Impl15_DeleteRec
   val internal_invariant0 [#"../red_black_tree.rs" 356 4 356 43] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = internal_invariant0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate color_invariant1 [#"../red_black_tree.rs" 286 4 286 36] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 287 8 287 112] color_invariant_here0 self /\ color_invariant0 (RedBlackTree_Node_Type.node_left self) /\ color_invariant0 (RedBlackTree_Node_Type.node_right self)
   val color_invariant1 [#"../red_black_tree.rs" 286 4 286 36] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -8840,11 +8840,11 @@ module RedBlackTree_Impl15_DeleteRec
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 11 22 11 30]  ^ x =  * y }
     ensures { [#"../../../../creusot-contracts/src/std/mem.rs" 12 22 12 30]  ^ y =  * x }
     
-  predicate resolve5 (self : Ghost.ghost_ty ())
-  val resolve5 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve5 (self : Snapshot.snap_ty ())
+  val resolve5 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve5 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   use map.Map
   use map.Map
   function model_acc0 [#"../red_black_tree.rs" 49 4 52 47] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
@@ -9094,7 +9094,7 @@ module RedBlackTree_Impl15_DeleteRec
   var _71 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var kv : (k, v);
   var _74 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
-  var _75 : Ghost.ghost_ty ();
+  var _75 : Snapshot.snap_ty ();
   var _77 : ();
   var _78 : borrowed k;
   var _79 : borrowed k;
@@ -9428,7 +9428,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB54
   }
   BB54 {
-    [#"../red_black_tree.rs" 778 24 778 53] _75 <- ([#"../red_black_tree.rs" 778 24 778 53] Ghost.new ());
+    [#"../red_black_tree.rs" 778 24 778 59] _75 <- ([#"../red_black_tree.rs" 778 24 778 59] Snapshot.new ());
     goto BB55
   }
   BB55 {
@@ -9892,7 +9892,7 @@ module RedBlackTree_Impl15_Delete
   val invariant0 [#"../red_black_tree.rs" 364 4 364 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   val unwrap0 (self : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))) : borrowed (RedBlackTree_Node_Type.t_node k v)
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
     requires {inv11 self}
@@ -9962,11 +9962,11 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../red_black_tree.rs" 388 15 388 19] inv10 self}
     ensures { [#"../red_black_tree.rs" 387 14 387 45] result = (color0 self = RedBlackTree_Color_Type.C_Red) }
     
-  predicate resolve0 (self : Ghost.ghost_ty ())
-  val resolve0 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve0 (self : Snapshot.snap_ty ())
+  val resolve0 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -10023,7 +10023,7 @@ module RedBlackTree_Impl15_Delete
   var _0 : Core_Option_Option_Type.t_option (k, v);
   var self : borrowed (RedBlackTree_Tree_Type.t_tree k v) = self;
   var key : k = key;
-  var _7 : Ghost.ghost_ty ();
+  var _7 : Snapshot.snap_ty ();
   var _9 : ();
   var _10 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
@@ -10039,7 +10039,7 @@ module RedBlackTree_Impl15_Delete
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 801 8 801 39] _7 <- ([#"../red_black_tree.rs" 801 8 801 39] Ghost.new ());
+    [#"../red_black_tree.rs" 801 8 801 45] _7 <- ([#"../red_black_tree.rs" 801 8 801 45] Snapshot.new ());
     goto BB1
   }
   BB1 {
@@ -10459,7 +10459,7 @@ module RedBlackTree_Impl15_Get
   val invariant0 [#"../red_black_tree.rs" 364 4 364 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve5 (self : v)
   val resolve5 (self : v) : bool
     ensures { result = resolve5 self }
@@ -10490,11 +10490,11 @@ module RedBlackTree_Impl15_Get
   val resolve1 (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = resolve1 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty ())
-  val resolve0 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve0 (self : Snapshot.snap_ty ())
+  val resolve0 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -10549,7 +10549,7 @@ module RedBlackTree_Impl15_Get
   var _0 : Core_Option_Option_Type.t_option v;
   var self : RedBlackTree_Tree_Type.t_tree k v = self;
   var key : k = key;
-  var _6 : Ghost.ghost_ty ();
+  var _6 : Snapshot.snap_ty ();
   var tree : RedBlackTree_Tree_Type.t_tree k v;
   var _12 : ();
   var _13 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
@@ -10563,7 +10563,7 @@ module RedBlackTree_Impl15_Get
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 823 8 823 39] _6 <- ([#"../red_black_tree.rs" 823 8 823 39] Ghost.new ());
+    [#"../red_black_tree.rs" 823 8 823 45] _6 <- ([#"../red_black_tree.rs" 823 8 823 45] Snapshot.new ());
     goto BB1
   }
   BB1 {
@@ -10875,16 +10875,16 @@ module RedBlackTree_Impl15_GetMut
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : v . inv1 x = true
-  use prelude.Ghost
-  predicate invariant1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val invariant1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  use prelude.Snapshot
+  predicate invariant1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val invariant1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = invariant1 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)) . inv0 x = true
   use map.Map
   function deep_model1 (self : k) : deep_model_ty0
   val deep_model1 (self : k) : deep_model_ty0
@@ -11040,22 +11040,22 @@ module RedBlackTree_Impl15_GetMut
   val match_t0 [#"../red_black_tree.rs" 232 4 232 52] (self : RedBlackTree_Cp_Type.t_cp) (tree : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = match_t0 self tree }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function deep_model0 (self : k) : deep_model_ty0 =
     [#"../../../../creusot-contracts/src/model.rs" 74 8 74 28] deep_model1 self
   val deep_model0 (self : k) : deep_model_ty0
     ensures { result = deep_model0 self }
     
-  predicate resolve1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
-  val resolve1 (self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
+  predicate resolve1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v)))
+  val resolve1 (self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v))) : bool
     ensures { result = resolve1 self }
     
-  use prelude.Ghost
-  predicate resolve0 (self : Ghost.ghost_ty ())
-  val resolve0 (self : Ghost.ghost_ty ()) : bool
+  use prelude.Snapshot
+  predicate resolve0 (self : Snapshot.snap_ty ())
+  val resolve0 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function model_acc_has_mapping0 [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -11111,8 +11111,8 @@ module RedBlackTree_Impl15_GetMut
   var _0 : Core_Option_Option_Type.t_option (borrowed v);
   var self : borrowed (RedBlackTree_Tree_Type.t_tree k v) = self;
   var key : k = key;
-  var _7 : Ghost.ghost_ty ();
-  var old_self : Ghost.ghost_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v));
+  var _7 : Snapshot.snap_ty ();
+  var old_self : Snapshot.snap_ty (borrowed (RedBlackTree_Tree_Type.t_tree k v));
   var tree : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _22 : ();
   var _23 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -11129,12 +11129,12 @@ module RedBlackTree_Impl15_GetMut
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 845 8 845 39] _7 <- ([#"../red_black_tree.rs" 845 8 845 39] Ghost.new ());
+    [#"../red_black_tree.rs" 845 8 845 45] _7 <- ([#"../red_black_tree.rs" 845 8 845 45] Snapshot.new ());
     goto BB1
   }
   BB1 {
     assume { resolve0 _7 };
-    [#"../red_black_tree.rs" 847 23 847 35] old_self <- ([#"../red_black_tree.rs" 847 23 847 35] Ghost.new self);
+    [#"../red_black_tree.rs" 847 23 847 41] old_self <- ([#"../red_black_tree.rs" 847 23 847 41] Snapshot.new self);
     goto BB2
   }
   BB2 {
@@ -11148,12 +11148,12 @@ module RedBlackTree_Impl15_GetMut
     invariant { [#"../red_black_tree.rs" 850 20 850 43] bst_invariant0 ( * tree) };
     invariant { [#"../red_black_tree.rs" 851 20 851 46] height_invariant0 ( * tree) };
     invariant { [#"../red_black_tree.rs" 852 20 852 45] color_invariant0 ( * tree) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( ^ tree) (deep_model0 key) v = has_mapping0 ( ^ Ghost.inner old_self) (deep_model0 key) v };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( * tree) (deep_model0 key) v = has_mapping0 ( * Ghost.inner old_self) (deep_model0 key) v };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> k = deep_model0 key \/ has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v) -> bst_invariant0 ( ^ tree) -> bst_invariant0 ( ^ Ghost.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] height0 ( * tree) = height0 ( ^ tree) /\ height_invariant0 ( ^ tree) -> height_invariant0 ( ^ Ghost.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] match_t0 (RedBlackTree_Cp_Type.C_CPL (color0 ( * tree))) ( ^ tree) -> match_t0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) ( ^ Ghost.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v -> has_mapping0 ( * Ghost.inner old_self) k v = has_mapping0 ( ^ Ghost.inner old_self) k v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( ^ tree) (deep_model0 key) v = has_mapping0 ( ^ Snapshot.inner old_self) (deep_model0 key) v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( * tree) (deep_model0 key) v = has_mapping0 ( * Snapshot.inner old_self) (deep_model0 key) v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> k = deep_model0 key \/ has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v) -> bst_invariant0 ( ^ tree) -> bst_invariant0 ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] height0 ( * tree) = height0 ( ^ tree) /\ height_invariant0 ( ^ tree) -> height_invariant0 ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] match_t0 (RedBlackTree_Cp_Type.C_CPL (color0 ( * tree))) ( ^ tree) -> match_t0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v -> has_mapping0 ( * Snapshot.inner old_self) k v = has_mapping0 ( ^ Snapshot.inner old_self) k v };
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/red_black_tree.rs b/creusot/tests/should_succeed/red_black_tree.rs
index cf67597fd2..9fb3f15fd7 100644
--- a/creusot/tests/should_succeed/red_black_tree.rs
+++ b/creusot/tests/should_succeed/red_black_tree.rs
@@ -45,7 +45,7 @@ impl<K: DeepModel, V> Tree<K, V> {
         }
     }
 
-    #[ghost]
+    #[logic]
     fn model_acc(
         self,
         accu: <Self as ShallowModel>::ShallowModelTy,
@@ -62,7 +62,7 @@ impl<K: DeepModel, V> Tree<K, V> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[ensures(self.model_acc(accu).get(k) == accu.get(k) ||
               exists<v: V> self.model_acc(accu).get(k) == Some(v) && self.has_mapping(k, v))]
     fn model_acc_has_mapping(
@@ -83,7 +83,7 @@ impl<K: DeepModel, V> Tree<K, V> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.bst_invariant())]
     #[ensures(forall<v: V> self.has_mapping(k, v) ==> self.model_acc(accu).get(k) == Some(v))]
     fn has_mapping_model_acc(self, accu: <Self as ShallowModel>::ShallowModelTy, k: K::DeepModelTy)
@@ -104,7 +104,7 @@ impl<K: DeepModel, V> Tree<K, V> {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.bst_invariant())]
     #[ensures(forall<v: V> self.has_mapping(k, v) == (self@.get(k) == Some(v)))]
     fn has_mapping_model(self, k: K::DeepModelTy)
@@ -117,7 +117,7 @@ impl<K: DeepModel, V> Tree<K, V> {
         } }
     }
 
-    #[ghost]
+    #[logic]
     #[requires(self.bst_invariant())]
     #[requires(self.has_mapping(k, v1))]
     #[requires(self.has_mapping(k, v2))]
@@ -155,7 +155,7 @@ impl<K: DeepModel, V> Node<K, V> {
 impl<K: DeepModel, V> ShallowModel for Node<K, V> {
     type ShallowModelTy = Mapping<K::DeepModelTy, Option<V>>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! {
@@ -167,7 +167,7 @@ impl<K: DeepModel, V> ShallowModel for Node<K, V> {
 impl<K: DeepModel, V> ShallowModel for Tree<K, V> {
     type ShallowModelTy = Mapping<K::DeepModelTy, Option<V>>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! { self.model_acc(Mapping::cst(None)) }
@@ -222,7 +222,7 @@ enum CP {
 }
 use CP::*;
 
-#[ghost]
+#[logic]
 fn cpn(c: Color, l: CP, r: CP) -> CP {
     pearlite! { CPN(c, Box::new(l), Box::new(r)) }
 }
@@ -252,7 +252,7 @@ impl CP {
 }
 
 impl<K, V> Tree<K, V> {
-    #[ghost]
+    #[logic]
     fn color(self) -> Color {
         pearlite! {
             match self.node {
@@ -291,7 +291,7 @@ impl<K, V> Node<K, V> {
 /*****************************  The height invariant  *************************/
 
 impl<K, V> Tree<K, V> {
-    #[ghost]
+    #[logic]
     #[ensures(result >= 0)]
     fn height(self) -> Int {
         pearlite! {
@@ -322,7 +322,7 @@ impl<K, V> Tree<K, V> {
 }
 
 impl<K, V> Node<K, V> {
-    #[ghost]
+    #[logic]
     #[ensures(forall<node: Box<Node<K, V>>>
               self == *node ==> result == Tree{ node: Some(node) }.height())]
     fn height(self) -> Int {
@@ -410,7 +410,7 @@ where
               ((^self).left, r.left, r.right) == (l.left, l.right, (*self).right) &&
               r.key == (*self).key)]
     fn rotate_right(&mut self) {
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
 
         //     self
         //    /    \
@@ -460,7 +460,7 @@ where
               (l.left, l.right, (^self).right) == ((*self).left, r.left, r.right) &&
               l.key == (*self).key)]
     fn rotate_left(&mut self) {
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         let mut x = std::mem::take(&mut self.right.node).unwrap();
         std::mem::swap(&mut self.right, &mut x.left);
         std::mem::swap(self, &mut x);
@@ -626,7 +626,7 @@ where
     pub fn insert(&mut self, key: K, val: V) {
         self.insert_rec(key, val);
         self.node.as_mut().unwrap().color = Black;
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
     }
 
     #[requires((*self).internal_invariant())]
@@ -665,7 +665,7 @@ where
             (^self)@ == self@.set(k.deep_model(), None),
         None => (^self)@ == self@ && self@ == Mapping::cst(None)})]
     pub fn delete_max(&mut self) -> Option<(K, V)> {
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         if let Some(node) = &mut self.node {
             if !node.left.is_red() {
                 node.color = Red;
@@ -678,7 +678,7 @@ where
         if self.is_red() {
             self.node.as_mut().unwrap().color = Black;
         }
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
         Some(r)
     }
 
@@ -717,7 +717,7 @@ where
         None => (^self)@ == self@ && self@ == Mapping::cst(None)
     })]
     pub fn delete_min(&mut self) -> Option<(K, V)> {
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
 
         if let Some(node) = &mut self.node {
             if !node.left.is_red() {
@@ -775,7 +775,7 @@ where
                     }
                     if let Equal = ord {
                         let mut kv = node.right.delete_min_rec();
-                        gh! { Self::has_mapping_inj };
+                        snapshot! { Self::has_mapping_inj };
                         std::mem::swap(&mut node.key, &mut kv.0);
                         std::mem::swap(&mut node.val, &mut kv.1);
                         r = Some(kv)
@@ -798,7 +798,7 @@ where
     })]
     #[ensures((^self)@ == self@.set(key.deep_model(), None))]
     pub fn delete(&mut self, key: &K) -> Option<(K, V)> {
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
 
         if let Some(node) = &mut self.node {
             if !node.left.is_red() {
@@ -820,7 +820,7 @@ where
         None => self@.get(key.deep_model()) == None
     })]
     pub fn get(&self, key: &K) -> Option<&V> {
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
 
         let mut tree = self;
         #[invariant((*tree).bst_invariant())]
@@ -842,9 +842,9 @@ where
         None => self@.get(key.deep_model()) == None && (^self)@ == self@
     })]
     pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
-        gh! { Self::has_mapping_model };
+        snapshot! { Self::has_mapping_model };
 
-        let old_self = gh! { self };
+        let old_self = snapshot! { self };
         let mut tree = self;
 
         #[invariant((*tree).bst_invariant())]
diff --git a/creusot/tests/should_succeed/result/own.rs b/creusot/tests/should_succeed/result/own.rs
index 9d3b333910..a4ca0bf952 100644
--- a/creusot/tests/should_succeed/result/own.rs
+++ b/creusot/tests/should_succeed/result/own.rs
@@ -11,7 +11,7 @@ pub enum OwnResult<T, E> {
 #[trusted]
 impl<T, E> Resolve for OwnResult<T, E> {
     #[open]
-    #[predicate]
+    #[predicate(prophetic)]
     fn resolve(self) -> bool {
         match self {
             OwnResult::Ok(t) => t.resolve(),
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
index 450906744d..adeffc0c7b 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
@@ -167,7 +167,7 @@ module IncMaxRepeat_IncMaxRepeat
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range uint32 . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve1 (self : borrowed uint32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed uint32) : bool
@@ -199,11 +199,11 @@ module IncMaxRepeat_IncMaxRepeat
       end }
     ensures { inv2 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range uint32) (res : Core_Ops_Range_Range_Type.t_range uint32)
     
    =
@@ -231,13 +231,13 @@ module IncMaxRepeat_IncMaxRepeat
   var b : uint32 = b;
   var n : uint32 = n;
   var iter : Core_Ops_Range_Range_Type.t_range uint32;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range uint32);
-  var produced : Ghost.ghost_ty (Seq.seq uint32);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range uint32);
+  var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _18 : Core_Option_Option_Type.t_option uint32;
   var _19 : borrowed (Core_Ops_Range_Range_Type.t_range uint32);
   var _20 : borrowed (Core_Ops_Range_Range_Type.t_range uint32);
   var __creusot_proc_iter_elem : uint32;
-  var _23 : Ghost.ghost_ty (Seq.seq uint32);
+  var _23 : Snapshot.snap_ty (Seq.seq uint32);
   var mc : borrowed uint32;
   var _26 : borrowed uint32;
   var _27 : borrowed uint32;
@@ -251,11 +251,11 @@ module IncMaxRepeat_IncMaxRepeat
     goto BB1
   }
   BB1 {
-    [#"../inc_max_repeat.rs" 16 4 16 86] iter_old <- ([#"../inc_max_repeat.rs" 16 4 16 86] Ghost.new iter);
+    [#"../inc_max_repeat.rs" 16 4 16 86] iter_old <- ([#"../inc_max_repeat.rs" 16 4 16 86] Snapshot.new iter);
     goto BB2
   }
   BB2 {
-    [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] Ghost.new (Seq.empty ));
+    [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -263,9 +263,9 @@ module IncMaxRepeat_IncMaxRepeat
   }
   BB4 {
     invariant { [#"../inc_max_repeat.rs" 16 4 16 86] inv0 iter };
-    invariant { [#"../inc_max_repeat.rs" 16 4 16 86] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../inc_max_repeat.rs" 16 16 16 84] UInt32.to_int a <= 1000000 + Seq.length (Ghost.inner produced) /\ UInt32.to_int b <= 1000000 + Seq.length (Ghost.inner produced) };
-    invariant { [#"../inc_max_repeat.rs" 17 16 17 70] UInt32.to_int a >= UInt32.to_int b + Seq.length (Ghost.inner produced) \/ UInt32.to_int b >= UInt32.to_int a + Seq.length (Ghost.inner produced) };
+    invariant { [#"../inc_max_repeat.rs" 16 4 16 86] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../inc_max_repeat.rs" 16 16 16 84] UInt32.to_int a <= 1000000 + Seq.length (Snapshot.inner produced) /\ UInt32.to_int b <= 1000000 + Seq.length (Snapshot.inner produced) };
+    invariant { [#"../inc_max_repeat.rs" 17 16 17 70] UInt32.to_int a >= UInt32.to_int b + Seq.length (Snapshot.inner produced) \/ UInt32.to_int b >= UInt32.to_int a + Seq.length (Snapshot.inner produced) };
     goto BB5
   }
   BB5 {
@@ -298,13 +298,13 @@ module IncMaxRepeat_IncMaxRepeat
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _18);
-    [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- ([#"../inc_max_repeat.rs" 16 4 16 86] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18);
+    [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- ([#"../inc_max_repeat.rs" 16 4 16 86] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] _23);
-    [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- any Ghost.ghost_ty (Seq.seq uint32);
+    [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../inc_max_repeat.rs" 19 26 19 32] _27 <- Borrow.borrow_mut a;
     [#"../inc_max_repeat.rs" 19 26 19 32] a <-  ^ _27;
     [#"../inc_max_repeat.rs" 19 26 19 32] _26 <- Borrow.borrow_final ( * _27) (Borrow.get_id _27);
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index 8a31fb3c75..cec949ebd3 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -120,7 +120,7 @@ module IncSome2List_Impl0_TakeSomeRest
   val sum0 [#"../inc_some_2_list.rs" 21 4 21 23] (self : IncSome2List_List_Type.t_list) : int
     ensures { result = sum0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (IncSome2List_List_Type.t_list)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (IncSome2List_List_Type.t_list)) : bool
@@ -137,7 +137,7 @@ module IncSome2List_Impl0_TakeSomeRest
     ensures { result = resolve0 self }
     
   val random0 [#"../inc_some_2_list.rs" 15 0 15 19] (_1 : ()) : bool
-  use prelude.Ghost
+  use prelude.Snapshot
   function lemma_sum_nonneg0 [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : ()
   axiom lemma_sum_nonneg0_def : forall self : IncSome2List_List_Type.t_list . lemma_sum_nonneg0 self = ([#"../inc_some_2_list.rs" 35 8 38 9] match self with
     | IncSome2List_List_Type.C_Cons _ l -> lemma_sum_nonneg0 l
@@ -157,7 +157,7 @@ module IncSome2List_Impl0_TakeSomeRest
   var self : borrowed (IncSome2List_List_Type.t_list) = self;
   var ma : borrowed uint32;
   var ml : borrowed (IncSome2List_List_Type.t_list);
-  var _8 : Ghost.ghost_ty ();
+  var _8 : Snapshot.snap_ty ();
   var _10 : bool;
   var _11 : borrowed uint32;
   var _12 : borrowed (IncSome2List_List_Type.t_list);
@@ -188,7 +188,7 @@ module IncSome2List_Impl0_TakeSomeRest
     [#"../inc_some_2_list.rs" 56 17 56 19] self <- { self with current = (let IncSome2List_List_Type.C_Cons x0 x1 =  * self in IncSome2List_List_Type.C_Cons ( ^ ma) x1) ; };
     [#"../inc_some_2_list.rs" 56 21 56 23] ml <- Borrow.borrow_final (IncSome2List_List_Type.cons_1 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../inc_some_2_list.rs" 56 21 56 23] self <- { self with current = (let IncSome2List_List_Type.C_Cons x0 x1 =  * self in IncSome2List_List_Type.C_Cons x0 ( ^ ml)) ; };
-    [#"../inc_some_2_list.rs" 57 16 57 45] _8 <- ([#"../inc_some_2_list.rs" 57 16 57 45] Ghost.new (lemma_sum_nonneg0 ( * ml)));
+    [#"../inc_some_2_list.rs" 57 16 57 51] _8 <- ([#"../inc_some_2_list.rs" 57 16 57 51] Snapshot.new (lemma_sum_nonneg0 ( * ml)));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.rs b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.rs
index 9b6c99adf9..e440b224d1 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.rs
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.rs
@@ -17,7 +17,7 @@ fn random() -> bool {
 }
 
 impl List {
-    #[ghost]
+    #[logic]
     fn sum(self) -> Int {
         pearlite! {
             match self {
@@ -28,7 +28,7 @@ impl List {
     }
 
     // TODO: Make this ghost
-    #[ghost]
+    #[logic]
     #[variant(*self)]
     #[ensures(self.sum() >= 0)]
     fn lemma_sum_nonneg(&self) {
@@ -54,7 +54,7 @@ impl List {
     fn take_some_rest(&mut self) -> (&mut u32, &mut List) {
         match self {
             Cons(ma, ml) => {
-                gh! { ml.lemma_sum_nonneg() };
+                snapshot! { ml.lemma_sum_nonneg() };
                 if random() {
                     (ma, ml)
                 } else {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.rs b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.rs
index 3074f94c8f..059d409e9e 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.rs
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.rs
@@ -17,7 +17,7 @@ fn random() -> bool {
 }
 
 impl Tree {
-    #[ghost]
+    #[logic]
     fn sum(self) -> Int {
         pearlite! {
             match self {
@@ -27,7 +27,7 @@ impl Tree {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[variant(*self)]
     #[ensures(self.sum() >= 0)]
     fn lemma_sum_nonneg(&self) {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index 6ec52c1e83..e1d6374a94 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -120,7 +120,7 @@ module IncSomeList_Impl0_TakeSome
   val sum0 [#"../inc_some_list.rs" 21 4 21 23] (self : IncSomeList_List_Type.t_list) : int
     ensures { result = sum0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (IncSomeList_List_Type.t_list)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (IncSomeList_List_Type.t_list)) : bool
@@ -137,7 +137,7 @@ module IncSomeList_Impl0_TakeSome
     ensures { result = resolve0 self }
     
   val random0 [#"../inc_some_list.rs" 15 0 15 19] (_1 : ()) : bool
-  use prelude.Ghost
+  use prelude.Snapshot
   function lemma_sum_nonneg0 [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : ()
   axiom lemma_sum_nonneg0_def : forall self : IncSomeList_List_Type.t_list . lemma_sum_nonneg0 self = ([#"../inc_some_list.rs" 34 8 37 9] match self with
     | IncSomeList_List_Type.C_Cons _ l -> lemma_sum_nonneg0 l
@@ -159,7 +159,7 @@ module IncSomeList_Impl0_TakeSome
   var ma : borrowed uint32;
   var ml : borrowed (IncSomeList_List_Type.t_list);
   var _9 : borrowed uint32;
-  var _10 : Ghost.ghost_ty ();
+  var _10 : Snapshot.snap_ty ();
   var _12 : borrowed uint32;
   var _13 : bool;
   var _14 : borrowed uint32;
@@ -191,7 +191,7 @@ module IncSomeList_Impl0_TakeSome
     [#"../inc_some_list.rs" 53 17 53 19] self <- { self with current = (let IncSomeList_List_Type.C_Cons x0 x1 =  * self in IncSomeList_List_Type.C_Cons ( ^ ma) x1) ; };
     [#"../inc_some_list.rs" 53 21 53 23] ml <- Borrow.borrow_final (IncSomeList_List_Type.cons_1 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../inc_some_list.rs" 53 21 53 23] self <- { self with current = (let IncSomeList_List_Type.C_Cons x0 x1 =  * self in IncSomeList_List_Type.C_Cons x0 ( ^ ml)) ; };
-    [#"../inc_some_list.rs" 54 16 54 45] _10 <- ([#"../inc_some_list.rs" 54 16 54 45] Ghost.new (lemma_sum_nonneg0 ( * ml)));
+    [#"../inc_some_list.rs" 54 16 54 51] _10 <- ([#"../inc_some_list.rs" 54 16 54 51] Snapshot.new (lemma_sum_nonneg0 ( * ml)));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.rs b/creusot/tests/should_succeed/rusthorn/inc_some_list.rs
index 5f865b043f..36a4b51e37 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.rs
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.rs
@@ -17,7 +17,7 @@ fn random() -> bool {
 }
 
 impl List {
-    #[ghost]
+    #[logic]
     fn sum(self) -> Int {
         pearlite! {
             match self {
@@ -27,7 +27,7 @@ impl List {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[variant(*self)]
     #[ensures(self.sum() >= 0)]
     fn lemma_sum_nonneg(&self) {
@@ -51,7 +51,7 @@ impl List {
     fn take_some(&mut self) -> &mut u32 {
         match self {
             Cons(ma, ml) => {
-                gh! { ml.lemma_sum_nonneg() };
+                snapshot! { ml.lemma_sum_nonneg() };
                 if random() {
                     ma
                 } else {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.rs b/creusot/tests/should_succeed/rusthorn/inc_some_tree.rs
index ece870a132..908c02e973 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.rs
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.rs
@@ -17,7 +17,7 @@ fn random() -> bool {
 }
 
 impl Tree {
-    #[ghost]
+    #[logic]
     fn sum(self) -> Int {
         pearlite! {
             match self {
@@ -27,7 +27,7 @@ impl Tree {
         }
     }
 
-    #[ghost]
+    #[logic]
     #[variant(*self)]
     #[ensures(self.sum() >= 0)]
     fn lemma_sum_nonneg(&self) {
diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index 4b2adbf524..bc06c2fc5f 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -348,17 +348,17 @@ module SelectionSortGeneric_SelectionSort
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../selection_sort_generic.rs" 10 0 10 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int)
    =
@@ -491,7 +491,7 @@ module SelectionSortGeneric_SelectionSort
   val partition0 [#"../selection_sort_generic.rs" 24 0 24 52] (v : Seq.seq deep_model_ty0) (i : int) : bool
     ensures { result = partition0 v i }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function deep_model0 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq deep_model_ty0
     
    =
@@ -511,18 +511,18 @@ module SelectionSortGeneric_SelectionSort
   val shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model5 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -545,11 +545,12 @@ module SelectionSortGeneric_SelectionSort
     requires {inv7 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model4 self) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg selection_sort [#"../selection_sort_generic.rs" 30 0 32 29] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {[#"../selection_sort_generic.rs" 30 42 30 43] inv6 v}
     ensures { [#"../selection_sort_generic.rs" 28 10 28 35] sorted0 (deep_model1 ( ^ v)) }
@@ -558,28 +559,28 @@ module SelectionSortGeneric_SelectionSort
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
   var _8 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _19 : ();
   var _20 : Core_Option_Option_Type.t_option usize;
   var _21 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _22 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _25 : Ghost.ghost_ty (Seq.seq usize);
+  var _25 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var min : usize;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
   var _34 : usize;
-  var iter_old1 : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced1 : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced1 : Snapshot.snap_ty (Seq.seq usize);
   var _44 : Core_Option_Option_Type.t_option usize;
   var _45 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _46 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem1 : usize;
-  var _49 : Ghost.ghost_ty (Seq.seq usize);
+  var _49 : Snapshot.snap_ty (Seq.seq usize);
   var j : usize;
   var _52 : bool;
   var _54 : t;
@@ -592,7 +593,7 @@ module SelectionSortGeneric_SelectionSort
     goto BB0
   }
   BB0 {
-    [#"../selection_sort_generic.rs" 34 16 34 25] old_v <- ([#"../selection_sort_generic.rs" 34 16 34 25] Ghost.new v);
+    [#"../selection_sort_generic.rs" 34 16 34 31] old_v <- ([#"../selection_sort_generic.rs" 34 16 34 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
@@ -607,11 +608,11 @@ module SelectionSortGeneric_SelectionSort
     goto BB3
   }
   BB3 {
-    [#"../selection_sort_generic.rs" 35 4 35 43] iter_old <- ([#"../selection_sort_generic.rs" 35 4 35 43] Ghost.new iter);
+    [#"../selection_sort_generic.rs" 35 4 35 43] iter_old <- ([#"../selection_sort_generic.rs" 35 4 35 43] Snapshot.new iter);
     goto BB4
   }
   BB4 {
-    [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] Ghost.new (Seq.empty ));
+    [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -619,10 +620,10 @@ module SelectionSortGeneric_SelectionSort
   }
   BB6 {
     invariant { [#"../selection_sort_generic.rs" 35 4 35 43] inv1 iter };
-    invariant { [#"../selection_sort_generic.rs" 35 4 35 43] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../selection_sort_generic.rs" 35 4 35 43] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../selection_sort_generic.rs" 35 4 35 43] permutation_of0 (shallow_model0 v) (shallow_model1 old_v) };
-    invariant { [#"../selection_sort_generic.rs" 36 16 36 63] sorted_range0 (deep_model0 v) 0 (Seq.length (Ghost.inner produced)) };
-    invariant { [#"../selection_sort_generic.rs" 37 16 37 57] partition0 (deep_model0 v) (Seq.length (Ghost.inner produced)) };
+    invariant { [#"../selection_sort_generic.rs" 36 16 36 63] sorted_range0 (deep_model0 v) 0 (Seq.length (Snapshot.inner produced)) };
+    invariant { [#"../selection_sort_generic.rs" 37 16 37 57] partition0 (deep_model0 v) (Seq.length (Snapshot.inner produced)) };
     goto BB7
   }
   BB7 {
@@ -655,14 +656,14 @@ module SelectionSortGeneric_SelectionSort
     absurd
   }
   BB12 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _20);
-    [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- ([#"../selection_sort_generic.rs" 35 4 35 43] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _20);
+    [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- ([#"../selection_sort_generic.rs" 35 4 35 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] _25);
-    [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../selection_sort_generic.rs" 39 22 39 23] min <- ([#"../selection_sort_generic.rs" 39 22 39 23] i);
     [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ([#"../selection_sort_generic.rs" 43 26 43 27]  * v));
     goto BB14
@@ -673,11 +674,11 @@ module SelectionSortGeneric_SelectionSort
     goto BB15
   }
   BB15 {
-    [#"../selection_sort_generic.rs" 41 8 41 121] iter_old1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Ghost.new iter1);
+    [#"../selection_sort_generic.rs" 41 8 41 121] iter_old1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new iter1);
     goto BB16
   }
   BB16 {
-    [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Ghost.new (Seq.empty ));
+    [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new (Seq.empty ));
     goto BB17
   }
   BB17 {
@@ -685,9 +686,9 @@ module SelectionSortGeneric_SelectionSort
   }
   BB18 {
     invariant { [#"../selection_sort_generic.rs" 41 8 41 121] inv1 iter1 };
-    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] produces0 (Ghost.inner iter_old1) (Ghost.inner produced1) iter1 };
-    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] forall k : int . UIntSize.to_int i <= k /\ k < Seq.length (Ghost.inner produced1) + UIntSize.to_int i + 1 -> le_log0 (Seq.get (deep_model0 v) (UIntSize.to_int min)) (Seq.get (deep_model0 v) k) };
-    invariant { [#"../selection_sort_generic.rs" 42 20 42 64] UIntSize.to_int i <= UIntSize.to_int min /\ UIntSize.to_int min < Seq.length (Ghost.inner produced1) + UIntSize.to_int i + 1 };
+    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] produces0 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
+    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] forall k : int . UIntSize.to_int i <= k /\ k < Seq.length (Snapshot.inner produced1) + UIntSize.to_int i + 1 -> le_log0 (Seq.get (deep_model0 v) (UIntSize.to_int min)) (Seq.get (deep_model0 v) k) };
+    invariant { [#"../selection_sort_generic.rs" 42 20 42 64] UIntSize.to_int i <= UIntSize.to_int min /\ UIntSize.to_int min < Seq.length (Snapshot.inner produced1) + UIntSize.to_int i + 1 };
     goto BB19
   }
   BB19 {
@@ -718,14 +719,14 @@ module SelectionSortGeneric_SelectionSort
     goto BB23
   }
   BB23 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _44);
-    [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Ghost.new (Seq.(++) (Ghost.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _44);
+    [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB24
   }
   BB24 {
     [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] _49);
-    [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] j <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1);
+    [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ([#"../selection_sort_generic.rs" 44 15 44 16]  * v) ([#"../selection_sort_generic.rs" 44 17 44 18] j));
     goto BB25
   }
@@ -770,7 +771,7 @@ module SelectionSortGeneric_SelectionSort
   BB32 {
     assert { [@expl:type invariant] inv5 _65 };
     assume { resolve3 _65 };
-    assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Ghost.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v) -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
+    assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v) -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
     [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] ());
     goto BB6
   }
diff --git a/creusot/tests/should_succeed/selection_sort_generic.rs b/creusot/tests/should_succeed/selection_sort_generic.rs
index 6beb8d5349..47a92baa7d 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.rs
+++ b/creusot/tests/should_succeed/selection_sort_generic.rs
@@ -31,7 +31,7 @@ pub fn selection_sort<T: Ord + DeepModel>(v: &mut Vec<T>)
 where
     T::DeepModelTy: OrdLogic,
 {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
     #[invariant(v@.permutation_of(old_v@))]
     #[invariant(sorted_range(v.deep_model(), 0, produced.len()))]
     #[invariant(partition(v.deep_model(), produced.len()))]
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index f0ab87c15d..05784a95c2 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -729,7 +729,7 @@ module SparseArray_Impl2_Set
   val shallow_model1 (self : borrowed (SparseArray_Sparse_Type.t_sparse t)) : Seq.seq (Core_Option_Option_Type.t_option t)
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve4 (self : borrowed (SparseArray_Sparse_Type.t_sparse t)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (SparseArray_Sparse_Type.t_sparse t)) : bool
@@ -773,11 +773,11 @@ module SparseArray_Impl2_Set
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 136 26 136 55] Seq.length (shallow_model7 ( ^ self)) = Seq.length (shallow_model6 self) }
     ensures { inv10 result }
     
-  predicate resolve2 (self : Ghost.ghost_ty ())
-  val resolve2 (self : Ghost.ghost_ty ()) : bool
+  predicate resolve2 (self : Snapshot.snap_ty ())
+  val resolve2 (self : Snapshot.snap_ty ()) : bool
     ensures { result = resolve2 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function lemma_permutation0 [#"../sparse_array.rs" 104 4 104 38] (self : SparseArray_Sparse_Type.t_sparse t) (i : int) : ()
     
    =
@@ -859,7 +859,7 @@ module SparseArray_Impl2_Set
   var index : usize;
   var _13 : usize;
   var _21 : usize;
-  var _25 : Ghost.ghost_ty ();
+  var _25 : Snapshot.snap_ty ();
   var _30 : borrowed usize;
   var _31 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _34 : borrowed usize;
@@ -924,7 +924,7 @@ module SparseArray_Impl2_Set
     goto BB12
   }
   BB12 {
-    [#"../sparse_array.rs" 117 12 117 40] _25 <- ([#"../sparse_array.rs" 117 12 117 40] Ghost.new ());
+    [#"../sparse_array.rs" 117 12 117 46] _25 <- ([#"../sparse_array.rs" 117 12 117 46] Snapshot.new ());
     goto BB13
   }
   BB13 {
diff --git a/creusot/tests/should_succeed/sparse_array.rs b/creusot/tests/should_succeed/sparse_array.rs
index cff884529a..20fd0adb32 100644
--- a/creusot/tests/should_succeed/sparse_array.rs
+++ b/creusot/tests/should_succeed/sparse_array.rs
@@ -33,7 +33,7 @@ pub struct Sparse<T> {
 impl<T> ShallowModel for Sparse<T> {
     type ShallowModelTy = Seq<Option<T>>;
 
-    #[ghost]
+    #[logic]
     #[open(self)]
     fn shallow_model(self) -> Self::ShallowModelTy {
         pearlite! {
@@ -68,7 +68,7 @@ impl<T> Sparse<T> {
      *   (1) check that array `idx` maps `i` to a index `j` between 0 and `n` (excluded)
      *   (2) check that `back[j]` is `i`
      */
-    #[ghost]
+    #[logic]
     fn is_elt(&self, i: Int) -> bool {
         pearlite! { self.idx[i]@ < self.n@
                     && self.back[self.idx[i]@]@ == i
@@ -97,7 +97,7 @@ impl<T> Sparse<T> {
 
     /* A key lemma to prove for safety of access in `set()`
      */
-    #[ghost]
+    #[logic]
     #[requires(self.n == self.size)]
     #[requires(0 <= i && i < self.size@)]
     #[ensures(self.is_elt(i))]
@@ -114,7 +114,7 @@ impl<T> Sparse<T> {
         let index = self.idx[i];
         if !(index < self.n && self.back[index] == i) {
             // the hard assertion!
-            gh!(Self::lemma_permutation);
+            snapshot!(Self::lemma_permutation);
             proof_assert!(self.n@ < self.size@);
             // assert!(self.n < self.size);
             self.idx[i] = self.n;
diff --git a/creusot/tests/should_succeed/specification/logic_call.rs b/creusot/tests/should_succeed/specification/logic_call.rs
index 9d75253f5d..db19f7db1f 100644
--- a/creusot/tests/should_succeed/specification/logic_call.rs
+++ b/creusot/tests/should_succeed/specification/logic_call.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 
 use creusot_contracts::*;
 
-#[ghost]
+#[logic]
 fn reflexive<T: PartialEq>(x: T) -> bool {
     pearlite! { x == x }
 }
diff --git a/creusot/tests/should_succeed/specification/logic_functions.rs b/creusot/tests/should_succeed/specification/logic_functions.rs
index b0b2ae096d..553dcb2f8c 100644
--- a/creusot/tests/should_succeed/specification/logic_functions.rs
+++ b/creusot/tests/should_succeed/specification/logic_functions.rs
@@ -1,7 +1,7 @@
 extern crate creusot_contracts;
 use creusot_contracts::{logic::Int, *};
 
-#[ghost]
+#[logic]
 fn logic() -> bool {
     true
 }
@@ -10,7 +10,7 @@ fn logic() -> bool {
 pub fn use_logic() {}
 
 // When we want to use pearlite syntax, we use pearlite! macro
-#[ghost]
+#[logic]
 fn logic_pearlite() -> bool {
     pearlite! { 0 == 0 }
 }
@@ -21,7 +21,7 @@ pub fn use_logic_pearlite() {}
 pub mod nested {
     use creusot_contracts::*;
 
-    #[ghost]
+    #[logic]
     #[open]
     pub fn nested() -> bool {
         true
@@ -29,7 +29,7 @@ pub mod nested {
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn arith(n: Int, b: bool) -> Int {
     if !b {
         -n + n - n * n
@@ -39,7 +39,7 @@ pub fn arith(n: Int, b: bool) -> Int {
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn deref_pat<'a>(o: &'a Option<Int>) -> Int {
     match o {
         Some(a) => *a,
diff --git a/creusot/tests/should_succeed/specification/model.rs b/creusot/tests/should_succeed/specification/model.rs
index 2f93c5f6d7..5407192a21 100644
--- a/creusot/tests/should_succeed/specification/model.rs
+++ b/creusot/tests/should_succeed/specification/model.rs
@@ -6,7 +6,7 @@ pub struct Seven();
 impl ShallowModel for Seven {
     type ShallowModelTy = Int;
 
-    #[ghost]
+    #[logic]
     #[open]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
@@ -25,7 +25,7 @@ pub struct Pair<T, U>(T, U);
 impl<T, U> ShallowModel for Pair<T, U> {
     type ShallowModelTy = (T, U);
 
-    #[ghost]
+    #[logic]
     #[open]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg
index 535bf2c8e5..f2f32e7f16 100644
--- a/creusot/tests/should_succeed/sum.mlcfg
+++ b/creusot/tests/should_succeed/sum.mlcfg
@@ -145,7 +145,7 @@ module Sum_SumFirstN
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate resolve0 (self : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -165,11 +165,11 @@ module Sum_SumFirstN
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) (res : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32)
     
    =
@@ -206,13 +206,13 @@ module Sum_SumFirstN
   var sum : uint32;
   var iter : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32;
   var _7 : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32);
-  var produced : Ghost.ghost_ty (Seq.seq uint32);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32);
+  var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _17 : Core_Option_Option_Type.t_option uint32;
   var _18 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32);
   var _19 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32);
   var __creusot_proc_iter_elem : uint32;
-  var _22 : Ghost.ghost_ty (Seq.seq uint32);
+  var _22 : Snapshot.snap_ty (Seq.seq uint32);
   var i : uint32;
   {
     goto BB0
@@ -228,11 +228,11 @@ module Sum_SumFirstN
     goto BB2
   }
   BB2 {
-    [#"../sum.rs" 8 4 8 67] iter_old <- ([#"../sum.rs" 8 4 8 67] Ghost.new iter);
+    [#"../sum.rs" 8 4 8 67] iter_old <- ([#"../sum.rs" 8 4 8 67] Snapshot.new iter);
     goto BB3
   }
   BB3 {
-    [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] Ghost.new (Seq.empty ));
+    [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -240,8 +240,8 @@ module Sum_SumFirstN
   }
   BB5 {
     invariant { [#"../sum.rs" 8 4 8 67] inv0 iter };
-    invariant { [#"../sum.rs" 8 4 8 67] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../sum.rs" 8 16 8 65] UInt32.to_int sum = div (Seq.length (Ghost.inner produced) * (Seq.length (Ghost.inner produced) + 1)) 2 };
+    invariant { [#"../sum.rs" 8 4 8 67] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../sum.rs" 8 16 8 65] UInt32.to_int sum = div (Seq.length (Snapshot.inner produced) * (Seq.length (Snapshot.inner produced) + 1)) 2 };
     goto BB6
   }
   BB6 {
@@ -272,14 +272,14 @@ module Sum_SumFirstN
     absurd
   }
   BB11 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../sum.rs" 8 4 8 67] _22 <- ([#"../sum.rs" 8 4 8 67] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../sum.rs" 8 4 8 67] _22 <- ([#"../sum.rs" 8 4 8 67] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
     [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] _22);
-    [#"../sum.rs" 8 4 8 67] _22 <- any Ghost.ghost_ty (Seq.seq uint32);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../sum.rs" 8 4 8 67] _22 <- any Snapshot.snap_ty (Seq.seq uint32);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../sum.rs" 10 8 10 16] sum <- ([#"../sum.rs" 10 8 10 16] sum + ([#"../sum.rs" 10 15 10 16] i));
     goto BB5
   }
diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index d1612b4d8f..06a4f1687d 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -139,7 +139,7 @@ module SumOfOdds_ComputeSumOfOdd
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range uint32 . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   function sqr0 [#"../sum_of_odds.rs" 7 0 7 21] (x : int) : int =
     [#"../sum_of_odds.rs" 8 4 8 9] x * x
   val sqr0 [#"../sum_of_odds.rs" 7 0 7 21] (x : int) : int
@@ -184,11 +184,11 @@ module SumOfOdds_ComputeSumOfOdd
       end }
     ensures { inv2 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range uint32) (res : Core_Ops_Range_Range_Type.t_range uint32)
     
    =
@@ -216,13 +216,13 @@ module SumOfOdds_ComputeSumOfOdd
   var x : uint32 = x;
   var s : uint32;
   var iter : Core_Ops_Range_Range_Type.t_range uint32;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range uint32);
-  var produced : Ghost.ghost_ty (Seq.seq uint32);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range uint32);
+  var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _18 : Core_Option_Option_Type.t_option uint32;
   var _19 : borrowed (Core_Ops_Range_Range_Type.t_range uint32);
   var _20 : borrowed (Core_Ops_Range_Range_Type.t_range uint32);
   var __creusot_proc_iter_elem : uint32;
-  var _23 : Ghost.ghost_ty (Seq.seq uint32);
+  var _23 : Snapshot.snap_ty (Seq.seq uint32);
   var i : uint32;
   {
     goto BB0
@@ -233,11 +233,11 @@ module SumOfOdds_ComputeSumOfOdd
     goto BB1
   }
   BB1 {
-    [#"../sum_of_odds.rs" 38 4 38 50] iter_old <- ([#"../sum_of_odds.rs" 38 4 38 50] Ghost.new iter);
+    [#"../sum_of_odds.rs" 38 4 38 50] iter_old <- ([#"../sum_of_odds.rs" 38 4 38 50] Snapshot.new iter);
     goto BB2
   }
   BB2 {
-    [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] Ghost.new (Seq.empty ));
+    [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -245,8 +245,8 @@ module SumOfOdds_ComputeSumOfOdd
   }
   BB4 {
     invariant { [#"../sum_of_odds.rs" 38 4 38 50] inv0 iter };
-    invariant { [#"../sum_of_odds.rs" 38 4 38 50] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../sum_of_odds.rs" 38 16 38 48] UInt32.to_int s = sum_of_odd0 (Seq.length (Ghost.inner produced)) };
+    invariant { [#"../sum_of_odds.rs" 38 4 38 50] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../sum_of_odds.rs" 38 16 38 48] UInt32.to_int s = sum_of_odd0 (Seq.length (Snapshot.inner produced)) };
     goto BB5
   }
   BB5 {
@@ -277,14 +277,14 @@ module SumOfOdds_ComputeSumOfOdd
     absurd
   }
   BB10 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _18);
-    [#"../sum_of_odds.rs" 38 4 38 50] _23 <- ([#"../sum_of_odds.rs" 38 4 38 50] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18);
+    [#"../sum_of_odds.rs" 38 4 38 50] _23 <- ([#"../sum_of_odds.rs" 38 4 38 50] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] _23);
-    [#"../sum_of_odds.rs" 38 4 38 50] _23 <- any Ghost.ghost_ty (Seq.seq uint32);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../sum_of_odds.rs" 38 4 38 50] _23 <- any Snapshot.snap_ty (Seq.seq uint32);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 41 12 41 33] let _ = sum_of_odd_is_sqr0 (UInt32.to_int i) in true };
     [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + ([#"../sum_of_odds.rs" 44 13 44 22] ([#"../sum_of_odds.rs" 44 13 44 18] ([#"../sum_of_odds.rs" 44 13 44 14] [#"../sum_of_odds.rs" 44 13 44 14] (2 : uint32)) * ([#"../sum_of_odds.rs" 44 17 44 18] i)) + ([#"../sum_of_odds.rs" 44 21 44 22] [#"../sum_of_odds.rs" 44 21 44 22] (1 : uint32))));
     goto BB4
diff --git a/creusot/tests/should_succeed/sum_of_odds.rs b/creusot/tests/should_succeed/sum_of_odds.rs
index f16c467ade..971972807b 100644
--- a/creusot/tests/should_succeed/sum_of_odds.rs
+++ b/creusot/tests/should_succeed/sum_of_odds.rs
@@ -3,7 +3,7 @@
 extern crate creusot_contracts;
 use creusot_contracts::{logic::Int, *};
 
-#[ghost]
+#[logic]
 fn sqr(x: Int) -> Int {
     x * x
 }
@@ -13,7 +13,7 @@ fn is_square(y: Int) -> bool {
     pearlite! { exists<z: Int> y == sqr(z) }
 }
 
-#[ghost]
+#[logic]
 #[variant(x)]
 fn sum_of_odd(x: Int) -> Int {
     if x <= 0 {
@@ -23,7 +23,7 @@ fn sum_of_odd(x: Int) -> Int {
     }
 }
 
-#[ghost]
+#[logic]
 #[requires(x >= 0)]
 #[ensures(sum_of_odd(x) == sqr(x))]
 #[variant(x)]
diff --git a/creusot/tests/should_succeed/syntax/02_operators.rs b/creusot/tests/should_succeed/syntax/02_operators.rs
index df0b14bc17..7b0ebbe17f 100644
--- a/creusot/tests/should_succeed/syntax/02_operators.rs
+++ b/creusot/tests/should_succeed/syntax/02_operators.rs
@@ -9,12 +9,12 @@ fn division(x: usize, y: usize) -> usize {
     x / y
 }
 
-// #[ghost]
+// #[logic]
 // fn division_logic(x : usize, y : usize) -> usize {
 //     x / y
 // }
 
-#[ghost]
+#[logic]
 fn division_int(x: Int, y: Int) -> Int {
     x / y
 }
@@ -24,12 +24,12 @@ fn modulus(x: usize, y: usize) -> usize {
     x % y
 }
 
-// #[ghost]
+// #[logic]
 // fn modulus_logic(x : usize, y : usize) -> usize {
 //     x % y
 // }
 
-#[ghost]
+#[logic]
 fn modulus_int(x: Int, y: Int) -> Int {
     x % y
 }
@@ -39,7 +39,7 @@ fn multiply(x: usize, y: usize) -> usize {
     x * y
 }
 
-#[ghost]
+#[logic]
 fn multiply_int(x: Int, y: Int) -> Int {
     x * y
 }
@@ -49,12 +49,12 @@ fn add(x: usize, y: usize) -> usize {
     x + y
 }
 
-#[ghost]
+#[logic]
 fn add_int(x: Int, y: Int) -> Int {
     x + y
 }
 
-// #[ghost]
+// #[logic]
 // fn add_logic(x : usize, y : usize) -> usize {
 //     x + y
 // }
@@ -64,7 +64,7 @@ fn sub(x: usize, y: usize) -> usize {
     x - y
 }
 
-#[ghost]
+#[logic]
 fn sub_int(x: Int, y: Int) -> Int {
     x - y
 }
@@ -78,7 +78,7 @@ fn expression(x: usize, y: usize, z: usize) -> bool {
     x / y * z == (x / y) * z
 }
 
-#[ghost]
+#[logic]
 #[ensures(result)]
 fn expression_logic(x: usize, y: usize, z: usize) -> bool {
     x / y * z == (x / y) * z
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index 02cec69d8c..9f91579208 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -101,19 +101,19 @@ end
 module C05Pearlite_GhostClosure
   use prelude.UInt32
   use map.Map
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use prelude.Mapping
   use prelude.Int
   let rec cfg ghost_closure [#"../05_pearlite.rs" 48 0 48 22] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
-  var _x : Ghost.ghost_ty (Map.map uint32 uint32);
+  var _x : Snapshot.snap_ty (Map.map uint32 uint32);
   {
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 49 13 49 32] _x <- ([#"../05_pearlite.rs" 49 13 49 32] Ghost.new (Mapping.from_fn (fun (a : uint32) -> a)));
+    [#"../05_pearlite.rs" 49 13 49 38] _x <- ([#"../05_pearlite.rs" 49 13 49 38] Snapshot.new (Mapping.from_fn (fun (a : uint32) -> a)));
     goto BB1
   }
   BB1 {
@@ -126,8 +126,8 @@ module C05Pearlite_PearliteClosure
   use prelude.UInt32
   use prelude.Int
   use map.Map
-  use prelude.Ghost
-  let rec cfg pearlite_closure [#"../05_pearlite.rs" 52 0 52 54] [@cfg:stackify] [@cfg:subregion_analysis] (_x : Ghost.ghost_ty (Map.map uint32 bool)) : ()
+  use prelude.Snapshot
+  let rec cfg pearlite_closure [#"../05_pearlite.rs" 52 0 52 57] [@cfg:stackify] [@cfg:subregion_analysis] (_x : Snapshot.snap_ty (Map.map uint32 bool)) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -135,7 +135,7 @@ module C05Pearlite_PearliteClosure
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 52 55 52 57] _0 <- ([#"../05_pearlite.rs" 52 55 52 57] ());
+    [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] ());
     return _0
   }
   
@@ -143,26 +143,26 @@ end
 module C05Pearlite_Caller
   use prelude.UInt32
   use map.Map
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
-  val pearlite_closure0 [#"../05_pearlite.rs" 52 0 52 54] (_x : Ghost.ghost_ty (Map.map uint32 bool)) : ()
-  use prelude.Ghost
+  val pearlite_closure0 [#"../05_pearlite.rs" 52 0 52 57] (_x : Snapshot.snap_ty (Map.map uint32 bool)) : ()
+  use prelude.Snapshot
   use prelude.Mapping
   let rec cfg caller [#"../05_pearlite.rs" 54 0 54 15] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var _1 : ();
-  var _2 : Ghost.ghost_ty (Map.map uint32 bool);
+  var _2 : Snapshot.snap_ty (Map.map uint32 bool);
   {
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 55 21 55 38] _2 <- ([#"../05_pearlite.rs" 55 21 55 38] Ghost.new (Mapping.from_fn (fun (_a : uint32) -> true)));
+    [#"../05_pearlite.rs" 55 21 55 44] _2 <- ([#"../05_pearlite.rs" 55 21 55 44] Snapshot.new (Mapping.from_fn (fun (_a : uint32) -> true)));
     goto BB1
   }
   BB1 {
-    [#"../05_pearlite.rs" 55 4 55 39] _1 <- ([#"../05_pearlite.rs" 55 4 55 39] pearlite_closure0 _2);
-    _2 <- any Ghost.ghost_ty (Map.map uint32 bool);
+    [#"../05_pearlite.rs" 55 4 55 45] _1 <- ([#"../05_pearlite.rs" 55 4 55 45] pearlite_closure0 _2);
+    _2 <- any Snapshot.snap_ty (Map.map uint32 bool);
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.rs b/creusot/tests/should_succeed/syntax/05_pearlite.rs
index 4fb2ab7010..5a9a7612f9 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.rs
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.rs
@@ -46,13 +46,13 @@ pub fn field1_is_true(x: B) -> bool {
 }
 
 pub fn ghost_closure() {
-    let _x = gh! { |a : u32| a };
+    let _x = snapshot! { |a : u32| a };
 }
 
-pub fn pearlite_closure(_x: Ghost<Mapping<u32, bool>>) {}
+pub fn pearlite_closure(_x: Snapshot<Mapping<u32, bool>>) {}
 
 pub fn caller() {
-    pearlite_closure(gh! { |_a| true });
+    pearlite_closure(snapshot! { |_a| true });
 }
 
 // Implicit logical reborrows
@@ -61,20 +61,20 @@ pub struct S {}
 
 impl S {
     #[open]
-    #[ghost]
+    #[logic]
     pub fn x(&mut self) -> bool {
         true
     }
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn proj(x: &mut (S, S)) -> bool {
     x.0.x()
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn proj2(x: &mut &mut (S, S)) -> bool {
     x.0.x()
 }
@@ -82,43 +82,43 @@ pub fn proj2(x: &mut &mut (S, S)) -> bool {
 // Unnesting through an index projection
 
 #[open(self)]
-#[ghost]
+#[logic]
 pub fn reborrow_index_projection<'a, 'b, T>(a: &'a mut &'b mut [T]) -> &'a mut T {
     &mut a[0]
 }
 
 #[open(self)]
-#[ghost]
+#[logic]
 pub fn reborrow_index_projection2<'a, 'b, T>(a: &'a &'b [T]) -> &'a T {
     &a[0]
 }
 
 #[open(self)]
-#[ghost]
-pub fn test3<'a, T>(a: Ghost<&'a mut Vec<T>>) -> &'a mut T {
+#[logic]
+pub fn test3<'a, T>(a: Snapshot<&'a mut Vec<T>>) -> &'a mut T {
     &mut a[0]
 }
 
 #[open(self)]
-#[ghost]
-pub fn test4<'a, T>(a: &'a mut Ghost<Vec<T>>) -> &'a mut T {
+#[logic]
+pub fn test4<'a, T>(a: &'a mut Snapshot<Vec<T>>) -> &'a mut T {
     &mut a[0]
 }
 
 #[open(self)]
-#[ghost]
+#[logic]
 pub fn test5<'a, T>(a: &'a mut &mut &mut Vec<T>) -> &'a mut T {
     &mut a[0]
 }
 
 #[open(self)]
-#[ghost]
+#[logic]
 pub fn test6<'a>(a: &'a mut &&mut u32) -> &'a mut u32 {
     &mut ***a
 }
 
 // Left out until I understand the semantics of `Deref` patterns.
-// #[ghost]
+// #[logic]
 // pub fn proj_opt(x : &mut Option<S>)  -> bool {
 //     match x {
 //         Some(a) => a.x(),
diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.rs b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.rs
index c50a5713e1..83e05c9327 100644
--- a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.rs
+++ b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.rs
@@ -5,7 +5,7 @@ use creusot_contracts::{
 };
 
 #[open]
-#[ghost]
+#[logic]
 #[variant(seq.len())]
 pub fn sum(seq: Seq<Int>) -> Int {
     pearlite! {
diff --git a/creusot/tests/should_succeed/syntax/08_const.rs b/creusot/tests/should_succeed/syntax/08_const.rs
index 64a8d80210..97410d4ccb 100644
--- a/creusot/tests/should_succeed/syntax/08_const.rs
+++ b/creusot/tests/should_succeed/syntax/08_const.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::{logic::Seq, *};
 
 #[open]
-#[ghost]
+#[logic]
 pub fn omg<T>() -> Seq<T> {
     Seq::EMPTY
 }
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index 804220981f..f9dfc6f983 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -2,24 +2,24 @@
 module C12GhostCode_GhostArg
   use prelude.UInt32
   use prelude.Int
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  let rec cfg ghost_arg [#"../12_ghost_code.rs" 4 0 4 31] [@cfg:stackify] [@cfg:subregion_analysis] (g : Ghost.ghost_ty uint32) : ()
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  let rec cfg ghost_arg [#"../12_ghost_code.rs" 4 0 4 34] [@cfg:stackify] [@cfg:subregion_analysis] (g : Snapshot.snap_ty uint32) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
-  var g : Ghost.ghost_ty uint32 = g;
-  var _x : Ghost.ghost_ty uint32;
+  var g : Snapshot.snap_ty uint32 = g;
+  var _x : Snapshot.snap_ty uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 5 25 5 35] _x <- ([#"../12_ghost_code.rs" 5 25 5 35] Ghost.new (Ghost.inner g));
+    [#"../12_ghost_code.rs" 5 28 5 44] _x <- ([#"../12_ghost_code.rs" 5 28 5 44] Snapshot.new (Snapshot.inner g));
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 4 32 6 1] _0 <- ([#"../12_ghost_code.rs" 4 32 6 1] ());
+    [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] ());
     return _0
   }
   
@@ -100,8 +100,8 @@ module C12GhostCode_GhostVec
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate resolve1 (self : uint32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve1 (self : uint32) : bool
@@ -128,7 +128,7 @@ module C12GhostCode_GhostVec
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var x : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
-  var _s : Ghost.ghost_ty (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
+  var _s : Snapshot.snap_ty (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
   {
     goto BB0
   }
@@ -138,7 +138,7 @@ module C12GhostCode_GhostVec
   }
   BB1 {
     assume { resolve0 x };
-    [#"../12_ghost_code.rs" 10 32 10 41] _s <- ([#"../12_ghost_code.rs" 10 32 10 41] Ghost.new x);
+    [#"../12_ghost_code.rs" 10 35 10 50] _s <- ([#"../12_ghost_code.rs" 10 35 10 50] Snapshot.new x);
     goto BB2
   }
   BB2 {
@@ -153,9 +153,9 @@ end
 module C12GhostCode_GhostCopy
   use prelude.Int32
   use seq.Seq
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   use prelude.Int
@@ -163,23 +163,23 @@ module C12GhostCode_GhostCopy
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : int32;
-  var _s : Ghost.ghost_ty (Seq.seq int32);
-  var _4 : Ghost.ghost_ty (Seq.seq int32);
+  var _s : Snapshot.snap_ty (Seq.seq int32);
+  var _4 : Snapshot.snap_ty (Seq.seq int32);
   {
     goto BB0
   }
   BB0 {
     [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] [#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
-    [#"../12_ghost_code.rs" 19 17 19 46] _s <- ([#"../12_ghost_code.rs" 19 17 19 46] Ghost.new (Seq.snoc (Seq.empty ) (0 : int32)));
+    [#"../12_ghost_code.rs" 19 17 19 52] _s <- ([#"../12_ghost_code.rs" 19 17 19 52] Snapshot.new (Seq.snoc (Seq.empty ) (0 : int32)));
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 20 9 20 27] _4 <- ([#"../12_ghost_code.rs" 20 9 20 27] Ghost.new (Seq.snoc (Ghost.inner _s) a));
+    [#"../12_ghost_code.rs" 20 9 20 33] _4 <- ([#"../12_ghost_code.rs" 20 9 20 33] Snapshot.new (Seq.snoc (Snapshot.inner _s) a));
     goto BB2
   }
   BB2 {
-    [#"../12_ghost_code.rs" 20 4 20 27] _s <- ([#"../12_ghost_code.rs" 20 4 20 27] _4);
-    [#"../12_ghost_code.rs" 20 4 20 27] _4 <- any Ghost.ghost_ty (Seq.seq int32);
+    [#"../12_ghost_code.rs" 20 4 20 33] _s <- ([#"../12_ghost_code.rs" 20 4 20 33] _4);
+    [#"../12_ghost_code.rs" 20 4 20 33] _4 <- any Snapshot.snap_ty (Seq.seq int32);
     [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] ());
     return _0
   }
@@ -188,8 +188,8 @@ end
 module C12GhostCode_GhostIsCopy
   use prelude.Int32
   use prelude.Borrow
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate resolve0 (self : borrowed int32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed int32) : bool
@@ -201,9 +201,9 @@ module C12GhostCode_GhostIsCopy
   var _0 : ();
   var x : int32;
   var r : borrowed int32;
-  var g : Ghost.ghost_ty (borrowed int32);
-  var g1 : Ghost.ghost_ty (borrowed int32);
-  var g2 : Ghost.ghost_ty (borrowed int32);
+  var g : Snapshot.snap_ty (borrowed int32);
+  var g1 : Snapshot.snap_ty (borrowed int32);
+  var g2 : Snapshot.snap_ty (borrowed int32);
   {
     goto BB0
   }
@@ -212,7 +212,7 @@ module C12GhostCode_GhostIsCopy
     [#"../12_ghost_code.rs" 25 12 25 18] r <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 25 12 25 18] x <-  ^ r;
     assume { resolve0 r };
-    [#"../12_ghost_code.rs" 26 12 26 21] g <- ([#"../12_ghost_code.rs" 26 12 26 21] Ghost.new r);
+    [#"../12_ghost_code.rs" 26 12 26 27] g <- ([#"../12_ghost_code.rs" 26 12 26 27] Snapshot.new r);
     goto BB1
   }
   BB1 {
@@ -292,7 +292,7 @@ module C12GhostCode_GhostCheck
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve1 (self : int32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve1 (self : int32) : bool
@@ -333,7 +333,7 @@ module C12GhostCode_GhostCheck
     requires {inv2 value}
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 78 26 78 51] shallow_model0 ( ^ self) = Seq.snoc (shallow_model1 self) value }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function logi_drop0 [#"../12_ghost_code.rs" 33 0 33 21] (_1 : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : ()
     
    =
@@ -349,7 +349,7 @@ module C12GhostCode_GhostCheck
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var x : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
-  var _2 : Ghost.ghost_ty ();
+  var _2 : Snapshot.snap_ty ();
   var _4 : ();
   var _5 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
   var _8 : usize;
@@ -361,7 +361,7 @@ module C12GhostCode_GhostCheck
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 39 4 39 25] _2 <- ([#"../12_ghost_code.rs" 39 4 39 25] Ghost.new (let _ = logi_drop0 x in ()));
+    [#"../12_ghost_code.rs" 39 4 39 31] _2 <- ([#"../12_ghost_code.rs" 39 4 39 31] Snapshot.new (let _ = logi_drop0 x in ()));
     goto BB2
   }
   BB2 {
@@ -397,16 +397,16 @@ module C12GhostCode_GhostCheck
 end
 module C12GhostCode_MyStruct_Type
   use prelude.UInt32
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int
   type t_mystruct  =
-    | C_MyStruct uint32 (Ghost.ghost_ty uint32)
+    | C_MyStruct uint32 (Snapshot.snap_ty uint32)
     
   let function mystruct_f (self : t_mystruct) : uint32 = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_MyStruct a _ -> a
       end
-  let function mystruct_g (self : t_mystruct) : Ghost.ghost_ty uint32 = [@vc:do_not_keep_trace] [@vc:sp]
+  let function mystruct_g (self : t_mystruct) : Snapshot.snap_ty uint32 = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_MyStruct _ a -> a
       end
@@ -421,15 +421,15 @@ module C12GhostCode_TakesStruct
   val shallow_model1 (self : uint32) : int
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  function shallow_model0 (self : Ghost.ghost_ty uint32) : int =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model1 (Ghost.inner self)
-  val shallow_model0 (self : Ghost.ghost_ty uint32) : int
+  use prelude.Snapshot
+  use prelude.Snapshot
+  function shallow_model0 (self : Snapshot.snap_ty uint32) : int =
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model1 (Snapshot.inner self)
+  val shallow_model0 (self : Snapshot.snap_ty uint32) : int
     ensures { result = shallow_model0 self }
     
   use prelude.Int
-  use prelude.Ghost
+  use prelude.Snapshot
   use C12GhostCode_MyStruct_Type as C12GhostCode_MyStruct_Type
   let rec cfg takes_struct [#"../12_ghost_code.rs" 52 0 52 36] [@cfg:stackify] [@cfg:subregion_analysis] (x : C12GhostCode_MyStruct_Type.t_mystruct) : ()
     requires {[#"../12_ghost_code.rs" 51 11 51 20] shallow_model0 (C12GhostCode_MyStruct_Type.mystruct_g x) = 0}
@@ -437,17 +437,17 @@ module C12GhostCode_TakesStruct
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var x : C12GhostCode_MyStruct_Type.t_mystruct = x;
-  var _3 : Ghost.ghost_ty uint32;
+  var _3 : Snapshot.snap_ty uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 53 10 53 21] _3 <- ([#"../12_ghost_code.rs" 53 10 53 21] Ghost.new (C12GhostCode_MyStruct_Type.mystruct_f x));
+    [#"../12_ghost_code.rs" 53 10 53 27] _3 <- ([#"../12_ghost_code.rs" 53 10 53 27] Snapshot.new (C12GhostCode_MyStruct_Type.mystruct_f x));
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 53 4 53 21] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 21] _3));
-    [#"../12_ghost_code.rs" 53 4 53 21] _3 <- any Ghost.ghost_ty uint32;
+    [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 27] _3));
+    [#"../12_ghost_code.rs" 53 4 53 27] _3 <- any Snapshot.snap_ty uint32;
     [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.rs b/creusot/tests/should_succeed/syntax/12_ghost_code.rs
index a4dfc8143b..206fed9302 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.rs
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.rs
@@ -1,42 +1,42 @@
 extern crate creusot_contracts;
 use creusot_contracts::{logic::Seq, *};
 
-pub fn ghost_arg(g: Ghost<u32>) {
-    let _x: Ghost<u32> = gh! { *g };
+pub fn ghost_arg(g: Snapshot<u32>) {
+    let _x: Snapshot<u32> = snapshot! { *g };
 }
 
 pub fn ghost_vec() {
     let x: Vec<u32> = Vec::new();
-    let mut _s: Ghost<Vec<_>> = gh! { x };
+    let mut _s: Snapshot<Vec<_>> = snapshot! { x };
 }
 
 #[open]
-#[ghost]
+#[logic]
 pub fn omg() {}
 
 pub fn ghost_copy() {
     let a = 0;
-    let mut _s = gh! { Seq::EMPTY.push(0i32) };
-    _s = gh! { _s.push(a) };
+    let mut _s = snapshot! { Seq::EMPTY.push(0i32) };
+    _s = snapshot! { _s.push(a) };
 }
 
 pub fn ghost_is_copy() {
     let mut x = 0;
     let r = &mut x;
-    let g = gh! { r };
+    let g = snapshot! { r };
     let g1 = g;
     let g2 = g;
     proof_assert!(g1 == g2);
 }
 
-#[ghost]
+#[logic]
 fn logi_drop<T>(_: T) {}
 
 pub fn ghost_check() {
     let mut x = Vec::new();
 
     // We ghost capture the value and then drop it without affecting program
-    gh! { logi_drop(x); };
+    snapshot! { logi_drop(x); };
 
     x.push(0);
 
@@ -45,10 +45,10 @@ pub fn ghost_check() {
 
 pub struct MyStruct {
     f: u32,
-    g: Ghost<u32>,
+    g: Snapshot<u32>,
 }
 
 #[requires(x.g@ == 0)]
 pub fn takes_struct(mut x: MyStruct) {
-    x.g = gh! { x.f };
+    x.g = snapshot! { x.f };
 }
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index f71e01f3b3..9a00153f23 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -237,7 +237,7 @@ module C13VecMacro_X
     goto BB6
   }
   BB6 {
-    [#"../13_vec_macro.rs" 12 13 12 26] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 254 47 254 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] [#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] [#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] [#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../13_vec_macro.rs" 12 13 12 26] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] [#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] [#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] [#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/syntax/derive_macros.rs b/creusot/tests/should_succeed/syntax/derive_macros.rs
index fc85641c23..063e18b6ff 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.rs
+++ b/creusot/tests/should_succeed/syntax/derive_macros.rs
@@ -19,7 +19,7 @@ where
     type DeepModelTy = Product<A::DeepModelTy, B::DeepModelTy>;
 
     #[open]
-    #[ghost]
+    #[logic]
     fn deep_model(self) -> Self::DeepModelTy {
         Product { a: self.a.deep_model(), b: self.b.deep_model() }
     }
@@ -35,7 +35,7 @@ impl<A: DeepModel, B: DeepModel> DeepModel for Sum<A, B> {
     type DeepModelTy = Sum<A::DeepModelTy, B::DeepModelTy>;
 
     #[open]
-    #[ghost]
+    #[logic]
     fn deep_model(self) -> Self::DeepModelTy {
         match self {
             Sum::A(a) => Sum::A(a.deep_model()),
diff --git a/creusot/tests/should_succeed/traits/08.rs b/creusot/tests/should_succeed/traits/08.rs
index 850aa34efb..4d3040d412 100644
--- a/creusot/tests/should_succeed/traits/08.rs
+++ b/creusot/tests/should_succeed/traits/08.rs
@@ -5,7 +5,7 @@ use creusot_contracts::{logic::Int, *};
 // Ensure that different kinds of functions are translated to the
 // correct abstract symbol in Rust
 pub trait Tr {
-    #[ghost]
+    #[logic]
     fn logical(&self) -> Int;
     #[predicate]
     fn predicate(&self) -> bool;
diff --git a/creusot/tests/should_succeed/traits/11.rs b/creusot/tests/should_succeed/traits/11.rs
index 0a8a8ef20f..faf81bba58 100644
--- a/creusot/tests/should_succeed/traits/11.rs
+++ b/creusot/tests/should_succeed/traits/11.rs
@@ -3,7 +3,7 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 #[open]
-#[ghost]
+#[logic]
 pub fn id<T>(x: T) -> T {
     x
 }
diff --git a/creusot/tests/should_succeed/traits/12_default_method.rs b/creusot/tests/should_succeed/traits/12_default_method.rs
index fd408f3743..963d97a8d2 100644
--- a/creusot/tests/should_succeed/traits/12_default_method.rs
+++ b/creusot/tests/should_succeed/traits/12_default_method.rs
@@ -8,7 +8,7 @@ pub trait T {
     }
 
     #[open]
-    #[ghost]
+    #[logic]
     fn logic_default(self) -> bool {
         true
     }
diff --git a/creusot/tests/should_succeed/traits/14_assoc_in_logic.rs b/creusot/tests/should_succeed/traits/14_assoc_in_logic.rs
index 7c51cac64c..021306e5fa 100644
--- a/creusot/tests/should_succeed/traits/14_assoc_in_logic.rs
+++ b/creusot/tests/should_succeed/traits/14_assoc_in_logic.rs
@@ -6,13 +6,13 @@ pub trait Assoc {
     type Ty;
 }
 
-#[ghost]
+#[logic]
 #[trusted]
 fn from_ty<T: Assoc>(_x: T::Ty) -> T {
     absurd
 }
 
-#[ghost]
+#[logic]
 #[trusted]
 fn to_ty<T: Assoc>(_x: T) -> T::Ty {
     absurd
diff --git a/creusot/tests/should_succeed/traits/15_impl_interfaces.rs b/creusot/tests/should_succeed/traits/15_impl_interfaces.rs
index a2bf356bc0..e02030aff1 100644
--- a/creusot/tests/should_succeed/traits/15_impl_interfaces.rs
+++ b/creusot/tests/should_succeed/traits/15_impl_interfaces.rs
@@ -14,7 +14,7 @@ impl Tr for () {
 }
 
 #[trusted]
-#[ghost]
+#[logic]
 fn x<T: Tr>(_x: T) -> T::A {
     absurd
 }
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.rs b/creusot/tests/should_succeed/traits/16_impl_cloning.rs
index 9fbe4d93aa..d9e0ab5aaa 100644
--- a/creusot/tests/should_succeed/traits/16_impl_cloning.rs
+++ b/creusot/tests/should_succeed/traits/16_impl_cloning.rs
@@ -6,7 +6,7 @@ pub struct Vec<T>(std::vec::Vec<T>);
 impl<T> ShallowModel for Vec<T> {
     type ShallowModelTy = Seq<T>;
     #[open]
-    #[ghost]
+    #[logic]
     #[trusted]
     fn shallow_model(self) -> Self::ShallowModelTy {
         absurd
diff --git a/creusot/tests/should_succeed/traits/18_trait_laws.rs b/creusot/tests/should_succeed/traits/18_trait_laws.rs
index c03d1b3103..b63d2eca86 100644
--- a/creusot/tests/should_succeed/traits/18_trait_laws.rs
+++ b/creusot/tests/should_succeed/traits/18_trait_laws.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 use creusot_contracts::*;
 
 pub trait Symmetric {
-    #[ghost]
+    #[logic]
     fn op(self, _: Self) -> Self;
 
     #[law]
@@ -11,7 +11,7 @@ pub trait Symmetric {
 }
 
 #[open]
-#[ghost]
+#[logic]
 #[ensures(result == true)]
 pub fn uses_op<T: Symmetric>(x: T, y: T) -> bool {
     pearlite! { x.op(y) == y.op(x) }
@@ -19,7 +19,7 @@ pub fn uses_op<T: Symmetric>(x: T, y: T) -> bool {
 
 impl Symmetric for () {
     #[open]
-    #[ghost]
+    #[logic]
     fn op(self, _: Self) -> Self {
         ()
     }
@@ -31,7 +31,7 @@ impl Symmetric for () {
 }
 
 #[open]
-#[ghost]
+#[logic]
 #[ensures(result == true)]
 pub fn impl_laws() -> bool {
     pearlite! { ().op(()) == ().op(()) }
diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index c58d4a4ba2..3312b54666 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -218,7 +218,7 @@ module C01_AllZero
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve2 (self : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -289,7 +289,7 @@ module C01_AllZero
   val index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) (ix : int) : uint32
     ensures { result = index_logic0 self ix }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) : Seq.seq uint32
     
    =
@@ -297,18 +297,18 @@ module C01_AllZero
   val shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) : Seq.seq uint32
     ensures { result = shallow_model5 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq uint32
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq uint32
     
    =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq uint32
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq uint32
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -336,7 +336,7 @@ module C01_AllZero
     requires {inv1 self}
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model4 self) }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg all_zero [#"../01.rs" 7 0 7 33] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) : ()
     ensures { [#"../01.rs" 5 0 5 73] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 ( ^ v)) -> index_logic0 ( ^ v) i = (0 : uint32) }
     ensures { [#"../01.rs" 6 10 6 33] Seq.length (shallow_model0 v) = Seq.length (shallow_model2 ( ^ v)) }
@@ -344,16 +344,16 @@ module C01_AllZero
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) = v;
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
   var _8 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _19 : Core_Option_Option_Type.t_option usize;
   var _20 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _21 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _24 : Ghost.ghost_ty (Seq.seq usize);
+  var _24 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var _27 : borrowed uint32;
   var _28 : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
@@ -361,7 +361,7 @@ module C01_AllZero
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 8 16 8 25] old_v <- ([#"../01.rs" 8 16 8 25] Ghost.new v);
+    [#"../01.rs" 8 16 8 31] old_v <- ([#"../01.rs" 8 16 8 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
@@ -374,11 +374,11 @@ module C01_AllZero
     goto BB3
   }
   BB3 {
-    [#"../01.rs" 9 4 9 42] iter_old <- ([#"../01.rs" 9 4 9 42] Ghost.new iter);
+    [#"../01.rs" 9 4 9 42] iter_old <- ([#"../01.rs" 9 4 9 42] Snapshot.new iter);
     goto BB4
   }
   BB4 {
-    [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] Ghost.new (Seq.empty ));
+    [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -386,9 +386,9 @@ module C01_AllZero
   }
   BB6 {
     invariant { [#"../01.rs" 9 4 9 42] inv0 iter };
-    invariant { [#"../01.rs" 9 4 9 42] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../01.rs" 9 4 9 42] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../01.rs" 9 16 9 40] Seq.length (shallow_model0 v) = Seq.length (shallow_model1 old_v) };
-    invariant { [#"../01.rs" 9 4 9 42] forall j : int . 0 <= j /\ j < Seq.length (Ghost.inner produced) -> index_logic0 ( * v) j = (0 : uint32) };
+    invariant { [#"../01.rs" 9 4 9 42] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced) -> index_logic0 ( * v) j = (0 : uint32) };
     goto BB7
   }
   BB7 {
@@ -421,14 +421,14 @@ module C01_AllZero
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _19);
-    [#"../01.rs" 9 4 9 42] _24 <- ([#"../01.rs" 9 4 9 42] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19);
+    [#"../01.rs" 9 4 9 42] _24 <- ([#"../01.rs" 9 4 9 42] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] _24);
-    [#"../01.rs" 9 4 9 42] _24 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../01.rs" 9 4 9 42] _24 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../01.rs" 12 8 12 9] _28 <- Borrow.borrow_mut ( * v);
     [#"../01.rs" 12 8 12 9] v <- { v with current = ( ^ _28) ; };
     [#"../01.rs" 12 9 12 12] _27 <- ([#"../01.rs" 12 9 12 12] index_mut0 _28 ([#"../01.rs" 12 10 12 11] i));
diff --git a/creusot/tests/should_succeed/vector/01.rs b/creusot/tests/should_succeed/vector/01.rs
index 2e01e398f1..89966fb772 100644
--- a/creusot/tests/should_succeed/vector/01.rs
+++ b/creusot/tests/should_succeed/vector/01.rs
@@ -5,7 +5,7 @@ use creusot_contracts::{logic::Int, *};
 #[ensures(forall<i : Int> 0 <= i && i < (^v)@.len() ==> (^v)[i] == 0u32)]
 #[ensures(v@.len() == (^v)@.len())]
 pub fn all_zero(v: &mut Vec<u32>) {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
     #[invariant(v@.len() == old_v@.len())]
     #[invariant(forall<j : Int> 0 <= j && j < produced.len() ==> v[j] == 0u32)]
     for i in 0..v.len() {
diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index 1701594573..92097f2ad8 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -246,17 +246,17 @@ module C02Gnome_GnomeSort
     ensures { result = inv1 _x }
     
   axiom inv1 : forall x : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../02_gnome.rs" 9 0 9 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) =
     [#"../02_gnome.rs" 10 4 12 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
@@ -380,12 +380,12 @@ module C02Gnome_GnomeSort
   val shallow_model4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model4 self }
     
-  use prelude.Ghost
-  function shallow_model2 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model2 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model4 (Ghost.inner self)
-  val shallow_model2 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model4 (Snapshot.inner self)
+  val shallow_model2 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model2 self }
     
   function deep_model0 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq deep_model_ty0
@@ -395,11 +395,12 @@ module C02Gnome_GnomeSort
   val deep_model0 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq deep_model_ty0
     ensures { result = deep_model0 self }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg gnome_sort [#"../02_gnome.rs" 22 0 24 29] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {[#"../02_gnome.rs" 22 38 22 39] inv1 v}
     ensures { [#"../02_gnome.rs" 20 10 20 35] sorted0 (deep_model1 ( ^ v)) }
@@ -408,7 +409,7 @@ module C02Gnome_GnomeSort
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var i : usize;
   var _9 : ();
   var _12 : usize;
@@ -424,7 +425,7 @@ module C02Gnome_GnomeSort
     goto BB0
   }
   BB0 {
-    [#"../02_gnome.rs" 26 16 26 25] old_v <- ([#"../02_gnome.rs" 26 16 26 25] Ghost.new v);
+    [#"../02_gnome.rs" 26 16 26 31] old_v <- ([#"../02_gnome.rs" 26 16 26 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/vector/02_gnome.rs b/creusot/tests/should_succeed/vector/02_gnome.rs
index 208058d019..02171fbeff 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.rs
+++ b/creusot/tests/should_succeed/vector/02_gnome.rs
@@ -23,7 +23,7 @@ pub fn gnome_sort<T: Ord + DeepModel>(v: &mut Vec<T>)
 where
     T::DeepModelTy: OrdLogic,
 {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
     let mut i = 0;
     #[invariant(sorted_range(v.deep_model(), 0, i@))]
     #[invariant(v@.permutation_of(old_v@))]
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index 5620a338cb..727bb57ea0 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -214,17 +214,17 @@ module C03KnuthShuffle_KnuthShuffle
     ensures { result = invariant1 self }
     
   axiom inv1 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv1 x = true
-  use prelude.Ghost
-  predicate invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  use prelude.Snapshot
+  predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
-  val invariant0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  val invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val inv0 (_x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+  val inv0 (_x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
+  axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   predicate resolve3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve3 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -301,18 +301,18 @@ module C03KnuthShuffle_KnuthShuffle
   val shallow_model5 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
     ensures { result = shallow_model5 self }
     
-  use prelude.Ghost
-  function shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+  use prelude.Snapshot
+  function shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     
    =
-    [#"../../../../../creusot-contracts/src/ghost.rs" 27 20 27 48] shallow_model5 (Ghost.inner self)
-  val shallow_model1 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
+    [#"../../../../../creusot-contracts/src/snapshot.rs" 27 20 27 48] shallow_model5 (Snapshot.inner self)
+  val shallow_model1 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : Seq.seq t
     ensures { result = shallow_model1 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -340,11 +340,12 @@ module C03KnuthShuffle_KnuthShuffle
     requires {inv6 self}
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model4 self) }
     
-  predicate resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
-  val resolve0 (self : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
+  predicate resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
+    
+  val resolve0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)))) : bool
     ensures { result = resolve0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   let rec cfg knuth_shuffle [#"../03_knuth_shuffle.rs" 13 0 13 39] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {[#"../03_knuth_shuffle.rs" 13 24 13 25] inv5 v}
     ensures { [#"../03_knuth_shuffle.rs" 12 0 12 36] permutation_of0 (shallow_model2 ( ^ v)) (shallow_model0 v) }
@@ -352,16 +353,16 @@ module C03KnuthShuffle_KnuthShuffle
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
-  var old_v : Ghost.ghost_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
   var _7 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _17 : Core_Option_Option_Type.t_option usize;
   var _18 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _19 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _22 : Ghost.ghost_ty (Seq.seq usize);
+  var _22 : Snapshot.snap_ty (Seq.seq usize);
   var n : usize;
   var upper : usize;
   var _26 : usize;
@@ -374,7 +375,7 @@ module C03KnuthShuffle_KnuthShuffle
     goto BB0
   }
   BB0 {
-    [#"../03_knuth_shuffle.rs" 14 16 14 25] old_v <- ([#"../03_knuth_shuffle.rs" 14 16 14 25] Ghost.new v);
+    [#"../03_knuth_shuffle.rs" 14 16 14 31] old_v <- ([#"../03_knuth_shuffle.rs" 14 16 14 31] Snapshot.new v);
     goto BB1
   }
   BB1 {
@@ -389,11 +390,11 @@ module C03KnuthShuffle_KnuthShuffle
     goto BB3
   }
   BB3 {
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] iter_old <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Ghost.new iter);
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] iter_old <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Snapshot.new iter);
     goto BB4
   }
   BB4 {
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Ghost.new (Seq.empty ));
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Snapshot.new (Seq.empty ));
     goto BB5
   }
   BB5 {
@@ -401,7 +402,7 @@ module C03KnuthShuffle_KnuthShuffle
   }
   BB6 {
     invariant { [#"../03_knuth_shuffle.rs" 16 4 16 43] inv1 iter };
-    invariant { [#"../03_knuth_shuffle.rs" 16 4 16 43] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../03_knuth_shuffle.rs" 16 4 16 43] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../03_knuth_shuffle.rs" 16 4 16 43] permutation_of0 (shallow_model0 v) (shallow_model1 old_v) };
     goto BB7
   }
@@ -437,14 +438,14 @@ module C03KnuthShuffle_KnuthShuffle
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] _22);
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] n <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../03_knuth_shuffle.rs" 20 20 20 27] _26 <- ([#"../03_knuth_shuffle.rs" 20 20 20 27] len0 ([#"../03_knuth_shuffle.rs" 20 20 20 21]  * v));
     goto BB14
   }
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.rs b/creusot/tests/should_succeed/vector/03_knuth_shuffle.rs
index ae6d15918c..c93b1e2313 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.rs
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.rs
@@ -11,7 +11,7 @@ fn rand_in_range(l: usize, u: usize) -> usize {
 
 #[ensures((^v)@.permutation_of(v@))]
 pub fn knuth_shuffle<T>(v: &mut Vec<T>) {
-    let old_v = gh! { v };
+    let old_v = snapshot! { v };
 
     #[invariant(v@.permutation_of(old_v@))]
     for n in 0..v.len() {
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index ecdfc5f9da..b59ce41797 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -140,9 +140,9 @@ module C06KnightsTour_Board_Type
 end
 module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   type t_mapinv 'i 'b 'f =
-    | C_MapInv 'i 'f (Ghost.ghost_ty (Seq.seq 'b))
+    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
     
   let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
@@ -152,7 +152,7 @@ module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
     match self with
       | C_MapInv _ a _ -> a
       end
-  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Ghost.ghost_ty (Seq.seq 'b)
+  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
    = [@vc:do_not_keep_trace] [@vc:sp]
     match self with
       | C_MapInv _ _ a -> a
@@ -176,7 +176,7 @@ module C06KnightsTour_Impl1_New_Closure3_Type
   use prelude.UIntSize
   use Alloc_Vec_Vec_Type as Alloc_Vec_Vec_Type
   use seq.Seq
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Int16
   use prelude.Int
   use prelude.Borrow
@@ -231,7 +231,7 @@ module C06KnightsTour_Impl1_New_Closure3
     
   axiom inv0 : forall x : usize . inv0 x = true
   use prelude.Int16
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Borrow
   use C06KnightsTour_Impl1_New_Closure3_Type as C06KnightsTour_Impl1_New_Closure3
   function field_00 [#"../06_knights_tour.rs" 43 16 43 50] (self : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : usize
@@ -264,7 +264,7 @@ module C06KnightsTour_Impl1_New_Closure3
   val resolve0 (self : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = resolve0 self }
     
-  let rec cfg c06KnightsTour_Impl1_New_Closure3 [#"../06_knights_tour.rs" 43 16 43 50] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (_2 : usize) (_3 : Ghost.ghost_ty (Seq.seq usize)) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
+  let rec cfg c06KnightsTour_Impl1_New_Closure3 [#"../06_knights_tour.rs" 43 16 43 50] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (_2 : usize) (_3 : Snapshot.snap_ty (Seq.seq usize)) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     ensures { [#"../06_knights_tour.rs" 43 26 43 48] Seq.length (shallow_model0 result) = UIntSize.to_int (field_00 ( ^ _1)) }
     ensures { unnest0 ( * _1) ( ^ _1) }
     
@@ -296,17 +296,17 @@ end
 module C06KnightsTour_Impl1_New
   use prelude.UIntSize
   use seq.Seq
-  use prelude.Ghost
-  predicate invariant12 (self : Ghost.ghost_ty (Seq.seq usize)) =
+  use prelude.Snapshot
+  predicate invariant12 (self : Snapshot.snap_ty (Seq.seq usize)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant12 (self : Ghost.ghost_ty (Seq.seq usize)) : bool
+  val invariant12 (self : Snapshot.snap_ty (Seq.seq usize)) : bool
     ensures { result = invariant12 self }
     
-  predicate inv12 (_x : Ghost.ghost_ty (Seq.seq usize))
-  val inv12 (_x : Ghost.ghost_ty (Seq.seq usize)) : bool
+  predicate inv12 (_x : Snapshot.snap_ty (Seq.seq usize))
+  val inv12 (_x : Snapshot.snap_ty (Seq.seq usize)) : bool
     ensures { result = inv12 _x }
     
-  axiom inv12 : forall x : Ghost.ghost_ty (Seq.seq usize) . inv12 x = true
+  axiom inv12 : forall x : Snapshot.snap_ty (Seq.seq usize) . inv12 x = true
   use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
   use Alloc_Vec_Vec_Type as Alloc_Vec_Vec_Type
   use prelude.Int16
@@ -418,23 +418,23 @@ module C06KnightsTour_Impl1_New
     
    =
     field_00 _2 = field_00 self
-  predicate postcondition_mut0 [#"../06_knights_tour.rs" 43 16 43 50] (self : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (args : (usize, Ghost.ghost_ty (Seq.seq usize))) (result : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))
+  predicate postcondition_mut0 [#"../06_knights_tour.rs" 43 16 43 50] (self : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (args : (usize, Snapshot.snap_ty (Seq.seq usize))) (result : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))
     
    =
     (let (_2, _3) = args in Seq.length (shallow_model2 result) = UIntSize.to_int (field_00 ( ^ self))) /\ unnest0 ( * self) ( ^ self)
   use seq.Seq
-  predicate precondition0 [#"../06_knights_tour.rs" 43 16 43 50] (self : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (args : (usize, Ghost.ghost_ty (Seq.seq usize)))
+  predicate precondition0 [#"../06_knights_tour.rs" 43 16 43 50] (self : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (args : (usize, Snapshot.snap_ty (Seq.seq usize)))
     
    =
     let (_2, _3) = args in true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq_ext.SeqExt
   use seq.Seq
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   use prelude.Int
   function deep_model0 (self : usize) : int =
     [#"../../../../../creusot-contracts/src/std/num.rs" 22 16 22 35] UIntSize.to_int self
@@ -451,11 +451,11 @@ module C06KnightsTour_Impl1_New
   predicate produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (visited : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq usize . inv7 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) . inv11 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq usize . inv7 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) . inv11 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
     else
        * Seq.get fs 0 = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self /\  ^ Seq.get fs (Seq.length visited - 1) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Ghost.new (Seq.(++) (Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (visited : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = produces1 self visited succ }
     
@@ -511,7 +511,7 @@ module C06KnightsTour_Impl1_New
   predicate next_precondition0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (produced : Seq.seq usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Ghost.new produced)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (produced : Seq.seq usize) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -519,7 +519,7 @@ module C06KnightsTour_Impl1_New
   predicate preservation0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall b : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . forall f : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall e2 : usize . forall e1 : usize . forall s : Seq.seq usize . inv0 i -> inv9 b -> inv10 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Ghost.new s) -> postcondition_mut0 f (e1, Ghost.new s) b -> precondition0 ( ^ f) (e2, Ghost.new (Seq.snoc s e1))
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall b : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . forall f : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall e2 : usize . forall e1 : usize . forall s : Seq.seq usize . inv0 i -> inv9 b -> inv10 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = preservation0 iter func }
     
@@ -639,7 +639,7 @@ module C06KnightsTour_Impl1_New
   predicate completed0 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 15 8 18 9] Ghost.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( * self)) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( * self) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( ^ self)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 15 8 18 9] Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( * self)) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( * self) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func ( ^ self)
   val completed0 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)) : bool
     ensures { result = completed0 self }
     
@@ -655,7 +655,7 @@ module C06KnightsTour_Impl1_New
   predicate resolve0 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 56 4 56 16] resolve1 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) /\ resolve2 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 56 4 56 27] resolve1 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) /\ resolve2 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self)
   val resolve0 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = resolve0 self }
     
@@ -665,13 +665,13 @@ module C06KnightsTour_Impl1_New
     ensures { inv6 result }
     
   val map_inv0 (self : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3
-    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 138] forall i2 : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i2 -> inv1 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Ghost.new (Seq.empty ))}
+    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i2 -> inv1 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 44 15 44 51] reinitialize0 ()}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 45 15 45 70] preservation0 self func}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 21 47 25] inv0 self}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 27 47 31] inv2 func}
-    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 46 14 46 85] result = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.C_MapInv self func (Ghost.new (Seq.empty )) }
-    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 47 4 50 58] inv3 result }
+    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 46 14 46 88] result = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.C_MapInv self func (Snapshot.new (Seq.empty )) }
+    ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 47 4 50 61] inv3 result }
     
   let rec cfg new [#"../06_knights_tour.rs" 40 4 40 31] [@cfg:stackify] [@cfg:subregion_analysis] (size : usize) : C06KnightsTour_Board_Type.t_board
     requires {[#"../06_knights_tour.rs" 37 15 37 28] UIntSize.to_int size <= 1000}
@@ -1187,7 +1187,7 @@ module C06KnightsTour_Impl1_CountDegree
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   predicate resolve3 (self : isize) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
   val resolve3 (self : isize) : bool
@@ -1248,11 +1248,11 @@ module C06KnightsTour_Impl1_CountDegree
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) (res : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1293,14 +1293,14 @@ module C06KnightsTour_Impl1_CountDegree
   var count : usize;
   var iter : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global);
   var _8 : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global);
-  var iter_old : Ghost.ghost_ty (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
-  var produced : Ghost.ghost_ty (Seq.seq (isize, isize));
+  var iter_old : Snapshot.snap_ty (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
+  var produced : Snapshot.snap_ty (Seq.seq (isize, isize));
   var _16 : ();
   var _17 : Core_Option_Option_Type.t_option (isize, isize);
   var _18 : borrowed (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
   var _19 : borrowed (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
   var __creusot_proc_iter_elem : (isize, isize);
-  var _22 : Ghost.ghost_ty (Seq.seq (isize, isize));
+  var _22 : Snapshot.snap_ty (Seq.seq (isize, isize));
   var m : (isize, isize);
   var next : C06KnightsTour_Point_Type.t_point;
   var _28 : (isize, isize);
@@ -1319,11 +1319,11 @@ module C06KnightsTour_Impl1_CountDegree
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 73 8 73 46] iter_old <- ([#"../06_knights_tour.rs" 73 8 73 46] Ghost.new iter);
+    [#"../06_knights_tour.rs" 73 8 73 46] iter_old <- ([#"../06_knights_tour.rs" 73 8 73 46] Snapshot.new iter);
     goto BB3
   }
   BB3 {
-    [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] Ghost.new (Seq.empty ));
+    [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] Snapshot.new (Seq.empty ));
     goto BB4
   }
   BB4 {
@@ -1337,8 +1337,8 @@ module C06KnightsTour_Impl1_CountDegree
   }
   BB7 {
     invariant { [#"../06_knights_tour.rs" 73 8 73 46] inv0 iter };
-    invariant { [#"../06_knights_tour.rs" 73 8 73 46] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../06_knights_tour.rs" 73 20 73 44] UIntSize.to_int count <= Seq.length (Ghost.inner produced) };
+    invariant { [#"../06_knights_tour.rs" 73 8 73 46] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../06_knights_tour.rs" 73 20 73 44] UIntSize.to_int count <= Seq.length (Snapshot.inner produced) };
     goto BB8
   }
   BB8 {
@@ -1370,14 +1370,14 @@ module C06KnightsTour_Impl1_CountDegree
     absurd
   }
   BB13 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _17);
-    [#"../06_knights_tour.rs" 73 8 73 46] _22 <- ([#"../06_knights_tour.rs" 73 8 73 46] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../06_knights_tour.rs" 73 8 73 46] _22 <- ([#"../06_knights_tour.rs" 73 8 73 46] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB14
   }
   BB14 {
     [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] _22);
-    [#"../06_knights_tour.rs" 73 8 73 46] _22 <- any Ghost.ghost_ty (Seq.seq (isize, isize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../06_knights_tour.rs" 73 8 73 46] _22 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assume { resolve1 __creusot_proc_iter_elem };
     [#"../06_knights_tour.rs" 75 29 75 31] _28 <- ([#"../06_knights_tour.rs" 75 29 75 31] m);
     [#"../06_knights_tour.rs" 75 23 75 32] next <- ([#"../06_knights_tour.rs" 75 23 75 32] mov0 ([#"../06_knights_tour.rs" 75 23 75 24] p) ([#"../06_knights_tour.rs" 75 29 75 31] _28));
@@ -1857,7 +1857,7 @@ module C06KnightsTour_Min
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point) . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use seq.Seq
   predicate resolve0 (self : borrowed (Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point))) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -1898,10 +1898,10 @@ module C06KnightsTour_Min
   val shallow_model0 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)) : Seq.seq (usize, C06KnightsTour_Point_Type.t_point)
     ensures { result = shallow_model0 self }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)) (res : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point))
     
    =
@@ -1929,13 +1929,13 @@ module C06KnightsTour_Min
   var v : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) = v;
   var min : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
   var iter : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point);
-  var iter_old : Ghost.ghost_ty (Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point));
-  var produced : Ghost.ghost_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
+  var iter_old : Snapshot.snap_ty (Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point));
+  var produced : Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
   var _15 : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
   var _16 : borrowed (Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point));
   var _17 : borrowed (Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point));
   var __creusot_proc_iter_elem : (usize, C06KnightsTour_Point_Type.t_point);
-  var _20 : Ghost.ghost_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
+  var _20 : Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
   var x : (usize, C06KnightsTour_Point_Type.t_point);
   var _23 : ();
   var m : (usize, C06KnightsTour_Point_Type.t_point);
@@ -1948,11 +1948,11 @@ module C06KnightsTour_Min
     goto BB1
   }
   BB1 {
-    [#"../06_knights_tour.rs" 113 4 114 74] iter_old <- ([#"../06_knights_tour.rs" 113 4 114 74] Ghost.new iter);
+    [#"../06_knights_tour.rs" 113 4 114 74] iter_old <- ([#"../06_knights_tour.rs" 113 4 114 74] Snapshot.new iter);
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] Ghost.new (Seq.empty ));
+    [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] Snapshot.new (Seq.empty ));
     goto BB3
   }
   BB3 {
@@ -1960,7 +1960,7 @@ module C06KnightsTour_Min
   }
   BB4 {
     invariant { [#"../06_knights_tour.rs" 113 4 114 74] inv0 iter };
-    invariant { [#"../06_knights_tour.rs" 113 4 114 74] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../06_knights_tour.rs" 113 4 114 74] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../06_knights_tour.rs" 113 4 114 74] forall r : (usize, C06KnightsTour_Point_Type.t_point) . min = Core_Option_Option_Type.C_Some r -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) /\ index_logic0 v i = r) };
     goto BB5
   }
@@ -1992,14 +1992,14 @@ module C06KnightsTour_Min
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _15);
-    [#"../06_knights_tour.rs" 113 4 114 74] _20 <- ([#"../06_knights_tour.rs" 113 4 114 74] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15);
+    [#"../06_knights_tour.rs" 113 4 114 74] _20 <- ([#"../06_knights_tour.rs" 113 4 114 74] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
     [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] _20);
-    [#"../06_knights_tour.rs" 113 4 114 74] _20 <- any Ghost.ghost_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../06_knights_tour.rs" 113 4 114 74] _20 <- any Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     switch (min)
       | Core_Option_Option_Type.C_None -> goto BB12
       | Core_Option_Option_Type.C_Some _ -> goto BB13
@@ -2347,7 +2347,7 @@ module C06KnightsTour_KnightsTour
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_Range_Type.t_range usize . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use C06KnightsTour_Board_Type as C06KnightsTour_Board_Type
   predicate resolve8 (self : C06KnightsTour_Point_Type.t_point) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -2487,10 +2487,10 @@ module C06KnightsTour_KnightsTour
       end }
     ensures { inv8 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post1 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) (res : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -2543,10 +2543,10 @@ module C06KnightsTour_KnightsTour
       end }
     ensures { inv3 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -2565,7 +2565,7 @@ module C06KnightsTour_KnightsTour
     ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 89 0 166 1] into_iter_post0 self result }
     ensures { inv0 result }
     
-  use prelude.Ghost
+  use prelude.Snapshot
   function dumb_nonlinear_arith0 [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : () =
     [#"../06_knights_tour.rs" 128 0 128 8] ()
   val dumb_nonlinear_arith0 [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : ()
@@ -2598,27 +2598,27 @@ module C06KnightsTour_KnightsTour
   var p : C06KnightsTour_Point_Type.t_point;
   var _14 : ();
   var _15 : borrowed (C06KnightsTour_Board_Type.t_board);
-  var _17 : Ghost.ghost_ty ();
+  var _17 : Snapshot.snap_ty ();
   var iter : Core_Ops_Range_Range_Type.t_range usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _34 : ();
   var _35 : Core_Option_Option_Type.t_option usize;
   var _36 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _37 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem : usize;
-  var _40 : Ghost.ghost_ty (Seq.seq usize);
+  var _40 : Snapshot.snap_ty (Seq.seq usize);
   var step : usize;
   var candidates : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global);
   var iter1 : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global);
   var _46 : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global);
-  var iter_old1 : Ghost.ghost_ty (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
-  var produced1 : Ghost.ghost_ty (Seq.seq (isize, isize));
+  var iter_old1 : Snapshot.snap_ty (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
+  var produced1 : Snapshot.snap_ty (Seq.seq (isize, isize));
   var _54 : Core_Option_Option_Type.t_option (isize, isize);
   var _55 : borrowed (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
   var _56 : borrowed (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global));
   var __creusot_proc_iter_elem1 : (isize, isize);
-  var _59 : Ghost.ghost_ty (Seq.seq (isize, isize));
+  var _59 : Snapshot.snap_ty (Seq.seq (isize, isize));
   var m : (isize, isize);
   var adj : C06KnightsTour_Point_Type.t_point;
   var _65 : (isize, isize);
@@ -2647,7 +2647,7 @@ module C06KnightsTour_KnightsTour
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 141 4 141 38] _17 <- ([#"../06_knights_tour.rs" 141 4 141 38] Ghost.new (dumb_nonlinear_arith0 size));
+    [#"../06_knights_tour.rs" 141 4 141 44] _17 <- ([#"../06_knights_tour.rs" 141 4 141 44] Snapshot.new (dumb_nonlinear_arith0 size));
     goto BB3
   }
   BB3 {
@@ -2655,11 +2655,11 @@ module C06KnightsTour_KnightsTour
     goto BB4
   }
   BB4 {
-    [#"../06_knights_tour.rs" 142 4 142 36] iter_old <- ([#"../06_knights_tour.rs" 142 4 142 36] Ghost.new iter);
+    [#"../06_knights_tour.rs" 142 4 142 36] iter_old <- ([#"../06_knights_tour.rs" 142 4 142 36] Snapshot.new iter);
     goto BB5
   }
   BB5 {
-    [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] Ghost.new (Seq.empty ));
+    [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] Snapshot.new (Seq.empty ));
     goto BB6
   }
   BB6 {
@@ -2673,7 +2673,7 @@ module C06KnightsTour_KnightsTour
   }
   BB9 {
     invariant { [#"../06_knights_tour.rs" 142 4 142 36] inv0 iter };
-    invariant { [#"../06_knights_tour.rs" 142 4 142 36] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
+    invariant { [#"../06_knights_tour.rs" 142 4 142 36] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../06_knights_tour.rs" 142 16 142 34] C06KnightsTour_Board_Type.board_size board = size };
     invariant { [#"../06_knights_tour.rs" 143 16 143 26] wf0 board };
     invariant { [#"../06_knights_tour.rs" 144 16 144 34] in_bounds0 board p };
@@ -2708,14 +2708,14 @@ module C06KnightsTour_KnightsTour
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _35);
-    [#"../06_knights_tour.rs" 142 4 142 36] _40 <- ([#"../06_knights_tour.rs" 142 4 142 36] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _35);
+    [#"../06_knights_tour.rs" 142 4 142 36] _40 <- ([#"../06_knights_tour.rs" 142 4 142 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB16
   }
   BB16 {
     [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] _40);
-    [#"../06_knights_tour.rs" 142 4 142 36] _40 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../06_knights_tour.rs" 142 4 142 36] _40 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ());
     goto BB17
   }
@@ -2729,11 +2729,11 @@ module C06KnightsTour_KnightsTour
     goto BB19
   }
   BB19 {
-    [#"../06_knights_tour.rs" 148 8 149 54] iter_old1 <- ([#"../06_knights_tour.rs" 148 8 149 54] Ghost.new iter1);
+    [#"../06_knights_tour.rs" 148 8 149 54] iter_old1 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new iter1);
     goto BB20
   }
   BB20 {
-    [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] Ghost.new (Seq.empty ));
+    [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new (Seq.empty ));
     goto BB21
   }
   BB21 {
@@ -2750,7 +2750,7 @@ module C06KnightsTour_KnightsTour
   }
   BB25 {
     invariant { [#"../06_knights_tour.rs" 148 8 149 54] inv1 iter1 };
-    invariant { [#"../06_knights_tour.rs" 148 8 149 54] produces1 (Ghost.inner iter_old1) (Ghost.inner produced1) iter1 };
+    invariant { [#"../06_knights_tour.rs" 148 8 149 54] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
     invariant { [#"../06_knights_tour.rs" 148 8 149 54] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 candidates) -> in_bounds0 board (let (_, a) = index_logic0 candidates i in a) };
     goto BB26
   }
@@ -2778,14 +2778,14 @@ module C06KnightsTour_KnightsTour
     goto BB30
   }
   BB30 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _54);
-    [#"../06_knights_tour.rs" 148 8 149 54] _59 <- ([#"../06_knights_tour.rs" 148 8 149 54] Ghost.new (Seq.(++) (Ghost.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _54);
+    [#"../06_knights_tour.rs" 148 8 149 54] _59 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB31
   }
   BB31 {
     [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] _59);
-    [#"../06_knights_tour.rs" 148 8 149 54] _59 <- any Ghost.ghost_ty (Seq.seq (isize, isize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1);
+    [#"../06_knights_tour.rs" 148 8 149 54] _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     assume { resolve2 __creusot_proc_iter_elem1 };
     [#"../06_knights_tour.rs" 151 28 151 30] _65 <- ([#"../06_knights_tour.rs" 151 28 151 30] m);
     [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 ([#"../06_knights_tour.rs" 151 22 151 23] p) ([#"../06_knights_tour.rs" 151 28 151 30] _65));
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.rs b/creusot/tests/should_succeed/vector/06_knights_tour.rs
index 84e824fb06..b3f6643fdc 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.rs
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.rs
@@ -125,7 +125,7 @@ fn min(v: &Vec<(usize, Point)>) -> Option<&(usize, Point)> {
     min
 }
 
-#[ghost]
+#[logic]
 #[requires(a@ <= 1_000)]
 #[ensures(a@ * a@ <= 1_000_000)]
 fn dumb_nonlinear_arith(a: usize) {}
@@ -138,7 +138,7 @@ pub fn knights_tour(size: usize, x: usize, y: usize) -> Option<Board> {
     let mut p = Point { x: x as isize, y: y as isize };
     board.set(p, 1);
 
-    gh! { dumb_nonlinear_arith(size) };
+    snapshot! { dumb_nonlinear_arith(size) };
     #[invariant(board.size == size)]
     #[invariant(board.wf())]
     #[invariant(board.in_bounds(p))]
diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index 8ac793f7be..406aaa9f4e 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -296,7 +296,7 @@ module C08Haystack_Search
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . inv0 x = true
-  use prelude.Ghost
+  use prelude.Snapshot
   use prelude.Slice
   use seq.Seq
   predicate has_value0 [@inline:trivial] (self : usize) (seq : Seq.seq uint8) (out : uint8) =
@@ -340,8 +340,8 @@ module C08Haystack_Search
       end }
     ensures { inv5 result }
     
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post1 (self : Core_Ops_Range_Range_Type.t_range usize) (res : Core_Ops_Range_Range_Type.t_range usize)
     
    =
@@ -392,11 +392,11 @@ module C08Haystack_Search
   val match_at0 [#"../08_haystack.rs" 7 0 7 77] (needle : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (haystack : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (pos : int) (len : int) : bool
     ensures { result = match_at0 needle haystack pos len }
     
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
-  use prelude.Ghost
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
+  use prelude.Snapshot
   predicate into_iter_post0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (res : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize)
     
    =
@@ -441,23 +441,23 @@ module C08Haystack_Search
   var _10 : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize;
   var _12 : usize;
   var _14 : usize;
-  var iter_old : Ghost.ghost_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
-  var produced : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old : Snapshot.snap_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
+  var produced : Snapshot.snap_ty (Seq.seq usize);
   var _24 : Core_Option_Option_Type.t_option usize;
   var _25 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
   var _26 : borrowed (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
   var __creusot_proc_iter_elem : usize;
-  var _29 : Ghost.ghost_ty (Seq.seq usize);
+  var _29 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
   var _36 : usize;
-  var iter_old1 : Ghost.ghost_ty (Core_Ops_Range_Range_Type.t_range usize);
-  var produced1 : Ghost.ghost_ty (Seq.seq usize);
+  var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
+  var produced1 : Snapshot.snap_ty (Seq.seq usize);
   var _45 : Core_Option_Option_Type.t_option usize;
   var _46 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var _47 : borrowed (Core_Ops_Range_Range_Type.t_range usize);
   var __creusot_proc_iter_elem1 : usize;
-  var _50 : Ghost.ghost_ty (Seq.seq usize);
+  var _50 : Snapshot.snap_ty (Seq.seq usize);
   var j : usize;
   var _55 : uint8;
   var _59 : uint8;
@@ -484,11 +484,11 @@ module C08Haystack_Search
     goto BB4
   }
   BB4 {
-    [#"../08_haystack.rs" 22 4 22 112] iter_old <- ([#"../08_haystack.rs" 22 4 22 112] Ghost.new iter);
+    [#"../08_haystack.rs" 22 4 22 112] iter_old <- ([#"../08_haystack.rs" 22 4 22 112] Snapshot.new iter);
     goto BB5
   }
   BB5 {
-    [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] Ghost.new (Seq.empty ));
+    [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] Snapshot.new (Seq.empty ));
     goto BB6
   }
   BB6 {
@@ -496,8 +496,8 @@ module C08Haystack_Search
   }
   BB7 {
     invariant { [#"../08_haystack.rs" 22 4 22 112] inv0 iter };
-    invariant { [#"../08_haystack.rs" 22 4 22 112] produces0 (Ghost.inner iter_old) (Ghost.inner produced) iter };
-    invariant { [#"../08_haystack.rs" 22 4 22 112] forall k : int . 0 <= k /\ k < Seq.length (Ghost.inner produced) -> not match_at0 needle haystack k (Seq.length (shallow_model0 needle)) };
+    invariant { [#"../08_haystack.rs" 22 4 22 112] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
+    invariant { [#"../08_haystack.rs" 22 4 22 112] forall k : int . 0 <= k /\ k < Seq.length (Snapshot.inner produced) -> not match_at0 needle haystack k (Seq.length (shallow_model0 needle)) };
     goto BB8
   }
   BB8 {
@@ -528,14 +528,14 @@ module C08Haystack_Search
     absurd
   }
   BB13 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _24);
-    [#"../08_haystack.rs" 22 4 22 112] _29 <- ([#"../08_haystack.rs" 22 4 22 112] Ghost.new (Seq.(++) (Ghost.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _24);
+    [#"../08_haystack.rs" 22 4 22 112] _29 <- ([#"../08_haystack.rs" 22 4 22 112] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB14
   }
   BB14 {
     [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] _29);
-    [#"../08_haystack.rs" 22 4 22 112] _29 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem);
+    [#"../08_haystack.rs" 22 4 22 112] _29 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../08_haystack.rs" 25 20 25 32] _36 <- ([#"../08_haystack.rs" 25 20 25 32] len0 ([#"../08_haystack.rs" 25 20 25 26] needle));
     goto BB15
   }
@@ -545,11 +545,11 @@ module C08Haystack_Search
     goto BB16
   }
   BB16 {
-    [#"../08_haystack.rs" 24 8 24 68] iter_old1 <- ([#"../08_haystack.rs" 24 8 24 68] Ghost.new iter1);
+    [#"../08_haystack.rs" 24 8 24 68] iter_old1 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new iter1);
     goto BB17
   }
   BB17 {
-    [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] Ghost.new (Seq.empty ));
+    [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new (Seq.empty ));
     goto BB18
   }
   BB18 {
@@ -557,8 +557,8 @@ module C08Haystack_Search
   }
   BB19 {
     invariant { [#"../08_haystack.rs" 24 8 24 68] inv1 iter1 };
-    invariant { [#"../08_haystack.rs" 24 8 24 68] produces1 (Ghost.inner iter_old1) (Ghost.inner produced1) iter1 };
-    invariant { [#"../08_haystack.rs" 24 20 24 66] match_at0 needle haystack (UIntSize.to_int i) (Seq.length (Ghost.inner produced1)) };
+    invariant { [#"../08_haystack.rs" 24 8 24 68] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
+    invariant { [#"../08_haystack.rs" 24 20 24 66] match_at0 needle haystack (UIntSize.to_int i) (Seq.length (Snapshot.inner produced1)) };
     goto BB20
   }
   BB20 {
@@ -585,14 +585,14 @@ module C08Haystack_Search
     goto BB24
   }
   BB24 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] Core_Option_Option_Type.some_0 _45);
-    [#"../08_haystack.rs" 24 8 24 68] _50 <- ([#"../08_haystack.rs" 24 8 24 68] Ghost.new (Seq.(++) (Ghost.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _45);
+    [#"../08_haystack.rs" 24 8 24 68] _50 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB25
   }
   BB25 {
     [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] _50);
-    [#"../08_haystack.rs" 24 8 24 68] _50 <- any Ghost.ghost_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] j <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 664 0 664 51] __creusot_proc_iter_elem1);
+    [#"../08_haystack.rs" 24 8 24 68] _50 <- any Snapshot.snap_ty (Seq.seq usize);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 ([#"../08_haystack.rs" 26 15 26 21] needle) ([#"../08_haystack.rs" 26 22 26 23] j));
     goto BB26
   }

From 0b2d650abf704e7b20ca9d542855a6448d0a9617 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 09:03:32 +0100
Subject: [PATCH 25/66] Update Coma AST and printer with latest syntax changes

---
 why3/src/coma.rs | 130 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 102 insertions(+), 28 deletions(-)

diff --git a/why3/src/coma.rs b/why3/src/coma.rs
index 607c21f995..631bf9408c 100644
--- a/why3/src/coma.rs
+++ b/why3/src/coma.rs
@@ -1,6 +1,8 @@
+use crate::{declaration::Use, ty::Type, Ident, Print, QName};
 use pretty::docs;
 
-use crate::{declaration::Use, ty::Type, Ident, Print};
+#[cfg(feature = "serialize")]
+use serde::{Deserialize, Serialize};
 
 type Term = crate::Exp;
 
@@ -18,9 +20,10 @@ type Term = crate::Exp;
 /// 3. CPS structure
 
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub enum Expr {
     /// Variables eg: `x`
-    Symbol(Ident),
+    Symbol(QName),
     /// Generic application for type lambdas, terms, references and continuations
     /// e <ty>... t... | e...
     App(Box<Expr>, Box<Arg>),
@@ -39,6 +42,8 @@ pub enum Expr {
     Let(Box<Expr>, Vec<Var>),
     /// Asserts that the term holds before evaluating the expression
     Assert(Box<Term>, Box<Expr>),
+    /// Syntactic sugar for assuming that a term holds before evaluating the inner expression
+    Assume(Box<Term>, Box<Expr>),
     /// The core operator of coma is the "black box" or *abstraction barrier* operator.
     /// This operator distinguishes the responsibility between the caller and callee for
     /// verification. Everything under an abstraction is opaque to the outside world, whereas from the inside,
@@ -55,9 +60,11 @@ pub enum Expr {
 }
 
 #[derive(Clone, Debug)]
-pub struct Var(Ident, Type, Term, IsRef);
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+pub struct Var(pub Ident, pub Type, pub Term, pub IsRef);
 
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub enum IsRef {
     Ref,
     NotRef,
@@ -65,6 +72,7 @@ pub enum IsRef {
 
 /// Parameter declarations
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub enum Param {
     // Can only be type parameters
     Ty(Type),
@@ -75,6 +83,7 @@ pub enum Param {
 }
 
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub enum Arg {
     /// Type application
     Ty(Type),
@@ -87,6 +96,7 @@ pub enum Arg {
 }
 
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub struct Defn {
     pub name: Ident,
     /// Only relevant if using references
@@ -96,6 +106,7 @@ pub struct Defn {
 }
 
 #[derive(Clone, Debug)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
 pub enum Decl {
     /// Coma definitions
     Defn(Vec<Defn>),
@@ -107,6 +118,22 @@ pub enum Decl {
 #[derive(Clone, Debug)]
 pub struct Module(pub Vec<Decl>);
 
+impl Expr {
+    pub fn app(self, args: Vec<Arg>) -> Self {
+        args.into_iter().fold(self, |acc, a| Expr::App(Box::new(acc), Box::new(a)))
+    }
+
+    pub fn assign(mut self, lhs: Ident, rhs: Term) -> Self {
+        match &mut self {
+            Expr::Assign(_, asgns) => {
+                asgns.push((lhs, rhs));
+                self
+            }
+            _ => Expr::Assign(Box::new(self), vec![(lhs, rhs)]),
+        }
+    }
+}
+
 impl Print for Param {
     fn pretty<'b, 'a: 'b, A: pretty::DocAllocator<'a>>(
         &'a self,
@@ -117,7 +144,7 @@ impl Print for Param {
     {
         match self {
             Param::Ty(ty) => ty.pretty(alloc),
-            Param::Term(id, ty) => docs![alloc, id.pretty(alloc), ":", ty.pretty(alloc)],
+            Param::Term(id, ty) => docs![alloc, id.pretty(alloc), ":", ty.pretty(alloc)].parens(),
             Param::Reference(id, ty) => docs![alloc, "&", id.pretty(alloc), ":", ty.pretty(alloc)],
             Param::Cont(id, writes, params) => docs![
                 alloc,
@@ -163,6 +190,7 @@ impl Print for Arg {
             Arg::Ty(ty) => ty.pretty(alloc).enclose("<", ">"),
             Arg::Term(t) => t.pretty(alloc).braces(),
             Arg::Ref(r) => alloc.text("& ").append(r.pretty(alloc)),
+            Arg::Cont(e @ Expr::Lambda(_, _)) => e.pretty(alloc),
             Arg::Cont(c) => c.pretty(alloc).parens(),
         }
     }
@@ -186,48 +214,68 @@ impl Print for Expr {
 
                 let doc = e.pretty(alloc);
 
-                if needs_paren { doc.parens() } else { doc }.append(arg.pretty(alloc))
+                docs![
+                    alloc,
+                    if needs_paren { doc.parens() } else { doc },
+                    alloc.softline(),
+                    arg.pretty(alloc)
+                ]
             }
             Expr::Lambda(params, body) => {
                 let header = if params.is_empty() {
-                    alloc.text("->")
+                    alloc.text("-> ")
                 } else {
                     docs![
                         alloc,
                         "fun ",
-                        alloc.intersperse(params.iter().map(|p| p.pretty(alloc)), alloc.text(" "))
+                        alloc.intersperse(params.iter().map(|p| p.pretty(alloc)), alloc.text(" ")),
+                        alloc.text(" -> ")
                     ]
                 };
 
-                header.append(body.pretty(alloc)).parens()
+                header.append(body.pretty(alloc).nest(2)).parens()
             }
             Expr::Defn(cont, rec, handlers) => {
                 let handlers =
                     handlers.iter().map(|d| print_defn(d, if *rec { "=" } else { "->" }, alloc));
-                cont.pretty(alloc).append(alloc.intersperse(handlers, alloc.text(" | ")).brackets())
+                cont.pretty(alloc).append(alloc.softline()).append(bracket_list(
+                    alloc,
+                    handlers,
+                    alloc.line().append(alloc.text("| ")),
+                ))
             }
             Expr::Let(cont, lets) => docs![
                 alloc,
                 cont.pretty(alloc),
-                alloc.intersperse(lets.iter().map(|l| l.pretty(alloc)), alloc.text(" | "))
+                bracket_list(
+                    alloc,
+                    lets.iter().map(|l| l.pretty(alloc)),
+                    alloc.line().append(alloc.text("| "))
+                )
             ],
             Expr::Assign(cont, asgns) => docs![
                 alloc,
-                alloc
-                    .intersperse(
-                        asgns.iter().map(|(id, t)| docs![
-                            alloc,
-                            "&",
-                            id.pretty(alloc),
-                            "<-",
-                            t.pretty(alloc).braces()
-                        ]),
-                        alloc.text(" | ")
-                    )
-                    .brackets(),
+                bracket_list(
+                    alloc,
+                    asgns.iter().map(|(id, t)| docs![
+                        alloc,
+                        "&",
+                        id.pretty(alloc),
+                        alloc.space(),
+                        "<-",
+                        alloc.space(),
+                        t.pretty(alloc)
+                    ]),
+                    alloc.line().append(alloc.text("| "))
+                ),
                 cont.pretty(alloc)
             ],
-            Expr::Assert(t, e) => docs![alloc, t.pretty(alloc).braces(), e.pretty(alloc)],
+            Expr::Assert(t, e) => {
+                docs![alloc, t.pretty(alloc).braces(), alloc.space(), e.pretty(alloc)]
+            }
+            Expr::Assume(t, e) => {
+                docs![alloc, t.pretty(alloc).enclose("-{", "}-"), alloc.space(), e.pretty(alloc)]
+            }
             Expr::BlackBox(e) => docs![alloc, "!", alloc.space(), e.pretty(alloc)].parens(),
             Expr::WhiteBox(e) => docs![alloc, "?", alloc.space(), e.pretty(alloc)].parens(),
             Expr::Any => alloc.text("any"),
@@ -237,14 +285,39 @@ impl Print for Expr {
 
 fn brackets<'a, A: pretty::DocAllocator<'a>>(
     doc: pretty::DocBuilder<'a, A>,
-) -> pretty::DocBuilder<'a, A> {
+) -> pretty::DocBuilder<'a, A>
+where
+    A::Doc: Clone,
+{
     if !matches!(&*doc.1, pretty::Doc::Nil) {
-        doc.brackets()
+        doc.brackets().nest(2)
     } else {
         doc
     }
 }
 
+fn bracket_list<'a, S, A: pretty::DocAllocator<'a>>(
+    alloc: &'a A,
+    docs: impl Iterator<Item = pretty::DocBuilder<'a, A>>,
+    sep: S,
+) -> pretty::DocBuilder<'a, A>
+where
+    S: pretty::Pretty<'a, A> + Clone,
+{
+    let body = alloc.intersperse(docs, sep).group();
+    if matches!(&*body.1, pretty::Doc::Nil) {
+        return body;
+    }
+
+    docs![
+        alloc,
+        alloc.line_(),
+        alloc.space().append(body).append(alloc.space()).brackets().nest(0),
+        alloc.line_()
+    ]
+    .group()
+}
+
 fn print_defn<'a, A: pretty::DocAllocator<'a>>(
     defn: &'a Defn,
     arrow_kind: &'a str,
@@ -257,11 +330,12 @@ where
         alloc,
         defn.name.pretty(alloc),
         alloc.space(),
-        brackets(alloc.intersperse(defn.writes.iter().map(|a| a.pretty(alloc)), " ")),
-        alloc.space(),
+        bracket_list(alloc, defn.writes.iter().map(|a| a.pretty(alloc)), " "),
+        if defn.writes.is_empty() { alloc.nil() } else { alloc.space() },
         alloc.intersperse(defn.params.iter().map(|a| a.pretty(alloc)), " "),
         arrow_kind,
-        defn.body.pretty(alloc),
+        alloc.space(),
+        defn.body.pretty(alloc).nest(2),
     ]
 }
 

From 808186aee73e51da6b8a6ae78852d424f917d061 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 09:13:12 +0100
Subject: [PATCH 26/66] refactor fmir

---
 creusot/src/backend/clone_map/elaborator.rs   | 14 ++--
 creusot/src/backend/constant.rs               |  8 +--
 creusot/src/backend/optimization.rs           | 54 ++++++++-------
 creusot/src/translation/constant.rs           | 51 ++++----------
 creusot/src/translation/fmir.rs               | 68 ++++++++++++++-----
 creusot/src/translation/function.rs           | 26 +++----
 creusot/src/translation/function/statement.rs | 20 +++---
 .../src/translation/function/terminator.rs    | 22 ++++--
 8 files changed, 139 insertions(+), 124 deletions(-)

diff --git a/creusot/src/backend/clone_map/elaborator.rs b/creusot/src/backend/clone_map/elaborator.rs
index 3fbf4775e3..1f705477a9 100644
--- a/creusot/src/backend/clone_map/elaborator.rs
+++ b/creusot/src/backend/clone_map/elaborator.rs
@@ -18,7 +18,7 @@ use crate::{
         dependency::HackedId,
         logic::{lower_logical_defn, lower_pure_defn, sigs, spec_axiom},
         signature::sig_to_why3,
-        term::lower_pure,
+        term::{lower_impure, lower_pure},
         ty_inv::InvariantElaborator,
         TransId, Why3Generator,
     },
@@ -63,21 +63,21 @@ impl<'tcx> SymbolElaborator<'tcx> {
         let param_env = old_names.param_env(ctx);
 
         match item {
-            DepNode::Type(ty) => return self.elaborate_ty(ctx, names, ty),
+            DepNode::Type(ty) => self.elaborate_ty(ctx, names, ty),
             DepNode::Builtin(b) => {
-                return vec![Decl::UseDecl(Use { name: b.qname(), as_: None, export: false })]
+                vec![Decl::UseDecl(Use { name: b.qname(), as_: None, export: false })]
             }
             DepNode::TyInv(ty, kind) => {
                 let term =
                     InvariantElaborator::new(param_env, true).elaborate_inv(ctx, ty, Some(kind));
                 let exp = lower_pure(ctx, names, &term);
                 let axiom = Axiom { name: names.ty_inv(ty).name, rewrite: false, axiom: exp };
-                return vec![Decl::Axiom(axiom)];
+                vec![Decl::Axiom(axiom)]
             }
             DepNode::Item(_, _) | DepNode::Hacked(_, _, _) => {
-                return self.elaborate_item(ctx, names, param_env, level_of_item, item)
+                self.elaborate_item(ctx, names, param_env, level_of_item, item)
             }
-        };
+        }
     }
 
     fn elaborate_ty<N: Namer<'tcx>>(
@@ -184,7 +184,7 @@ impl<'tcx> SymbolElaborator<'tcx> {
 
             let span = ctx.def_span(def_id);
             let res = crate::constant::from_ty_const(&mut ctx.ctx, constant, param_env, span);
-            let res = res.to_why(ctx, names, &LocalDecls::new());
+            let res = lower_impure(ctx, names, &res);
 
             vec![Decl::Let(LetDecl {
                 kind: Some(LetKind::Constant),
diff --git a/creusot/src/backend/constant.rs b/creusot/src/backend/constant.rs
index df9c0cb8e8..1ec964b1ef 100644
--- a/creusot/src/backend/constant.rs
+++ b/creusot/src/backend/constant.rs
@@ -1,14 +1,12 @@
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::{self, Const, GenericArgs};
 
-use crate::{
-    ctx::TranslatedItem,
-    translation::{constant::from_ty_const, fmir::LocalDecls},
-};
+use crate::{ctx::TranslatedItem, translation::constant::from_ty_const};
 
 use super::{
     clone_map::{CloneMap, CloneSummary},
     signature::signature_of,
+    term::lower_impure,
     CloneDepth, Why3Generator,
 };
 
@@ -29,7 +27,7 @@ impl<'tcx> Why3Generator<'tcx> {
         let span = self.def_span(def_id);
         let res = from_ty_const(&mut self.ctx, constant, param_env, span);
         let mut names = CloneMap::new(self.tcx, def_id.into());
-        let _ = res.to_why(self, &mut names, &LocalDecls::new());
+        let _ = lower_impure(self, &mut names, &res);
         let _ = signature_of(self, &mut names, def_id);
         let (_, summary) = names.to_clones(self, CloneDepth::Shallow);
 
diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index 933a34c146..8daecad1d1 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -68,7 +68,7 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
 
     fn visit_terminator(&mut self, t: &Terminator<'tcx>) {
         match t {
-            Terminator::Switch(e, _) => self.visit_expr(e),
+            Terminator::Switch(e, _) => self.visit_operand(e),
             Terminator::Return => {
                 self.read(Symbol::intern("_0"), true);
                 self.read(Symbol::intern("_0"), true);
@@ -96,7 +96,7 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
             Statement::AssertTyInv(p) => self.read_place(p),
             Statement::Call(dest, _, _, args, _) => {
                 self.write_place(dest);
-                args.iter().for_each(|a| self.visit_expr(a));
+                args.iter().for_each(|a| self.visit_operand(a));
             }
         }
     }
@@ -118,6 +118,7 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
         match op {
             Operand::Move(p) => self.read_place(p),
             Operand::Copy(p) => self.read_place(p),
+            Operand::Constant(t) => self.visit_term(t),
         }
     }
 
@@ -125,19 +126,18 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
         match &e.kind {
             ExprKind::Operand(op) => self.visit_operand(op),
             ExprKind::BinOp(_, l, r) => {
-                self.visit_expr(l);
-                self.visit_expr(r)
+                self.visit_operand(l);
+                self.visit_operand(r)
             }
-            ExprKind::UnaryOp(_, e) => self.visit_expr(e),
-            ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| self.visit_expr(e)),
-            ExprKind::Constant(t) => self.visit_term(t),
-            ExprKind::Cast(e, _, _) => self.visit_expr(e),
-            ExprKind::Tuple(es) => es.iter().for_each(|e| self.visit_expr(e)),
-            ExprKind::Len(e) => self.visit_expr(e),
-            ExprKind::Array(es) => es.iter().for_each(|e| self.visit_expr(e)),
+            ExprKind::UnaryOp(_, e) => self.visit_operand(e),
+            ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| self.visit_operand(e)),
+            ExprKind::Cast(e, _, _) => self.visit_operand(e),
+            ExprKind::Tuple(es) => es.iter().for_each(|e| self.visit_operand(e)),
+            ExprKind::Len(e) => self.visit_operand(e),
+            ExprKind::Array(es) => es.iter().for_each(|e| self.visit_operand(e)),
             ExprKind::Repeat(l, r) => {
-                self.visit_expr(l);
-                self.visit_expr(r)
+                self.visit_operand(l);
+                self.visit_operand(r)
             }
         }
     }
@@ -249,7 +249,7 @@ impl<'tcx> SimplePropagator<'tcx> {
 
         match &mut b.terminator {
             Terminator::Goto(_) => {}
-            Terminator::Switch(e, _) => self.visit_expr(e),
+            Terminator::Switch(e, _) => self.visit_operand(e),
             Terminator::Return => {}
             Terminator::Abort(_) => {}
         }
@@ -264,7 +264,7 @@ impl<'tcx> SimplePropagator<'tcx> {
               }
             }
             Statement::Assertion { cond, msg: _ } => self.visit_term(cond),
-            Statement::Call(_, _, _, args, _) => args.iter_mut().for_each(|a| self.visit_expr(a)),
+            Statement::Call(_, _, _, args, _) => args.iter_mut().for_each(|a| self.visit_operand(a)),
             Statement::AssumeBorrowInv(_) => {},
             Statement::AssertTyInv( _) => {},
         }
@@ -280,6 +280,8 @@ impl<'tcx> SimplePropagator<'tcx> {
         }
     }
 
+    fn visit_operand(&mut self, op: &mut Operand<'tcx>) {}
+
     fn visit_expr(&mut self, e: &mut Expr<'tcx>) {
         match &mut e.kind {
             ExprKind::Operand(Operand::Move(p) | Operand::Copy(p)) => {
@@ -287,20 +289,20 @@ impl<'tcx> SimplePropagator<'tcx> {
                 *e = v;
               }
             },
+            ExprKind::Operand(Operand::Constant(_)) => {}
             ExprKind::BinOp(_, l, r) => {
-                self.visit_expr(l);
-                self.visit_expr(r)
+                self.visit_operand(l);
+                self.visit_operand(r)
             }
-            ExprKind::UnaryOp(_, e) => self.visit_expr(e),
-            ExprKind::Constructor(_, _, es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
-            ExprKind::Constant(t) => self.visit_term(t),
-            ExprKind::Cast(e, _, _) => self.visit_expr(e),
-            ExprKind::Tuple(es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
-            ExprKind::Len(e) => self.visit_expr(e),
-            ExprKind::Array(es) => es.iter_mut().for_each(|e| self.visit_expr(e)),
+            ExprKind::UnaryOp(_, e) => self.visit_operand(e),
+            ExprKind::Constructor(_, _, es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
+            ExprKind::Cast(e, _, _) => self.visit_operand(e),
+            ExprKind::Tuple(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
+            ExprKind::Len(e) => self.visit_operand(e),
+            ExprKind::Array(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
             ExprKind::Repeat(l, r) => {
-                self.visit_expr(l);
-                self.visit_expr(r)
+                self.visit_operand(l);
+                self.visit_operand(r)
             }
         }
     }
diff --git a/creusot/src/translation/constant.rs b/creusot/src/translation/constant.rs
index 7552cd4966..9f0c9860c3 100644
--- a/creusot/src/translation/constant.rs
+++ b/creusot/src/translation/constant.rs
@@ -9,16 +9,13 @@ use rustc_middle::{
 use rustc_span::{Span, Symbol};
 use rustc_target::abi::Size;
 
-use super::{
-    fmir::{Expr, ExprKind},
-    pearlite::{Term, TermKind},
-};
+use super::pearlite::{Term, TermKind};
 
 pub(crate) fn from_mir_constant<'tcx>(
     env: ParamEnv<'tcx>,
     ctx: &mut TranslationCtx<'tcx>,
     c: &rustc_middle::mir::ConstOperand<'tcx>,
-) -> Expr<'tcx> {
+) -> Term<'tcx> {
     from_mir_constant_kind(ctx, c.const_, env, c.span)
 }
 
@@ -27,13 +24,13 @@ pub(crate) fn from_mir_constant_kind<'tcx>(
     ck: mir::Const<'tcx>,
     env: ParamEnv<'tcx>,
     span: Span,
-) -> Expr<'tcx> {
+) -> Term<'tcx> {
     if let mir::Const::Ty(c) = ck {
         return from_ty_const(ctx, c, env, span);
     }
 
     if ck.ty().is_unit() {
-        return Expr { kind: ExprKind::Tuple(Vec::new()), ty: ck.ty(), span };
+        return Term { kind: TermKind::Tuple { fields: Vec::new() }, ty: ck.ty(), span };
     }
     //
     // let ck = ck.normalize(ctx.tcx, env);
@@ -48,36 +45,20 @@ pub(crate) fn from_mir_constant_kind<'tcx>(
                 .unwrap();
             let string = std::str::from_utf8(bytes).unwrap();
 
-            return Expr {
-                ty: ck.ty(),
-                span,
-                kind: ExprKind::Constant(Term {
-                    kind: TermKind::Lit(Literal::String(string.into())),
-                    ty: ck.ty(),
-                    span,
-                }),
-            };
+            return Term { kind: TermKind::Lit(Literal::String(string.into())), ty: ck.ty(), span };
         }
     }
 
     if let mir::Const::Unevaluated(UnevaluatedConst { promoted: Some(p), .. }, _) = ck {
-        return Expr {
-            kind: ExprKind::Constant(Term {
-                kind: TermKind::Var(Symbol::intern(&format!("promoted{:?}", p.as_usize()))),
-                ty: ck.ty(),
-                span,
-            }),
+        return Term {
+            kind: TermKind::Var(Symbol::intern(&format!("promoted{:?}", p.as_usize()))),
             ty: ck.ty(),
             span,
         };
     }
 
-    return Expr {
-        kind: ExprKind::Constant(Term {
-            kind: TermKind::Lit(try_to_bits(ctx, env, ck.ty(), span, ck)),
-            ty: ck.ty(),
-            span,
-        }),
+    return Term {
+        kind: TermKind::Lit(try_to_bits(ctx, env, ck.ty(), span, ck)),
         ty: ck.ty(),
         span,
     };
@@ -88,27 +69,19 @@ pub(crate) fn from_ty_const<'tcx>(
     c: Const<'tcx>,
     env: ParamEnv<'tcx>,
     span: Span,
-) -> Expr<'tcx> {
+) -> Term<'tcx> {
     // Check if a constant is builtin and thus should not be evaluated further
     // Builtin constants are given a body which panics
     if let ConstKind::Unevaluated(u) = c.kind() &&
        let Some(_) = get_builtin(ctx.tcx, u.def) {
-            return Expr { kind: ExprKind::Constant(Term { kind: TermKind::Lit(Literal::Function(u.def, u.args)), ty: c.ty(), span}), ty: c.ty(), span }
+            return Term { kind: TermKind::Lit(Literal::Function(u.def, u.args)), ty: c.ty(), span}
     };
 
     if let ConstKind::Param(_) = c.kind() {
         ctx.crash_and_error(span, "const generic parameters are not yet supported");
     }
 
-    return Expr {
-        kind: ExprKind::Constant(Term {
-            kind: TermKind::Lit(try_to_bits(ctx, env, c.ty(), span, c)),
-            ty: c.ty(),
-            span,
-        }),
-        ty: c.ty(),
-        span,
-    };
+    return Term { kind: TermKind::Lit(try_to_bits(ctx, env, c.ty(), span, c)), ty: c.ty(), span };
 }
 
 fn try_to_bits<'tcx, C: ToBits<'tcx>>(
diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index 840986f4f0..7bb1471d20 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -44,7 +44,7 @@ pub enum Statement<'tcx> {
     AssumeBorrowInv(Place<'tcx>),
     // Todo: fold into `Assertion`
     AssertTyInv(Place<'tcx>),
-    Call(Place<'tcx>, DefId, GenericArgsRef<'tcx>, Vec<Expr<'tcx>>, Span),
+    Call(Place<'tcx>, DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>, Span),
 }
 
 // Re-organize this completely
@@ -73,21 +73,31 @@ pub struct Expr<'tcx> {
 pub enum Operand<'tcx> {
     Move(Place<'tcx>),
     Copy(Place<'tcx>),
+    Constant(Term<'tcx>),
+}
+
+impl<'tcx> Operand<'tcx> {
+    pub fn ty(&self, tcx: TyCtxt<'tcx>, locals: &LocalDecls<'tcx>) -> Ty<'tcx> {
+        match self {
+            Operand::Move(pl) => pl.ty(tcx, locals),
+            Operand::Copy(pl) => pl.ty(tcx, locals),
+            Operand::Constant(t) => t.ty,
+        }
+    }
 }
 
 #[derive(Clone, Debug)]
 pub enum ExprKind<'tcx> {
     Operand(Operand<'tcx>),
     // Revisit whether this is a good idea to allow general expression trees.
-    BinOp(BinOp, Box<Expr<'tcx>>, Box<Expr<'tcx>>),
-    UnaryOp(UnOp, Box<Expr<'tcx>>),
-    Constructor(DefId, GenericArgsRef<'tcx>, Vec<Expr<'tcx>>),
-    Constant(Term<'tcx>),
-    Cast(Box<Expr<'tcx>>, Ty<'tcx>, Ty<'tcx>),
-    Tuple(Vec<Expr<'tcx>>),
-    Len(Box<Expr<'tcx>>),
-    Array(Vec<Expr<'tcx>>),
-    Repeat(Box<Expr<'tcx>>, Box<Expr<'tcx>>),
+    BinOp(BinOp, Box<Operand<'tcx>>, Box<Operand<'tcx>>),
+    UnaryOp(UnOp, Box<Operand<'tcx>>),
+    Constructor(DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>),
+    Cast(Box<Operand<'tcx>>, Ty<'tcx>, Ty<'tcx>),
+    Tuple(Vec<Operand<'tcx>>),
+    Len(Box<Operand<'tcx>>),
+    Array(Vec<Operand<'tcx>>),
+    Repeat(Box<Operand<'tcx>>, Box<Operand<'tcx>>),
 }
 
 impl<'tcx> Expr<'tcx> {
@@ -97,7 +107,6 @@ impl<'tcx> Expr<'tcx> {
             ExprKind::BinOp(_, _, _) => false,
             ExprKind::UnaryOp(_, _) => false,
             ExprKind::Constructor(_, _, _) => false,
-            ExprKind::Constant(_) => false,
             ExprKind::Cast(_, _, _) => false,
             ExprKind::Tuple(_) => false,
             ExprKind::Len(_) => false,
@@ -117,13 +126,12 @@ impl<'tcx> Expr<'tcx> {
             ExprKind::BinOp(_, _, _) => true,
             ExprKind::UnaryOp(UnOp::Neg, _) => false,
             ExprKind::UnaryOp(_, _) => true,
-            ExprKind::Constructor(_, _, es) => es.iter().all(|e| e.is_pure()),
-            ExprKind::Constant(_) => true,
+            ExprKind::Constructor(_, _, _) => true,
             ExprKind::Cast(_, _, _) => false,
-            ExprKind::Tuple(es) => es.iter().all(|e| e.is_pure()),
-            ExprKind::Len(e) => e.is_pure(),
-            ExprKind::Array(es) => es.iter().all(|e| e.is_pure()),
-            ExprKind::Repeat(l, r) => l.is_pure() && r.is_pure(),
+            ExprKind::Tuple(_) => true,
+            ExprKind::Len(_) => true,
+            ExprKind::Array(_) => true,
+            ExprKind::Repeat(_, _) => true,
         }
     }
 }
@@ -131,11 +139,35 @@ impl<'tcx> Expr<'tcx> {
 #[derive(Clone)]
 pub enum Terminator<'tcx> {
     Goto(BasicBlock),
-    Switch(Expr<'tcx>, Branches<'tcx>),
+    Switch(self::Operand<'tcx>, Branches<'tcx>),
     Return,
     Abort(Span),
 }
 
+impl<'tcx> Terminator<'tcx> {
+    pub fn targets(&self) -> impl Iterator<Item = BasicBlock> + '_ {
+        use std::iter::*;
+        match self {
+            Terminator::Goto(bb) => Box::new(once(*bb)) as Box<dyn Iterator<Item = BasicBlock>>,
+            Terminator::Switch(_, brs) => match brs {
+                Branches::Int(brs, def) => Box::new(brs.iter().map(|(_, b)| *b).chain(once(*def)))
+                    as Box<dyn Iterator<Item = BasicBlock>>,
+                Branches::Uint(brs, def) => Box::new(brs.iter().map(|(_, b)| *b).chain(once(*def)))
+                    as Box<dyn Iterator<Item = BasicBlock>>,
+                Branches::Constructor(_, _, brs, def) => {
+                    Box::new(brs.iter().map(|(_, b)| *b).chain(once(*def)))
+                        as Box<dyn Iterator<Item = BasicBlock>>
+                }
+                Branches::Bool(f, t) => {
+                    Box::new([*f, *t].into_iter()) as Box<dyn Iterator<Item = BasicBlock>>
+                }
+            },
+            Terminator::Return => Box::new(empty()) as Box<dyn Iterator<Item = BasicBlock>>,
+            Terminator::Abort(_) => Box::new(empty()) as Box<dyn Iterator<Item = BasicBlock>>,
+        }
+    }
+}
+
 #[derive(Clone)]
 pub enum Branches<'tcx> {
     Int(Vec<(i128, BasicBlock)>, BasicBlock),
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index c1d835d8e3..a19d85916f 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -1,5 +1,5 @@
 use super::{
-    fmir::{ExprKind, LocalDecls, LocalIdent, RValue},
+    fmir::{LocalDecls, LocalIdent, RValue},
     pearlite::{normalize, Term},
     specification::inv_subst,
 };
@@ -7,7 +7,7 @@ use crate::{
     analysis::NotFinalPlaces,
     backend::ty::closure_accessors,
     ctx::*,
-    fmir::{self, Expr},
+    fmir::{self},
     gather_spec_closures::{corrected_invariant_names_and_locations, LoopSpecKind, SpecClosures},
     resolve::EagerResolver,
     translation::{
@@ -346,16 +346,16 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
     }
 
     // Useful helper to translate an operand
-    pub(crate) fn translate_operand(&mut self, operand: &Operand<'tcx>) -> Expr<'tcx> {
-        let kind = match operand {
-            Operand::Copy(pl) => ExprKind::Operand(fmir::Operand::Copy(self.translate_place(*pl))),
-            Operand::Move(pl) => ExprKind::Operand(fmir::Operand::Move(self.translate_place(*pl))),
-            Operand::Constant(c) => {
-                return crate::constant::from_mir_constant(self.param_env(), self.ctx, c)
-            }
-        };
-
-        Expr { kind, span: DUMMY_SP, ty: operand.ty(self.body, self.tcx) }
+    pub(crate) fn translate_operand(&mut self, operand: &Operand<'tcx>) -> fmir::Operand<'tcx> {
+        let kind =
+            match operand {
+                Operand::Copy(pl) => fmir::Operand::Copy(self.translate_place(*pl)),
+                Operand::Move(pl) => fmir::Operand::Move(self.translate_place(*pl)),
+                Operand::Constant(c) => fmir::Operand::Constant(
+                    crate::constant::from_mir_constant(self.param_env(), self.ctx, c),
+                ),
+            };
+        kind
     }
 
     fn translate_place(&self, _pl: mir::Place<'tcx>) -> fmir::Place<'tcx> {
@@ -654,7 +654,7 @@ pub(crate) fn closure_contract<'tcx>(
         contracts.postcond_once = Some((post_sig, postcondition));
     }
 
-    return contracts;
+    contracts
 }
 
 fn closure_resolve<'tcx>(
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index f59e977f42..843e97f707 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -17,7 +17,6 @@ use rustc_middle::{
     ty::adjustment::PointerCoercion,
 };
 use rustc_mir_dataflow::ResultsCursor;
-use rustc_span::DUMMY_SP;
 
 impl<'tcx> BodyTranslator<'_, 'tcx> {
     pub(crate) fn translate_statement(
@@ -77,12 +76,12 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
         let span = si.span;
         let rval: ExprKind<'tcx> = match rvalue {
             Rvalue::Use(op) => match op {
-                Move(_pl) | Copy(_pl) => self.translate_operand(op).kind,
+                Move(_pl) | Copy(_pl) => ExprKind::Operand(self.translate_operand(op)),
                 Constant(box c) => {
                     if snapshot_closure_id(self.tcx, c.const_.ty()).is_some() {
                         return;
                     };
-                    crate::constant::from_mir_constant(self.param_env(), self.ctx, c).kind
+                    ExprKind::Operand(self.translate_operand(op))
                 }
             },
             Rvalue::Ref(_, ss, pl) => match ss {
@@ -159,11 +158,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 }
             }
             Rvalue::Len(pl) => {
-                let e = Expr {
-                    kind: ExprKind::Operand(Operand::Copy(self.translate_place(*pl))),
-                    ty: pl.ty(self.body, self.tcx).ty,
-                    span: DUMMY_SP,
-                };
+                let e = Operand::Copy(self.translate_place(*pl));
                 ExprKind::Len(Box::new(e))
             }
             Rvalue::Cast(CastKind::IntToInt | CastKind::PtrToPtr, op, cast_ty) => {
@@ -172,13 +167,18 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             }
             Rvalue::Repeat(op, len) => ExprKind::Repeat(
                 Box::new(self.translate_operand(op)),
-                Box::new(crate::constant::from_ty_const(self.ctx, *len, self.param_env(), si.span)),
+                Box::new(Operand::Constant(crate::constant::from_ty_const(
+                    self.ctx,
+                    *len,
+                    self.param_env(),
+                    si.span,
+                ))),
             ),
 
             Rvalue::Cast(CastKind::PointerCoercion(PointerCoercion::Unsize), op, ty) => {
                 if let Some(t) = ty.builtin_deref(true) && t.ty.is_slice() {
                     // treat &[T; N] to &[T] casts as normal assignments
-                    self.translate_operand(op).kind
+                    ExprKind::Operand(self.translate_operand(op))
                 } else {
                     // TODO: Since we don't do anything with casts into `dyn` objects, just ignore them
                     return;
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index f6b2052e95..dc33ca92b9 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -1,6 +1,7 @@
 use super::BodyTranslator;
 use crate::{
     ctx::TranslationCtx,
+    fmir,
     translation::{
         fmir::*,
         pearlite::{Term, TermKind, UnOp},
@@ -99,18 +100,27 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 if func_args.is_empty() {
                     // TODO: Remove this, push the 0-ary handling down to why3 backend
                     // We use tuple as a dummy argument for 0-ary functions
-                    func_args.push(Expr {
-                        span: DUMMY_SP,
-                        kind: ExprKind::Tuple(vec![]),
+                    func_args.push(fmir::Operand::Constant(Term {
+                        kind: TermKind::Tuple { fields: Vec::new() },
                         ty: self.ctx.types.unit,
-                    })
+                        span,
+                    }))
                 }
                 let (loc, bb) = (destination, target.unwrap());
 
                 if self.is_box_new(fun_def_id) {
                     assert_eq!(func_args.len(), 1);
 
-                    self.emit_assignment(&loc, RValue::Expr(func_args.remove(0)), span);
+                    let arg_ty = func_args[0].ty(self.tcx, &self.vars);
+                    self.emit_assignment(
+                        &loc,
+                        RValue::Expr(Expr {
+                            kind: ExprKind::Operand(func_args.remove(0)),
+                            ty: arg_ty,
+                            span,
+                        }),
+                        span,
+                    );
                 } else {
                     let (fun_def_id, subst) =
                         resolve_function(self.ctx, self.param_env(), fun_def_id, subst, span);
@@ -279,7 +289,7 @@ pub(crate) fn make_switch<'tcx>(
     si: SourceInfo,
     switch_ty: Ty<'tcx>,
     targets: &SwitchTargets,
-    discr: Expr<'tcx>,
+    discr: fmir::Operand<'tcx>,
 ) -> Terminator<'tcx> {
     match switch_ty.kind() {
         TyKind::Adt(def, substs) => {

From 7e7d0b1368a1eee876271539fd81ad8ec6c9e2ab Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 09:56:11 +0100
Subject: [PATCH 27/66] Update tests

---
 creusot/src/backend/logic.rs                  |    3 +-
 creusot/src/backend/optimization.rs           |   43 +-
 creusot/src/backend/program.rs                |   60 +-
 creusot/src/backend/term.rs                   |    3 +-
 .../bug/01_resolve_unsoundness.mlcfg          |   12 +-
 creusot/tests/should_fail/bug/492.mlcfg       |    8 +-
 creusot/tests/should_fail/bug/692.mlcfg       |   18 +-
 creusot/tests/should_fail/bug/695.mlcfg       |   37 +-
 creusot/tests/should_fail/bug/869.mlcfg       |    2 +-
 .../tests/should_fail/bug/specialize.mlcfg    |   12 +-
 creusot/tests/should_fail/bug/subregion.mlcfg |    8 +-
 creusot/tests/should_fail/final_borrows.mlcfg |   14 +-
 .../traits/17_impl_refinement.mlcfg           |    2 +-
 creusot/tests/should_succeed/100doors.mlcfg   |   27 +-
 .../should_succeed/100doors/why3session.xml   |    2 +-
 .../should_succeed/100doors/why3shapes.gz     |  Bin 574 -> 589 bytes
 creusot/tests/should_succeed/all_zero.mlcfg   |    6 +-
 creusot/tests/should_succeed/bdd.mlcfg        |  141 +-
 .../tests/should_succeed/bdd/why3session.xml  |   90 +-
 .../tests/should_succeed/bdd/why3shapes.gz    |  Bin 14283 -> 14367 bytes
 .../tests/should_succeed/binary_search.mlcfg  |   66 +-
 .../binary_search/why3session.xml             |   58 +-
 .../binary_search/why3shapes.gz               |  Bin 2323 -> 2444 bytes
 creusot/tests/should_succeed/bug/168.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/173.mlcfg    |    4 +-
 creusot/tests/should_succeed/bug/235.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/256.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/271.mlcfg    |    6 +-
 creusot/tests/should_succeed/bug/273.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/387.mlcfg    |    8 +-
 creusot/tests/should_succeed/bug/395.mlcfg    |   23 +-
 .../should_succeed/bug/395/why3session.xml    |    2 +-
 .../should_succeed/bug/395/why3shapes.gz      |  Bin 248 -> 273 bytes
 creusot/tests/should_succeed/bug/463.mlcfg    |    7 +-
 .../should_succeed/bug/463/why3session.xml    |    2 +-
 .../should_succeed/bug/463/why3shapes.gz      |  Bin 237 -> 235 bytes
 creusot/tests/should_succeed/bug/486.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/510.mlcfg    |    4 +-
 creusot/tests/should_succeed/bug/511.mlcfg    |   12 +-
 creusot/tests/should_succeed/bug/528.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/552.mlcfg    |    4 +-
 creusot/tests/should_succeed/bug/570.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/594.mlcfg    |   16 +-
 creusot/tests/should_succeed/bug/682.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/691.mlcfg    |    4 +-
 creusot/tests/should_succeed/bug/693.mlcfg    |    2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   19 +-
 .../should_succeed/bug/874/why3session.xml    |    2 +-
 .../should_succeed/bug/874/why3shapes.gz      |  Bin 515 -> 532 bytes
 creusot/tests/should_succeed/bug/949.mlcfg    |   10 +-
 .../tests/should_succeed/bug/eq_panic.mlcfg   |    2 +-
 .../should_succeed/bug/final_borrows.mlcfg    |   28 +-
 .../bug/final_borrows/why3session.xml         |    2 +-
 .../bug/final_borrows/why3shapes.gz           |  Bin 2801 -> 2818 bytes
 .../tests/should_succeed/bug/two_phase.mlcfg  |    2 +-
 creusot/tests/should_succeed/cell/01.mlcfg    |   13 +-
 .../should_succeed/cell/01/why3session.xml    |    2 +-
 .../should_succeed/cell/01/why3shapes.gz      |  Bin 187 -> 211 bytes
 creusot/tests/should_succeed/cell/02.mlcfg    |   33 +-
 .../tests/should_succeed/checked_ops.mlcfg    | 1154 ++++++++++++-----
 .../checked_ops/why3session.xml               |   48 +-
 .../should_succeed/checked_ops/why3shapes.gz  |  Bin 4104 -> 4210 bytes
 creusot/tests/should_succeed/clones/03.mlcfg  |    2 +-
 .../should_succeed/closures/01_basic.mlcfg    |   44 +-
 .../should_succeed/closures/02_nested.mlcfg   |   16 +-
 .../closures/03_generic_bound.mlcfg           |   10 +-
 .../closures/04_generic_closure.mlcfg         |   14 +-
 .../should_succeed/closures/05_map.mlcfg      |    9 +-
 .../should_succeed/closures/06_fn_specs.mlcfg |   48 +-
 .../closures/06_fn_specs/why3session.xml      |    2 +-
 .../closures/06_fn_specs/why3shapes.gz        |  Bin 749 -> 752 bytes
 .../closures/07_mutable_capture.mlcfg         |   14 +-
 .../closures/07_mutable_capture/why3shapes.gz |  Bin 429 -> 429 bytes
 .../closures/08_multiple_calls.mlcfg          |    6 +-
 .../should_succeed/constrained_types.mlcfg    |    2 +-
 creusot/tests/should_succeed/drop_pair.mlcfg  |    2 +-
 creusot/tests/should_succeed/duration.mlcfg   |  126 +-
 .../should_succeed/filter_positive.mlcfg      |   52 +-
 .../filter_positive/why3session.xml           |    2 +-
 .../filter_positive/why3shapes.gz             |  Bin 879 -> 886 bytes
 .../should_succeed/ghost_ptr_token.mlcfg      |   36 +-
 creusot/tests/should_succeed/hashmap.mlcfg    |  151 ++-
 .../should_succeed/hashmap/why3session.xml    |  246 ++--
 .../should_succeed/hashmap/why3shapes.gz      |  Bin 10107 -> 10206 bytes
 .../should_succeed/heapsort_generic.mlcfg     |   70 +-
 .../heapsort_generic/why3session.xml          |  318 ++---
 .../heapsort_generic/why3shapes.gz            |  Bin 8766 -> 9128 bytes
 creusot/tests/should_succeed/hillel.mlcfg     |   91 +-
 .../should_succeed/hillel/why3session.xml     |   52 +-
 .../tests/should_succeed/hillel/why3shapes.gz |  Bin 7279 -> 7317 bytes
 creusot/tests/should_succeed/immut.mlcfg      |    2 +-
 .../tests/should_succeed/index_range.mlcfg    |  731 +++++++----
 .../index_range/why3session.xml               |  196 +--
 .../should_succeed/index_range/why3shapes.gz  |  Bin 4318 -> 4417 bytes
 .../inplace_list_reversal.mlcfg               |   28 +-
 .../inplace_list_reversal/why3session.xml     |    2 +-
 .../inplace_list_reversal/why3shapes.gz       |  Bin 417 -> 420 bytes
 creusot/tests/should_succeed/instant.mlcfg    |   66 +-
 .../tests/should_succeed/ite_normalize.mlcfg  |  148 +--
 .../should_succeed/iterators/01_range.mlcfg   |   21 +-
 .../iterators/01_range/why3session.xml        |    4 +-
 .../iterators/01_range/why3shapes.gz          |  Bin 935 -> 962 bytes
 .../iterators/02_iter_mut.mlcfg               |   13 +-
 .../iterators/02_iter_mut/why3shapes.gz       |  Bin 3582 -> 3587 bytes
 .../iterators/03_std_iterators.mlcfg          |  135 +-
 .../03_std_iterators/why3session.xml          |   86 +-
 .../iterators/03_std_iterators/why3shapes.gz  |  Bin 6551 -> 6586 bytes
 .../should_succeed/iterators/04_skip.mlcfg    |   14 +-
 .../iterators/04_skip/why3session.xml         |    2 +-
 .../iterators/04_skip/why3shapes.gz           |  Bin 1069 -> 1083 bytes
 .../should_succeed/iterators/05_map.mlcfg     |   15 +-
 .../iterators/05_map/why3session.xml          |   12 +-
 .../iterators/05_map/why3shapes.gz            |  Bin 6125 -> 6154 bytes
 .../iterators/06_map_precond.mlcfg            |   52 +-
 .../iterators/06_map_precond/why3session.xml  |   16 +-
 .../iterators/06_map_precond/why3shapes.gz    |  Bin 9087 -> 9109 bytes
 .../should_succeed/iterators/07_fuse.mlcfg    |    9 +-
 .../iterators/07_fuse/why3session.xml         |    2 +-
 .../iterators/07_fuse/why3shapes.gz           |  Bin 1433 -> 1437 bytes
 .../iterators/08_collect_extend.mlcfg         |   38 +-
 .../should_succeed/iterators/11_repeat.mlcfg  |    2 +-
 .../should_succeed/iterators/12_zip.mlcfg     |   17 +-
 .../iterators/12_zip/why3session.xml          |    4 +-
 .../iterators/12_zip/why3shapes.gz            |  Bin 2176 -> 2177 bytes
 .../iterators/15_enumerate.mlcfg              |   15 +-
 .../iterators/15_enumerate/why3session.xml    |    6 +-
 .../iterators/15_enumerate/why3shapes.gz      |  Bin 1860 -> 1874 bytes
 .../should_succeed/iterators/16_take.mlcfg    |    6 +-
 .../iterators/16_take/why3session.xml         |    2 +-
 .../iterators/16_take/why3shapes.gz           |  Bin 939 -> 965 bytes
 creusot/tests/should_succeed/knapsack.mlcfg   |  105 +-
 .../should_succeed/knapsack/why3session.xml   |  292 ++---
 .../should_succeed/knapsack/why3shapes.gz     |  Bin 5103 -> 5324 bytes
 .../tests/should_succeed/knapsack_full.mlcfg  |   99 +-
 .../knapsack_full/why3session.xml             |  263 ++--
 .../knapsack_full/why3shapes.gz               |  Bin 8611 -> 8521 bytes
 .../should_succeed/lang/branch_borrow_2.mlcfg |   54 +-
 creusot/tests/should_succeed/lang/const.mlcfg |    2 +-
 .../tests/should_succeed/lang/float_ops.mlcfg |   12 +-
 .../tests/should_succeed/lang/literals.mlcfg  |   13 +-
 .../tests/should_succeed/lang/modules.mlcfg   |    4 +-
 .../tests/should_succeed/lang/move_path.mlcfg |    8 +-
 .../should_succeed/lang/multiple_scopes.mlcfg |    8 +-
 .../lang/promoted_constants.mlcfg             |   22 +-
 .../tests/should_succeed/lang/unary_op.mlcfg  |    2 +-
 .../tests/should_succeed/lang/while_let.mlcfg |    7 +-
 .../tests/should_succeed/list_index_mut.mlcfg |   25 +-
 .../list_index_mut/why3session.xml            |    4 +-
 .../list_index_mut/why3shapes.gz              |  Bin 727 -> 748 bytes
 .../should_succeed/list_reversal_lasso.mlcfg  |   74 +-
 .../list_reversal_lasso/why3session.xml       |  172 +--
 .../list_reversal_lasso/why3shapes.gz         |  Bin 12905 -> 13005 bytes
 creusot/tests/should_succeed/loop.mlcfg       |    6 +-
 .../tests/should_succeed/mapping_test.mlcfg   |    4 +-
 creusot/tests/should_succeed/match_int.mlcfg  |   16 +-
 .../should_succeed/match_int/why3session.xml  |    2 +-
 .../should_succeed/match_int/why3shapes.gz    |  Bin 182 -> 241 bytes
 creusot/tests/should_succeed/mc91.mlcfg       |   11 +-
 .../tests/should_succeed/mc91/why3session.xml |    2 +-
 .../tests/should_succeed/mc91/why3shapes.gz   |  Bin 212 -> 248 bytes
 creusot/tests/should_succeed/mutex.mlcfg      |   40 +-
 .../should_succeed/mutex/why3session.xml      |    4 +-
 .../tests/should_succeed/mutex/why3shapes.gz  |  Bin 571 -> 593 bytes
 .../should_succeed/one_side_update.mlcfg      |    9 +-
 creusot/tests/should_succeed/option.mlcfg     |  252 ++--
 .../should_succeed/option/why3session.xml     |    2 +-
 .../tests/should_succeed/option/why3shapes.gz |  Bin 424 -> 365 bytes
 creusot/tests/should_succeed/ord_trait.mlcfg  |    6 +-
 .../should_succeed/projection_toggle.mlcfg    |   14 +-
 .../projection_toggle/why3shapes.gz           |  Bin 649 -> 661 bytes
 .../tests/should_succeed/projections.mlcfg    |   12 +-
 creusot/tests/should_succeed/prophecy.mlcfg   |    4 +-
 .../tests/should_succeed/red_black_tree.mlcfg |  265 ++--
 .../red_black_tree/why3session.xml            |  246 ++--
 .../red_black_tree/why3shapes.gz              |  Bin 79016 -> 79329 bytes
 creusot/tests/should_succeed/replace.mlcfg    |    4 +-
 .../tests/should_succeed/resolve_uninit.mlcfg |   24 +-
 .../resolve_uninit/why3session.xml            |    2 +-
 .../resolve_uninit/why3shapes.gz              |  Bin 450 -> 466 bytes
 creusot/tests/should_succeed/result/own.mlcfg |  126 +-
 .../tests/should_succeed/result/result.mlcfg  |  278 ++--
 .../should_succeed/rusthorn/inc_max.mlcfg     |   10 +-
 .../rusthorn/inc_max/why3session.xml          |    4 +-
 .../rusthorn/inc_max/why3shapes.gz            |  Bin 517 -> 549 bytes
 .../should_succeed/rusthorn/inc_max_3.mlcfg   |   28 +-
 .../rusthorn/inc_max_3/why3session.xml        |    4 +-
 .../rusthorn/inc_max_3/why3shapes.gz          |  Bin 823 -> 837 bytes
 .../rusthorn/inc_max_many.mlcfg               |   20 +-
 .../rusthorn/inc_max_many/why3session.xml     |    4 +-
 .../rusthorn/inc_max_many/why3shapes.gz       |  Bin 558 -> 605 bytes
 .../rusthorn/inc_max_repeat.mlcfg             |   27 +-
 .../rusthorn/inc_max_repeat/why3session.xml   |    4 +-
 .../rusthorn/inc_max_repeat/why3shapes.gz     |  Bin 751 -> 764 bytes
 .../rusthorn/inc_some_2_list.mlcfg            |   31 +-
 .../rusthorn/inc_some_2_list/why3session.xml  |    2 +-
 .../rusthorn/inc_some_2_list/why3shapes.gz    |  Bin 1008 -> 1026 bytes
 .../rusthorn/inc_some_2_tree.mlcfg            |   38 +-
 .../rusthorn/inc_some_2_tree/why3session.xml  |    4 +-
 .../rusthorn/inc_some_2_tree/why3shapes.gz    |  Bin 1125 -> 1153 bytes
 .../rusthorn/inc_some_list.mlcfg              |   20 +-
 .../rusthorn/inc_some_list/why3session.xml    |    2 +-
 .../rusthorn/inc_some_list/why3shapes.gz      |  Bin 898 -> 913 bytes
 .../rusthorn/inc_some_tree.mlcfg              |   27 +-
 .../rusthorn/inc_some_tree/why3session.xml    |    4 +-
 .../rusthorn/inc_some_tree/why3shapes.gz      |  Bin 985 -> 1011 bytes
 .../selection_sort_generic.mlcfg              |   31 +-
 .../selection_sort_generic/why3session.xml    |   90 +-
 .../selection_sort_generic/why3shapes.gz      |  Bin 4062 -> 4088 bytes
 creusot/tests/should_succeed/slices/01.mlcfg  |   29 +-
 .../should_succeed/slices/01/why3session.xml  |    6 +-
 .../should_succeed/slices/01/why3shapes.gz    |  Bin 643 -> 676 bytes
 .../tests/should_succeed/slices/02_std.mlcfg  |    6 +-
 .../tests/should_succeed/sparse_array.mlcfg   |   98 +-
 .../sparse_array/why3session.xml              |   54 +-
 .../should_succeed/sparse_array/why3shapes.gz |  Bin 4259 -> 4259 bytes
 .../specification/division.mlcfg              |    4 +-
 .../specification/logic_call.mlcfg            |    2 +-
 .../should_succeed/specification/loops.mlcfg  |    2 +-
 .../tests/should_succeed/split_borrow.mlcfg   |   33 +-
 creusot/tests/should_succeed/sum.mlcfg        |    8 +-
 .../tests/should_succeed/sum_of_odds.mlcfg    |   19 +-
 .../sum_of_odds/why3session.xml               |   22 +-
 .../should_succeed/sum_of_odds/why3shapes.gz  |  Bin 1706 -> 1712 bytes
 .../tests/should_succeed/swap_borrows.mlcfg   |   15 +-
 .../swap_borrows/why3session.xml              |    2 +-
 .../should_succeed/swap_borrows/why3shapes.gz |  Bin 340 -> 347 bytes
 creusot/tests/should_succeed/switch.mlcfg     |    4 +-
 .../tests/should_succeed/switch_struct.mlcfg  |    4 +-
 .../should_succeed/syntax/02_operators.mlcfg  |   36 +-
 .../syntax/02_operators/why3session.xml       |    2 +-
 .../syntax/02_operators/why3shapes.gz         |  Bin 670 -> 693 bytes
 .../syntax/07_extern_spec.mlcfg               |    2 +-
 .../syntax/10_mutual_rec_types.mlcfg          |    8 +-
 .../syntax/11_array_types.mlcfg               |   15 +-
 .../syntax/11_array_types/why3session.xml     |    4 +-
 .../syntax/11_array_types/why3shapes.gz       |  Bin 303 -> 310 bytes
 .../should_succeed/syntax/12_ghost_code.mlcfg |   17 +-
 .../syntax/12_ghost_code/why3shapes.gz        |  Bin 346 -> 362 bytes
 .../should_succeed/syntax/13_vec_macro.mlcfg  |    7 +-
 .../syntax/13_vec_macro/why3shapes.gz         |  Bin 376 -> 381 bytes
 .../should_succeed/syntax/14_const_fns.mlcfg  |    2 +-
 .../should_succeed/syntax/derive_macros.mlcfg |   30 +-
 .../tests/should_succeed/take_first_mut.mlcfg |    6 +-
 creusot/tests/should_succeed/traits/01.mlcfg  |    4 +-
 creusot/tests/should_succeed/traits/02.mlcfg  |    2 +-
 creusot/tests/should_succeed/traits/03.mlcfg  |    4 +-
 creusot/tests/should_succeed/traits/04.mlcfg  |    8 +-
 creusot/tests/should_succeed/traits/06.mlcfg  |    2 +-
 creusot/tests/should_succeed/traits/07.mlcfg  |    4 +-
 creusot/tests/should_succeed/traits/09.mlcfg  |    4 +-
 .../traits/12_default_method.mlcfg            |    4 +-
 .../traits/13_assoc_types.mlcfg               |    2 +-
 .../tests/should_succeed/two_modules.mlcfg    |    7 +-
 .../should_succeed/type_constructors.mlcfg    |   10 +
 .../type_invariants/borrows.mlcfg             |   20 +-
 .../type_invariants/non_zero.mlcfg            |   12 +-
 .../type_invariants/non_zero/why3session.xml  |    2 +-
 .../type_invariants/non_zero/why3shapes.gz    |  Bin 371 -> 378 bytes
 .../type_invariants/type_invariants.mlcfg     |    2 +-
 .../tests/should_succeed/unused_in_loop.mlcfg |    4 +-
 creusot/tests/should_succeed/vecdeque.mlcfg   |   48 +-
 .../should_succeed/vecdeque/why3session.xml   |  116 +-
 .../should_succeed/vecdeque/why3shapes.gz     |  Bin 2253 -> 2260 bytes
 creusot/tests/should_succeed/vector/01.mlcfg  |   13 +-
 .../should_succeed/vector/01/why3session.xml  |    2 +-
 .../should_succeed/vector/01/why3shapes.gz    |  Bin 647 -> 648 bytes
 .../should_succeed/vector/02_gnome.mlcfg      |   31 +-
 .../vector/02_gnome/why3session.xml           |   86 +-
 .../vector/02_gnome/why3shapes.gz             |  Bin 2578 -> 2635 bytes
 .../vector/03_knuth_shuffle.mlcfg             |   20 +-
 .../vector/03_knuth_shuffle/why3session.xml   |    2 +-
 .../vector/03_knuth_shuffle/why3shapes.gz     |  Bin 651 -> 651 bytes
 .../vector/04_binary_search.mlcfg             |   52 +-
 .../vector/04_binary_search/why3session.xml   |    2 +-
 .../vector/04_binary_search/why3shapes.gz     |  Bin 460 -> 467 bytes
 .../vector/05_binary_search_generic.mlcfg     |   44 +-
 .../05_binary_search_generic/why3session.xml  |  110 +-
 .../05_binary_search_generic/why3shapes.gz    |  Bin 2488 -> 2603 bytes
 .../vector/06_knights_tour.mlcfg              |  189 ++-
 .../vector/06_knights_tour/why3session.xml    |  133 +-
 .../vector/06_knights_tour/why3shapes.gz      |  Bin 11255 -> 11336 bytes
 .../should_succeed/vector/07_read_write.mlcfg |    8 +-
 .../should_succeed/vector/08_haystack.mlcfg   |   33 +-
 .../vector/08_haystack/why3session.xml        |   60 +-
 .../vector/08_haystack/why3shapes.gz          |  Bin 2877 -> 2920 bytes
 .../should_succeed/vector/09_capacity.mlcfg   |    6 +-
 286 files changed, 5615 insertions(+), 3707 deletions(-)

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index f12938d782..62a5fe78b0 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -326,7 +326,8 @@ fn proof_module(ctx: &mut Why3Generator, def_id: DefId) -> Option<Module> {
         return None;
     }
     let term = ctx.term(def_id).unwrap().clone();
-    let body = lower_impure(ctx, &mut names, &term);
+    let mut body = lower_impure(ctx, &mut names, &term);
+    body = ctx.attach_span(term.span, body);
 
     let mut decls: Vec<_> = Vec::new();
     decls.extend(all_generic_decls_for(ctx.tcx, def_id));
diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index 8daecad1d1..ae41d4efd2 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -45,6 +45,8 @@ pub(crate) struct Usage {
     temp_var: bool,
     // Is this local used in a place where we need a `Term`?
     used_in_pure_ctx: bool,
+    // Is this local being used in a move chain as in: _x = _y
+    is_move_chain: bool,
 }
 
 pub(crate) fn gather_usage(b: &Body) -> HashMap<Symbol, Usage> {
@@ -81,6 +83,9 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
         match b {
             Statement::Assignment(p, r, _) => {
                 self.write_place(p);
+                if let RValue::Expr(Expr { kind: ExprKind::Operand(_), .. }) = r {
+                    self.move_chain(p.local);
+                }
                 self.visit_rvalue(r)
             }
             Statement::Resolve(_, _, p) => {
@@ -124,7 +129,13 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
 
     fn visit_expr(&mut self, e: &Expr<'tcx>) {
         match &e.kind {
-            ExprKind::Operand(op) => self.visit_operand(op),
+            ExprKind::Operand(op) => match op {
+                Operand::Move(p) | Operand::Copy(p) => {
+                    self.read_place(p);
+                    // self.move_chain(p.local);
+                }
+                Operand::Constant(t) => self.visit_term(t),
+            },
             ExprKind::BinOp(_, l, r) => {
                 self.visit_operand(l);
                 self.visit_operand(r)
@@ -158,6 +169,12 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
         })
     }
 
+    fn move_chain(&mut self, local: Symbol) {
+        if let Some(usage) = self.get(local) {
+            usage.is_move_chain = true;
+        }
+    }
+
     fn read(&mut self, local: Symbol, whole: bool) {
         if let Some(usage) = self.get(local) {
             usage.read.inc(if whole { Whole::Whole } else { Whole::Part })
@@ -203,7 +220,7 @@ impl<'a, 'tcx> TermVisitor<'tcx> for LocalUsage<'a, 'tcx> {
 
 struct SimplePropagator<'tcx> {
     usage: HashMap<Symbol, Usage>,
-    prop: HashMap<Symbol, Expr<'tcx>>,
+    prop: HashMap<Symbol, Operand<'tcx>>,
     dead: HashSet<Symbol>,
 }
 
@@ -230,7 +247,8 @@ impl<'tcx> SimplePropagator<'tcx> {
                 Statement::Assignment(l, RValue::Expr(r), _)
                     // we do not propagate calls to avoid moving them after the resolve of their arguments
                     if self.should_propagate(l.local) && !self.usage[&l.local].used_in_pure_ctx => {
-                      self.prop.insert(l.local, r);
+                        let Expr { kind: ExprKind::Operand(op), .. } = r else { panic!() };
+                      self.prop.insert(l.local, op);
                       self.dead.insert(l.local);
                     }
                 Statement::Assignment(ref l, RValue::Expr(ref r), _) if self.should_erase(l.local) && r.is_pure() => {
@@ -280,16 +298,20 @@ impl<'tcx> SimplePropagator<'tcx> {
         }
     }
 
-    fn visit_operand(&mut self, op: &mut Operand<'tcx>) {}
-
-    fn visit_expr(&mut self, e: &mut Expr<'tcx>) {
-        match &mut e.kind {
-            ExprKind::Operand(Operand::Move(p) | Operand::Copy(p)) => {
+    fn visit_operand(&mut self, op: &mut Operand<'tcx>) {
+        match op {
+            Operand::Move(p) | Operand::Copy(p) => {
               if let Some(l) = p.as_symbol() && let Some(v) = self.prop.remove(&l) {
-                *e = v;
+                *op = v;
               }
             },
-            ExprKind::Operand(Operand::Constant(_)) => {}
+            Operand::Constant(_) => {}
+        }
+    }
+
+    fn visit_expr(&mut self, e: &mut Expr<'tcx>) {
+        match &mut e.kind {
+            ExprKind::Operand(op) => self.visit_operand(op),
             ExprKind::BinOp(_, l, r) => {
                 self.visit_operand(l);
                 self.visit_operand(r)
@@ -323,6 +345,7 @@ impl<'tcx> SimplePropagator<'tcx> {
                 u.read == ZeroOneMany::One(Whole::Whole)
                     && u.write == ZeroOneMany::One(Whole::Whole)
                     && u.temp_var
+                    && u.is_move_chain
             })
             .unwrap_or(false)
     }
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index 17589b051c..cbe7bd951f 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -294,6 +294,26 @@ pub fn to_why<'tcx>(
     Decl::CfgDecl(CfgFunction { sig, rec: true, constant: false, entry, blocks, vars })
 }
 
+impl<'tcx> Operand<'tcx> {
+    pub(crate) fn to_why<N: Namer<'tcx>>(
+        self,
+        ctx: &mut Why3Generator<'tcx>,
+        names: &mut N,
+        locals: &LocalDecls<'tcx>,
+    ) -> Exp {
+        match self {
+            Operand::Move(pl) => pl.as_rplace(ctx, names, locals),
+            Operand::Copy(pl) => pl.as_rplace(ctx, names, locals),
+            Operand::Constant(c) => lower_impure(ctx, names, &c),
+        }
+    }
+    fn invalidated_places(&self, places: &mut Vec<fmir::Place<'tcx>>) {
+        if let Operand::Move(pl) = self {
+            places.push(pl.clone())
+        }
+    }
+}
+
 impl<'tcx> Expr<'tcx> {
     pub(crate) fn to_why<N: Namer<'tcx>>(
         self,
@@ -302,44 +322,41 @@ impl<'tcx> Expr<'tcx> {
         locals: &LocalDecls<'tcx>,
     ) -> Exp {
         let e = match self.kind {
-            ExprKind::Operand(Operand::Move(pl)) => {
-                // TODO invalidate original place
-                pl.as_rplace(ctx, names, locals)
-            }
-            ExprKind::Operand(Operand::Copy(pl)) => pl.as_rplace(ctx, names, locals),
-            ExprKind::BinOp(BinOp::BitAnd, l, r) if l.ty.is_bool() => {
+            ExprKind::Operand(op) => op.to_why(ctx, names, locals),
+            ExprKind::BinOp(BinOp::BitAnd, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 l.to_why(ctx, names, locals).lazy_and(r.to_why(ctx, names, locals))
             }
-            ExprKind::BinOp(BinOp::Eq, l, r) if l.ty.is_bool() => {
+            ExprKind::BinOp(BinOp::Eq, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
                 Exp::impure_qvar(QName::from_string("Bool.eqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
-            ExprKind::BinOp(BinOp::Ne, l, r) if l.ty.is_bool() => {
+            ExprKind::BinOp(BinOp::Ne, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
                 Exp::impure_qvar(QName::from_string("Bool.neqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
             ExprKind::BinOp(op, l, r) => {
+                let ty = l.ty(ctx.tcx, locals);
                 // Hack
-                translate_ty(ctx, names, DUMMY_SP, l.ty);
+                translate_ty(ctx, names, DUMMY_SP, ty);
 
                 Exp::BinaryOp(
-                    binop_to_binop(ctx, l.ty, op),
+                    binop_to_binop(ctx, ty, op),
                     Box::new(l.to_why(ctx, names, locals)),
                     Box::new(r.to_why(ctx, names, locals)),
                 )
             }
-            ExprKind::UnaryOp(op, arg) => {
-                Exp::UnaryOp(unop_to_unop(arg.ty, op), Box::new(arg.to_why(ctx, names, locals)))
-            }
+            ExprKind::UnaryOp(op, arg) => Exp::UnaryOp(
+                unop_to_unop(arg.ty(ctx.tcx, locals), op),
+                Box::new(arg.to_why(ctx, names, locals)),
+            ),
             ExprKind::Constructor(id, subst, args) => {
                 let args = args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
 
                 let ctor = names.constructor(id, subst);
                 Exp::Constructor { ctor, args }
             }
-            ExprKind::Constant(c) => lower_impure(ctx, names, &c),
             ExprKind::Tuple(f) => {
                 Exp::Tuple(f.into_iter().map(|f| f.to_why(ctx, names, locals)).collect())
             }
@@ -424,9 +441,9 @@ impl<'tcx> Expr<'tcx> {
         }
     }
 
-    fn invalidated_places(&self, places: &mut Vec<(fmir::Place<'tcx>, Span)>) {
+    fn invalidated_places(&self, places: &mut Vec<fmir::Place<'tcx>>) {
         match &self.kind {
-            ExprKind::Operand(Operand::Move(p)) => places.push((p.clone(), self.span)),
+            ExprKind::Operand(Operand::Move(p)) => places.push(p.clone()),
             ExprKind::Operand(_) => {}
             ExprKind::BinOp(_, l, r) => {
                 l.invalidated_places(places);
@@ -434,7 +451,6 @@ impl<'tcx> Expr<'tcx> {
             }
             ExprKind::UnaryOp(_, e) => e.invalidated_places(places),
             ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| e.invalidated_places(places)),
-            ExprKind::Constant(_) => {}
             ExprKind::Cast(e, _, _) => e.invalidated_places(places),
             ExprKind::Tuple(es) => es.iter().for_each(|e| e.invalidated_places(places)),
             ExprKind::Len(e) => e.invalidated_places(places),
@@ -760,13 +776,13 @@ fn invalidate_places<'tcx>(
     names: &mut CloneMap<'tcx>,
     locals: &LocalDecls<'tcx>,
     span: Span,
-    invalid: Vec<(Place<'tcx>, Span)>,
+    invalid: Vec<Place<'tcx>>,
     out: &mut Vec<mlcfg::Statement>,
 ) {
-    for (pl, pl_span) in invalid {
+    for pl in invalid {
         let ty = pl.ty(ctx.tcx, locals);
-        let ty = translate_ty(ctx, names, pl_span.substitute_dummy(span), ty);
-        out.push(place::create_assign_inner(ctx, names, locals, &pl, Exp::Any(ty), pl_span));
+        let ty = translate_ty(ctx, names, DUMMY_SP.substitute_dummy(span), ty);
+        out.push(place::create_assign_inner(ctx, names, locals, &pl, Exp::Any(ty), DUMMY_SP));
     }
 }
 
@@ -776,7 +792,7 @@ fn func_call_to_why3<'tcx>(
     locals: &LocalDecls<'tcx>,
     id: DefId,
     subst: GenericArgsRef<'tcx>,
-    args: Vec<Expr<'tcx>>,
+    args: Vec<Operand<'tcx>>,
 ) -> Exp {
     let mut args: Vec<_> = args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
     let fname = names.value(id, subst);
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index 4fea167e62..00e64398ca 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -33,7 +33,8 @@ pub(crate) fn lower_impure<'tcx, N: Namer<'tcx>>(
     let span = term.span;
     let mut term = Lower { ctx, names, pure: Purity::Program }.lower_term(term);
     term.reassociate();
-    ctx.attach_span(span, term)
+    term
+    // ctx.attach_span(span, term)
 }
 
 pub(super) struct Lower<'a, 'tcx, N: Namer<'tcx>> {
diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
index 3ca526e5a6..edcae4251c 100644
--- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
+++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
@@ -120,6 +120,7 @@ module C01ResolveUnsoundness_MakeVecOfSize
   var n : usize = n;
   var out : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
   var i : usize;
+  var _9 : bool;
   var _12 : ();
   var _13 : borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
   {
@@ -130,7 +131,7 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB1
   }
   BB1 {
-    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] [#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
+    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -138,7 +139,8 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB3
   }
   BB3 {
-    switch ([#"../01_resolve_unsoundness.rs" 13 10 13 16] ([#"../01_resolve_unsoundness.rs" 13 10 13 11] i) <= ([#"../01_resolve_unsoundness.rs" 13 15 13 16] n))
+    [#"../01_resolve_unsoundness.rs" 13 10 13 16] _9 <- ([#"../01_resolve_unsoundness.rs" 13 10 13 16] i <= n);
+    switch (_9)
       | False -> goto BB6
       | True -> goto BB4
       end
@@ -146,17 +148,17 @@ module C01ResolveUnsoundness_MakeVecOfSize
   BB4 {
     [#"../01_resolve_unsoundness.rs" 14 8 14 11] _13 <- Borrow.borrow_mut out;
     [#"../01_resolve_unsoundness.rs" 14 8 14 11] out <-  ^ _13;
-    [#"../01_resolve_unsoundness.rs" 14 8 14 23] _12 <- ([#"../01_resolve_unsoundness.rs" 14 8 14 23] push0 _13 ([#"../01_resolve_unsoundness.rs" 14 17 14 22] [#"../01_resolve_unsoundness.rs" 14 17 14 22] false));
+    [#"../01_resolve_unsoundness.rs" 14 8 14 23] _12 <- ([#"../01_resolve_unsoundness.rs" 14 8 14 23] push0 _13 false);
     _13 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
     goto BB5
   }
   BB5 {
-    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + ([#"../01_resolve_unsoundness.rs" 15 13 15 14] [#"../01_resolve_unsoundness.rs" 15 13 15 14] (1 : usize)));
+    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + (1 : usize));
     goto BB2
   }
   BB6 {
     [#"../01_resolve_unsoundness.rs" 17 11 17 14] _0 <- ([#"../01_resolve_unsoundness.rs" 17 11 17 14] out);
-    [#"../01_resolve_unsoundness.rs" 17 11 17 14] out <- any Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
+    out <- any Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_fail/bug/492.mlcfg b/creusot/tests/should_fail/bug/492.mlcfg
index 4a4831c7a3..21d7ec792e 100644
--- a/creusot/tests/should_fail/bug/492.mlcfg
+++ b/creusot/tests/should_fail/bug/492.mlcfg
@@ -52,7 +52,7 @@ module C492_ReborrowTuple
     [#"../492.rs" 6 5 6 6] _3 <- Borrow.borrow_final ( * x) (Borrow.get_id x);
     [#"../492.rs" 6 5 6 6] x <- { x with current = ( ^ _3) ; };
     assume { inv0 ( ^ _3) };
-    [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, ([#"../492.rs" 6 8 6 10] [#"../492.rs" 6 8 6 10] (32 : uint32))));
+    [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, (32 : uint32)));
     _3 <- any borrowed t;
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
@@ -119,7 +119,7 @@ module C492_Test
     goto BB0
   }
   BB0 {
-    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] [#"../492.rs" 11 16 11 17] (5 : int32));
+    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] (5 : int32));
     [#"../492.rs" 12 34 12 40] _6 <- Borrow.borrow_mut x;
     [#"../492.rs" 12 34 12 40] x <-  ^ _6;
     [#"../492.rs" 12 34 12 40] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -130,11 +130,11 @@ module C492_Test
   }
   BB1 {
     [#"../492.rs" 12 9 12 12] res <- ([#"../492.rs" 12 9 12 12] let (a, _) = _4 in a);
-    [#"../492.rs" 12 9 12 12] _4 <- (let (x0, x1) = _4 in (any borrowed int32, x1));
+    _4 <- (let (x0, x1) = _4 in (any borrowed int32, x1));
     assume { resolve0 _4 };
     assume { resolve1 _6 };
     assert { [@expl:assertion] [#"../492.rs" 13 18 13 30]  ^ res = (5 : int32) };
-    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] [#"../492.rs" 14 11 14 13] (10 : int32)) ; };
+    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] (10 : int32)) ; };
     assume { resolve1 res };
     [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] ());
     return _0
diff --git a/creusot/tests/should_fail/bug/692.mlcfg b/creusot/tests/should_fail/bug/692.mlcfg
index a00ef582b2..b38b939b26 100644
--- a/creusot/tests/should_fail/bug/692.mlcfg
+++ b/creusot/tests/should_fail/bug/692.mlcfg
@@ -213,22 +213,22 @@ module C692_ValidNormal_Closure2
     goto BB0
   }
   BB0 {
-    switch ([#"../692.rs" 16 21 16 22] b)
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] [#"../692.rs" 16 25 16 26] (2 : uint32));
+    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] [#"../692.rs" 16 36 16 37] (1 : uint32));
+    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] (1 : uint32));
     goto BB3
   }
   BB3 {
     [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 =  * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = ([#"../692.rs" 16 14 16 39] _4) ; })) ; };
-    [#"../692.rs" 16 14 16 39] _4 <- any uint32;
+    _4 <- any uint32;
     assume { resolve0 _1 };
     [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] ());
     [#"../692.rs" 15 17 15 64] _0 <- ([#"../692.rs" 15 17 15 64] res);
@@ -267,7 +267,7 @@ module C692_ValidNormal_Closure1
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] ([#"../692.rs" 14 7 14 8] field_00 _1) > ([#"../692.rs" 14 11 14 15] [#"../692.rs" 14 11 14 15] (7 : uint32)));
+    [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] field_00 _1 > (7 : uint32));
     [#"../692.rs" 13 15 13 47] _0 <- ([#"../692.rs" 13 15 13 47] res);
     return _0
   }
@@ -341,15 +341,15 @@ module C692_ValidNormal
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] [#"../692.rs" 12 16 12 20] (0 : uint32));
-    [#"../692.rs" 13 15 13 47] cond <- ([#"../692.rs" 13 15 13 47] C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 ([#"../692.rs" 13 15 13 47] n));
+    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] (0 : uint32));
+    [#"../692.rs" 13 15 13 47] cond <- ([#"../692.rs" 13 15 13 47] C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n);
     [#"../692.rs" 15 17 15 64] _7 <- Borrow.borrow_mut r;
     [#"../692.rs" 15 17 15 64] r <-  ^ _7;
     [#"../692.rs" 15 17 15 64] branch <- ([#"../692.rs" 15 17 15 64] C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 _7);
     _7 <- any borrowed uint32;
     assume { resolve0 cond };
-    [#"../692.rs" 17 4 17 27] _8 <- ([#"../692.rs" 17 4 17 27] incorrect0 ([#"../692.rs" 17 14 17 18] cond) ([#"../692.rs" 17 20 17 26] branch));
-    [#"../692.rs" 17 20 17 26] branch <- any C692_ValidNormal_Closure2.c692_validnormal_closure2;
+    [#"../692.rs" 17 4 17 27] _8 <- ([#"../692.rs" 17 4 17 27] incorrect0 cond branch);
+    branch <- any C692_ValidNormal_Closure2.c692_validnormal_closure2;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_fail/bug/695.mlcfg b/creusot/tests/should_fail/bug/695.mlcfg
index cdbe67b164..d3ed638384 100644
--- a/creusot/tests/should_fail/bug/695.mlcfg
+++ b/creusot/tests/should_fail/bug/695.mlcfg
@@ -180,6 +180,9 @@ module C695_InversedIf
   var cond : c = cond;
   var branch : b = branch;
   var _5 : bool;
+  var _7 : ();
+  var _9 : bool;
+  var _11 : bool;
   {
     goto BB0
   }
@@ -190,7 +193,9 @@ module C695_InversedIf
     goto BB2
   }
   BB2 {
-    [#"../695.rs" 7 8 7 14] _5 <- ([#"../695.rs" 7 8 7 14] call0 ([#"../695.rs" 7 8 7 12] cond) ([#"../695.rs" 7 8 7 14] ()));
+    [#"../695.rs" 7 8 7 14] _7 <- ([#"../695.rs" 7 8 7 14] ());
+    [#"../695.rs" 7 8 7 14] _5 <- ([#"../695.rs" 7 8 7 14] call0 cond _7);
+    _7 <- any ();
     goto BB3
   }
   BB3 {
@@ -202,15 +207,19 @@ module C695_InversedIf
   BB4 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 10 8 10 21] _0 <- ([#"../695.rs" 10 8 10 21] call_once0 ([#"../695.rs" 10 8 10 14] branch) ([#"../695.rs" 10 8 10 21] (([#"../695.rs" 10 15 10 20] [#"../695.rs" 10 15 10 20] false))));
-    [#"../695.rs" 10 8 10 14] branch <- any b;
+    [#"../695.rs" 10 8 10 21] _11 <- ([#"../695.rs" 10 8 10 21] (false));
+    [#"../695.rs" 10 8 10 21] _0 <- ([#"../695.rs" 10 8 10 21] call_once0 branch _11);
+    branch <- any b;
+    _11 <- any bool;
     goto BB7
   }
   BB5 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 8 8 8 20] _0 <- ([#"../695.rs" 8 8 8 20] call_once0 ([#"../695.rs" 8 8 8 14] branch) ([#"../695.rs" 8 8 8 20] (([#"../695.rs" 8 15 8 19] [#"../695.rs" 8 15 8 19] true))));
-    [#"../695.rs" 8 8 8 14] branch <- any b;
+    [#"../695.rs" 8 8 8 20] _9 <- ([#"../695.rs" 8 8 8 20] (true));
+    [#"../695.rs" 8 8 8 20] _0 <- ([#"../695.rs" 8 8 8 20] call_once0 branch _9);
+    branch <- any b;
+    _9 <- any bool;
     goto BB6
   }
   BB6 {
@@ -273,22 +282,22 @@ module C695_Valid_Closure2
     goto BB0
   }
   BB0 {
-    switch ([#"../695.rs" 20 21 20 22] b)
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] [#"../695.rs" 20 25 20 26] (2 : uint32));
+    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] [#"../695.rs" 20 36 20 37] (1 : uint32));
+    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] (1 : uint32));
     goto BB3
   }
   BB3 {
     [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 =  * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = ([#"../695.rs" 20 14 20 39] _4) ; })) ; };
-    [#"../695.rs" 20 14 20 39] _4 <- any uint32;
+    _4 <- any uint32;
     assume { resolve0 _1 };
     [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] ());
     [#"../695.rs" 19 17 19 64] _0 <- ([#"../695.rs" 19 17 19 64] res);
@@ -327,7 +336,7 @@ module C695_Valid_Closure1
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] ([#"../695.rs" 18 7 18 8] field_00 _1) > ([#"../695.rs" 18 11 18 15] [#"../695.rs" 18 11 18 15] (7 : uint32)));
+    [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] field_00 _1 > (7 : uint32));
     [#"../695.rs" 17 15 17 47] _0 <- ([#"../695.rs" 17 15 17 47] res);
     return _0
   }
@@ -406,15 +415,15 @@ module C695_Valid
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] [#"../695.rs" 16 16 16 20] (0 : uint32));
-    [#"../695.rs" 17 15 17 47] cond <- ([#"../695.rs" 17 15 17 47] C695_Valid_Closure1.C695_Valid_Closure1 ([#"../695.rs" 17 15 17 47] n));
+    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] (0 : uint32));
+    [#"../695.rs" 17 15 17 47] cond <- ([#"../695.rs" 17 15 17 47] C695_Valid_Closure1.C695_Valid_Closure1 n);
     [#"../695.rs" 19 17 19 64] _7 <- Borrow.borrow_mut r;
     [#"../695.rs" 19 17 19 64] r <-  ^ _7;
     [#"../695.rs" 19 17 19 64] branch <- ([#"../695.rs" 19 17 19 64] C695_Valid_Closure2.C695_Valid_Closure2 _7);
     _7 <- any borrowed uint32;
     assume { resolve0 cond };
-    [#"../695.rs" 21 4 21 29] _8 <- ([#"../695.rs" 21 4 21 29] inversed_if0 ([#"../695.rs" 21 16 21 20] cond) ([#"../695.rs" 21 22 21 28] branch));
-    [#"../695.rs" 21 22 21 28] branch <- any C695_Valid_Closure2.c695_valid_closure2;
+    [#"../695.rs" 21 4 21 29] _8 <- ([#"../695.rs" 21 4 21 29] inversed_if0 cond branch);
+    branch <- any C695_Valid_Closure2.c695_valid_closure2;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_fail/bug/869.mlcfg b/creusot/tests/should_fail/bug/869.mlcfg
index 2353255e0c..336bd0c7c1 100644
--- a/creusot/tests/should_fail/bug/869.mlcfg
+++ b/creusot/tests/should_fail/bug/869.mlcfg
@@ -62,7 +62,7 @@ module C869_Unsound
   }
   BB3 {
     [#"../869.rs" 18 4 18 64] evil <- { evil with current = ([#"../869.rs" 18 4 18 64] _15) ; };
-    [#"../869.rs" 18 4 18 64] _15 <- any Snapshot.snap_ty bool;
+    _15 <- any Snapshot.snap_ty bool;
     assume { resolve0 evil };
     assume { resolve0 xm };
     assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( ^ evil)) };
diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg
index 1168a6b820..2b62b6f2c4 100644
--- a/creusot/tests/should_fail/bug/specialize.mlcfg
+++ b/creusot/tests/should_fail/bug/specialize.mlcfg
@@ -56,8 +56,8 @@ module Specialize_F
     goto BB0
   }
   BB0 {
-    [#"../specialize.rs" 22 4 22 9] _2 <- ([#"../specialize.rs" 22 4 22 9] x0 ([#"../specialize.rs" 22 4 22 5] v));
-    [#"../specialize.rs" 22 4 22 5] v <- any Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
+    [#"../specialize.rs" 22 4 22 9] _2 <- ([#"../specialize.rs" 22 4 22 9] x0 v);
+    v <- any Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
     goto BB1
   }
   BB1 {
@@ -120,8 +120,8 @@ module Specialize_G
     goto BB0
   }
   BB0 {
-    [#"../specialize.rs" 28 4 28 9] _2 <- ([#"../specialize.rs" 28 4 28 9] x0 ([#"../specialize.rs" 28 4 28 5] v));
-    [#"../specialize.rs" 28 4 28 5] v <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
+    [#"../specialize.rs" 28 4 28 9] _2 <- ([#"../specialize.rs" 28 4 28 9] x0 v);
+    v <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     goto BB1
   }
   BB1 {
@@ -185,8 +185,8 @@ module Specialize_H
     goto BB0
   }
   BB0 {
-    [#"../specialize.rs" 35 4 35 9] _2 <- ([#"../specialize.rs" 35 4 35 9] x0 ([#"../specialize.rs" 35 4 35 5] v));
-    [#"../specialize.rs" 35 4 35 5] v <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+    [#"../specialize.rs" 35 4 35 9] _2 <- ([#"../specialize.rs" 35 4 35 9] x0 v);
+    v <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_fail/bug/subregion.mlcfg b/creusot/tests/should_fail/bug/subregion.mlcfg
index 5f4eb60b5d..f5199bad20 100644
--- a/creusot/tests/should_fail/bug/subregion.mlcfg
+++ b/creusot/tests/should_fail/bug/subregion.mlcfg
@@ -8,13 +8,14 @@ module Subregion_ListReversalH
   var _0 : usize;
   var l : usize = l;
   var r : usize;
+  var _7 : bool;
   var x : usize;
   var tmp : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] [#"../subregion.rs" 4 16 4 17] (0 : usize));
+    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -22,7 +23,8 @@ module Subregion_ListReversalH
     goto BB2
   }
   BB2 {
-    switch ([#"../subregion.rs" 6 10 6 16] ([#"../subregion.rs" 6 10 6 11] l) <> ([#"../subregion.rs" 6 15 6 16] [#"../subregion.rs" 6 15 6 16] (0 : usize)))
+    [#"../subregion.rs" 6 10 6 16] _7 <- ([#"../subregion.rs" 6 10 6 16] l <> (0 : usize));
+    switch (_7)
       | False -> goto BB4
       | True -> goto BB3
       end
@@ -31,7 +33,7 @@ module Subregion_ListReversalH
     assert { [@expl:assertion] [#"../subregion.rs" 7 22 7 27] false };
     [#"../subregion.rs" 8 16 8 17] x <- ([#"../subregion.rs" 8 16 8 17] r);
     [#"../subregion.rs" 9 18 9 19] tmp <- ([#"../subregion.rs" 9 18 9 19] l);
-    [#"../subregion.rs" 10 8 10 15] r <- ([#"../subregion.rs" 10 12 10 15] tmp);
+    [#"../subregion.rs" 10 8 10 15] r <- ([#"../subregion.rs" 10 8 10 15] tmp);
     goto BB1
   }
   BB4 {
diff --git a/creusot/tests/should_fail/final_borrows.mlcfg b/creusot/tests/should_fail/final_borrows.mlcfg
index 3a90adab4e..a4d8b7fa04 100644
--- a/creusot/tests/should_fail/final_borrows.mlcfg
+++ b/creusot/tests/should_fail/final_borrows.mlcfg
@@ -106,8 +106,8 @@ module FinalBorrows_StoreChangesProphecy
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = ([#"../final_borrows.rs" 14 11 14 12] x) ; };
-    [#"../final_borrows.rs" 14 11 14 12] x <- any t;
+    [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = ([#"../final_borrows.rs" 14 4 14 8] x) ; };
+    x <- any t;
     assert { [@expl:type invariant] inv0 ( * bor) };
     assume { resolve1 ( * bor) };
     assert { [@expl:type invariant] inv1 bor };
@@ -134,7 +134,7 @@ module FinalBorrows_CallChangesProphecy_Inner
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] [#"../final_borrows.rs" 20 8 20 9] (2 : int32));
+    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] (2 : int32));
     return _0
   }
   
@@ -168,7 +168,7 @@ module FinalBorrows_CallChangesProphecy
   }
   BB1 {
     [#"../final_borrows.rs" 24 4 24 18] bor <- { bor with current = ([#"../final_borrows.rs" 24 4 24 18] _3) ; };
-    [#"../final_borrows.rs" 24 4 24 18] _3 <- any int32;
+    _3 <- any int32;
     assume { resolve0 bor };
     assert { [@expl:assertion] [#"../final_borrows.rs" 25 18 25 27] b1 = bor };
     [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] ());
@@ -362,13 +362,15 @@ module FinalBorrows_Indexing
   var _2 : borrowed t;
   var _5 : borrowed t;
   var _6 : usize;
+  var _7 : usize;
   var _8 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] [#"../final_borrows.rs" 38 11 38 12] (0 : usize));
-    [#"../final_borrows.rs" 38 9 38 13] _8 <- ([#"../final_borrows.rs" 38 9 38 13] _6 < ([#"../final_borrows.rs" 38 9 38 13] Slice.length ( * x)));
+    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] (0 : usize));
+    [#"../final_borrows.rs" 38 9 38 13] _7 <- ([#"../final_borrows.rs" 38 9 38 13] Slice.length ( * x));
+    [#"../final_borrows.rs" 38 9 38 13] _8 <- ([#"../final_borrows.rs" 38 9 38 13] _6 < _7);
     assert { [@expl:index in bounds] [#"../final_borrows.rs" 38 9 38 13] _8 };
     goto BB1
   }
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
index a5c6b6a316..fc76655409 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
@@ -14,7 +14,7 @@ module C17ImplRefinement_Impl0_MyFunction
     goto BB0
   }
   BB0 {
-    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] [#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
+    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index f974b231f5..81005bcef7 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -358,6 +358,7 @@ module C100doors_F
   var _0 : ();
   var door_open : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _3 : Core_Ops_Range_Range_Type.t_range usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
   var _11 : ();
@@ -368,18 +369,23 @@ module C100doors_F
   var _17 : Snapshot.snap_ty (Seq.seq usize);
   var pass : usize;
   var door : usize;
+  var _23 : bool;
   var _26 : bool;
+  var _28 : usize;
   var _30 : borrowed bool;
   var _31 : borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
+  var _32 : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../100doors.rs" 19 35 19 51] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 ([#"../100doors.rs" 19 40 19 45] [#"../100doors.rs" 19 40 19 45] false) ([#"../100doors.rs" 19 47 19 50] [#"../100doors.rs" 19 47 19 50] (100 : usize)));
+    [#"../100doors.rs" 19 35 19 51] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 false (100 : usize));
     goto BB1
   }
   BB1 {
-    [#"../100doors.rs" 20 4 20 41] iter <- ([#"../100doors.rs" 20 4 20 41] into_iter0 ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range ([#"../100doors.rs" 21 16 21 17] [#"../100doors.rs" 21 16 21 17] (1 : usize)) ([#"../100doors.rs" 21 19 21 22] [#"../100doors.rs" 21 19 21 22] (101 : usize))));
+    [#"../100doors.rs" 21 16 21 22] _3 <- ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range (1 : usize) (101 : usize));
+    [#"../100doors.rs" 20 4 20 41] iter <- ([#"../100doors.rs" 20 4 20 41] into_iter0 _3);
+    _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
   }
   BB2 {
@@ -438,7 +444,7 @@ module C100doors_F
   }
   BB13 {
     [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] _17);
-    [#"../100doors.rs" 20 4 20 41] _17 <- any Snapshot.snap_ty (Seq.seq usize);
+    _17 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../100doors.rs" 22 30 22 34] door <- ([#"../100doors.rs" 22 30 22 34] pass);
     goto BB14
@@ -452,26 +458,31 @@ module C100doors_F
     goto BB16
   }
   BB16 {
-    switch ([#"../100doors.rs" 25 14 25 25] ([#"../100doors.rs" 25 14 25 18] door) <= ([#"../100doors.rs" 25 22 25 25] [#"../100doors.rs" 25 22 25 25] (100 : usize)))
+    [#"../100doors.rs" 25 14 25 25] _23 <- ([#"../100doors.rs" 25 14 25 25] door <= (100 : usize));
+    switch (_23)
       | False -> goto BB20
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../100doors.rs" 26 44 26 54] _26 <- ([#"../100doors.rs" 26 44 26 54] index0 ([#"../100doors.rs" 26 35 26 44] door_open) ([#"../100doors.rs" 26 45 26 53] ([#"../100doors.rs" 26 45 26 49] door) - ([#"../100doors.rs" 26 52 26 53] [#"../100doors.rs" 26 52 26 53] (1 : usize))));
+    [#"../100doors.rs" 26 45 26 53] _28 <- ([#"../100doors.rs" 26 45 26 53] door - (1 : usize));
+    [#"../100doors.rs" 26 44 26 54] _26 <- ([#"../100doors.rs" 26 44 26 54] index0 door_open _28);
+    _28 <- any usize;
     goto BB18
   }
   BB18 {
     [#"../100doors.rs" 26 12 26 21] _31 <- Borrow.borrow_mut door_open;
     [#"../100doors.rs" 26 12 26 21] door_open <-  ^ _31;
-    [#"../100doors.rs" 26 21 26 31] _30 <- ([#"../100doors.rs" 26 21 26 31] index_mut0 _31 ([#"../100doors.rs" 26 22 26 30] ([#"../100doors.rs" 26 22 26 26] door) - ([#"../100doors.rs" 26 29 26 30] [#"../100doors.rs" 26 29 26 30] (1 : usize))));
+    [#"../100doors.rs" 26 22 26 30] _32 <- ([#"../100doors.rs" 26 22 26 30] door - (1 : usize));
+    [#"../100doors.rs" 26 21 26 31] _30 <- ([#"../100doors.rs" 26 21 26 31] index_mut0 _31 _32);
     _31 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
+    _32 <- any usize;
     goto BB19
   }
   BB19 {
-    [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = ([#"../100doors.rs" 26 12 26 54] not ([#"../100doors.rs" 26 35 26 54] _26)) ; };
+    [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = ([#"../100doors.rs" 26 12 26 54] not _26) ; };
     assume { resolve1 _30 };
-    [#"../100doors.rs" 27 12 27 24] door <- ([#"../100doors.rs" 27 12 27 24] door + ([#"../100doors.rs" 27 20 27 24] pass));
+    [#"../100doors.rs" 27 12 27 24] door <- ([#"../100doors.rs" 27 12 27 24] door + pass);
     [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] ());
     goto BB15
   }
diff --git a/creusot/tests/should_succeed/100doors/why3session.xml b/creusot/tests/should_succeed/100doors/why3session.xml
index 9998709ce0..5d2178ff19 100644
--- a/creusot/tests/should_succeed/100doors/why3session.xml
+++ b/creusot/tests/should_succeed/100doors/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="100doors.mlcfg"/>
 <theory name="C100doors_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="1"><result status="valid" time="0.122415" steps="677037"/></proof>
+ <proof prover="1"><result status="valid" time="0.122415" steps="662386"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/100doors/why3shapes.gz b/creusot/tests/should_succeed/100doors/why3shapes.gz
index 7919eb508f55850f04ca116b5cadfda7c92e6e8f..925625dabc950eab694a87b4840e8044de23749c 100644
GIT binary patch
literal 589
zcmV-T0<!%diwFP!00000|CLisZ`&{oz2{f>)~&?=(fYE7_Fx1sl*>*7j|<pDS&cb%
zXD8|Q??=l~QnzV<UF;`Pe0-$HPq#_`M9;oY4!-NFw)vWv<o5Gy_nWHb0Dz*5SRh24
zV;W(GGD3?gLW4R&jV3~cHbRM6Iivdrs(tfw_e3nBuG^R8wq5&LU{1SsSv5P_(jQTT
zfOl6GgE_@KQl<!Ju?Q@dp1XFvU-_P;r*wCRAQ3cz385kat`c-Ksgp@YQ@VIfq$0&@
z^1!U787=wk^X@N$NOY>6F_%Bz(R}%>ZTy@*>Vq;X5Zr(hEk`%L!&D!Ek|@(+<di9u
zRQLWvHmyfCZu{6?G~AZK7SBoz-W8nv3wq!$8Ymgjo{dJ`1Q*cV>$9?xlPU*Q%g1)#
zto!RX7u5N_tq&g1h>%avW7~D@i(lVte^vCo+xu7=>U2DBs)lORIaO=^4(j-aIx82)
zY1LWrQ77mJYIV^i*-=D2OJDadPrma^X5ZhtL|PCNE)P`iF9aR){s_{p+zaHlLoLO)
zSK1ci+6@U#UA-I_8o?pv?SpAUU#8Eng2^Mj^9Cv%M34PdsAZsKagv8~w5F(G?0Uv%
zTA7#%OgU({9qSr*+pu+7*M+c<iZ>#ETbIiJx2`ZisIq}lWz})C!c^TqyuB<$NO*le
z&l|<VeRZRhEze^)!+El4yJRz)t%MND>Wr9D3JIC8Ae6~$wzd{FCIRC>J5Ua!gVX^y
b5H5F_v(7l}l#`CFPR#xRI3!vs(**zkm(U=M

literal 574
zcmV-E0>S+siwFP!00000|CLn9j+;Obz56S;O=4@L-hn7{K$cMZl2cU2u?o8#qhN5r
zOY-+Az&$qJqFm7HT3)}ZuHw@;Xx6xOO>l5^lUL=Jzy#yZqunpe%LC`YQjZyMk7E!X
zMj$;5L3wCEd#J&9s37!ELX?j1>l+rX{IOdji71NdINwxDS1^ciSIzTsha3FOk}lyU
zWY(Gm#GX<BKZ^xUVsTqn%l*PNBwgTS0$c*uz)hFRJfJGM_9pdVlHMd{mqf}_T#|Rp
zYItLaZnNF}A>fHVswYh4Pj@(-f2&HD<D)((v*3&x@Ig!2rK>^c6HpSQNP12w9`b0}
z^H9V4#)6J<(%Sr4sn)yTXa5Y}=nFbZ3E`fMM!j^d2q%|k6%I}+ZS~BvYF{p!=aDn4
zT~ieY$3chPeIaI5T~|l9eA)cW@q4{@m}1em*2((wDlf4BZ7^TbH|_Fh;B-1W&8gPO
zqfX#EXmQsi$&q+Hb5}ISwW}SGsoS`FqzMw?{D8&&PSWY#_fFcAxQ=|>){^uarB%`|
zoE8^dy`OmfObTCz&0p}r)7*HwPRdSd-&Fyccdt*9I1OWOrLm0rUPpum^{8klOHfi9
zeX2%9N&k0HW>C$&w5w_;<UgxvhyBXL*zBLHc3u&h)~73?!t~*sfe3Ht^flcGropPJ
zgVktcB;$gi(5uK~VWtg>SD7)HTSz8F$O3LG*On{GrRBnMZaK5DjcjO*)mB+)$!gi?
MFGG_rGtvbB0Q;FF&;S4c

diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg
index 817be0c32b..a5d2f172c2 100644
--- a/creusot/tests/should_succeed/all_zero.mlcfg
+++ b/creusot/tests/should_succeed/all_zero.mlcfg
@@ -86,7 +86,7 @@ module AllZero_AllZero
   }
   BB1 {
     [#"../all_zero.rs" 37 21 37 22] loop_l <- ([#"../all_zero.rs" 37 21 37 22] l);
-    [#"../all_zero.rs" 37 21 37 22] l <- any borrowed (AllZero_List_Type.t_list);
+    l <- any borrowed (AllZero_List_Type.t_list);
     goto BB2
   }
   BB2 {
@@ -108,13 +108,13 @@ module AllZero_AllZero
     [#"../all_zero.rs" 43 19 43 24] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons ( ^ value) x1) ; };
     [#"../all_zero.rs" 43 26 43 30] next <- Borrow.borrow_final (AllZero_List_Type.cons_1 ( * loop_l)) (Borrow.inherit_id (Borrow.get_id loop_l) 2);
     [#"../all_zero.rs" 43 26 43 30] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons x0 ( ^ next)) ; };
-    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] [#"../all_zero.rs" 44 17 44 18] (0 : uint32)) ; };
+    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] (0 : uint32)) ; };
     assume { resolve0 value };
     [#"../all_zero.rs" 45 17 45 21] _13 <- Borrow.borrow_mut ( * next);
     [#"../all_zero.rs" 45 17 45 21] next <- { next with current = ( ^ _13) ; };
     assume { resolve1 loop_l };
     [#"../all_zero.rs" 45 8 45 21] loop_l <- ([#"../all_zero.rs" 45 8 45 21] _13);
-    [#"../all_zero.rs" 45 8 45 21] _13 <- any borrowed (AllZero_List_Type.t_list);
+    _13 <- any borrowed (AllZero_List_Type.t_list);
     assume { resolve2 next };
     goto BB2
   }
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 729da25651..5beb972661 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -141,17 +141,17 @@ module Bdd_Hashmap_Impl2_Hash
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 77 12 77 25] _3 <- ([#"../bdd.rs" 77 12 77 25] hash0 ([#"../bdd.rs" 77 12 77 18] let (a, _) = self in a));
+    [#"../bdd.rs" 77 12 77 25] _3 <- ([#"../bdd.rs" 77 12 77 25] hash0 (let (a, _) = self in a));
     goto BB1
   }
   BB1 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../bdd.rs" 77 39 77 52] _6 <- ([#"../bdd.rs" 77 39 77 52] hash1 ([#"../bdd.rs" 77 39 77 45] let (_, a) = self in a));
+    [#"../bdd.rs" 77 39 77 52] _6 <- ([#"../bdd.rs" 77 39 77 52] hash1 (let (_, a) = self in a));
     goto BB2
   }
   BB2 {
-    [#"../bdd.rs" 77 39 77 69] _5 <- ([#"../bdd.rs" 77 39 77 69] wrapping_mul0 _6 ([#"../bdd.rs" 77 66 77 68] [#"../bdd.rs" 77 66 77 68] (17 : uint64)));
+    [#"../bdd.rs" 77 39 77 69] _5 <- ([#"../bdd.rs" 77 39 77 69] wrapping_mul0 _6 (17 : uint64));
     _6 <- any uint64;
     goto BB3
   }
@@ -254,7 +254,7 @@ module Bdd_Impl7_Eq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 203 8 203 21] _0 <- ([#"../bdd.rs" 203 8 203 21] ([#"../bdd.rs" 203 8 203 14] Bdd_Bdd_Type.bdd_1 self) = ([#"../bdd.rs" 203 18 203 21] Bdd_Bdd_Type.bdd_1 o));
+    [#"../bdd.rs" 203 8 203 21] _0 <- ([#"../bdd.rs" 203 8 203 21] Bdd_Bdd_Type.bdd_1 self = Bdd_Bdd_Type.bdd_1 o);
     return _0
   }
   
@@ -353,7 +353,7 @@ module Bdd_Impl14_Eq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 90 13 90 22] _4 <- ([#"../bdd.rs" 90 13 90 22] (([#"../bdd.rs" 90 13 90 22] self), ([#"../bdd.rs" 90 13 90 22] rhs)));
+    [#"../bdd.rs" 90 13 90 22] _4 <- ([#"../bdd.rs" 90 13 90 22] (self, rhs));
     switch (let (a, _) = _4 in a)
       | Bdd_Node_Type.C_False -> goto BB1
       | Bdd_Node_Type.C_True -> goto BB4
@@ -371,7 +371,7 @@ module Bdd_Impl14_Eq
   }
   BB3 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
     goto BB22
   }
   BB4 {
@@ -394,12 +394,12 @@ module Bdd_Impl14_Eq
   }
   BB8 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB9 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB10 {
@@ -410,7 +410,7 @@ module Bdd_Impl14_Eq
     [#"../bdd.rs" 94 17 94 23] childt_2 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt (let (_, a) = _4 in a));
     [#"../bdd.rs" 94 38 94 44] childf_2 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf (let (_, a) = _4 in a));
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _17 <- ([#"../bdd.rs" 90 13 90 22] eq0 ([#"../bdd.rs" 94 38 94 44] childf_1) ([#"../bdd.rs" 94 38 94 44] childf_2));
+    [#"../bdd.rs" 90 13 90 22] _17 <- ([#"../bdd.rs" 90 13 90 22] eq0 childf_1 childf_2);
     goto BB11
   }
   BB11 {
@@ -420,7 +420,7 @@ module Bdd_Impl14_Eq
       end
   }
   BB12 {
-    [#"../bdd.rs" 90 13 90 22] _20 <- ([#"../bdd.rs" 90 13 90 22] eq0 ([#"../bdd.rs" 94 17 94 23] childt_1) ([#"../bdd.rs" 94 17 94 23] childt_2));
+    [#"../bdd.rs" 90 13 90 22] _20 <- ([#"../bdd.rs" 90 13 90 22] eq0 childt_1 childt_2);
     goto BB13
   }
   BB13 {
@@ -430,7 +430,7 @@ module Bdd_Impl14_Eq
       end
   }
   BB14 {
-    [#"../bdd.rs" 90 13 90 22] _23 <- ([#"../bdd.rs" 90 13 90 22] eq1 ([#"../bdd.rs" 94 9 94 10] v_1) ([#"../bdd.rs" 94 9 94 10] v_2));
+    [#"../bdd.rs" 90 13 90 22] _23 <- ([#"../bdd.rs" 90 13 90 22] eq1 v_1 v_2);
     goto BB15
   }
   BB15 {
@@ -440,7 +440,7 @@ module Bdd_Impl14_Eq
       end
   }
   BB16 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB21
   }
   BB17 {
@@ -453,7 +453,7 @@ module Bdd_Impl14_Eq
     goto BB20
   }
   BB20 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
     goto BB21
   }
   BB21 {
@@ -530,7 +530,7 @@ module Bdd_Impl15_Clone
     [#"../bdd.rs" 94 17 94 23] childt_1 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt self);
     [#"../bdd.rs" 94 38 94 44] childf_1 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf self);
     [#"../bdd.rs" 90 24 90 29] _9 <- ([#"../bdd.rs" 90 24 90 29] v_1);
-    [#"../bdd.rs" 90 24 90 29] _7 <- ([#"../bdd.rs" 90 24 90 29] clone0 ([#"../bdd.rs" 90 24 90 29] _9));
+    [#"../bdd.rs" 90 24 90 29] _7 <- ([#"../bdd.rs" 90 24 90 29] clone0 _9);
     goto BB7
   }
   BB4 {
@@ -547,12 +547,12 @@ module Bdd_Impl15_Clone
   }
   BB7 {
     [#"../bdd.rs" 90 24 90 29] _12 <- ([#"../bdd.rs" 90 24 90 29] childt_1);
-    [#"../bdd.rs" 90 24 90 29] _10 <- ([#"../bdd.rs" 90 24 90 29] clone1 ([#"../bdd.rs" 90 24 90 29] _12));
+    [#"../bdd.rs" 90 24 90 29] _10 <- ([#"../bdd.rs" 90 24 90 29] clone1 _12);
     goto BB8
   }
   BB8 {
     [#"../bdd.rs" 90 24 90 29] _15 <- ([#"../bdd.rs" 90 24 90 29] childf_1);
-    [#"../bdd.rs" 90 24 90 29] _13 <- ([#"../bdd.rs" 90 24 90 29] clone1 ([#"../bdd.rs" 90 24 90 29] _15));
+    [#"../bdd.rs" 90 24 90 29] _13 <- ([#"../bdd.rs" 90 24 90 29] clone1 _15);
     goto BB9
   }
   BB9 {
@@ -673,7 +673,7 @@ module Bdd_Impl1_Hash
     [#"../bdd.rs" 120 17 120 18] v <- ([#"../bdd.rs" 120 17 120 18] Bdd_Node_Type.if_v self);
     [#"../bdd.rs" 120 20 120 26] childt <- ([#"../bdd.rs" 120 20 120 26] Bdd_Node_Type.if_childt self);
     [#"../bdd.rs" 120 28 120 34] childf <- ([#"../bdd.rs" 120 28 120 34] Bdd_Node_Type.if_childf self);
-    [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 ([#"../bdd.rs" 121 31 121 39] Bdd_Bdd_Type.bdd_1 childt) ([#"../bdd.rs" 121 53 121 54] [#"../bdd.rs" 121 53 121 54] (5 : uint64)));
+    [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childt) (5 : uint64));
     goto BB7
   }
   BB4 {
@@ -681,20 +681,20 @@ module Bdd_Impl1_Hash
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] [#"../bdd.rs" 118 21 118 22] (1 : uint64));
+    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] (1 : uint64));
     goto BB11
   }
   BB6 {
-    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] [#"../bdd.rs" 119 20 119 21] (2 : uint64));
+    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] (2 : uint64));
     goto BB11
   }
   BB7 {
-    [#"../bdd.rs" 121 16 121 56] _7 <- ([#"../bdd.rs" 121 16 121 56] wrapping_add0 ([#"../bdd.rs" 121 16 121 17] v) _9);
+    [#"../bdd.rs" 121 16 121 56] _7 <- ([#"../bdd.rs" 121 16 121 56] wrapping_add0 v _9);
     _9 <- any uint64;
     goto BB8
   }
   BB8 {
-    [#"../bdd.rs" 121 70 121 94] _11 <- ([#"../bdd.rs" 121 70 121 94] wrapping_mul0 ([#"../bdd.rs" 121 70 121 78] Bdd_Bdd_Type.bdd_1 childf) ([#"../bdd.rs" 121 92 121 93] [#"../bdd.rs" 121 92 121 93] (7 : uint64)));
+    [#"../bdd.rs" 121 70 121 94] _11 <- ([#"../bdd.rs" 121 70 121 94] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childf) (7 : uint64));
     goto BB9
   }
   BB9 {
@@ -1766,7 +1766,7 @@ module Bdd_Impl11_New
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] [#"../bdd.rs" 425 16 425 21] promoted0);
+    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] promoted0);
     [#"../bdd.rs" 425 16 425 21] t <- ([#"../bdd.rs" 425 16 425 21] _10);
     [#"../bdd.rs" 428 22 428 47] _5 <- ([#"../bdd.rs" 428 22 428 47] new0 ());
     goto BB1
@@ -1784,7 +1784,7 @@ module Bdd_Impl11_New
     goto BB4
   }
   BB4 {
-    [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context ([#"../bdd.rs" 427 12 427 17] alloc) _5 _6 _8 _9 ([#"../bdd.rs" 432 17 432 18] [#"../bdd.rs" 432 17 432 18] (0 : uint64)));
+    [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 (0 : uint64));
     _5 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd);
     _6 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
     _8 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
@@ -2062,12 +2062,14 @@ module Bdd_Impl11_Hashcons
   var _23 : ();
   var _24 : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd));
   var _27 : Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+  var _30 : bool;
+  var _32 : uint64;
   {
     goto BB0
   }
   BB0 {
     [#"../bdd.rs" 441 44 441 46] _11 <- ([#"../bdd.rs" 441 44 441 46] n);
-    [#"../bdd.rs" 441 26 441 47] _8 <- ([#"../bdd.rs" 441 26 441 47] get0 ([#"../bdd.rs" 441 26 441 39] Bdd_Context_Type.context_hashcons ( * self)) ([#"../bdd.rs" 441 44 441 46] _11));
+    [#"../bdd.rs" 441 26 441 47] _8 <- ([#"../bdd.rs" 441 26 441 47] get0 (Bdd_Context_Type.context_hashcons ( * self)) _11);
     goto BB1
   }
   BB1 {
@@ -2088,15 +2090,15 @@ module Bdd_Impl11_Hashcons
     goto BB12
   }
   BB4 {
-    [#"../bdd.rs" 445 20 445 39] _19 <- ([#"../bdd.rs" 445 20 445 39] alloc0 ([#"../bdd.rs" 445 20 445 30] Bdd_Context_Type.context_alloc ( * self)) ([#"../bdd.rs" 445 37 445 38] n));
+    [#"../bdd.rs" 445 20 445 39] _19 <- ([#"../bdd.rs" 445 20 445 39] alloc0 (Bdd_Context_Type.context_alloc ( * self)) n);
     goto BB5
   }
   BB5 {
-    [#"../bdd.rs" 445 16 445 50] r1 <- ([#"../bdd.rs" 445 16 445 50] Bdd_Bdd_Type.C_Bdd ([#"../bdd.rs" 445 20 445 39]  * _19) ([#"../bdd.rs" 445 41 445 49] Bdd_Context_Type.context_cnt ( * self)));
+    [#"../bdd.rs" 445 16 445 50] r1 <- ([#"../bdd.rs" 445 16 445 50] Bdd_Bdd_Type.C_Bdd ( * _19) (Bdd_Context_Type.context_cnt ( * self)));
     assume { resolve1 _19 };
     [#"../bdd.rs" 446 8 446 21] _24 <- Borrow.borrow_final (Bdd_Context_Type.context_hashcons ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../bdd.rs" 446 8 446 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 ( ^ _24) x2 x3 x4 x5) ; };
-    [#"../bdd.rs" 446 8 446 31] _23 <- ([#"../bdd.rs" 446 8 446 31] add0 _24 ([#"../bdd.rs" 446 26 446 27] n) ([#"../bdd.rs" 446 29 446 30] r1));
+    [#"../bdd.rs" 446 8 446 31] _23 <- ([#"../bdd.rs" 446 8 446 31] add0 _24 n r1);
     _24 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd));
     goto BB6
   }
@@ -2106,8 +2108,11 @@ module Bdd_Impl11_Hashcons
   }
   BB7 {
     [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 77] _27) x3 x4 x5) ; };
-    [#"../bdd.rs" 447 8 447 77] _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
-    switch ([#"../bdd.rs" 448 11 448 34] ([#"../bdd.rs" 448 11 448 19] Bdd_Context_Type.context_cnt ( * self)) > ([#"../bdd.rs" 448 22 448 34] ([#"../bdd.rs" 448 22 448 30] [#"../bdd.rs" 448 22 448 30] (18446744073709551615 : uint64)) - ([#"../bdd.rs" 448 33 448 34] [#"../bdd.rs" 448 33 448 34] (1 : uint64))))
+    _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
+    [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 34] (18446744073709551615 : uint64) - (1 : uint64));
+    [#"../bdd.rs" 448 11 448 34] _30 <- ([#"../bdd.rs" 448 11 448 34] Bdd_Context_Type.context_cnt ( * self) > _32);
+    _32 <- any uint64;
+    switch (_30)
       | False -> goto BB11
       | True -> goto BB8
       end
@@ -2119,11 +2124,11 @@ module Bdd_Impl11_Hashcons
     goto BB10
   }
   BB10 {
-    [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 451 27 451 35] Bdd_Context_Type.context_cnt ( * self))) ; };
+    [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 451 16 451 35] Bdd_Context_Type.context_cnt ( * self))) ; };
     goto BB9
   }
   BB11 {
-    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + ([#"../bdd.rs" 454 20 454 21] [#"../bdd.rs" 454 20 454 21] (1 : uint64)))) ; };
+    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + (1 : uint64))) ; };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     [#"../bdd.rs" 455 8 455 9] _0 <- ([#"../bdd.rs" 455 8 455 9] r1);
@@ -2321,11 +2326,12 @@ module Bdd_Impl11_Node
   var childf : Bdd_Bdd_Type.t_bdd = childf;
   var _13 : bool;
   var _17 : borrowed (Bdd_Context_Type.t_context);
+  var _18 : Bdd_Node_Type.t_node;
   {
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 466 11 466 27] _13 <- ([#"../bdd.rs" 466 11 466 27] eq0 ([#"../bdd.rs" 466 11 466 17] childt) ([#"../bdd.rs" 466 21 466 27] childf));
+    [#"../bdd.rs" 466 11 466 27] _13 <- ([#"../bdd.rs" 466 11 466 27] eq0 childt childf);
     goto BB1
   }
   BB1 {
@@ -2344,8 +2350,10 @@ module Bdd_Impl11_Node
     [#"../bdd.rs" 469 8 469 12] _17 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 469 8 469 12] self <- { self with current = ( ^ _17) ; };
     assume { inv0 ( ^ _17) };
-    [#"../bdd.rs" 469 8 469 50] _0 <- ([#"../bdd.rs" 469 8 469 50] hashcons0 _17 ([#"../bdd.rs" 469 22 469 49] Bdd_Node_Type.C_If ([#"../bdd.rs" 469 30 469 31] x) ([#"../bdd.rs" 469 33 469 39] childt) ([#"../bdd.rs" 469 41 469 47] childf)));
+    [#"../bdd.rs" 469 22 469 49] _18 <- ([#"../bdd.rs" 469 22 469 49] Bdd_Node_Type.C_If x childt childf);
+    [#"../bdd.rs" 469 8 469 50] _0 <- ([#"../bdd.rs" 469 8 469 50] hashcons0 _17 _18);
     _17 <- any borrowed (Bdd_Context_Type.t_context);
+    _18 <- any Bdd_Node_Type.t_node;
     goto BB4
   }
   BB4 {
@@ -2516,6 +2524,7 @@ module Bdd_Impl11_True
   var _0 : Bdd_Bdd_Type.t_bdd;
   var self : borrowed (Bdd_Context_Type.t_context) = self;
   var _6 : borrowed (Bdd_Context_Type.t_context);
+  var _7 : Bdd_Node_Type.t_node;
   {
     goto BB0
   }
@@ -2523,8 +2532,10 @@ module Bdd_Impl11_True
     [#"../bdd.rs" 477 8 477 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 477 8 477 12] self <- { self with current = ( ^ _6) ; };
     assume { inv0 ( ^ _6) };
-    [#"../bdd.rs" 477 8 477 27] _0 <- ([#"../bdd.rs" 477 8 477 27] hashcons0 _6 ([#"../bdd.rs" 477 22 477 26] Bdd_Node_Type.C_True));
+    [#"../bdd.rs" 477 22 477 26] _7 <- ([#"../bdd.rs" 477 22 477 26] Bdd_Node_Type.C_True);
+    [#"../bdd.rs" 477 8 477 27] _0 <- ([#"../bdd.rs" 477 8 477 27] hashcons0 _6 _7);
     _6 <- any borrowed (Bdd_Context_Type.t_context);
+    _7 <- any Bdd_Node_Type.t_node;
     goto BB1
   }
   BB1 {
@@ -2692,6 +2703,7 @@ module Bdd_Impl11_False
   var _0 : Bdd_Bdd_Type.t_bdd;
   var self : borrowed (Bdd_Context_Type.t_context) = self;
   var _6 : borrowed (Bdd_Context_Type.t_context);
+  var _7 : Bdd_Node_Type.t_node;
   {
     goto BB0
   }
@@ -2699,8 +2711,10 @@ module Bdd_Impl11_False
     [#"../bdd.rs" 485 8 485 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 485 8 485 12] self <- { self with current = ( ^ _6) ; };
     assume { inv0 ( ^ _6) };
-    [#"../bdd.rs" 485 8 485 28] _0 <- ([#"../bdd.rs" 485 8 485 28] hashcons0 _6 ([#"../bdd.rs" 485 22 485 27] Bdd_Node_Type.C_False));
+    [#"../bdd.rs" 485 22 485 27] _7 <- ([#"../bdd.rs" 485 22 485 27] Bdd_Node_Type.C_False);
+    [#"../bdd.rs" 485 8 485 28] _0 <- ([#"../bdd.rs" 485 8 485 28] hashcons0 _6 _7);
     _6 <- any borrowed (Bdd_Context_Type.t_context);
+    _7 <- any Bdd_Node_Type.t_node;
     goto BB1
   }
   BB1 {
@@ -2916,7 +2930,7 @@ module Bdd_Impl11_V
     [#"../bdd.rs" 494 8 494 12] _10 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 494 8 494 12] self <- { self with current = ( ^ _10) ; };
     assume { inv0 ( ^ _10) };
-    [#"../bdd.rs" 494 8 494 26] _0 <- ([#"../bdd.rs" 494 8 494 26] node0 _10 ([#"../bdd.rs" 494 18 494 19] x) ([#"../bdd.rs" 494 21 494 22] t) ([#"../bdd.rs" 494 24 494 25] f));
+    [#"../bdd.rs" 494 8 494 26] _0 <- ([#"../bdd.rs" 494 8 494 26] node0 _10 x t f);
     _10 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB3
   }
@@ -3220,7 +3234,7 @@ module Bdd_Impl11_Not
   }
   BB0 {
     [#"../bdd.rs" 504 43 504 45] _13 <- ([#"../bdd.rs" 504 43 504 45] x);
-    [#"../bdd.rs" 504 25 504 46] _10 <- ([#"../bdd.rs" 504 25 504 46] get0 ([#"../bdd.rs" 504 25 504 38] Bdd_Context_Type.context_not_memo ( * self)) ([#"../bdd.rs" 504 43 504 45] _13));
+    [#"../bdd.rs" 504 25 504 46] _10 <- ([#"../bdd.rs" 504 25 504 46] get0 (Bdd_Context_Type.context_not_memo ( * self)) _13);
     goto BB1
   }
   BB1 {
@@ -3265,7 +3279,7 @@ module Bdd_Impl11_Not
     [#"../bdd.rs" 511 29 511 33] _25 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 511 29 511 33] self <- { self with current = ( ^ _25) ; };
     assume { inv1 ( ^ _25) };
-    [#"../bdd.rs" 511 29 511 45] childt1 <- ([#"../bdd.rs" 511 29 511 45] not' _25 ([#"../bdd.rs" 511 38 511 44] childt));
+    [#"../bdd.rs" 511 29 511 45] childt1 <- ([#"../bdd.rs" 511 29 511 45] not' _25 childt);
     _25 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB13
   }
@@ -3295,7 +3309,7 @@ module Bdd_Impl11_Not
     [#"../bdd.rs" 512 29 512 33] _28 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 512 29 512 33] self <- { self with current = ( ^ _28) ; };
     assume { inv1 ( ^ _28) };
-    [#"../bdd.rs" 512 29 512 45] childf1 <- ([#"../bdd.rs" 512 29 512 45] not' _28 ([#"../bdd.rs" 512 38 512 44] childf));
+    [#"../bdd.rs" 512 29 512 45] childf1 <- ([#"../bdd.rs" 512 29 512 45] not' _28 childf);
     _28 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB14
   }
@@ -3303,7 +3317,7 @@ module Bdd_Impl11_Not
     [#"../bdd.rs" 513 16 513 20] _30 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 513 16 513 20] self <- { self with current = ( ^ _30) ; };
     assume { inv1 ( ^ _30) };
-    [#"../bdd.rs" 513 16 513 44] r1 <- ([#"../bdd.rs" 513 16 513 44] node0 _30 ([#"../bdd.rs" 513 26 513 27] v) ([#"../bdd.rs" 513 29 513 35] childt1) ([#"../bdd.rs" 513 37 513 43] childf1));
+    [#"../bdd.rs" 513 16 513 44] r1 <- ([#"../bdd.rs" 513 16 513 44] node0 _30 v childt1 childf1);
     _30 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB15
   }
@@ -3313,7 +3327,7 @@ module Bdd_Impl11_Not
   BB16 {
     [#"../bdd.rs" 516 8 516 21] _35 <- Borrow.borrow_final (Bdd_Context_Type.context_not_memo ( * self)) (Borrow.inherit_id (Borrow.get_id self) 4);
     [#"../bdd.rs" 516 8 516 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 ( ^ _35) x4 x5) ; };
-    [#"../bdd.rs" 516 8 516 31] _34 <- ([#"../bdd.rs" 516 8 516 31] add0 _35 ([#"../bdd.rs" 516 26 516 27] x) ([#"../bdd.rs" 516 29 516 30] r1));
+    [#"../bdd.rs" 516 8 516 31] _34 <- ([#"../bdd.rs" 516 8 516 31] add0 _35 x r1);
     _35 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd));
     goto BB17
   }
@@ -3725,13 +3739,14 @@ module Bdd_Impl11_And
   var _74 : borrowed (Bdd_Context_Type.t_context);
   var _78 : ();
   var _79 : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd));
+  var _80 : (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd);
   {
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 528 44 528 50] _16 <- ([#"../bdd.rs" 528 44 528 50] (([#"../bdd.rs" 528 45 528 46] a), ([#"../bdd.rs" 528 48 528 49] b)));
+    [#"../bdd.rs" 528 44 528 50] _16 <- ([#"../bdd.rs" 528 44 528 50] (a, b));
     [#"../bdd.rs" 528 43 528 50] _15 <- ([#"../bdd.rs" 528 43 528 50] _16);
-    [#"../bdd.rs" 528 25 528 51] _12 <- ([#"../bdd.rs" 528 25 528 51] get0 ([#"../bdd.rs" 528 25 528 38] Bdd_Context_Type.context_and_memo ( * self)) ([#"../bdd.rs" 528 43 528 50] _15));
+    [#"../bdd.rs" 528 25 528 51] _12 <- ([#"../bdd.rs" 528 25 528 51] get0 (Bdd_Context_Type.context_and_memo ( * self)) _15);
     goto BB1
   }
   BB1 {
@@ -3756,7 +3771,7 @@ module Bdd_Impl11_And
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 531 22 531 34] _23 <- ([#"../bdd.rs" 531 22 531 34] (([#"../bdd.rs" 531 23 531 27] Bdd_Bdd_Type.bdd_0 a), ([#"../bdd.rs" 531 29 531 33] Bdd_Bdd_Type.bdd_0 b)));
+    [#"../bdd.rs" 531 22 531 34] _23 <- ([#"../bdd.rs" 531 22 531 34] (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b));
     switch (let (a, _) = _23 in a)
       | Bdd_Node_Type.C_True -> goto BB7
       | _ -> goto BB6
@@ -3808,7 +3823,7 @@ module Bdd_Impl11_And
     [#"../bdd.rs" 536 53 536 60] childfa <- ([#"../bdd.rs" 536 53 536 60] Bdd_Node_Type.if_childf (let (a, _) = _23 in a));
     assume { resolve2 _23 };
     [#"../bdd.rs" 540 29 540 32] _45 <- ([#"../bdd.rs" 540 29 540 32] vb);
-    [#"../bdd.rs" 540 22 540 33] _42 <- ([#"../bdd.rs" 540 22 540 33] cmp0 ([#"../bdd.rs" 540 22 540 24] va) ([#"../bdd.rs" 540 29 540 32] _45));
+    [#"../bdd.rs" 540 22 540 33] _42 <- ([#"../bdd.rs" 540 22 540 33] cmp0 va _45);
     goto BB19
   }
   BB15 {
@@ -3844,11 +3859,11 @@ module Bdd_Impl11_And
     goto BB26
   }
   BB21 {
-    [#"../bdd.rs" 552 24 552 30] v <- ([#"../bdd.rs" 552 28 552 30] va);
+    [#"../bdd.rs" 552 24 552 30] v <- ([#"../bdd.rs" 552 24 552 30] va);
     [#"../bdd.rs" 553 33 553 37] _67 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 553 33 553 37] self <- { self with current = ( ^ _67) ; };
     assume { inv1 ( ^ _67) };
-    [#"../bdd.rs" 553 33 553 59] _66 <- ([#"../bdd.rs" 553 33 553 59] and _67 ([#"../bdd.rs" 553 42 553 49] childta) ([#"../bdd.rs" 553 51 553 58] childtb));
+    [#"../bdd.rs" 553 33 553 59] _66 <- ([#"../bdd.rs" 553 33 553 59] and _67 childta childtb);
     _67 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB29
   }
@@ -3856,68 +3871,68 @@ module Bdd_Impl11_And
     goto BB23
   }
   BB23 {
-    [#"../bdd.rs" 542 24 542 30] v <- ([#"../bdd.rs" 542 28 542 30] vb);
+    [#"../bdd.rs" 542 24 542 30] v <- ([#"../bdd.rs" 542 24 542 30] vb);
     [#"../bdd.rs" 543 33 543 37] _49 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 543 33 543 37] self <- { self with current = ( ^ _49) ; };
     assume { inv1 ( ^ _49) };
-    [#"../bdd.rs" 543 33 543 53] _48 <- ([#"../bdd.rs" 543 33 543 53] and _49 ([#"../bdd.rs" 543 42 543 43] a) ([#"../bdd.rs" 543 45 543 52] childtb));
+    [#"../bdd.rs" 543 33 543 53] _48 <- ([#"../bdd.rs" 543 33 543 53] and _49 a childtb);
     _49 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB24
   }
   BB24 {
     [#"../bdd.rs" 543 24 543 53] childt <- ([#"../bdd.rs" 543 24 543 53] _48);
-    [#"../bdd.rs" 543 24 543 53] _48 <- any Bdd_Bdd_Type.t_bdd;
+    _48 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 544 33 544 37] _53 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 544 33 544 37] self <- { self with current = ( ^ _53) ; };
     assume { inv1 ( ^ _53) };
-    [#"../bdd.rs" 544 33 544 53] _52 <- ([#"../bdd.rs" 544 33 544 53] and _53 ([#"../bdd.rs" 544 42 544 43] a) ([#"../bdd.rs" 544 45 544 52] childfb));
+    [#"../bdd.rs" 544 33 544 53] _52 <- ([#"../bdd.rs" 544 33 544 53] and _53 a childfb);
     _53 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB25
   }
   BB25 {
     [#"../bdd.rs" 544 24 544 53] childf <- ([#"../bdd.rs" 544 24 544 53] _52);
-    [#"../bdd.rs" 544 24 544 53] _52 <- any Bdd_Bdd_Type.t_bdd;
+    _52 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] ());
     goto BB31
   }
   BB26 {
-    [#"../bdd.rs" 547 24 547 30] v <- ([#"../bdd.rs" 547 28 547 30] va);
+    [#"../bdd.rs" 547 24 547 30] v <- ([#"../bdd.rs" 547 24 547 30] va);
     [#"../bdd.rs" 548 33 548 37] _58 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 548 33 548 37] self <- { self with current = ( ^ _58) ; };
     assume { inv1 ( ^ _58) };
-    [#"../bdd.rs" 548 33 548 53] _57 <- ([#"../bdd.rs" 548 33 548 53] and _58 ([#"../bdd.rs" 548 42 548 49] childta) ([#"../bdd.rs" 548 51 548 52] b));
+    [#"../bdd.rs" 548 33 548 53] _57 <- ([#"../bdd.rs" 548 33 548 53] and _58 childta b);
     _58 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB27
   }
   BB27 {
     [#"../bdd.rs" 548 24 548 53] childt <- ([#"../bdd.rs" 548 24 548 53] _57);
-    [#"../bdd.rs" 548 24 548 53] _57 <- any Bdd_Bdd_Type.t_bdd;
+    _57 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 549 33 549 37] _62 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 549 33 549 37] self <- { self with current = ( ^ _62) ; };
     assume { inv1 ( ^ _62) };
-    [#"../bdd.rs" 549 33 549 53] _61 <- ([#"../bdd.rs" 549 33 549 53] and _62 ([#"../bdd.rs" 549 42 549 49] childfa) ([#"../bdd.rs" 549 51 549 52] b));
+    [#"../bdd.rs" 549 33 549 53] _61 <- ([#"../bdd.rs" 549 33 549 53] and _62 childfa b);
     _62 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB28
   }
   BB28 {
     [#"../bdd.rs" 549 24 549 53] childf <- ([#"../bdd.rs" 549 24 549 53] _61);
-    [#"../bdd.rs" 549 24 549 53] _61 <- any Bdd_Bdd_Type.t_bdd;
+    _61 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] ());
     goto BB31
   }
   BB29 {
     [#"../bdd.rs" 553 24 553 59] childt <- ([#"../bdd.rs" 553 24 553 59] _66);
-    [#"../bdd.rs" 553 24 553 59] _66 <- any Bdd_Bdd_Type.t_bdd;
+    _66 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 554 33 554 37] _71 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 554 33 554 37] self <- { self with current = ( ^ _71) ; };
     assume { inv1 ( ^ _71) };
-    [#"../bdd.rs" 554 33 554 59] _70 <- ([#"../bdd.rs" 554 33 554 59] and _71 ([#"../bdd.rs" 554 42 554 49] childfa) ([#"../bdd.rs" 554 51 554 58] childfb));
+    [#"../bdd.rs" 554 33 554 59] _70 <- ([#"../bdd.rs" 554 33 554 59] and _71 childfa childfb);
     _71 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB30
   }
   BB30 {
     [#"../bdd.rs" 554 24 554 59] childf <- ([#"../bdd.rs" 554 24 554 59] _70);
-    [#"../bdd.rs" 554 24 554 59] _70 <- any Bdd_Bdd_Type.t_bdd;
+    _70 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] ());
     goto BB31
   }
@@ -3925,7 +3940,7 @@ module Bdd_Impl11_And
     [#"../bdd.rs" 557 16 557 20] _74 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 557 16 557 20] self <- { self with current = ( ^ _74) ; };
     assume { inv1 ( ^ _74) };
-    [#"../bdd.rs" 557 16 557 44] r1 <- ([#"../bdd.rs" 557 16 557 44] node0 _74 ([#"../bdd.rs" 557 26 557 27] v) ([#"../bdd.rs" 557 29 557 35] childt) ([#"../bdd.rs" 557 37 557 43] childf));
+    [#"../bdd.rs" 557 16 557 44] r1 <- ([#"../bdd.rs" 557 16 557 44] node0 _74 v childt childf);
     _74 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB32
   }
@@ -3935,8 +3950,10 @@ module Bdd_Impl11_And
   BB33 {
     [#"../bdd.rs" 560 8 560 21] _79 <- Borrow.borrow_final (Bdd_Context_Type.context_and_memo ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5);
     [#"../bdd.rs" 560 8 560 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 ( ^ _79) x5) ; };
-    [#"../bdd.rs" 560 8 560 36] _78 <- ([#"../bdd.rs" 560 8 560 36] add0 _79 ([#"../bdd.rs" 560 26 560 32] (([#"../bdd.rs" 560 27 560 28] a), ([#"../bdd.rs" 560 30 560 31] b))) ([#"../bdd.rs" 560 34 560 35] r1));
+    [#"../bdd.rs" 560 26 560 32] _80 <- ([#"../bdd.rs" 560 26 560 32] (a, b));
+    [#"../bdd.rs" 560 8 560 36] _78 <- ([#"../bdd.rs" 560 8 560 36] add0 _79 _80 r1);
     _79 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd));
+    _80 <- any (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd);
     goto BB34
   }
   BB34 {
diff --git a/creusot/tests/should_succeed/bdd/why3session.xml b/creusot/tests/should_succeed/bdd/why3session.xml
index 7e2b51fade..6618e26c9c 100644
--- a/creusot/tests/should_succeed/bdd/why3session.xml
+++ b/creusot/tests/should_succeed/bdd/why3session.xml
@@ -247,7 +247,7 @@
   <proof prover="2"><result status="valid" time="0.030636" steps="84"/></proof>
   </goal>
   <goal name="hashcons&#39;vc.7" expl="integer overflow" proved="true">
-  <proof prover="2"><result status="valid" time="0.036734" steps="108"/></proof>
+  <proof prover="2"><result status="valid" time="0.036734" steps="110"/></proof>
   </goal>
   <goal name="hashcons&#39;vc.8" expl="type invariant" proved="true">
   <transf name="rewrite" proved="true" arg1="inv0">
@@ -262,52 +262,52 @@
        <goal name="hashcons&#39;vc.8.0.0.0.0.0" expl="VC for hashcons" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.0" expl="VC for hashcons" proved="true">
-        <proof prover="2"><result status="valid" time="0.110409" steps="1553"/></proof>
+        <proof prover="2"><result status="valid" time="0.110409" steps="1170"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.1" expl="VC for hashcons" proved="true">
-        <proof prover="6" timelimit="1"><result status="valid" time="0.635331" steps="52685"/></proof>
+        <proof prover="6" timelimit="1"><result status="valid" time="0.454523" steps="51792"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.2" expl="VC for hashcons" proved="true">
-        <proof prover="2"><result status="valid" time="0.094482" steps="960"/></proof>
+        <proof prover="2"><result status="valid" time="0.094482" steps="958"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.3" expl="VC for hashcons" proved="true">
-        <proof prover="2"><result status="valid" time="0.915675" steps="6832"/></proof>
+        <proof prover="2"><result status="valid" time="0.562310" steps="6832"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.4" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.032625" steps="138001"/></proof>
+        <proof prover="0"><result status="valid" time="0.028391" steps="138150"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.5" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.033041" steps="170927"/></proof>
+        <proof prover="0"><result status="valid" time="0.154632" steps="171094"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.6" expl="VC for hashcons" proved="true">
-        <proof prover="6" timelimit="1"><result status="valid" time="0.425428" steps="44185"/></proof>
+        <proof prover="6" timelimit="1"><result status="valid" time="0.425428" steps="43553"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.7" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.031228" steps="121158"/></proof>
+        <proof prover="0"><result status="valid" time="0.121809" steps="121325"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.8" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.040674" steps="70392"/></proof>
+        <proof prover="0"><result status="valid" time="0.040674" steps="70563"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.9" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.028391" steps="122658"/></proof>
+        <proof prover="0"><result status="valid" time="0.032625" steps="122825"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.10" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.166327" steps="310895"/></proof>
+        <proof prover="0"><result status="valid" time="0.166327" steps="307519"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.11" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.154632" steps="282353"/></proof>
+        <proof prover="0"><result status="valid" time="0.033041" steps="270215"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.12" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.065605" steps="128497"/></proof>
+        <proof prover="0"><result status="valid" time="0.065605" steps="128660"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.13" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.067905" steps="131691"/></proof>
+        <proof prover="0"><result status="valid" time="0.067905" steps="179154"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.14" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.121809" steps="105283"/></proof>
+        <proof prover="0"><result status="valid" time="0.031228" steps="105448"/></proof>
         </goal>
         <goal name="hashcons&#39;vc.8.0.0.0.0.0.15" expl="VC for hashcons" proved="true">
-        <proof prover="0"><result status="valid" time="0.101807" steps="317286"/></proof>
+        <proof prover="0"><result status="valid" time="0.101807" steps="317453"/></proof>
         </goal>
        </transf>
        </goal>
@@ -318,7 +318,7 @@
     </transf>
     </goal>
     <goal name="hashcons&#39;vc.8.0.1" expl="VC for hashcons" proved="true">
-    <proof prover="2"><result status="valid" time="0.017977" steps="124"/></proof>
+    <proof prover="2"><result status="valid" time="0.017977" steps="125"/></proof>
     </goal>
    </transf>
    </goal>
@@ -327,18 +327,18 @@
   <goal name="hashcons&#39;vc.9" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="hashcons&#39;vc.9.0" expl="postcondition" proved="true">
-   <proof prover="6" timelimit="1"><result status="valid" time="0.209358" steps="26719"/></proof>
+   <proof prover="6" timelimit="1"><result status="valid" time="0.209358" steps="26610"/></proof>
    </goal>
    <goal name="hashcons&#39;vc.9.1" expl="postcondition" proved="true">
-   <proof prover="6" timelimit="1"><result status="valid" time="0.043739" steps="8329"/></proof>
+   <proof prover="6" timelimit="1"><result status="valid" time="0.043739" steps="8369"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="hashcons&#39;vc.10" expl="postcondition" proved="true">
-  <proof prover="6" timelimit="1"><result status="valid" time="0.182563" steps="23613"/></proof>
+  <proof prover="6" timelimit="1"><result status="valid" time="0.182563" steps="23805"/></proof>
   </goal>
   <goal name="hashcons&#39;vc.11" expl="postcondition" proved="true">
-  <proof prover="6" timelimit="1"><result status="valid" time="0.182360" steps="21948"/></proof>
+  <proof prover="6" timelimit="1"><result status="valid" time="0.182360" steps="22225"/></proof>
   </goal>
  </transf>
  </goal>
@@ -347,28 +347,28 @@
  <goal name="node&#39;vc" expl="VC for node" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="node&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.066813" steps="274"/></proof>
+  <proof prover="2"><result status="valid" time="0.066813" steps="275"/></proof>
   </goal>
   <goal name="node&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.028080" steps="43"/></proof>
+  <proof prover="2"><result status="valid" time="0.028080" steps="44"/></proof>
   </goal>
   <goal name="node&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.026771" steps="46"/></proof>
+  <proof prover="2"><result status="valid" time="0.026771" steps="47"/></proof>
   </goal>
   <goal name="node&#39;vc.3" expl="type invariant" proved="true">
   <proof prover="2"><result status="valid" time="0.032788" steps="24"/></proof>
   </goal>
   <goal name="node&#39;vc.4" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.042761" steps="136"/></proof>
+  <proof prover="2"><result status="valid" time="0.042761" steps="138"/></proof>
   </goal>
   <goal name="node&#39;vc.5" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.034798" steps="105"/></proof>
+  <proof prover="2"><result status="valid" time="0.034798" steps="107"/></proof>
   </goal>
   <goal name="node&#39;vc.6" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.100856" steps="125115"/></proof>
+  <proof prover="0"><result status="valid" time="0.100856" steps="125196"/></proof>
   </goal>
   <goal name="node&#39;vc.7" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.071532" steps="230"/></proof>
+  <proof prover="2"><result status="valid" time="0.071532" steps="234"/></proof>
   </goal>
  </transf>
  </goal>
@@ -380,7 +380,7 @@
 </theory>
 <theory name="Bdd_Impl11_False" proved="true">
  <goal name="false_&#39;vc" expl="VC for false_" proved="true">
- <proof prover="2"><result status="valid" time="0.112015" steps="438"/></proof>
+ <proof prover="2"><result status="valid" time="0.112015" steps="437"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl11_V" proved="true">
@@ -639,10 +639,10 @@
   <proof prover="0"><result status="valid" time="0.034477" steps="46150"/></proof>
   </goal>
   <goal name="and&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.014341" steps="48"/></proof>
+  <proof prover="2"><result status="valid" time="0.014341" steps="51"/></proof>
   </goal>
   <goal name="and&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.137980" steps="50"/></proof>
+  <proof prover="2"><result status="valid" time="0.137980" steps="52"/></proof>
   </goal>
   <goal name="and&#39;vc.37" expl="type invariant" proved="true">
   <transf name="split_vc" proved="true" >
@@ -653,14 +653,14 @@
      <goal name="and&#39;vc.37.0.0.0" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="and&#39;vc.37.0.0.0.0" expl="type invariant" proved="true">
-      <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="1.022186" steps="86392"/></proof>
+      <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="1.022186" steps="88549"/></proof>
       </goal>
      </transf>
      </goal>
      <goal name="and&#39;vc.37.0.0.1" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="and&#39;vc.37.0.0.1.0" expl="type invariant" proved="true">
-      <proof prover="6" memlimit="2000"><result status="valid" time="1.106945" steps="81369"/></proof>
+      <proof prover="6" memlimit="2000"><result status="valid" time="1.106945" steps="83156"/></proof>
       </goal>
      </transf>
      </goal>
@@ -675,13 +675,13 @@
      <goal name="and&#39;vc.37.1.0.0" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="and&#39;vc.37.1.0.0.0" expl="type invariant" proved="true">
-      <proof prover="6" timelimit="10" memlimit="2000"><result status="valid" time="3.704138" steps="185143"/></proof>
+      <proof prover="6" timelimit="10" memlimit="2000"><result status="valid" time="2.235251" steps="171085"/></proof>
       </goal>
       <goal name="and&#39;vc.37.1.0.0.1" expl="type invariant" proved="true">
-      <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="4.436816" steps="212108"/></proof>
+      <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="3.025925" steps="220111"/></proof>
       </goal>
       <goal name="and&#39;vc.37.1.0.0.2" expl="type invariant" proved="true">
-      <proof prover="6" memlimit="2000"><result status="valid" time="3.978777" steps="194598"/></proof>
+      <proof prover="6" memlimit="2000"><result status="valid" time="2.671487" steps="201897"/></proof>
       </goal>
      </transf>
      </goal>
@@ -694,12 +694,12 @@
     <goal name="and&#39;vc.37.2.0" expl="type invariant" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="and&#39;vc.37.2.0.0" expl="type invariant" proved="true">
-     <proof prover="6" memlimit="2000"><result status="valid" time="1.696591" steps="111668"/></proof>
+     <proof prover="6" memlimit="2000"><result status="valid" time="1.233999" steps="109950"/></proof>
      </goal>
      <goal name="and&#39;vc.37.2.0.1" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="and&#39;vc.37.2.0.1.0" expl="type invariant" proved="true">
-      <proof prover="6" memlimit="2000"><result status="valid" time="2.419454" steps="147521"/></proof>
+      <proof prover="6" memlimit="2000"><result status="valid" time="1.875914" steps="150636"/></proof>
       </goal>
      </transf>
      </goal>
@@ -710,10 +710,10 @@
   </transf>
   </goal>
   <goal name="and&#39;vc.38" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.337344" steps="533609"/></proof>
+  <proof prover="0"><result status="valid" time="0.337344" steps="604217"/></proof>
   </goal>
   <goal name="and&#39;vc.39" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.073766" steps="279179"/></proof>
+  <proof prover="0"><result status="valid" time="0.073766" steps="278977"/></proof>
   </goal>
   <goal name="and&#39;vc.40" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -723,12 +723,12 @@
     <proof prover="0"><result status="valid" time="0.089271" steps="161164"/></proof>
     </goal>
     <goal name="and&#39;vc.40.0.1" expl="postcondition" proved="true">
-    <proof prover="0"><result status="valid" time="0.245881" steps="485801"/></proof>
+    <proof prover="6" timelimit="1"><result status="valid" time="0.482601" steps="74098"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="and&#39;vc.40.1" expl="postcondition" proved="true">
-   <proof prover="6" timelimit="1"><result status="valid" time="0.731618" steps="88270"/></proof>
+   <proof prover="6" timelimit="1"><result status="valid" time="0.731618" steps="87565"/></proof>
    </goal>
    <goal name="and&#39;vc.40.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -736,7 +736,7 @@
     <proof prover="0"><result status="valid" time="0.072442" steps="224146"/></proof>
     </goal>
     <goal name="and&#39;vc.40.2.1" expl="postcondition" proved="true">
-    <proof prover="6" timelimit="1"><result status="valid" time="0.641319" steps="69585"/></proof>
+    <proof prover="6" timelimit="1"><result status="valid" time="0.641319" steps="70623"/></proof>
     </goal>
    </transf>
    </goal>
@@ -748,7 +748,7 @@
    <proof prover="0"><result status="valid" time="0.226651" steps="418425"/></proof>
    </goal>
    <goal name="and&#39;vc.41.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.070438" steps="228705"/></proof>
+   <proof prover="0"><result status="valid" time="0.070438" steps="228897"/></proof>
    </goal>
   </transf>
   </goal>
diff --git a/creusot/tests/should_succeed/bdd/why3shapes.gz b/creusot/tests/should_succeed/bdd/why3shapes.gz
index 8a9e864eaafc5f7e571376143ac6a3fa1c8eace1..4506ae1babb921c56720f687b77c2848edd4354f 100644
GIT binary patch
literal 14367
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
ZJY?FyB1Ba#MqW=o_%C69tFl%C0RSuWO6&jt

literal 14283
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

diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg
index cda5fce41f..994615dafe 100644
--- a/creusot/tests/should_succeed/binary_search.mlcfg
+++ b/creusot/tests/should_succeed/binary_search.mlcfg
@@ -134,6 +134,7 @@ module BinarySearch_Impl0_Index
   var l : BinarySearch_List_Type.t_list t;
   var t : t;
   var ls : BinarySearch_List_Type.t_list t;
+  var _14 : bool;
   var _17 : BinarySearch_List_Type.t_list t;
   {
     goto BB0
@@ -164,7 +165,8 @@ module BinarySearch_Impl0_Index
     [#"../binary_search.rs" 51 26 51 28] ls <- ([#"../binary_search.rs" 51 26 51 28] BinarySearch_List_Type.cons_1 l);
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    switch ([#"../binary_search.rs" 52 15 52 21] ([#"../binary_search.rs" 52 15 52 17] ix) > ([#"../binary_search.rs" 52 20 52 21] [#"../binary_search.rs" 52 20 52 21] (0 : usize)))
+    [#"../binary_search.rs" 52 15 52 21] _14 <- ([#"../binary_search.rs" 52 15 52 21] ix > (0 : usize));
+    switch (_14)
       | False -> goto BB6
       | True -> goto BB5
       end
@@ -177,8 +179,8 @@ module BinarySearch_Impl0_Index
     assume { resolve1 ls };
     assert { [@expl:type invariant] inv1 _17 };
     assume { resolve1 _17 };
-    [#"../binary_search.rs" 53 16 53 24] l <- ([#"../binary_search.rs" 53 20 53 24] _17);
-    [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - ([#"../binary_search.rs" 54 22 54 23] [#"../binary_search.rs" 54 22 54 23] (1 : usize)));
+    [#"../binary_search.rs" 53 16 53 24] l <- ([#"../binary_search.rs" 53 16 53 24] _17);
+    [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - (1 : usize));
     goto BB1
   }
   BB6 {
@@ -265,7 +267,7 @@ module BinarySearch_Impl0_Len
     goto BB0
   }
   BB0 {
-    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] [#"../binary_search.rs" 67 29 67 30] (0 : usize));
+    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] (0 : usize));
     [#"../binary_search.rs" 68 20 68 24] l <- ([#"../binary_search.rs" 68 20 68 24] self);
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
@@ -288,10 +290,10 @@ module BinarySearch_Impl0_Len
     [#"../binary_search.rs" 70 26 70 28] ls <- ([#"../binary_search.rs" 70 26 70 28] BinarySearch_List_Type.cons_1 l);
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + ([#"../binary_search.rs" 71 19 71 20] [#"../binary_search.rs" 71 19 71 20] (1 : usize)));
+    [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + (1 : usize));
     assert { [@expl:type invariant] inv1 ls };
     assume { resolve1 ls };
-    [#"../binary_search.rs" 72 12 72 18] l <- ([#"../binary_search.rs" 72 16 72 18] ls);
+    [#"../binary_search.rs" 72 12 72 18] l <- ([#"../binary_search.rs" 72 12 72 18] ls);
     goto BB1
   }
   BB5 {
@@ -409,39 +411,47 @@ module BinarySearch_BinarySearch
   var _0 : Core_Result_Result_Type.t_result usize usize;
   var arr : BinarySearch_List_Type.t_list uint32 = arr;
   var elem : uint32 = elem;
+  var _9 : bool;
   var _10 : usize;
   var size : usize;
   var base : usize;
+  var _21 : bool;
   var half : usize;
   var _25 : bool;
   var mid : usize;
   var _29 : usize;
+  var _30 : bool;
   var _32 : uint32;
   var cmp : uint32;
   var _41 : uint32;
+  var _44 : bool;
+  var _48 : bool;
+  var _51 : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../binary_search.rs" 110 7 110 16] _10 <- ([#"../binary_search.rs" 110 7 110 16] len0 ([#"../binary_search.rs" 110 7 110 10] arr));
+    [#"../binary_search.rs" 110 7 110 16] _10 <- ([#"../binary_search.rs" 110 7 110 16] len0 arr);
     goto BB1
   }
   BB1 {
-    switch ([#"../binary_search.rs" 110 7 110 21] _10 = ([#"../binary_search.rs" 110 20 110 21] [#"../binary_search.rs" 110 20 110 21] (0 : usize)))
+    [#"../binary_search.rs" 110 7 110 21] _9 <- ([#"../binary_search.rs" 110 7 110 21] _10 = (0 : usize));
+    _10 <- any usize;
+    switch (_9)
       | False -> goto BB3
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 111 19 111 20] [#"../binary_search.rs" 111 19 111 20] (0 : usize)));
+    [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err (0 : usize));
     goto BB21
   }
   BB3 {
-    [#"../binary_search.rs" 113 19 113 28] size <- ([#"../binary_search.rs" 113 19 113 28] len0 ([#"../binary_search.rs" 113 19 113 22] arr));
+    [#"../binary_search.rs" 113 19 113 28] size <- ([#"../binary_search.rs" 113 19 113 28] len0 arr);
     goto BB4
   }
   BB4 {
-    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] [#"../binary_search.rs" 114 19 114 20] (0 : usize));
+    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -451,24 +461,26 @@ module BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    switch ([#"../binary_search.rs" 119 10 119 18] ([#"../binary_search.rs" 119 10 119 14] size) > ([#"../binary_search.rs" 119 17 119 18] [#"../binary_search.rs" 119 17 119 18] (1 : usize)))
+    [#"../binary_search.rs" 119 10 119 18] _21 <- ([#"../binary_search.rs" 119 10 119 18] size > (1 : usize));
+    switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] ([#"../binary_search.rs" 120 26 120 27] [#"../binary_search.rs" 120 26 120 27] (2 : usize)) = ([#"../binary_search.rs" 120 19 120 27] [#"../binary_search.rs" 120 19 120 27] (0 : usize)));
+    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../binary_search.rs" 120 19 120 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] ([#"../binary_search.rs" 120 19 120 23] size) / ([#"../binary_search.rs" 120 26 120 27] [#"../binary_search.rs" 120 26 120 27] (2 : usize)));
-    [#"../binary_search.rs" 121 18 121 29] mid <- ([#"../binary_search.rs" 121 18 121 29] ([#"../binary_search.rs" 121 18 121 22] base) + ([#"../binary_search.rs" 121 25 121 29] half));
-    [#"../binary_search.rs" 123 19 123 33] _32 <- ([#"../binary_search.rs" 123 19 123 33] index0 ([#"../binary_search.rs" 123 19 123 22] arr) ([#"../binary_search.rs" 123 29 123 32] mid));
+    [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] size / (2 : usize));
+    [#"../binary_search.rs" 121 18 121 29] mid <- ([#"../binary_search.rs" 121 18 121 29] base + half);
+    [#"../binary_search.rs" 123 19 123 33] _32 <- ([#"../binary_search.rs" 123 19 123 33] index0 arr mid);
     goto BB9
   }
   BB9 {
-    switch ([#"../binary_search.rs" 123 18 123 40] ([#"../binary_search.rs" 123 18 123 33] _32) > ([#"../binary_search.rs" 123 36 123 40] elem))
+    [#"../binary_search.rs" 123 18 123 40] _30 <- ([#"../binary_search.rs" 123 18 123 40] _32 > elem);
+    switch (_30)
       | False -> goto BB11
       | True -> goto BB10
       end
@@ -483,37 +495,41 @@ module BinarySearch_BinarySearch
   }
   BB12 {
     [#"../binary_search.rs" 123 8 123 62] base <- ([#"../binary_search.rs" 123 8 123 62] _29);
-    [#"../binary_search.rs" 123 8 123 62] _29 <- any usize;
-    [#"../binary_search.rs" 124 8 124 20] size <- ([#"../binary_search.rs" 124 8 124 20] size - ([#"../binary_search.rs" 124 16 124 20] half));
+    _29 <- any usize;
+    [#"../binary_search.rs" 124 8 124 20] size <- ([#"../binary_search.rs" 124 8 124 20] size - half);
     goto BB5
   }
   BB13 {
-    [#"../binary_search.rs" 127 15 127 30] _41 <- ([#"../binary_search.rs" 127 15 127 30] index0 ([#"../binary_search.rs" 127 15 127 18] arr) ([#"../binary_search.rs" 127 25 127 29] base));
+    [#"../binary_search.rs" 127 15 127 30] _41 <- ([#"../binary_search.rs" 127 15 127 30] index0 arr base);
     goto BB14
   }
   BB14 {
     [#"../binary_search.rs" 127 14 127 30] cmp <- ([#"../binary_search.rs" 127 14 127 30] _41);
-    switch ([#"../binary_search.rs" 128 7 128 18] ([#"../binary_search.rs" 128 7 128 10] cmp) = ([#"../binary_search.rs" 128 14 128 18] elem))
+    [#"../binary_search.rs" 128 7 128 18] _44 <- ([#"../binary_search.rs" 128 7 128 18] cmp = elem);
+    switch (_44)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../binary_search.rs" 129 8 129 16] _0 <- ([#"../binary_search.rs" 129 8 129 16] Core_Result_Result_Type.C_Ok ([#"../binary_search.rs" 129 11 129 15] base));
+    [#"../binary_search.rs" 129 8 129 16] _0 <- ([#"../binary_search.rs" 129 8 129 16] Core_Result_Result_Type.C_Ok base);
     goto BB20
   }
   BB16 {
-    switch ([#"../binary_search.rs" 130 14 130 24] ([#"../binary_search.rs" 130 14 130 17] cmp) < ([#"../binary_search.rs" 130 20 130 24] elem))
+    [#"../binary_search.rs" 130 14 130 24] _48 <- ([#"../binary_search.rs" 130 14 130 24] cmp < elem);
+    switch (_48)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../binary_search.rs" 131 8 131 21] _0 <- ([#"../binary_search.rs" 131 8 131 21] Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 131 12 131 20] ([#"../binary_search.rs" 131 12 131 16] base) + ([#"../binary_search.rs" 131 19 131 20] [#"../binary_search.rs" 131 19 131 20] (1 : usize))));
+    [#"../binary_search.rs" 131 12 131 20] _51 <- ([#"../binary_search.rs" 131 12 131 20] base + (1 : usize));
+    [#"../binary_search.rs" 131 8 131 21] _0 <- ([#"../binary_search.rs" 131 8 131 21] Core_Result_Result_Type.C_Err _51);
+    _51 <- any usize;
     goto BB19
   }
   BB18 {
-    [#"../binary_search.rs" 133 8 133 17] _0 <- ([#"../binary_search.rs" 133 8 133 17] Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 133 12 133 16] base));
+    [#"../binary_search.rs" 133 8 133 17] _0 <- ([#"../binary_search.rs" 133 8 133 17] Core_Result_Result_Type.C_Err base);
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/binary_search/why3session.xml b/creusot/tests/should_succeed/binary_search/why3session.xml
index 61fddab936..426bf24a8c 100644
--- a/creusot/tests/should_succeed/binary_search/why3session.xml
+++ b/creusot/tests/should_succeed/binary_search/why3session.xml
@@ -12,7 +12,7 @@
 </theory>
 <theory name="BinarySearch_Impl0_Index" proved="true">
  <goal name="index&#39;vc" expl="VC for index" proved="true">
- <proof prover="0"><result status="valid" time="0.030000" steps="163"/></proof>
+ <proof prover="0"><result status="valid" time="0.030000" steps="239"/></proof>
  </goal>
 </theory>
 <theory name="BinarySearch_Impl0_Len" proved="true">
@@ -30,67 +30,67 @@
   <proof prover="0"><result status="valid" time="0.006300" steps="13"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.010000" steps="24"/></proof>
+  <proof prover="0"><result status="valid" time="0.010000" steps="25"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.008696" steps="29"/></proof>
+  <proof prover="0"><result status="valid" time="0.008696" steps="31"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.4" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.010000" steps="34"/></proof>
+  <proof prover="0"><result status="valid" time="0.010000" steps="35"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.5" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.010000" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.010000" steps="65"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.6" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.070000" steps="48"/></proof>
+  <proof prover="0"><result status="valid" time="0.070000" steps="49"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.7" expl="division by zero" proved="true">
-  <proof prover="0"><result status="valid" time="0.020000" steps="51"/></proof>
+  <goal name="binary_search&#39;vc.7" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.020000" steps="53"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.8" expl="division by zero" proved="true">
-  <proof prover="0"><result status="valid" time="0.050000" steps="53"/></proof>
+  <goal name="binary_search&#39;vc.8" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.015004" steps="67"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.9" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.030000" steps="115"/></proof>
+  <proof prover="0"><result status="valid" time="0.060000" steps="94"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.10" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.040000" steps="564"/></proof>
+  <goal name="binary_search&#39;vc.10" expl="division by zero" proved="true">
+  <proof prover="0"><result status="valid" time="0.020000" steps="54"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.030000" steps="149"/></proof>
+  <goal name="binary_search&#39;vc.11" expl="division by zero" proved="true">
+  <proof prover="0"><result status="valid" time="0.050000" steps="56"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.015004" steps="127"/></proof>
+  <goal name="binary_search&#39;vc.12" expl="integer overflow" proved="true">
+  <proof prover="0"><result status="valid" time="0.030000" steps="118"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.020000" steps="50"/></proof>
+  <goal name="binary_search&#39;vc.13" expl="integer overflow" proved="true">
+  <proof prover="0"><result status="valid" time="0.040000" steps="570"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.025913" steps="65"/></proof>
+  <proof prover="0"><result status="valid" time="0.030000" steps="152"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.15" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.060000" steps="87"/></proof>
+  <goal name="binary_search&#39;vc.15" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.025913" steps="130"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.16" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.120000" steps="704"/></proof>
+  <proof prover="0"><result status="valid" time="0.120000" steps="797"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.17" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.030000" steps="305"/></proof>
+  <proof prover="0"><result status="valid" time="0.030000" steps="346"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.18" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.120000" steps="1073"/></proof>
+  <proof prover="0"><result status="valid" time="0.120000" steps="1188"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.19" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.161160" steps="2341"/></proof>
+  <proof prover="0"><result status="valid" time="0.161160" steps="2768"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.20" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.090000" steps="800"/></proof>
+  <proof prover="0"><result status="valid" time="0.090000" steps="986"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.568309" steps="8489"/></proof>
+  <proof prover="0"><result status="valid" time="0.568309" steps="9945"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.22" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.511725" steps="8878"/></proof>
+  <proof prover="0"><result status="valid" time="0.511725" steps="10015"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/binary_search/why3shapes.gz b/creusot/tests/should_succeed/binary_search/why3shapes.gz
index 43f2d834d4b9c438b0944e220ba07167733763de..c4f7ae7603be9b8183d1eeb77576d810f653cba5 100644
GIT binary patch
literal 2444
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
K-)txtApiigY`1Oz

literal 2323
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

diff --git a/creusot/tests/should_succeed/bug/168.mlcfg b/creusot/tests/should_succeed/bug/168.mlcfg
index 90ce3d79d0..44d49dffa9 100644
--- a/creusot/tests/should_succeed/bug/168.mlcfg
+++ b/creusot/tests/should_succeed/bug/168.mlcfg
@@ -9,7 +9,7 @@ module C168_MaxInt
     goto BB0
   }
   BB0 {
-    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] [#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
+    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/173.mlcfg b/creusot/tests/should_succeed/bug/173.mlcfg
index d7c037e886..ddd9bd8528 100644
--- a/creusot/tests/should_succeed/bug/173.mlcfg
+++ b/creusot/tests/should_succeed/bug/173.mlcfg
@@ -12,9 +12,9 @@ module C173_Test233
     goto BB0
   }
   BB0 {
-    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] [#"../173.rs" 20 12 20 14] (17 : int32));
+    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] (17 : int32));
     assert { [@expl:assertion] [#"../173.rs" 21 19 21 27] Int32.to_int x = 17 };
-    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] [#"../173.rs" 22 12 22 14] (42 : int32));
+    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] (42 : int32));
     assert { [@expl:assertion] [#"../173.rs" 23 19 23 27] Int32.to_int x1 = 42 };
     [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/bug/235.mlcfg b/creusot/tests/should_succeed/bug/235.mlcfg
index 54e66782fd..7ff0fc105d 100644
--- a/creusot/tests/should_succeed/bug/235.mlcfg
+++ b/creusot/tests/should_succeed/bug/235.mlcfg
@@ -15,7 +15,7 @@ module C235_F
     goto BB2
   }
   BB2 {
-    switch ([#"../235.rs" 8 10 8 14] [#"../235.rs" 8 10 8 14] true)
+    switch (true)
       | False -> goto BB4
       | True -> goto BB3
       end
diff --git a/creusot/tests/should_succeed/bug/256.mlcfg b/creusot/tests/should_succeed/bug/256.mlcfg
index 31ead196f2..30e3140e33 100644
--- a/creusot/tests/should_succeed/bug/256.mlcfg
+++ b/creusot/tests/should_succeed/bug/256.mlcfg
@@ -11,7 +11,7 @@ module C256_U8Safe
     goto BB0
   }
   BB0 {
-    [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] ([#"../256.rs" 4 12 4 13] u) + ([#"../256.rs" 4 16 4 17] [#"../256.rs" 4 16 4 17] (0 : uint8)));
+    [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] u + (0 : uint8));
     [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/271.mlcfg b/creusot/tests/should_succeed/bug/271.mlcfg
index ad30030cf4..1834729226 100644
--- a/creusot/tests/should_succeed/bug/271.mlcfg
+++ b/creusot/tests/should_succeed/bug/271.mlcfg
@@ -10,7 +10,7 @@ module C271_Ex
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] [#"../271.rs" 6 12 6 13] (0 : int32));
+    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] (0 : int32));
     goto BB2
   }
   BB1 {
@@ -37,7 +37,7 @@ module C271_Ex2
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] [#"../271.rs" 14 12 14 13] (0 : int32));
+    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
@@ -89,7 +89,7 @@ module C271_Ex3
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] [#"../271.rs" 23 12 23 13] (0 : int32));
+    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
diff --git a/creusot/tests/should_succeed/bug/273.mlcfg b/creusot/tests/should_succeed/bug/273.mlcfg
index 7c4be7eafa..3e369b934c 100644
--- a/creusot/tests/should_succeed/bug/273.mlcfg
+++ b/creusot/tests/should_succeed/bug/273.mlcfg
@@ -21,7 +21,7 @@ module C273_Ex
     goto BB0
   }
   BB0 {
-    [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some ([#"../273.rs" 5 26 5 30] [#"../273.rs" 5 26 5 30] true));
+    [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some true);
     switch (_1)
       | Core_Option_Option_Type.C_Some _ -> goto BB1
       | _ -> goto BB3
diff --git a/creusot/tests/should_succeed/bug/387.mlcfg b/creusot/tests/should_succeed/bug/387.mlcfg
index 97d8c50a50..e909861af9 100644
--- a/creusot/tests/should_succeed/bug/387.mlcfg
+++ b/creusot/tests/should_succeed/bug/387.mlcfg
@@ -118,7 +118,7 @@ module C387_Impl0_Height
   }
   BB2 {
     [#"../387.rs" 19 22 19 23] n <- ([#"../387.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C387_Tree_Type.tree_0 self));
-    [#"../387.rs" 19 29 19 44] _5 <- ([#"../387.rs" 19 29 19 44] height ([#"../387.rs" 19 29 19 35] C387_Node_Type.node_left n));
+    [#"../387.rs" 19 29 19 44] _5 <- ([#"../387.rs" 19 29 19 44] height (C387_Node_Type.node_left n));
     goto BB5
   }
   BB3 {
@@ -126,11 +126,11 @@ module C387_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] [#"../387.rs" 18 26 18 27] (0 : uint64));
+    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
-    [#"../387.rs" 19 49 19 65] _7 <- ([#"../387.rs" 19 49 19 65] height ([#"../387.rs" 19 49 19 56] C387_Node_Type.node_right n));
+    [#"../387.rs" 19 49 19 65] _7 <- ([#"../387.rs" 19 49 19 65] height (C387_Node_Type.node_right n));
     goto BB6
   }
   BB6 {
@@ -140,7 +140,7 @@ module C387_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + ([#"../387.rs" 19 69 19 70] [#"../387.rs" 19 69 19 70] (1 : uint64)));
+    [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + (1 : uint64));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/bug/395.mlcfg b/creusot/tests/should_succeed/bug/395.mlcfg
index 256f6a0f9e..997c4c4fe2 100644
--- a/creusot/tests/should_succeed/bug/395.mlcfg
+++ b/creusot/tests/should_succeed/bug/395.mlcfg
@@ -7,29 +7,42 @@ module C395_SignedDivision
   var _0 : ();
   var x : int32;
   var y : int32;
+  var _4 : bool;
+  var _5 : int32;
   var _6 : int32;
   var _7 : int32;
   var _8 : bool;
+  var _9 : bool;
+  var _10 : bool;
   var _11 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] [#"../395.rs" 4 12 4 14] (10 : int32));
-    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] [#"../395.rs" 5 12 5 13] (1 : int32));
+    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] (10 : int32));
+    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] (1 : int32));
     [#"../395.rs" 7 12 7 13] _6 <- ([#"../395.rs" 7 12 7 13] x);
     [#"../395.rs" 7 16 7 17] _7 <- ([#"../395.rs" 7 16 7 17] y);
-    [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] [#"../395.rs" 7 12 7 17] (0 : int32)));
+    [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = (0 : int32));
     assert { [@expl:division by zero] [#"../395.rs" 7 12 7 17] not _8 };
     goto BB1
   }
   BB1 {
-    [#"../395.rs" 7 12 7 17] _11 <- ([#"../395.rs" 7 12 7 17] ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] [#"../395.rs" 7 12 7 17] (-1 : int32))) && ([#"../395.rs" 7 12 7 17] _6 = ([#"../395.rs" 7 12 7 17] [#"../395.rs" 7 12 7 17] (-2147483648 : int32))));
+    [#"../395.rs" 7 12 7 17] _9 <- ([#"../395.rs" 7 12 7 17] _7 = (-1 : int32));
+    [#"../395.rs" 7 12 7 17] _10 <- ([#"../395.rs" 7 12 7 17] _6 = (-2147483648 : int32));
+    [#"../395.rs" 7 12 7 17] _11 <- ([#"../395.rs" 7 12 7 17] _9 && _10);
+    _9 <- any bool;
+    _10 <- any bool;
     assert { [@expl:Div overflow] [#"../395.rs" 7 12 7 17] not _11 };
     goto BB2
   }
   BB2 {
-    switch ([#"../395.rs" 7 12 7 23] ([#"../395.rs" 7 12 7 17] _6 / _7) = ([#"../395.rs" 7 21 7 23] [#"../395.rs" 7 21 7 23] (10 : int32)))
+    [#"../395.rs" 7 12 7 17] _5 <- ([#"../395.rs" 7 12 7 17] _6 / _7);
+    _6 <- any int32;
+    _7 <- any int32;
+    [#"../395.rs" 7 12 7 23] _4 <- ([#"../395.rs" 7 12 7 23] _5 = (10 : int32));
+    _5 <- any int32;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
diff --git a/creusot/tests/should_succeed/bug/395/why3session.xml b/creusot/tests/should_succeed/bug/395/why3session.xml
index a3a1bf3a69..3c77f7b5e8 100644
--- a/creusot/tests/should_succeed/bug/395/why3session.xml
+++ b/creusot/tests/should_succeed/bug/395/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="395.mlcfg"/>
 <theory name="C395_SignedDivision" proved="true">
  <goal name="signed_division&#39;vc" expl="VC for signed_division" proved="true">
- <proof prover="0"><result status="valid" time="0.014763" steps="410"/></proof>
+ <proof prover="0"><result status="valid" time="0.014763" steps="336"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/395/why3shapes.gz b/creusot/tests/should_succeed/bug/395/why3shapes.gz
index 145d22c4cecd4360af35e0589c173b2550d81768..f153c50072d304c0c971bf29feef0a9def008495 100644
GIT binary patch
literal 273
zcmV+s0q*`EiwFP!00000|9z27Z^IxAhVS_m+_qJ!#D^1LQV&t3Xk2!hxK<QMhg2m~
zX#4v|NVYbav<uj;t(OP;d4uAo`SKCn{18Lmy`l<jUW$FI+PXE3IY)mnAH&saf|c2&
zGfZk0lOQd@jhcgWo6ubteM;w#qNNtivLcKNw}+fQ#H^`Pb~yIe&c*-w>i2~wvsfiX
z^GsIX!x4ec)VfMZndJ;!t$su8mJ;9~SOpn+sVsl7F6naR#_X14lQB>$+N6w(aL0vT
zT=-*zXCJ(_$rEOJdWY(%kJu^4<8lhUM{Pf#7*3schcwYJZn`K8;S7XhM3#~}Y>%>X
X0K!}ES^<(H@`j6VA~gYKA_4#aPNIUA

literal 248
zcmV<U00;jciwFP!00000|9w$Si^Cugz56S?b+=IPD@GRfAPcfydMddVHQE)HWQlEm
z{~A-8HiTZBd2ePOZ^pMROh4w&CwTQkihcJ1Io!U3po0v0Z$2CDFw%20u{%?;$?qCt
z+IW4y<RPa@W^}aurEAlxKDmF=qz)Ayl{pL-FXwbLRYjxBZ}PWL_)HVGBbe1pP|ifg
z)a|g+@w_a_TkUy^wQ0TDS(wogo6WJiIks?>H&K%gTFR6Q(*~D1X{J8xCXDi(6==R-
y=m(hMsq^hI-!G2e1wds@u(cqF*TQ;>Yb%UHsNy-N2y=+P5%>pXSPEq40RRA=Fm?+7

diff --git a/creusot/tests/should_succeed/bug/463.mlcfg b/creusot/tests/should_succeed/bug/463.mlcfg
index bcfbe448ed..1d867edcc7 100644
--- a/creusot/tests/should_succeed/bug/463.mlcfg
+++ b/creusot/tests/should_succeed/bug/463.mlcfg
@@ -26,7 +26,7 @@ module C463_Test_Closure0
     goto BB0
   }
   BB0 {
-    [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] ([#"../463.rs" 7 19 7 20] x) + ([#"../463.rs" 7 23 7 24] [#"../463.rs" 7 23 7 24] (1 : usize)));
+    [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] x + (1 : usize));
     [#"../463.rs" 5 8 5 30] res <- ([#"../463.rs" 5 8 5 30] res1);
     [#"../463.rs" 6 8 6 37] _0 <- ([#"../463.rs" 6 8 6 37] res);
     return _0
@@ -51,12 +51,15 @@ module C463_Test
   var _0 : ();
   var c : C463_Test_Closure0.c463_test_closure0;
   var y : usize;
+  var _4 : usize;
   {
     goto BB0
   }
   BB0 {
     [#"../463.rs" 6 8 6 37] c <- ([#"../463.rs" 6 8 6 37] C463_Test_Closure0.C463_Test_Closure0);
-    [#"../463.rs" 9 12 9 16] y <- ([#"../463.rs" 9 12 9 16] let (a) = [#"../463.rs" 9 12 9 16] (([#"../463.rs" 9 14 9 15] [#"../463.rs" 9 14 9 15] (2 : usize))) in closure00 ([#"../463.rs" 9 12 9 13] c) a);
+    [#"../463.rs" 9 12 9 16] _4 <- ([#"../463.rs" 9 12 9 16] ((2 : usize)));
+    [#"../463.rs" 9 12 9 16] y <- ([#"../463.rs" 9 12 9 16] let (a) = _4 in closure00 c a);
+    _4 <- any usize;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/463/why3session.xml b/creusot/tests/should_succeed/bug/463/why3session.xml
index 1af2d5d592..949c7766d3 100644
--- a/creusot/tests/should_succeed/bug/463/why3session.xml
+++ b/creusot/tests/should_succeed/bug/463/why3session.xml
@@ -12,7 +12,7 @@
 </theory>
 <theory name="C463_Test" proved="true">
  <goal name="test&#39;vc" expl="VC for test" proved="true">
- <proof prover="0"><result status="valid" time="0.007604" steps="6"/></proof>
+ <proof prover="0"><result status="valid" time="0.007604" steps="12"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/463/why3shapes.gz b/creusot/tests/should_succeed/bug/463/why3shapes.gz
index 544b969f2ae21dea31223d7dd2024996c409957f..d1ca6a8262641d24f2fc5cd0d63df0316d020a07 100644
GIT binary patch
literal 235
zcmV<H02KcpiwFP!00000|7B0hZo?oDyz>>@+NKv^5tOPqRF<sxUU9WHu&9<IQyHA^
zFRmKNZBDa~nVs3k123QWMTK8!DN~+bx#5Q=hDWS<oaX8^KHo|a<bX%7J@gxbS3jt{
z+z{8sG5TR+$|l;iP1wKVG>_-J&avDr2YlOk2qAjrJD&2wgElaJP^n{g$z@$g?4qdv
z11?nZ<w^p(JL*2%uSEX&riJ=vyh%i8f7M%p+AcC?baXC8&{hXLOG8GJwh=&K5MYqY
llVDa_NLHeKan52Jrv%EWK%^;2<2alY`v#~Jo6vFr003;!Zl?eM

literal 237
zcmV<J022QniwFP!00000|7A~2i-Rx_z2{ftw!7WSB$Gz7w1*-{y)U`Sn50xFrkL2@
zzbd#0J-r#`ea+{Ar#n4E;;%5KJ`O)z^TQXTGv(O!L$->(w-KCZ=xmk6dO@^uMQO!?
zG|e2XJ{G2!MZ0wt))(rBwu{r?)7!D3(=G!5YGx~biz9bRWBVIYZmUO3(->e^O*m|5
z3@JWd0jPSTF6D%UwcKX^|BaJtsnc$qgPXi1=h=xdt-LYbqbii6PUxUjP=!a7<N!5s
naRp|i(IyCGB$&<}OHnve3b?rr%QDC#$E#$2VSq4DY5@QMj}mW0

diff --git a/creusot/tests/should_succeed/bug/486.mlcfg b/creusot/tests/should_succeed/bug/486.mlcfg
index 70a5ebf5ee..086796c83b 100644
--- a/creusot/tests/should_succeed/bug/486.mlcfg
+++ b/creusot/tests/should_succeed/bug/486.mlcfg
@@ -25,7 +25,7 @@ module C486_Test
     goto BB0
   }
   BB0 {
-    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] [#"../486.rs" 8 11 8 12] (5 : uint32)) ; }));
+    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] (5 : uint32)) ; }));
     [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/510.mlcfg b/creusot/tests/should_succeed/bug/510.mlcfg
index 4cfd6a83af..9a9062e921 100644
--- a/creusot/tests/should_succeed/bug/510.mlcfg
+++ b/creusot/tests/should_succeed/bug/510.mlcfg
@@ -12,7 +12,7 @@ module C510_TestBool
     goto BB0
   }
   BB0 {
-    [#"../510.rs" 4 16 4 25] _bing <- ([#"../510.rs" 4 16 4 25] UInt8.of_int (Bool.to_int ([#"../510.rs" 4 16 4 19] inp)));
+    [#"../510.rs" 4 16 4 25] _bing <- ([#"../510.rs" 4 16 4 25] UInt8.of_int (Bool.to_int inp));
     [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] ());
     return _0
   }
@@ -30,7 +30,7 @@ module C510_TestChar
     goto BB0
   }
   BB0 {
-    [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int ([#"../510.rs" 8 4 8 6] [#"../510.rs" 8 4 8 6] (22 : uint8))));
+    [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int (22 : uint8)));
     [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/511.mlcfg b/creusot/tests/should_succeed/bug/511.mlcfg
index 155900a2db..ad7981a790 100644
--- a/creusot/tests/should_succeed/bug/511.mlcfg
+++ b/creusot/tests/should_succeed/bug/511.mlcfg
@@ -12,7 +12,7 @@ module C511_TestU8
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 4 16 4 28] _bing <- ([#"../511.rs" 4 16 4 28] UIntSize.of_int (UInt8.to_int ([#"../511.rs" 4 16 4 19] inp)));
+    [#"../511.rs" 4 16 4 28] _bing <- ([#"../511.rs" 4 16 4 28] UIntSize.of_int (UInt8.to_int inp));
     [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] ());
     return _0
   }
@@ -31,7 +31,7 @@ module C511_TestU16
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 8 16 8 28] _bing <- ([#"../511.rs" 8 16 8 28] UIntSize.of_int (UInt16.to_int ([#"../511.rs" 8 16 8 19] inp)));
+    [#"../511.rs" 8 16 8 28] _bing <- ([#"../511.rs" 8 16 8 28] UIntSize.of_int (UInt16.to_int inp));
     [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] ());
     return _0
   }
@@ -50,7 +50,7 @@ module C511_TestU128
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 12 16 12 28] _bing <- ([#"../511.rs" 12 16 12 28] UIntSize.of_int (UInt128.to_int ([#"../511.rs" 12 16 12 19] inp)));
+    [#"../511.rs" 12 16 12 28] _bing <- ([#"../511.rs" 12 16 12 28] UIntSize.of_int (UInt128.to_int inp));
     [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] ());
     return _0
   }
@@ -69,7 +69,7 @@ module C511_TestI8
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 16 16 16 28] _bing <- ([#"../511.rs" 16 16 16 28] UIntSize.of_int (Int8.to_int ([#"../511.rs" 16 16 16 19] inp)));
+    [#"../511.rs" 16 16 16 28] _bing <- ([#"../511.rs" 16 16 16 28] UIntSize.of_int (Int8.to_int inp));
     [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] ());
     return _0
   }
@@ -88,7 +88,7 @@ module C511_TestI16
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 20 16 20 28] _bing <- ([#"../511.rs" 20 16 20 28] UIntSize.of_int (Int16.to_int ([#"../511.rs" 20 16 20 19] inp)));
+    [#"../511.rs" 20 16 20 28] _bing <- ([#"../511.rs" 20 16 20 28] UIntSize.of_int (Int16.to_int inp));
     [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] ());
     return _0
   }
@@ -107,7 +107,7 @@ module C511_TestI128
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 24 16 24 28] _bing <- ([#"../511.rs" 24 16 24 28] UIntSize.of_int (Int128.to_int ([#"../511.rs" 24 16 24 19] inp)));
+    [#"../511.rs" 24 16 24 28] _bing <- ([#"../511.rs" 24 16 24 28] UIntSize.of_int (Int128.to_int inp));
     [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/528.mlcfg b/creusot/tests/should_succeed/bug/528.mlcfg
index b28df86ddb..7b9b4401ee 100644
--- a/creusot/tests/should_succeed/bug/528.mlcfg
+++ b/creusot/tests/should_succeed/bug/528.mlcfg
@@ -10,7 +10,7 @@ module C528_Neq
     goto BB0
   }
   BB0 {
-    [#"../528.rs" 4 4 4 10] _0 <- ([#"../528.rs" 4 4 4 10] Bool.neqb ([#"../528.rs" 4 4 4 5] a) ([#"../528.rs" 4 9 4 10] b));
+    [#"../528.rs" 4 4 4 10] _0 <- ([#"../528.rs" 4 4 4 10] Bool.neqb a b);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/552.mlcfg b/creusot/tests/should_succeed/bug/552.mlcfg
index b6358407a9..af756ed851 100644
--- a/creusot/tests/should_succeed/bug/552.mlcfg
+++ b/creusot/tests/should_succeed/bug/552.mlcfg
@@ -61,12 +61,12 @@ module C552_Impl0_Step
     goto BB0
   }
   BB0 {
-    [#"../552.rs" 24 8 24 25] _4 <- ([#"../552.rs" 24 8 24 25] transition0 ([#"../552.rs" 24 8 24 12]  * self));
+    [#"../552.rs" 24 8 24 25] _4 <- ([#"../552.rs" 24 8 24 25] transition0 ( * self));
     goto BB1
   }
   BB1 {
     assume { resolve0 self };
-    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] [#"../552.rs" 25 8 25 13] false);
+    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] false);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/570.mlcfg b/creusot/tests/should_succeed/bug/570.mlcfg
index 39b486da65..1306d8bdf8 100644
--- a/creusot/tests/should_succeed/bug/570.mlcfg
+++ b/creusot/tests/should_succeed/bug/570.mlcfg
@@ -50,7 +50,7 @@ module C570_TestAssign
     goto BB0
   }
   BB0 {
-    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] [#"../570.rs" 17 13 17 14] (2 : int32))));
+    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] (2 : int32))));
     [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/bug/594.mlcfg b/creusot/tests/should_succeed/bug/594.mlcfg
index 48b1124e45..0e34c01bc4 100644
--- a/creusot/tests/should_succeed/bug/594.mlcfg
+++ b/creusot/tests/should_succeed/bug/594.mlcfg
@@ -153,19 +153,31 @@ module C594_TestClosure
   var cl1 : C594_TestClosure_Closure0.c594_testclosure_closure0;
   var cl2 : C594_TestClosure_Closure1.c594_testclosure_closure1;
   var _a : int32;
+  var _5 : (int32, (int32, int32));
+  var _6 : (int32, int32);
   var _b : int32;
+  var _9 : (int32, int32);
+  var _10 : (int32, int32);
   {
     goto BB0
   }
   BB0 {
     [#"../594.rs" 16 14 16 37] cl1 <- ([#"../594.rs" 16 14 16 37] C594_TestClosure_Closure0.C594_TestClosure_Closure0);
     [#"../594.rs" 18 14 18 37] cl2 <- ([#"../594.rs" 18 14 18 37] C594_TestClosure_Closure1.C594_TestClosure_Closure1);
-    [#"../594.rs" 20 13 20 29] _a <- ([#"../594.rs" 20 13 20 29] let (a, b) = [#"../594.rs" 20 13 20 29] (([#"../594.rs" 20 19 20 20] [#"../594.rs" 20 19 20 20] (4 : int32)), ([#"../594.rs" 20 22 20 28] (([#"../594.rs" 20 23 20 24] [#"../594.rs" 20 23 20 24] (0 : int32)), ([#"../594.rs" 20 26 20 27] [#"../594.rs" 20 26 20 27] (3 : int32))))) in closure00 ([#"../594.rs" 20 13 20 18] cl1) a b);
+    [#"../594.rs" 20 22 20 28] _6 <- ([#"../594.rs" 20 22 20 28] ((0 : int32), (3 : int32)));
+    [#"../594.rs" 20 13 20 29] _5 <- ([#"../594.rs" 20 13 20 29] ((4 : int32), _6));
+    _6 <- any (int32, int32);
+    [#"../594.rs" 20 13 20 29] _a <- ([#"../594.rs" 20 13 20 29] let (a, b) = _5 in closure00 cl1 a b);
+    _5 <- any (int32, (int32, int32));
     goto BB1
   }
   BB1 {
     assume { resolve0 cl1 };
-    [#"../594.rs" 21 13 21 26] _b <- ([#"../594.rs" 21 13 21 26] let (a) = [#"../594.rs" 21 13 21 26] (([#"../594.rs" 21 19 21 25] (([#"../594.rs" 21 20 21 21] [#"../594.rs" 21 20 21 21] (0 : int32)), ([#"../594.rs" 21 23 21 24] [#"../594.rs" 21 23 21 24] (4 : int32))))) in closure10 ([#"../594.rs" 21 13 21 18] cl2) a);
+    [#"../594.rs" 21 19 21 25] _10 <- ([#"../594.rs" 21 19 21 25] ((0 : int32), (4 : int32)));
+    [#"../594.rs" 21 13 21 26] _9 <- ([#"../594.rs" 21 13 21 26] (_10));
+    _10 <- any (int32, int32);
+    [#"../594.rs" 21 13 21 26] _b <- ([#"../594.rs" 21 13 21 26] let (a) = _9 in closure10 cl2 a);
+    _9 <- any (int32, int32);
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/bug/682.mlcfg b/creusot/tests/should_succeed/bug/682.mlcfg
index f4c346d39f..488137d7b9 100644
--- a/creusot/tests/should_succeed/bug/682.mlcfg
+++ b/creusot/tests/should_succeed/bug/682.mlcfg
@@ -21,7 +21,7 @@ module C682_AddSome
     goto BB0
   }
   BB0 {
-    [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11]  * a + ([#"../682.rs" 7 10 7 11] [#"../682.rs" 7 10 7 11] (1 : uint64))) ; };
+    [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11]  * a + (1 : uint64)) ; };
     assume { resolve0 a };
     [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/bug/691.mlcfg b/creusot/tests/should_succeed/bug/691.mlcfg
index 72883934cf..ef2abb420e 100644
--- a/creusot/tests/should_succeed/bug/691.mlcfg
+++ b/creusot/tests/should_succeed/bug/691.mlcfg
@@ -65,8 +65,8 @@ module C691_Example
     goto BB0
   }
   BB0 {
-    [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo ([#"../691.rs" 9 23 9 27] [#"../691.rs" 9 23 9 27] (2 : uint32)));
-    [#"../691.rs" 10 12 10 39] _2 <- ([#"../691.rs" 10 12 10 39] C691_Example_Closure0.C691_Example_Closure0 ([#"../691.rs" 10 12 10 39] c));
+    [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo (2 : uint32));
+    [#"../691.rs" 10 12 10 39] _2 <- ([#"../691.rs" 10 12 10 39] C691_Example_Closure0.C691_Example_Closure0 c);
     assume { resolve0 _2 };
     [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/bug/693.mlcfg b/creusot/tests/should_succeed/bug/693.mlcfg
index 406efe6074..43a517f18b 100644
--- a/creusot/tests/should_succeed/bug/693.mlcfg
+++ b/creusot/tests/should_succeed/bug/693.mlcfg
@@ -57,7 +57,7 @@ module C693_G
     goto BB0
   }
   BB0 {
-    [#"../693.rs" 6 4 6 8] _0 <- ([#"../693.rs" 6 4 6 8] f0 ([#"../693.rs" 6 6 6 7] [#"../693.rs" 6 6 6 7] (0 : int32)));
+    [#"../693.rs" 6 4 6 8] _0 <- ([#"../693.rs" 6 4 6 8] f0 (0 : int32));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index d2da1c5c95..76a9249439 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -276,50 +276,59 @@ module C874_CanExtend
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var v : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+  var _4 : array int32;
   var w : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+  var _8 : array int32;
   var _9 : ();
   var _10 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
   var z : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+  var _15 : array int32;
   {
     goto BB0
   }
   BB0 {
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB1
   }
   BB1 {
     goto BB2
   }
   BB2 {
-    [#"../874.rs" 5 16 5 29] v <- ([#"../874.rs" 5 16 5 29] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] [#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] [#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] [#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 5 16 5 29] v <- ([#"../874.rs" 5 16 5 29] into_vec0 _4);
+    _4 <- any array int32;
     goto BB3
   }
   BB3 {
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (6 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB4
   }
   BB4 {
     goto BB5
   }
   BB5 {
-    [#"../874.rs" 6 12 6 25] w <- ([#"../874.rs" 6 12 6 25] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] [#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] [#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] [#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../874.rs" 6 12 6 25] w <- ([#"../874.rs" 6 12 6 25] into_vec0 _8);
+    _8 <- any array int32;
     goto BB6
   }
   BB6 {
     [#"../874.rs" 7 4 7 5] _10 <- Borrow.borrow_mut v;
     [#"../874.rs" 7 4 7 5] v <-  ^ _10;
-    [#"../874.rs" 7 4 7 15] _9 <- ([#"../874.rs" 7 4 7 15] extend0 _10 ([#"../874.rs" 7 13 7 14] w));
+    [#"../874.rs" 7 4 7 15] _9 <- ([#"../874.rs" 7 4 7 15] extend0 _10 w);
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
-    [#"../874.rs" 7 13 7 14] w <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+    w <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB7
   }
   BB7 {
     assume { resolve0 v };
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Seq.get (__arr_temp.elts) 3 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 4 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 5 = (6 : int32)}; assume {Slice.length __arr_temp = 6}; __arr_temp);
     goto BB8
   }
   BB8 {
     goto BB9
   }
   BB9 {
-    [#"../874.rs" 9 12 9 34] z <- ([#"../874.rs" 9 12 9 34] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] [#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] [#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] [#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] [#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] [#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] [#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp));
+    [#"../874.rs" 9 12 9 34] z <- ([#"../874.rs" 9 12 9 34] into_vec0 _15);
+    _15 <- any array int32;
     goto BB10
   }
   BB10 {
diff --git a/creusot/tests/should_succeed/bug/874/why3session.xml b/creusot/tests/should_succeed/bug/874/why3session.xml
index a4efaab4aa..01992b39ef 100644
--- a/creusot/tests/should_succeed/bug/874/why3session.xml
+++ b/creusot/tests/should_succeed/bug/874/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="874.mlcfg"/>
 <theory name="C874_CanExtend" proved="true">
  <goal name="can_extend&#39;vc" expl="VC for can_extend" proved="true">
- <proof prover="3"><result status="valid" time="0.039819" steps="702"/></proof>
+ <proof prover="3"><result status="valid" time="0.039819" steps="719"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/874/why3shapes.gz b/creusot/tests/should_succeed/bug/874/why3shapes.gz
index 73aae1d83a04690f4a02bff789987aed4c107dd4..f4bf1f6df69cccf583e6a6da93084bda9876aa53 100644
GIT binary patch
literal 532
zcmV+v0_*)BiwFP!00000|8-JLbDJ;_z4I%$wRJ99NeIZ4gC}D~{sTJJqX;?i3<d`j
zH~sfr1Z0e`FR*(1^>+9D+{FF6zSus#+O9vf&2uc`&9BIP=u>kQij<MQbZzx%Y)=&E
zrzb@fSIK^GC)1xPKE2uWrqdhtH`#1VyeWsZ*rI{Z_Iz>wl$i2GIWb98I-6W&v&mFG
zn^eKT^>?9b+q}7Vjbqhy`}c5eD_dhP(5^k48mG_ti)?-NI>xsJH0H8s)7i!V_P7OC
zz?UtGI{~K(zxTQi-u<|9;Mk=oLUuG?A-K)X_HBK&gL|(F{3@E2(-<^ck-)fYiC|b-
zZpZm(>T9Hm3anA+PaH<@AHzuF$QUe)7+i1GX<NH~0FpJtO%g)P@DQSgg%B7TLc~CM
zJE*U`oJ#*ul%qJ8Fhx)?yu^(LQE^0X6oaic?fFt$XDi~LI3-@s+3s*@dxw26lx`<o
zj|QItQFx5(cDwDg=g~W~Ta@Vrw$!gQ@eE6Eb48h7?*<J8*@$8`d>;<(9S&B9Bj1N3
zz6L5Ze{?v=gJmN?gTo;N!Ql`hW+V=of^?<`=^cuYh7>`}6hZhJDDUJU#U!MdtR#X^
zC=rAPiA3rpKDJ$KbaSv@&NfvPkreWy$nwgNqXGT;nx{e^3Fnz5HlsWSDgh)AnafP3
WQpiMd$t0qZME?P~;DnzY1polni~h<0

literal 515
zcmV+e0{s0SiwFP!00000|8-K!lAACPyz>>@l6Wr~y@0K7pi-vfAJ8$bS<vpf3WEcz
zv-$gscx)N4FEDD&qg&J8cVYLA7uSVX*LJ6-ehziG`w{ei@Kj&5WqE*?wkbaf*D(wD
z^klh}RvrAcn*PGd=`5x*pU!Z&sTO15O*`r(76UZ8^QHf1^;EC(iHWk&97-F{p|Hsu
zatog8&lD?HzxD4(vZ|{2dptL#t7sNr-yBbMk7xX3*-*XB8O8zyb6bk}98-dLJVIKK
z%Mt0Fgi}f1d(-{xVSICtG$l>f?6}?_^xUoMn(FHO^#N1*TCVa*23H#rl&6*mrO7-S
z^>Lz*;s;64@|zbj3iT<4Z;x-TM_2Wo2h<iKa1Dt<t|4BCH3S7;L#%-OR^Cvv)Plb)
z=VZwx%n7tS%5H4M69RB&d7NR<oG+E@UCD+csid9tu039wt|!cAXQSn&Ku(F?*U^5z
z&!*QMUF63t+O(c68<rskhWQXvo)?sQ8sw^IM9EXhye>%YtP7I$x*(p{1@VJ*LA-im
z0{CiO1i@-u1hGO6#2~VuzliC3#Po)k`XZ(t5mReoYGVh2)^;Gs+aa*O!q=t^3#^as
zvv+kF1d1aAg|b8;;Z?^;%rN0DmKtAPgv1cI0WiQ!Vqy~+ZIqEl7(xvT{sWUAu6q9j
F003>!{v-eZ

diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
index 360f62446d..837e58198d 100644
--- a/creusot/tests/should_succeed/bug/949.mlcfg
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -253,26 +253,26 @@ module C949_Main
     goto BB1
   }
   BB1 {
-    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 21 6 22] [#"../949.rs" 6 21 6 22] (1 : int32));
+    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 12 6 23] (1 : int32));
     goto BB2
   }
   BB2 {
     [#"../949.rs" 7 12 7 15] _4 <- Borrow.borrow_mut tok;
     [#"../949.rs" 7 12 7 15] tok <-  ^ _4;
-    [#"../949.rs" 7 12 7 31] p <- ([#"../949.rs" 7 12 7 31] ptr_from_box0 _4 ([#"../949.rs" 7 29 7 30] b));
+    [#"../949.rs" 7 12 7 31] p <- ([#"../949.rs" 7 12 7 31] ptr_from_box0 _4 b);
     _4 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
-    [#"../949.rs" 7 29 7 30] b <- any int32;
+    b <- any int32;
     goto BB3
   }
   BB3 {
     [#"../949.rs" 8 16 8 19] _7 <- Borrow.borrow_mut tok;
     [#"../949.rs" 8 16 8 19] tok <-  ^ _7;
-    [#"../949.rs" 8 16 8 33] r <- ([#"../949.rs" 8 16 8 33] ptr_to_box0 _7 ([#"../949.rs" 8 31 8 32] p));
+    [#"../949.rs" 8 16 8 33] r <- ([#"../949.rs" 8 16 8 33] ptr_to_box0 _7 p);
     _7 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB4
   }
   BB4 {
-    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + ([#"../949.rs" 9 10 9 11] [#"../949.rs" 9 10 9 11] (5 : int32)));
+    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + (5 : int32));
     assume { resolve0 r };
     [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] ());
     goto BB5
diff --git a/creusot/tests/should_succeed/bug/eq_panic.mlcfg b/creusot/tests/should_succeed/bug/eq_panic.mlcfg
index a8f4a43c2c..4bba04abf2 100644
--- a/creusot/tests/should_succeed/bug/eq_panic.mlcfg
+++ b/creusot/tests/should_succeed/bug/eq_panic.mlcfg
@@ -56,7 +56,7 @@ module EqPanic_Omg
     goto BB0
   }
   BB0 {
-    [#"../eq_panic.rs" 7 4 7 10] _0 <- ([#"../eq_panic.rs" 7 4 7 10] eq0 ([#"../eq_panic.rs" 7 4 7 5] x) ([#"../eq_panic.rs" 7 9 7 10] y));
+    [#"../eq_panic.rs" 7 4 7 10] _0 <- ([#"../eq_panic.rs" 7 4 7 10] eq0 x y);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/final_borrows.mlcfg b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
index 9c48ff2c95..fb1ab311ec 100644
--- a/creusot/tests/should_succeed/bug/final_borrows.mlcfg
+++ b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
@@ -96,7 +96,7 @@ module FinalBorrows_Select
     goto BB0
   }
   BB0 {
-    switch ([#"../final_borrows.rs" 11 7 11 8] b)
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -569,7 +569,7 @@ module FinalBorrows_Set7
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] [#"../final_borrows.rs" 49 9 49 10] (7 : int32)) ; };
+    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] (7 : int32)) ; };
     assume { resolve0 r };
     [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] ());
     return _0
@@ -604,7 +604,7 @@ module FinalBorrows_NotFinalBorrowWorks
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] [#"../final_borrows.rs" 54 16 54 20] (1 : int32));
+    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] (1 : int32));
     [#"../final_borrows.rs" 55 12 55 18] r <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 55 12 55 18] x <-  ^ r;
     [#"../final_borrows.rs" 56 13 56 20] r1 <- Borrow.borrow_final ( * r) (Borrow.get_id r);
@@ -618,9 +618,9 @@ module FinalBorrows_NotFinalBorrowWorks
   BB1 {
     assume { resolve0 r1 };
     [#"../final_borrows.rs" 58 12 58 14] y <- ([#"../final_borrows.rs" 58 12 58 14]  * r);
-    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] [#"../final_borrows.rs" 59 9 59 10] (2 : int32)) ; };
+    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] (2 : int32)) ; };
     assume { resolve0 r };
-    [#"../final_borrows.rs" 60 11 60 16] _0 <- ([#"../final_borrows.rs" 60 11 60 16] ([#"../final_borrows.rs" 60 11 60 12] x) + ([#"../final_borrows.rs" 60 15 60 16] y));
+    [#"../final_borrows.rs" 60 11 60 16] _0 <- ([#"../final_borrows.rs" 60 11 60 16] x + y);
     return _0
   }
   
@@ -653,14 +653,14 @@ module FinalBorrows_Branching
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] [#"../final_borrows.rs" 65 16 65 17] (3 : int32));
+    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] (3 : int32));
     [#"../final_borrows.rs" 67 17 67 23] r1 <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 67 17 67 23] x <-  ^ r1;
     [#"../final_borrows.rs" 69 13 69 21] r2 <- Borrow.borrow_mut ( * r1);
     [#"../final_borrows.rs" 69 13 69 21] r1 <- { r1 with current = ( ^ r2) ; };
     assume { resolve0 r2 };
-    [#"../final_borrows.rs" 70 4 70 11] y <- ([#"../final_borrows.rs" 70 8 70 11]  * r2);
-    switch ([#"../final_borrows.rs" 71 7 71 8] b)
+    [#"../final_borrows.rs" 70 4 70 11] y <- ([#"../final_borrows.rs" 70 4 70 11]  * r2);
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -672,10 +672,10 @@ module FinalBorrows_Branching
     [#"../final_borrows.rs" 73 13 73 19] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11);
     [#"../final_borrows.rs" 73 13 73 19] _11 <- { _11 with current = ( ^ _10) ; };
     [#"../final_borrows.rs" 73 8 73 19] r1 <- ([#"../final_borrows.rs" 73 8 73 19] _10);
-    [#"../final_borrows.rs" 73 8 73 19] _10 <- any borrowed int32;
+    _10 <- any borrowed int32;
     assume { resolve0 _11 };
     assume { resolve0 r1 };
-    [#"../final_borrows.rs" 74 8 74 15] y <- ([#"../final_borrows.rs" 74 12 74 15]  * r1);
+    [#"../final_borrows.rs" 74 8 74 15] y <- ([#"../final_borrows.rs" 74 8 74 15]  * r1);
     [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] ());
     goto BB3
   }
@@ -683,7 +683,7 @@ module FinalBorrows_Branching
     [#"../final_borrows.rs" 77 17 77 25] r21 <- Borrow.borrow_final ( * r1) (Borrow.get_id r1);
     [#"../final_borrows.rs" 77 17 77 25] r1 <- { r1 with current = ( ^ r21) ; };
     assume { resolve0 r21 };
-    [#"../final_borrows.rs" 78 8 78 15] y <- ([#"../final_borrows.rs" 78 12 78 15]  * r21);
+    [#"../final_borrows.rs" 78 8 78 15] y <- ([#"../final_borrows.rs" 78 8 78 15]  * r21);
     assume { resolve0 r1 };
     [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] ());
     goto BB3
@@ -843,7 +843,7 @@ module FinalBorrows_BoxDeref
   }
   BB1 {
     [#"../final_borrows.rs" 95 4 95 6] _0 <- ([#"../final_borrows.rs" 95 4 95 6] x);
-    [#"../final_borrows.rs" 95 4 95 6] x <- any t;
+    x <- any t;
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     goto BB2
@@ -1453,6 +1453,7 @@ module FinalBorrows_ShallowBorrowNoGen
   var _r : borrowed (Core_Option_Option_Type.t_option int32);
   var inner : int32;
   var inner1 : int32;
+  var _8 : bool;
   {
     goto BB0
   }
@@ -1475,7 +1476,8 @@ module FinalBorrows_ShallowBorrowNoGen
   BB3 {
     [#"../final_borrows.rs" 174 13 174 22] inner <- ([#"../final_borrows.rs" 174 13 174 22] Core_Option_Option_Type.some_0 ( * x));
     [#"../final_borrows.rs" 174 13 174 22] inner1 <- ([#"../final_borrows.rs" 174 13 174 22] inner);
-    switch ([#"../final_borrows.rs" 174 27 174 38] ([#"../final_borrows.rs" 174 27 174 33] inner1) = ([#"../final_borrows.rs" 174 37 174 38] [#"../final_borrows.rs" 174 37 174 38] (2 : int32)))
+    [#"../final_borrows.rs" 174 27 174 38] _8 <- ([#"../final_borrows.rs" 174 27 174 38] inner1 = (2 : int32));
+    switch (_8)
       | False -> goto BB5
       | True -> goto BB4
       end
diff --git a/creusot/tests/should_succeed/bug/final_borrows/why3session.xml b/creusot/tests/should_succeed/bug/final_borrows/why3session.xml
index b2d906e4a1..2f919458e1 100644
--- a/creusot/tests/should_succeed/bug/final_borrows/why3session.xml
+++ b/creusot/tests/should_succeed/bug/final_borrows/why3session.xml
@@ -109,7 +109,7 @@
 </theory>
 <theory name="FinalBorrows_ShallowBorrowNoGen" proved="true">
  <goal name="shallow_borrow_no_gen&#39;vc" expl="VC for shallow_borrow_no_gen" proved="true">
- <proof prover="2"><result status="valid" time="0.004012" steps="25"/></proof>
+ <proof prover="2"><result status="valid" time="0.004012" steps="27"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/final_borrows/why3shapes.gz b/creusot/tests/should_succeed/bug/final_borrows/why3shapes.gz
index fc47d67e6253661e10dcde1cae9df918d7953df1..b9593b54d1f0c3c0d346e1c44f45b3838a70f30d 100644
GIT binary patch
delta 651
zcmV;60(AZH6@nJ9gb07Z_uI#CJ;Fm-m-7gOaQRoKv?##gN8f>q0Q8(t-ml|81}2?*
zXnXK|hSB3~Qb(}^zAoSbr|G!7g!(|vDyNr^zMLpq0$=L$nE*b;`HFMaV8a0VUMr!L
zCH81L158R`gw$(ZVFeXibxNrQYrr1R2-RX|4R;ElscX^ob}fG^5f(PRkZsorCIl#w
zDf*7{)^^Y`)Q!V6u*z1Z(v@2ET-IE31H5l~=M1yfa@Ka%wa{qUu0dCzDv%YBa9#nO
z1y;NP#0EQ!uD7yxo$7c~cRfQ@JKMW8*a}SELIal!4Uk~XwE&}~0@{c>Yf!)%p+Yv_
z0@}t2kX-}TG$eo7DIuY*5jrhv)w(s3U2r8N?c7RZ=~GJHl7UpOkz_Y@V-&7YRwz~o
z3LHag47RQ5Tg$9gttE?6+UR7xMqQy=(J$!dk_j$5Z5`EpifQb~5>02NrcG^ySuf4V
z5kk}sbVCXXrFpM9vV{<eb-Gz|s5lEAAq%(KnObR5p9z1b`&N+Cuxn~b3fVR16~`pk
zSq+VHEg6UWMyF_)Y-DSpX*ijT7R!o@wAi-BHiVr<2-$S15v?E>cal4B!l-`Db;W6!
z=%qDeP}Z8xiMGW?3oC@?tm`^PXSEg2iaBN-DJvasxUH!;BzfdGrZnq%g49|-CD^Ja
z-<eiAS95<S4eceJY#Z)`?s&(oTnk<aTs7n(>}sbv!8lsmIR{-Wxv-`t(7;*{ZnHX!
z8$thSvX-XpykZ^pT#34~4Pj_4bR|@<sU>GgClG`{=@k)OLy&A--3iHnt%a?G2}?~=
lw@^#XYHPhsIfA6)w2kg1w!K(Os3cqc2hylMtZoA&005blFzWyS

delta 633
zcmV-<0*3v97V#CZgb07q_joAl@mPhnIDQnj-#nh)$BVJ8!S@*^kGDyk#18nn;CGy+
z+wzj>12wCZUM~7_p}g{csn2Hu@D#@@&RK&E1L%9Lgi@B+q3sMXDTNVIuX%+PRBY8L
zr5daOdq5*pi=8#xDS)P~Mc3Q4tVCGY^g^~>E0_?VNT%pJ&Rc)mLCa7#4%fgcTbW8%
zYSnXDbIlF#zUiGa%v#G?+gaB_qh-4WU4g1VRzSje1#}iz@dgkZ>@>RG%HDOV<4xW5
z3{~xH@77=|FnJ3NTrxC3f;HCyjFt*$Bkrt00c(T`*?bFV8z(?^4Or8VWT%9Lx<=@<
ztX1pQNOr-MkhFhuD~+X3DS1l<QoTl!-PDayxJFr_SRp8I46QNPwx(|_vs$&5EJ|si
zll2;Pg=$5=pr1=7xa_obRM#n{u_H?~ot2t4wH0Q)G$Tg{Q9IBLDJYcYz3RvoLMYbh
zX3e4EEO>-0+-hfPrAd7zobFpePQ$LLB`IXroL3x^TxWkZG|IJP9P%5TqG7U;t%auH
zWHMSTD=yMv+Zx*tb{ZjM)2T+Zf?V85?!XD7`Zd=Tr)8p-){sG2YdR;|78@<B5Sp{D
z>lmHYRy-@_n02JAbiCoVrs9v}k>i-stm_F<YXOyDtD1agTIpQPoiwzUbh2%@6T0Ia
zw{k6bC2(=okc+UZo$3VRXl>^lbhYHdnwmfZYeBfp>M(8u{j14Znzr+bb=Y$y>drQV
zp|#MJP{F2_oF$z=5CWxFM05>7vT=1MBm=e<wh|^RHK5wYHr6m^$v}o;gA$bm))Ndm
T(X1s@lCAy&8Xs1XP9y*TUfMF_

diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg
index b474097921..925a87c903 100644
--- a/creusot/tests/should_succeed/bug/two_phase.mlcfg
+++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg
@@ -155,7 +155,7 @@ module TwoPhase_Test
   BB0 {
     [#"../two_phase.rs" 7 4 7 5] _4 <- Borrow.borrow_final ( * v) (Borrow.get_id v);
     [#"../two_phase.rs" 7 4 7 5] v <- { v with current = ( ^ _4) ; };
-    [#"../two_phase.rs" 7 11 7 18] _5 <- ([#"../two_phase.rs" 7 11 7 18] len0 ([#"../two_phase.rs" 7 11 7 12]  * _4));
+    [#"../two_phase.rs" 7 11 7 18] _5 <- ([#"../two_phase.rs" 7 11 7 18] len0 ( * _4));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/cell/01.mlcfg b/creusot/tests/should_succeed/cell/01.mlcfg
index f9ccf2ef96..1a0d454d08 100644
--- a/creusot/tests/should_succeed/cell/01.mlcfg
+++ b/creusot/tests/should_succeed/cell/01.mlcfg
@@ -74,23 +74,28 @@ module C01_AddsTwo
   var _0 : ();
   var c : C01_Cell_Type.t_cell uint32 (C01_Even_Type.t_even) = c;
   var v : uint32;
+  var _4 : bool;
   var _6 : ();
+  var _8 : uint32;
   var _10 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 41 12 41 19] v <- ([#"../01.rs" 41 12 41 19] get0 ([#"../01.rs" 41 12 41 13] c));
+    [#"../01.rs" 41 12 41 19] v <- ([#"../01.rs" 41 12 41 19] get0 c);
     goto BB1
   }
   BB1 {
-    switch ([#"../01.rs" 43 7 43 17] ([#"../01.rs" 43 7 43 8] v) < ([#"../01.rs" 43 11 43 17] [#"../01.rs" 43 11 43 17] (100000 : uint32)))
+    [#"../01.rs" 43 7 43 17] _4 <- ([#"../01.rs" 43 7 43 17] v < (100000 : uint32));
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../01.rs" 44 8 44 20] _6 <- ([#"../01.rs" 44 8 44 20] set0 ([#"../01.rs" 44 8 44 9] c) ([#"../01.rs" 44 14 44 19] ([#"../01.rs" 44 14 44 15] v) + ([#"../01.rs" 44 18 44 19] [#"../01.rs" 44 18 44 19] (2 : uint32))));
+    [#"../01.rs" 44 14 44 19] _8 <- ([#"../01.rs" 44 14 44 19] v + (2 : uint32));
+    [#"../01.rs" 44 8 44 20] _6 <- ([#"../01.rs" 44 8 44 20] set0 c _8);
+    _8 <- any uint32;
     goto BB3
   }
   BB3 {
@@ -98,7 +103,7 @@ module C01_AddsTwo
     goto BB6
   }
   BB4 {
-    [#"../01.rs" 46 8 46 16] _10 <- ([#"../01.rs" 46 8 46 16] set0 ([#"../01.rs" 46 8 46 9] c) ([#"../01.rs" 46 14 46 15] [#"../01.rs" 46 14 46 15] (0 : uint32)));
+    [#"../01.rs" 46 8 46 16] _10 <- ([#"../01.rs" 46 8 46 16] set0 c (0 : uint32));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/cell/01/why3session.xml b/creusot/tests/should_succeed/cell/01/why3session.xml
index c1273f0f5c..450c0bb113 100644
--- a/creusot/tests/should_succeed/cell/01/why3session.xml
+++ b/creusot/tests/should_succeed/cell/01/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="01.mlcfg"/>
 <theory name="C01_AddsTwo" proved="true">
  <goal name="adds_two&#39;vc" expl="VC for adds_two" proved="true">
- <proof prover="0"><result status="valid" time="0.033868" steps="679"/></proof>
+ <proof prover="0"><result status="valid" time="0.033868" steps="672"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/cell/01/why3shapes.gz b/creusot/tests/should_succeed/cell/01/why3shapes.gz
index 5695af0330aaaa161ac06cbe335b32d7e21ac7cc..f9b6d4914e7f1c15721261944fcd2691b0a3f78a 100644
GIT binary patch
literal 211
zcmV;^04)C>iwFP!00000|7A|GZiFxl-SZXMuH}{_4hgERLv>O__sT0WB&S2F;7Wl0
zehE;is2=?6XFvNrWjx;L5h9<%5Zk_c;f80=Z2Y3On-vPTmjb0@*OhF<+s3FBWh2PZ
zXAGOd9*1b(=@l&+w;)YzH-b7X84aEPwz^R+DXO}kIv@WH>0_7z=IL18?*9@+m*b)o
zDbh342n(*JU^fHq*PUZ{<+py|<bABh@18NpsqnS6PzY%(cv+CPo`UxVg4TgUsY+Q2
N_5(SxEN(Rc007K!WN`oh

literal 187
zcmV;s07U;EiwFP!00000|7DHO4uUWY#_xNI-Bi4ED-$q!FeVGUz^<eYjJtp`z}J_5
zCK7vSzyA8A-!|a>LC@0jzHGd!t0O<~V8_}QxvG~2^di9s&D;bnTxKGtDJ;xhwZ=we
zbf(T#Ey~T%jiUYU8d|AGXMU@@s_=hDI<0|#v4)=}G^n#V6PGO1-*C;$mEY@zQ&IT5
peb<Z?QkG~D6vl$$C`J(ph#<LPLW3*fn95Y7z&<Tkt91?m008N_S|k7f

diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index 15bee105da..a97461e951 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -308,21 +308,26 @@ module C02_FibMemo
   var _9 : C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib);
   var v : usize;
   var fib_i : usize;
+  var _15 : bool;
+  var _17 : bool;
   var _19 : Snapshot.snap_ty ();
   var _21 : Snapshot.snap_ty ();
   var _23 : usize;
+  var _25 : usize;
   var _27 : usize;
+  var _29 : usize;
   var _33 : ();
   var _35 : C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib);
+  var _38 : Core_Option_Option_Type.t_option usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../02.rs" 96 13 96 16] _9 <- ([#"../02.rs" 96 13 96 16] index0 ([#"../02.rs" 96 10 96 13] mem) ([#"../02.rs" 96 14 96 15] i));
+    [#"../02.rs" 96 13 96 16] _9 <- ([#"../02.rs" 96 13 96 16] index0 mem i);
     goto BB1
   }
   BB1 {
-    [#"../02.rs" 96 10 96 22] _7 <- ([#"../02.rs" 96 10 96 22] get0 ([#"../02.rs" 96 10 96 16] _9));
+    [#"../02.rs" 96 10 96 22] _7 <- ([#"../02.rs" 96 10 96 22] get0 _9);
     goto BB2
   }
   BB2 {
@@ -332,7 +337,8 @@ module C02_FibMemo
       end
   }
   BB3 {
-    switch ([#"../02.rs" 99 27 99 33] ([#"../02.rs" 99 27 99 28] i) = ([#"../02.rs" 99 32 99 33] [#"../02.rs" 99 32 99 33] (0 : usize)))
+    [#"../02.rs" 99 27 99 33] _15 <- ([#"../02.rs" 99 27 99 33] i = (0 : usize));
+    switch (_15)
       | False -> goto BB8
       | True -> goto BB7
       end
@@ -350,17 +356,18 @@ module C02_FibMemo
     goto BB19
   }
   BB7 {
-    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] [#"../02.rs" 100 16 100 17] (0 : usize));
+    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] (0 : usize));
     goto BB16
   }
   BB8 {
-    switch ([#"../02.rs" 101 22 101 28] ([#"../02.rs" 101 22 101 23] i) = ([#"../02.rs" 101 27 101 28] [#"../02.rs" 101 27 101 28] (1 : usize)))
+    [#"../02.rs" 101 22 101 28] _17 <- ([#"../02.rs" 101 22 101 28] i = (1 : usize));
+    switch (_17)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] [#"../02.rs" 102 16 102 17] (1 : usize));
+    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] (1 : usize));
     goto BB15
   }
   BB10 {
@@ -372,11 +379,15 @@ module C02_FibMemo
     goto BB12
   }
   BB12 {
-    [#"../02.rs" 106 16 106 36] _23 <- ([#"../02.rs" 106 16 106 36] fib_memo ([#"../02.rs" 106 25 106 28] mem) ([#"../02.rs" 106 30 106 35] ([#"../02.rs" 106 30 106 31] i) - ([#"../02.rs" 106 34 106 35] [#"../02.rs" 106 34 106 35] (1 : usize))));
+    [#"../02.rs" 106 30 106 35] _25 <- ([#"../02.rs" 106 30 106 35] i - (1 : usize));
+    [#"../02.rs" 106 16 106 36] _23 <- ([#"../02.rs" 106 16 106 36] fib_memo mem _25);
+    _25 <- any usize;
     goto BB13
   }
   BB13 {
-    [#"../02.rs" 106 39 106 59] _27 <- ([#"../02.rs" 106 39 106 59] fib_memo ([#"../02.rs" 106 48 106 51] mem) ([#"../02.rs" 106 53 106 58] ([#"../02.rs" 106 53 106 54] i) - ([#"../02.rs" 106 57 106 58] [#"../02.rs" 106 57 106 58] (2 : usize))));
+    [#"../02.rs" 106 53 106 58] _29 <- ([#"../02.rs" 106 53 106 58] i - (2 : usize));
+    [#"../02.rs" 106 39 106 59] _27 <- ([#"../02.rs" 106 39 106 59] fib_memo mem _29);
+    _29 <- any usize;
     goto BB14
   }
   BB14 {
@@ -390,11 +401,13 @@ module C02_FibMemo
   }
   BB16 {
     assert { [@expl:assertion] [#"../02.rs" 108 28 108 45] UIntSize.to_int fib_i = fib0 (UIntSize.to_int i) };
-    [#"../02.rs" 109 15 109 18] _35 <- ([#"../02.rs" 109 15 109 18] index0 ([#"../02.rs" 109 12 109 15] mem) ([#"../02.rs" 109 16 109 17] i));
+    [#"../02.rs" 109 15 109 18] _35 <- ([#"../02.rs" 109 15 109 18] index0 mem i);
     goto BB17
   }
   BB17 {
-    [#"../02.rs" 109 12 109 35] _33 <- ([#"../02.rs" 109 12 109 35] set0 ([#"../02.rs" 109 12 109 18] _35) ([#"../02.rs" 109 23 109 34] Core_Option_Option_Type.C_Some ([#"../02.rs" 109 28 109 33] fib_i)));
+    [#"../02.rs" 109 23 109 34] _38 <- ([#"../02.rs" 109 23 109 34] Core_Option_Option_Type.C_Some fib_i);
+    [#"../02.rs" 109 12 109 35] _33 <- ([#"../02.rs" 109 12 109 35] set0 _35 _38);
+    _38 <- any Core_Option_Option_Type.t_option usize;
     goto BB18
   }
   BB18 {
diff --git a/creusot/tests/should_succeed/checked_ops.mlcfg b/creusot/tests/should_succeed/checked_ops.mlcfg
index badfe90472..9125f4b762 100644
--- a/creusot/tests/should_succeed/checked_ops.mlcfg
+++ b/creusot/tests/should_succeed/checked_ops.mlcfg
@@ -103,21 +103,30 @@ module CheckedOps_TestU8AddExample
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _2 : bool;
   var _3 : uint8;
   var _4 : Core_Option_Option_Type.t_option uint8;
   var _7 : bool;
   var _9 : Core_Option_Option_Type.t_option uint8;
+  var _12 : bool;
   var _13 : uint8;
+  var _16 : bool;
   var _17 : uint8;
+  var _20 : bool;
   var _21 : uint8;
+  var _24 : bool;
   var _25 : uint8;
   var res : (uint8, bool);
+  var _29 : bool;
+  var _31 : bool;
   var res1 : (uint8, bool);
+  var _36 : bool;
+  var _38 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 6 12 6 31] _4 <- ([#"../checked_ops.rs" 6 12 6 31] checked_add0 ([#"../checked_ops.rs" 6 12 6 15] [#"../checked_ops.rs" 6 12 6 15] (5 : uint8)) ([#"../checked_ops.rs" 6 28 6 30] [#"../checked_ops.rs" 6 28 6 30] (10 : uint8)));
+    [#"../checked_ops.rs" 6 12 6 31] _4 <- ([#"../checked_ops.rs" 6 12 6 31] checked_add0 (5 : uint8) (10 : uint8));
     goto BB1
   }
   BB1 {
@@ -126,13 +135,15 @@ module CheckedOps_TestU8AddExample
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 6 12 6 46] _3 = ([#"../checked_ops.rs" 6 44 6 46] [#"../checked_ops.rs" 6 44 6 46] (15 : uint8)))
+    [#"../checked_ops.rs" 6 12 6 46] _2 <- ([#"../checked_ops.rs" 6 12 6 46] _3 = (15 : uint8));
+    _3 <- any uint8;
+    switch (_2)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 7 12 7 33] _9 <- ([#"../checked_ops.rs" 7 12 7 33] checked_add0 ([#"../checked_ops.rs" 7 12 7 17] [#"../checked_ops.rs" 7 12 7 17] (250 : uint8)) ([#"../checked_ops.rs" 7 30 7 32] [#"../checked_ops.rs" 7 30 7 32] (10 : uint8)));
+    [#"../checked_ops.rs" 7 12 7 33] _9 <- ([#"../checked_ops.rs" 7 12 7 33] checked_add0 (250 : uint8) (10 : uint8));
     goto BB5
   }
   BB4 {
@@ -140,7 +151,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 7 12 7 43] _7 <- ([#"../checked_ops.rs" 7 12 7 43] is_none0 ([#"../checked_ops.rs" 7 12 7 33] _9));
+    [#"../checked_ops.rs" 7 12 7 43] _7 <- ([#"../checked_ops.rs" 7 12 7 43] is_none0 _9);
     goto BB6
   }
   BB6 {
@@ -150,7 +161,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 9 12 9 32] _13 <- ([#"../checked_ops.rs" 9 12 9 32] wrapping_add0 ([#"../checked_ops.rs" 9 12 9 15] [#"../checked_ops.rs" 9 12 9 15] (5 : uint8)) ([#"../checked_ops.rs" 9 29 9 31] [#"../checked_ops.rs" 9 29 9 31] (10 : uint8)));
+    [#"../checked_ops.rs" 9 12 9 32] _13 <- ([#"../checked_ops.rs" 9 12 9 32] wrapping_add0 (5 : uint8) (10 : uint8));
     goto BB9
   }
   BB8 {
@@ -158,13 +169,15 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB9 {
-    switch ([#"../checked_ops.rs" 9 12 9 38] _13 = ([#"../checked_ops.rs" 9 36 9 38] [#"../checked_ops.rs" 9 36 9 38] (15 : uint8)))
+    [#"../checked_ops.rs" 9 12 9 38] _12 <- ([#"../checked_ops.rs" 9 12 9 38] _13 = (15 : uint8));
+    _13 <- any uint8;
+    switch (_12)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 10 12 10 34] _17 <- ([#"../checked_ops.rs" 10 12 10 34] wrapping_add0 ([#"../checked_ops.rs" 10 12 10 17] [#"../checked_ops.rs" 10 12 10 17] (250 : uint8)) ([#"../checked_ops.rs" 10 31 10 33] [#"../checked_ops.rs" 10 31 10 33] (10 : uint8)));
+    [#"../checked_ops.rs" 10 12 10 34] _17 <- ([#"../checked_ops.rs" 10 12 10 34] wrapping_add0 (250 : uint8) (10 : uint8));
     goto BB12
   }
   BB11 {
@@ -172,13 +185,15 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB12 {
-    switch ([#"../checked_ops.rs" 10 12 10 39] _17 = ([#"../checked_ops.rs" 10 38 10 39] [#"../checked_ops.rs" 10 38 10 39] (4 : uint8)))
+    [#"../checked_ops.rs" 10 12 10 39] _16 <- ([#"../checked_ops.rs" 10 12 10 39] _17 = (4 : uint8));
+    _17 <- any uint8;
+    switch (_16)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 12 12 12 34] _21 <- ([#"../checked_ops.rs" 12 12 12 34] saturating_add0 ([#"../checked_ops.rs" 12 12 12 15] [#"../checked_ops.rs" 12 12 12 15] (5 : uint8)) ([#"../checked_ops.rs" 12 31 12 33] [#"../checked_ops.rs" 12 31 12 33] (10 : uint8)));
+    [#"../checked_ops.rs" 12 12 12 34] _21 <- ([#"../checked_ops.rs" 12 12 12 34] saturating_add0 (5 : uint8) (10 : uint8));
     goto BB15
   }
   BB14 {
@@ -186,13 +201,15 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB15 {
-    switch ([#"../checked_ops.rs" 12 12 12 40] _21 = ([#"../checked_ops.rs" 12 38 12 40] [#"../checked_ops.rs" 12 38 12 40] (15 : uint8)))
+    [#"../checked_ops.rs" 12 12 12 40] _20 <- ([#"../checked_ops.rs" 12 12 12 40] _21 = (15 : uint8));
+    _21 <- any uint8;
+    switch (_20)
       | False -> goto BB17
       | True -> goto BB16
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 13 12 13 36] _25 <- ([#"../checked_ops.rs" 13 12 13 36] saturating_add0 ([#"../checked_ops.rs" 13 12 13 17] [#"../checked_ops.rs" 13 12 13 17] (250 : uint8)) ([#"../checked_ops.rs" 13 33 13 35] [#"../checked_ops.rs" 13 33 13 35] (10 : uint8)));
+    [#"../checked_ops.rs" 13 12 13 36] _25 <- ([#"../checked_ops.rs" 13 12 13 36] saturating_add0 (250 : uint8) (10 : uint8));
     goto BB18
   }
   BB17 {
@@ -200,13 +217,15 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB18 {
-    switch ([#"../checked_ops.rs" 13 12 13 43] _25 = ([#"../checked_ops.rs" 13 40 13 43] [#"../checked_ops.rs" 13 40 13 43] (255 : uint8)))
+    [#"../checked_ops.rs" 13 12 13 43] _24 <- ([#"../checked_ops.rs" 13 12 13 43] _25 = (255 : uint8));
+    _25 <- any uint8;
+    switch (_24)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 15 14 15 37] res <- ([#"../checked_ops.rs" 15 14 15 37] overflowing_add0 ([#"../checked_ops.rs" 15 14 15 17] [#"../checked_ops.rs" 15 14 15 17] (5 : uint8)) ([#"../checked_ops.rs" 15 34 15 36] [#"../checked_ops.rs" 15 34 15 36] (10 : uint8)));
+    [#"../checked_ops.rs" 15 14 15 37] res <- ([#"../checked_ops.rs" 15 14 15 37] overflowing_add0 (5 : uint8) (10 : uint8));
     goto BB21
   }
   BB20 {
@@ -214,20 +233,22 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB21 {
-    switch ([#"../checked_ops.rs" 16 12 16 23] ([#"../checked_ops.rs" 16 12 16 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 16 21 16 23] [#"../checked_ops.rs" 16 21 16 23] (15 : uint8)))
+    [#"../checked_ops.rs" 16 12 16 23] _29 <- ([#"../checked_ops.rs" 16 12 16 23] (let (a, _) = res in a) = (15 : uint8));
+    switch (_29)
       | False -> goto BB25
       | True -> goto BB22
       end
   }
   BB22 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb ([#"../checked_ops.rs" 16 27 16 32] let (_, a) = res in a) ([#"../checked_ops.rs" 16 36 16 41] [#"../checked_ops.rs" 16 36 16 41] false))
+    [#"../checked_ops.rs" 16 27 16 41] _31 <- ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb (let (_, a) = res in a) false);
+    switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 17 14 17 39] res1 <- ([#"../checked_ops.rs" 17 14 17 39] overflowing_add0 ([#"../checked_ops.rs" 17 14 17 19] [#"../checked_ops.rs" 17 14 17 19] (250 : uint8)) ([#"../checked_ops.rs" 17 36 17 38] [#"../checked_ops.rs" 17 36 17 38] (10 : uint8)));
+    [#"../checked_ops.rs" 17 14 17 39] res1 <- ([#"../checked_ops.rs" 17 14 17 39] overflowing_add0 (250 : uint8) (10 : uint8));
     goto BB27
   }
   BB24 {
@@ -242,14 +263,16 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB27 {
-    switch ([#"../checked_ops.rs" 18 12 18 22] ([#"../checked_ops.rs" 18 12 18 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 18 21 18 22] [#"../checked_ops.rs" 18 21 18 22] (4 : uint8)))
+    [#"../checked_ops.rs" 18 12 18 22] _36 <- ([#"../checked_ops.rs" 18 12 18 22] (let (a, _) = res1 in a) = (4 : uint8));
+    switch (_36)
       | False -> goto BB31
       | True -> goto BB28
       end
   }
   BB28 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb ([#"../checked_ops.rs" 18 26 18 31] let (_, a) = res1 in a) ([#"../checked_ops.rs" 18 35 18 39] [#"../checked_ops.rs" 18 35 18 39] true))
+    [#"../checked_ops.rs" 18 26 18 39] _38 <- ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb (let (_, a) = res1 in a) true);
+    switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
@@ -347,18 +370,24 @@ module CheckedOps_TestU8AddOverflow
   var a : uint8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option uint8;
+  var _10 : bool;
   var _11 : uint8;
+  var _13 : uint8;
+  var _17 : bool;
   var _18 : uint8;
   var res : (uint8, bool);
+  var _24 : bool;
+  var _26 : uint8;
+  var _28 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 24 12 24 32] _6 <- ([#"../checked_ops.rs" 24 12 24 32] checked_add0 ([#"../checked_ops.rs" 24 12 24 17] [#"../checked_ops.rs" 24 12 24 17] (255 : uint8)) ([#"../checked_ops.rs" 24 30 24 31] a));
+    [#"../checked_ops.rs" 24 12 24 32] _6 <- ([#"../checked_ops.rs" 24 12 24 32] checked_add0 (255 : uint8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 24 12 24 42] _4 <- ([#"../checked_ops.rs" 24 12 24 42] is_none0 ([#"../checked_ops.rs" 24 12 24 32] _6));
+    [#"../checked_ops.rs" 24 12 24 42] _4 <- ([#"../checked_ops.rs" 24 12 24 42] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -368,7 +397,7 @@ module CheckedOps_TestU8AddOverflow
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 25 12 25 33] _11 <- ([#"../checked_ops.rs" 25 12 25 33] wrapping_add0 ([#"../checked_ops.rs" 25 12 25 17] [#"../checked_ops.rs" 25 12 25 17] (255 : uint8)) ([#"../checked_ops.rs" 25 31 25 32] a));
+    [#"../checked_ops.rs" 25 12 25 33] _11 <- ([#"../checked_ops.rs" 25 12 25 33] wrapping_add0 (255 : uint8) a);
     goto BB5
   }
   BB4 {
@@ -376,13 +405,17 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 25 12 25 42] _11 = ([#"../checked_ops.rs" 25 37 25 42] ([#"../checked_ops.rs" 25 37 25 38] a) - ([#"../checked_ops.rs" 25 41 25 42] [#"../checked_ops.rs" 25 41 25 42] (1 : uint8))))
+    [#"../checked_ops.rs" 25 37 25 42] _13 <- ([#"../checked_ops.rs" 25 37 25 42] a - (1 : uint8));
+    [#"../checked_ops.rs" 25 12 25 42] _10 <- ([#"../checked_ops.rs" 25 12 25 42] _11 = _13);
+    _11 <- any uint8;
+    _13 <- any uint8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 26 12 26 35] _18 <- ([#"../checked_ops.rs" 26 12 26 35] saturating_add0 ([#"../checked_ops.rs" 26 12 26 17] [#"../checked_ops.rs" 26 12 26 17] (255 : uint8)) ([#"../checked_ops.rs" 26 33 26 34] a));
+    [#"../checked_ops.rs" 26 12 26 35] _18 <- ([#"../checked_ops.rs" 26 12 26 35] saturating_add0 (255 : uint8) a);
     goto BB8
   }
   BB7 {
@@ -390,13 +423,15 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 26 12 26 42] _18 = ([#"../checked_ops.rs" 26 39 26 42] [#"../checked_ops.rs" 26 39 26 42] (255 : uint8)))
+    [#"../checked_ops.rs" 26 12 26 42] _17 <- ([#"../checked_ops.rs" 26 12 26 42] _18 = (255 : uint8));
+    _18 <- any uint8;
+    switch (_17)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 27 14 27 38] res <- ([#"../checked_ops.rs" 27 14 27 38] overflowing_add0 ([#"../checked_ops.rs" 27 14 27 19] [#"../checked_ops.rs" 27 14 27 19] (255 : uint8)) ([#"../checked_ops.rs" 27 36 27 37] a));
+    [#"../checked_ops.rs" 27 14 27 38] res <- ([#"../checked_ops.rs" 27 14 27 38] overflowing_add0 (255 : uint8) a);
     goto BB11
   }
   BB10 {
@@ -404,14 +439,18 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 28 12 28 26] ([#"../checked_ops.rs" 28 12 28 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 28 21 28 26] ([#"../checked_ops.rs" 28 21 28 22] a) - ([#"../checked_ops.rs" 28 25 28 26] [#"../checked_ops.rs" 28 25 28 26] (1 : uint8))))
+    [#"../checked_ops.rs" 28 21 28 26] _26 <- ([#"../checked_ops.rs" 28 21 28 26] a - (1 : uint8));
+    [#"../checked_ops.rs" 28 12 28 26] _24 <- ([#"../checked_ops.rs" 28 12 28 26] (let (a, _) = res in a) = _26);
+    _26 <- any uint8;
+    switch (_24)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb ([#"../checked_ops.rs" 28 30 28 35] let (_, a) = res in a) ([#"../checked_ops.rs" 28 39 28 43] [#"../checked_ops.rs" 28 39 28 43] true))
+    [#"../checked_ops.rs" 28 30 28 43] _28 <- ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb (let (_, a) = res in a) true);
+    switch (_28)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -464,7 +503,7 @@ module CheckedOps_TestU8WrappingAdd
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 35 4 35 21] _0 <- ([#"../checked_ops.rs" 35 4 35 21] wrapping_add0 ([#"../checked_ops.rs" 35 4 35 5] a) ([#"../checked_ops.rs" 35 19 35 20] b));
+    [#"../checked_ops.rs" 35 4 35 21] _0 <- ([#"../checked_ops.rs" 35 4 35 21] wrapping_add0 a b);
     goto BB1
   }
   BB1 {
@@ -541,8 +580,10 @@ module CheckedOps_TestU8OverflowingAdd
   var _0 : ();
   var a : uint8 = a;
   var b : uint8 = b;
+  var _4 : bool;
   var _6 : (uint8, bool);
   var _9 : uint8;
+  var _14 : bool;
   var _16 : (uint8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option uint8;
@@ -550,22 +591,24 @@ module CheckedOps_TestU8OverflowingAdd
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 40 12 40 32] _6 <- ([#"../checked_ops.rs" 40 12 40 32] overflowing_add0 ([#"../checked_ops.rs" 40 12 40 13] a) ([#"../checked_ops.rs" 40 30 40 31] b));
+    [#"../checked_ops.rs" 40 12 40 32] _6 <- ([#"../checked_ops.rs" 40 12 40 32] overflowing_add0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 40 38 40 55] _9 <- ([#"../checked_ops.rs" 40 38 40 55] wrapping_add0 ([#"../checked_ops.rs" 40 38 40 39] a) ([#"../checked_ops.rs" 40 53 40 54] b));
+    [#"../checked_ops.rs" 40 38 40 55] _9 <- ([#"../checked_ops.rs" 40 38 40 55] wrapping_add0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 40 12 40 55] ([#"../checked_ops.rs" 40 12 40 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 40 12 40 55] _4 <- ([#"../checked_ops.rs" 40 12 40 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any uint8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 41 12 41 32] _16 <- ([#"../checked_ops.rs" 41 12 41 32] overflowing_add0 ([#"../checked_ops.rs" 41 12 41 13] a) ([#"../checked_ops.rs" 41 30 41 31] b));
+    [#"../checked_ops.rs" 41 12 41 32] _16 <- ([#"../checked_ops.rs" 41 12 41 32] overflowing_add0 a b);
     goto BB5
   }
   BB4 {
@@ -574,15 +617,17 @@ module CheckedOps_TestU8OverflowingAdd
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 41 38 41 54] _21 <- ([#"../checked_ops.rs" 41 38 41 54] checked_add0 ([#"../checked_ops.rs" 41 38 41 39] a) ([#"../checked_ops.rs" 41 52 41 53] b));
+    [#"../checked_ops.rs" 41 38 41 54] _21 <- ([#"../checked_ops.rs" 41 38 41 54] checked_add0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 41 38 41 64] _19 <- ([#"../checked_ops.rs" 41 38 41 64] is_none0 ([#"../checked_ops.rs" 41 38 41 54] _21));
+    [#"../checked_ops.rs" 41 38 41 64] _19 <- ([#"../checked_ops.rs" 41 38 41 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 41 12 41 64] Bool.eqb ([#"../checked_ops.rs" 41 12 41 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 41 12 41 64] _14 <- ([#"../checked_ops.rs" 41 12 41 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -697,23 +742,32 @@ module CheckedOps_TestU8SubExample
   var _0 : ();
   var _2 : bool;
   var _4 : Core_Option_Option_Type.t_option uint8;
+  var _7 : bool;
   var _8 : uint8;
   var _9 : Core_Option_Option_Type.t_option uint8;
+  var _12 : bool;
   var _13 : uint8;
+  var _16 : bool;
   var _17 : uint8;
+  var _20 : bool;
   var _21 : uint8;
+  var _24 : bool;
   var _25 : uint8;
   var res : (uint8, bool);
+  var _29 : bool;
+  var _31 : bool;
   var res1 : (uint8, bool);
+  var _36 : bool;
+  var _38 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 46 12 46 31] _4 <- ([#"../checked_ops.rs" 46 12 46 31] checked_sub0 ([#"../checked_ops.rs" 46 12 46 15] [#"../checked_ops.rs" 46 12 46 15] (5 : uint8)) ([#"../checked_ops.rs" 46 28 46 30] [#"../checked_ops.rs" 46 28 46 30] (10 : uint8)));
+    [#"../checked_ops.rs" 46 12 46 31] _4 <- ([#"../checked_ops.rs" 46 12 46 31] checked_sub0 (5 : uint8) (10 : uint8));
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 46 12 46 41] _2 <- ([#"../checked_ops.rs" 46 12 46 41] is_none0 ([#"../checked_ops.rs" 46 12 46 31] _4));
+    [#"../checked_ops.rs" 46 12 46 41] _2 <- ([#"../checked_ops.rs" 46 12 46 41] is_none0 _4);
     goto BB2
   }
   BB2 {
@@ -723,7 +777,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 47 12 47 33] _9 <- ([#"../checked_ops.rs" 47 12 47 33] checked_sub0 ([#"../checked_ops.rs" 47 12 47 17] [#"../checked_ops.rs" 47 12 47 17] (250 : uint8)) ([#"../checked_ops.rs" 47 30 47 32] [#"../checked_ops.rs" 47 30 47 32] (10 : uint8)));
+    [#"../checked_ops.rs" 47 12 47 33] _9 <- ([#"../checked_ops.rs" 47 12 47 33] checked_sub0 (250 : uint8) (10 : uint8));
     goto BB5
   }
   BB4 {
@@ -736,13 +790,15 @@ module CheckedOps_TestU8SubExample
     goto BB6
   }
   BB6 {
-    switch ([#"../checked_ops.rs" 47 12 47 49] _8 = ([#"../checked_ops.rs" 47 46 47 49] [#"../checked_ops.rs" 47 46 47 49] (240 : uint8)))
+    [#"../checked_ops.rs" 47 12 47 49] _7 <- ([#"../checked_ops.rs" 47 12 47 49] _8 = (240 : uint8));
+    _8 <- any uint8;
+    switch (_7)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 49 12 49 32] _13 <- ([#"../checked_ops.rs" 49 12 49 32] wrapping_sub0 ([#"../checked_ops.rs" 49 12 49 15] [#"../checked_ops.rs" 49 12 49 15] (5 : uint8)) ([#"../checked_ops.rs" 49 29 49 31] [#"../checked_ops.rs" 49 29 49 31] (10 : uint8)));
+    [#"../checked_ops.rs" 49 12 49 32] _13 <- ([#"../checked_ops.rs" 49 12 49 32] wrapping_sub0 (5 : uint8) (10 : uint8));
     goto BB9
   }
   BB8 {
@@ -750,13 +806,15 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB9 {
-    switch ([#"../checked_ops.rs" 49 12 49 39] _13 = ([#"../checked_ops.rs" 49 36 49 39] [#"../checked_ops.rs" 49 36 49 39] (251 : uint8)))
+    [#"../checked_ops.rs" 49 12 49 39] _12 <- ([#"../checked_ops.rs" 49 12 49 39] _13 = (251 : uint8));
+    _13 <- any uint8;
+    switch (_12)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 50 12 50 34] _17 <- ([#"../checked_ops.rs" 50 12 50 34] wrapping_sub0 ([#"../checked_ops.rs" 50 12 50 17] [#"../checked_ops.rs" 50 12 50 17] (250 : uint8)) ([#"../checked_ops.rs" 50 31 50 33] [#"../checked_ops.rs" 50 31 50 33] (10 : uint8)));
+    [#"../checked_ops.rs" 50 12 50 34] _17 <- ([#"../checked_ops.rs" 50 12 50 34] wrapping_sub0 (250 : uint8) (10 : uint8));
     goto BB12
   }
   BB11 {
@@ -764,13 +822,15 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB12 {
-    switch ([#"../checked_ops.rs" 50 12 50 41] _17 = ([#"../checked_ops.rs" 50 38 50 41] [#"../checked_ops.rs" 50 38 50 41] (240 : uint8)))
+    [#"../checked_ops.rs" 50 12 50 41] _16 <- ([#"../checked_ops.rs" 50 12 50 41] _17 = (240 : uint8));
+    _17 <- any uint8;
+    switch (_16)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 52 12 52 34] _21 <- ([#"../checked_ops.rs" 52 12 52 34] saturating_sub0 ([#"../checked_ops.rs" 52 12 52 15] [#"../checked_ops.rs" 52 12 52 15] (5 : uint8)) ([#"../checked_ops.rs" 52 31 52 33] [#"../checked_ops.rs" 52 31 52 33] (10 : uint8)));
+    [#"../checked_ops.rs" 52 12 52 34] _21 <- ([#"../checked_ops.rs" 52 12 52 34] saturating_sub0 (5 : uint8) (10 : uint8));
     goto BB15
   }
   BB14 {
@@ -778,13 +838,15 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB15 {
-    switch ([#"../checked_ops.rs" 52 12 52 39] _21 = ([#"../checked_ops.rs" 52 38 52 39] [#"../checked_ops.rs" 52 38 52 39] (0 : uint8)))
+    [#"../checked_ops.rs" 52 12 52 39] _20 <- ([#"../checked_ops.rs" 52 12 52 39] _21 = (0 : uint8));
+    _21 <- any uint8;
+    switch (_20)
       | False -> goto BB17
       | True -> goto BB16
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 53 12 53 36] _25 <- ([#"../checked_ops.rs" 53 12 53 36] saturating_sub0 ([#"../checked_ops.rs" 53 12 53 17] [#"../checked_ops.rs" 53 12 53 17] (250 : uint8)) ([#"../checked_ops.rs" 53 33 53 35] [#"../checked_ops.rs" 53 33 53 35] (10 : uint8)));
+    [#"../checked_ops.rs" 53 12 53 36] _25 <- ([#"../checked_ops.rs" 53 12 53 36] saturating_sub0 (250 : uint8) (10 : uint8));
     goto BB18
   }
   BB17 {
@@ -792,13 +854,15 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB18 {
-    switch ([#"../checked_ops.rs" 53 12 53 43] _25 = ([#"../checked_ops.rs" 53 40 53 43] [#"../checked_ops.rs" 53 40 53 43] (240 : uint8)))
+    [#"../checked_ops.rs" 53 12 53 43] _24 <- ([#"../checked_ops.rs" 53 12 53 43] _25 = (240 : uint8));
+    _25 <- any uint8;
+    switch (_24)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 55 14 55 37] res <- ([#"../checked_ops.rs" 55 14 55 37] overflowing_sub0 ([#"../checked_ops.rs" 55 14 55 17] [#"../checked_ops.rs" 55 14 55 17] (5 : uint8)) ([#"../checked_ops.rs" 55 34 55 36] [#"../checked_ops.rs" 55 34 55 36] (10 : uint8)));
+    [#"../checked_ops.rs" 55 14 55 37] res <- ([#"../checked_ops.rs" 55 14 55 37] overflowing_sub0 (5 : uint8) (10 : uint8));
     goto BB21
   }
   BB20 {
@@ -806,20 +870,22 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB21 {
-    switch ([#"../checked_ops.rs" 56 12 56 24] ([#"../checked_ops.rs" 56 12 56 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 56 21 56 24] [#"../checked_ops.rs" 56 21 56 24] (251 : uint8)))
+    [#"../checked_ops.rs" 56 12 56 24] _29 <- ([#"../checked_ops.rs" 56 12 56 24] (let (a, _) = res in a) = (251 : uint8));
+    switch (_29)
       | False -> goto BB25
       | True -> goto BB22
       end
   }
   BB22 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb ([#"../checked_ops.rs" 56 28 56 33] let (_, a) = res in a) ([#"../checked_ops.rs" 56 37 56 41] [#"../checked_ops.rs" 56 37 56 41] true))
+    [#"../checked_ops.rs" 56 28 56 41] _31 <- ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb (let (_, a) = res in a) true);
+    switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 57 14 57 39] res1 <- ([#"../checked_ops.rs" 57 14 57 39] overflowing_sub0 ([#"../checked_ops.rs" 57 14 57 19] [#"../checked_ops.rs" 57 14 57 19] (250 : uint8)) ([#"../checked_ops.rs" 57 36 57 38] [#"../checked_ops.rs" 57 36 57 38] (10 : uint8)));
+    [#"../checked_ops.rs" 57 14 57 39] res1 <- ([#"../checked_ops.rs" 57 14 57 39] overflowing_sub0 (250 : uint8) (10 : uint8));
     goto BB27
   }
   BB24 {
@@ -834,14 +900,16 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB27 {
-    switch ([#"../checked_ops.rs" 58 12 58 24] ([#"../checked_ops.rs" 58 12 58 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 58 21 58 24] [#"../checked_ops.rs" 58 21 58 24] (240 : uint8)))
+    [#"../checked_ops.rs" 58 12 58 24] _36 <- ([#"../checked_ops.rs" 58 12 58 24] (let (a, _) = res1 in a) = (240 : uint8));
+    switch (_36)
       | False -> goto BB31
       | True -> goto BB28
       end
   }
   BB28 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb ([#"../checked_ops.rs" 58 28 58 33] let (_, a) = res1 in a) ([#"../checked_ops.rs" 58 37 58 42] [#"../checked_ops.rs" 58 37 58 42] false))
+    [#"../checked_ops.rs" 58 28 58 42] _38 <- ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb (let (_, a) = res1 in a) false);
+    switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
@@ -939,18 +1007,26 @@ module CheckedOps_TestU8SubOverflow
   var a : uint8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option uint8;
+  var _10 : bool;
   var _11 : uint8;
+  var _13 : uint8;
+  var _14 : uint8;
+  var _18 : bool;
   var _19 : uint8;
   var res : (uint8, bool);
+  var _25 : bool;
+  var _27 : uint8;
+  var _28 : uint8;
+  var _30 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 64 12 64 30] _6 <- ([#"../checked_ops.rs" 64 12 64 30] checked_sub0 ([#"../checked_ops.rs" 64 12 64 15] [#"../checked_ops.rs" 64 12 64 15] (0 : uint8)) ([#"../checked_ops.rs" 64 28 64 29] a));
+    [#"../checked_ops.rs" 64 12 64 30] _6 <- ([#"../checked_ops.rs" 64 12 64 30] checked_sub0 (0 : uint8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 64 12 64 40] _4 <- ([#"../checked_ops.rs" 64 12 64 40] is_none0 ([#"../checked_ops.rs" 64 12 64 30] _6));
+    [#"../checked_ops.rs" 64 12 64 40] _4 <- ([#"../checked_ops.rs" 64 12 64 40] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -960,7 +1036,7 @@ module CheckedOps_TestU8SubOverflow
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 65 12 65 31] _11 <- ([#"../checked_ops.rs" 65 12 65 31] wrapping_sub0 ([#"../checked_ops.rs" 65 12 65 15] [#"../checked_ops.rs" 65 12 65 15] (0 : uint8)) ([#"../checked_ops.rs" 65 29 65 30] a));
+    [#"../checked_ops.rs" 65 12 65 31] _11 <- ([#"../checked_ops.rs" 65 12 65 31] wrapping_sub0 (0 : uint8) a);
     goto BB5
   }
   BB4 {
@@ -968,13 +1044,19 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 65 12 65 46] _11 = ([#"../checked_ops.rs" 65 35 65 46] ([#"../checked_ops.rs" 65 35 65 42] ([#"../checked_ops.rs" 65 35 65 38] [#"../checked_ops.rs" 65 35 65 38] (255 : uint8)) - ([#"../checked_ops.rs" 65 41 65 42] a)) + ([#"../checked_ops.rs" 65 45 65 46] [#"../checked_ops.rs" 65 45 65 46] (1 : uint8))))
+    [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 42] (255 : uint8) - a);
+    [#"../checked_ops.rs" 65 35 65 46] _13 <- ([#"../checked_ops.rs" 65 35 65 46] _14 + (1 : uint8));
+    _14 <- any uint8;
+    [#"../checked_ops.rs" 65 12 65 46] _10 <- ([#"../checked_ops.rs" 65 12 65 46] _11 = _13);
+    _11 <- any uint8;
+    _13 <- any uint8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 66 12 66 33] _19 <- ([#"../checked_ops.rs" 66 12 66 33] saturating_sub0 ([#"../checked_ops.rs" 66 12 66 15] [#"../checked_ops.rs" 66 12 66 15] (0 : uint8)) ([#"../checked_ops.rs" 66 31 66 32] a));
+    [#"../checked_ops.rs" 66 12 66 33] _19 <- ([#"../checked_ops.rs" 66 12 66 33] saturating_sub0 (0 : uint8) a);
     goto BB8
   }
   BB7 {
@@ -982,13 +1064,15 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 66 12 66 38] _19 = ([#"../checked_ops.rs" 66 37 66 38] [#"../checked_ops.rs" 66 37 66 38] (0 : uint8)))
+    [#"../checked_ops.rs" 66 12 66 38] _18 <- ([#"../checked_ops.rs" 66 12 66 38] _19 = (0 : uint8));
+    _19 <- any uint8;
+    switch (_18)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 67 14 67 36] res <- ([#"../checked_ops.rs" 67 14 67 36] overflowing_sub0 ([#"../checked_ops.rs" 67 14 67 17] [#"../checked_ops.rs" 67 14 67 17] (0 : uint8)) ([#"../checked_ops.rs" 67 34 67 35] a));
+    [#"../checked_ops.rs" 67 14 67 36] res <- ([#"../checked_ops.rs" 67 14 67 36] overflowing_sub0 (0 : uint8) a);
     goto BB11
   }
   BB10 {
@@ -996,14 +1080,20 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 68 12 68 32] ([#"../checked_ops.rs" 68 12 68 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 68 21 68 32] ([#"../checked_ops.rs" 68 21 68 28] ([#"../checked_ops.rs" 68 21 68 24] [#"../checked_ops.rs" 68 21 68 24] (255 : uint8)) - ([#"../checked_ops.rs" 68 27 68 28] a)) + ([#"../checked_ops.rs" 68 31 68 32] [#"../checked_ops.rs" 68 31 68 32] (1 : uint8))))
+    [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 28] (255 : uint8) - a);
+    [#"../checked_ops.rs" 68 21 68 32] _27 <- ([#"../checked_ops.rs" 68 21 68 32] _28 + (1 : uint8));
+    _28 <- any uint8;
+    [#"../checked_ops.rs" 68 12 68 32] _25 <- ([#"../checked_ops.rs" 68 12 68 32] (let (a, _) = res in a) = _27);
+    _27 <- any uint8;
+    switch (_25)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb ([#"../checked_ops.rs" 68 36 68 41] let (_, a) = res in a) ([#"../checked_ops.rs" 68 45 68 49] [#"../checked_ops.rs" 68 45 68 49] true))
+    [#"../checked_ops.rs" 68 36 68 49] _30 <- ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb (let (_, a) = res in a) true);
+    switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -1056,7 +1146,7 @@ module CheckedOps_TestU8WrappingSub
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 75 4 75 21] _0 <- ([#"../checked_ops.rs" 75 4 75 21] wrapping_sub0 ([#"../checked_ops.rs" 75 4 75 5] a) ([#"../checked_ops.rs" 75 19 75 20] b));
+    [#"../checked_ops.rs" 75 4 75 21] _0 <- ([#"../checked_ops.rs" 75 4 75 21] wrapping_sub0 a b);
     goto BB1
   }
   BB1 {
@@ -1133,8 +1223,10 @@ module CheckedOps_TestU8OverflowingSub
   var _0 : ();
   var a : uint8 = a;
   var b : uint8 = b;
+  var _4 : bool;
   var _6 : (uint8, bool);
   var _9 : uint8;
+  var _14 : bool;
   var _16 : (uint8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option uint8;
@@ -1142,22 +1234,24 @@ module CheckedOps_TestU8OverflowingSub
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 80 12 80 32] _6 <- ([#"../checked_ops.rs" 80 12 80 32] overflowing_sub0 ([#"../checked_ops.rs" 80 12 80 13] a) ([#"../checked_ops.rs" 80 30 80 31] b));
+    [#"../checked_ops.rs" 80 12 80 32] _6 <- ([#"../checked_ops.rs" 80 12 80 32] overflowing_sub0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 80 38 80 55] _9 <- ([#"../checked_ops.rs" 80 38 80 55] wrapping_sub0 ([#"../checked_ops.rs" 80 38 80 39] a) ([#"../checked_ops.rs" 80 53 80 54] b));
+    [#"../checked_ops.rs" 80 38 80 55] _9 <- ([#"../checked_ops.rs" 80 38 80 55] wrapping_sub0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 80 12 80 55] ([#"../checked_ops.rs" 80 12 80 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 80 12 80 55] _4 <- ([#"../checked_ops.rs" 80 12 80 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any uint8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 81 12 81 32] _16 <- ([#"../checked_ops.rs" 81 12 81 32] overflowing_sub0 ([#"../checked_ops.rs" 81 12 81 13] a) ([#"../checked_ops.rs" 81 30 81 31] b));
+    [#"../checked_ops.rs" 81 12 81 32] _16 <- ([#"../checked_ops.rs" 81 12 81 32] overflowing_sub0 a b);
     goto BB5
   }
   BB4 {
@@ -1166,15 +1260,17 @@ module CheckedOps_TestU8OverflowingSub
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 81 38 81 54] _21 <- ([#"../checked_ops.rs" 81 38 81 54] checked_sub0 ([#"../checked_ops.rs" 81 38 81 39] a) ([#"../checked_ops.rs" 81 52 81 53] b));
+    [#"../checked_ops.rs" 81 38 81 54] _21 <- ([#"../checked_ops.rs" 81 38 81 54] checked_sub0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 81 38 81 64] _19 <- ([#"../checked_ops.rs" 81 38 81 64] is_none0 ([#"../checked_ops.rs" 81 38 81 54] _21));
+    [#"../checked_ops.rs" 81 38 81 64] _19 <- ([#"../checked_ops.rs" 81 38 81 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 81 12 81 64] Bool.eqb ([#"../checked_ops.rs" 81 12 81 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 81 12 81 64] _14 <- ([#"../checked_ops.rs" 81 12 81 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -1287,21 +1383,30 @@ module CheckedOps_TestU8MulExample
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _2 : bool;
   var _3 : uint8;
   var _4 : Core_Option_Option_Type.t_option uint8;
   var _7 : bool;
   var _9 : Core_Option_Option_Type.t_option uint8;
+  var _12 : bool;
   var _13 : uint8;
+  var _16 : bool;
   var _17 : uint8;
+  var _20 : bool;
   var _21 : uint8;
+  var _24 : bool;
   var _25 : uint8;
   var res : (uint8, bool);
+  var _29 : bool;
+  var _31 : bool;
   var res1 : (uint8, bool);
+  var _36 : bool;
+  var _38 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 86 12 86 31] _4 <- ([#"../checked_ops.rs" 86 12 86 31] checked_mul0 ([#"../checked_ops.rs" 86 12 86 15] [#"../checked_ops.rs" 86 12 86 15] (5 : uint8)) ([#"../checked_ops.rs" 86 28 86 30] [#"../checked_ops.rs" 86 28 86 30] (10 : uint8)));
+    [#"../checked_ops.rs" 86 12 86 31] _4 <- ([#"../checked_ops.rs" 86 12 86 31] checked_mul0 (5 : uint8) (10 : uint8));
     goto BB1
   }
   BB1 {
@@ -1310,13 +1415,15 @@ module CheckedOps_TestU8MulExample
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 86 12 86 46] _3 = ([#"../checked_ops.rs" 86 44 86 46] [#"../checked_ops.rs" 86 44 86 46] (50 : uint8)))
+    [#"../checked_ops.rs" 86 12 86 46] _2 <- ([#"../checked_ops.rs" 86 12 86 46] _3 = (50 : uint8));
+    _3 <- any uint8;
+    switch (_2)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 87 12 87 32] _9 <- ([#"../checked_ops.rs" 87 12 87 32] checked_mul0 ([#"../checked_ops.rs" 87 12 87 16] [#"../checked_ops.rs" 87 12 87 16] (50 : uint8)) ([#"../checked_ops.rs" 87 29 87 31] [#"../checked_ops.rs" 87 29 87 31] (10 : uint8)));
+    [#"../checked_ops.rs" 87 12 87 32] _9 <- ([#"../checked_ops.rs" 87 12 87 32] checked_mul0 (50 : uint8) (10 : uint8));
     goto BB5
   }
   BB4 {
@@ -1324,7 +1431,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 87 12 87 42] _7 <- ([#"../checked_ops.rs" 87 12 87 42] is_none0 ([#"../checked_ops.rs" 87 12 87 32] _9));
+    [#"../checked_ops.rs" 87 12 87 42] _7 <- ([#"../checked_ops.rs" 87 12 87 42] is_none0 _9);
     goto BB6
   }
   BB6 {
@@ -1334,7 +1441,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 89 12 89 32] _13 <- ([#"../checked_ops.rs" 89 12 89 32] wrapping_mul0 ([#"../checked_ops.rs" 89 12 89 15] [#"../checked_ops.rs" 89 12 89 15] (5 : uint8)) ([#"../checked_ops.rs" 89 29 89 31] [#"../checked_ops.rs" 89 29 89 31] (10 : uint8)));
+    [#"../checked_ops.rs" 89 12 89 32] _13 <- ([#"../checked_ops.rs" 89 12 89 32] wrapping_mul0 (5 : uint8) (10 : uint8));
     goto BB9
   }
   BB8 {
@@ -1342,13 +1449,15 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB9 {
-    switch ([#"../checked_ops.rs" 89 12 89 38] _13 = ([#"../checked_ops.rs" 89 36 89 38] [#"../checked_ops.rs" 89 36 89 38] (50 : uint8)))
+    [#"../checked_ops.rs" 89 12 89 38] _12 <- ([#"../checked_ops.rs" 89 12 89 38] _13 = (50 : uint8));
+    _13 <- any uint8;
+    switch (_12)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 90 12 90 33] _17 <- ([#"../checked_ops.rs" 90 12 90 33] wrapping_mul0 ([#"../checked_ops.rs" 90 12 90 16] [#"../checked_ops.rs" 90 12 90 16] (50 : uint8)) ([#"../checked_ops.rs" 90 30 90 32] [#"../checked_ops.rs" 90 30 90 32] (10 : uint8)));
+    [#"../checked_ops.rs" 90 12 90 33] _17 <- ([#"../checked_ops.rs" 90 12 90 33] wrapping_mul0 (50 : uint8) (10 : uint8));
     goto BB12
   }
   BB11 {
@@ -1356,13 +1465,15 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB12 {
-    switch ([#"../checked_ops.rs" 90 12 90 40] _17 = ([#"../checked_ops.rs" 90 37 90 40] [#"../checked_ops.rs" 90 37 90 40] (244 : uint8)))
+    [#"../checked_ops.rs" 90 12 90 40] _16 <- ([#"../checked_ops.rs" 90 12 90 40] _17 = (244 : uint8));
+    _17 <- any uint8;
+    switch (_16)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 92 12 92 34] _21 <- ([#"../checked_ops.rs" 92 12 92 34] saturating_mul0 ([#"../checked_ops.rs" 92 12 92 15] [#"../checked_ops.rs" 92 12 92 15] (5 : uint8)) ([#"../checked_ops.rs" 92 31 92 33] [#"../checked_ops.rs" 92 31 92 33] (10 : uint8)));
+    [#"../checked_ops.rs" 92 12 92 34] _21 <- ([#"../checked_ops.rs" 92 12 92 34] saturating_mul0 (5 : uint8) (10 : uint8));
     goto BB15
   }
   BB14 {
@@ -1370,13 +1481,15 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB15 {
-    switch ([#"../checked_ops.rs" 92 12 92 40] _21 = ([#"../checked_ops.rs" 92 38 92 40] [#"../checked_ops.rs" 92 38 92 40] (50 : uint8)))
+    [#"../checked_ops.rs" 92 12 92 40] _20 <- ([#"../checked_ops.rs" 92 12 92 40] _21 = (50 : uint8));
+    _21 <- any uint8;
+    switch (_20)
       | False -> goto BB17
       | True -> goto BB16
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 93 12 93 35] _25 <- ([#"../checked_ops.rs" 93 12 93 35] saturating_mul0 ([#"../checked_ops.rs" 93 12 93 16] [#"../checked_ops.rs" 93 12 93 16] (50 : uint8)) ([#"../checked_ops.rs" 93 32 93 34] [#"../checked_ops.rs" 93 32 93 34] (10 : uint8)));
+    [#"../checked_ops.rs" 93 12 93 35] _25 <- ([#"../checked_ops.rs" 93 12 93 35] saturating_mul0 (50 : uint8) (10 : uint8));
     goto BB18
   }
   BB17 {
@@ -1384,13 +1497,15 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB18 {
-    switch ([#"../checked_ops.rs" 93 12 93 42] _25 = ([#"../checked_ops.rs" 93 39 93 42] [#"../checked_ops.rs" 93 39 93 42] (255 : uint8)))
+    [#"../checked_ops.rs" 93 12 93 42] _24 <- ([#"../checked_ops.rs" 93 12 93 42] _25 = (255 : uint8));
+    _25 <- any uint8;
+    switch (_24)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 95 14 95 37] res <- ([#"../checked_ops.rs" 95 14 95 37] overflowing_mul0 ([#"../checked_ops.rs" 95 14 95 17] [#"../checked_ops.rs" 95 14 95 17] (5 : uint8)) ([#"../checked_ops.rs" 95 34 95 36] [#"../checked_ops.rs" 95 34 95 36] (10 : uint8)));
+    [#"../checked_ops.rs" 95 14 95 37] res <- ([#"../checked_ops.rs" 95 14 95 37] overflowing_mul0 (5 : uint8) (10 : uint8));
     goto BB21
   }
   BB20 {
@@ -1398,20 +1513,22 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB21 {
-    switch ([#"../checked_ops.rs" 96 12 96 23] ([#"../checked_ops.rs" 96 12 96 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 96 21 96 23] [#"../checked_ops.rs" 96 21 96 23] (50 : uint8)))
+    [#"../checked_ops.rs" 96 12 96 23] _29 <- ([#"../checked_ops.rs" 96 12 96 23] (let (a, _) = res in a) = (50 : uint8));
+    switch (_29)
       | False -> goto BB25
       | True -> goto BB22
       end
   }
   BB22 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb ([#"../checked_ops.rs" 96 27 96 32] let (_, a) = res in a) ([#"../checked_ops.rs" 96 36 96 41] [#"../checked_ops.rs" 96 36 96 41] false))
+    [#"../checked_ops.rs" 96 27 96 41] _31 <- ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb (let (_, a) = res in a) false);
+    switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 97 14 97 38] res1 <- ([#"../checked_ops.rs" 97 14 97 38] overflowing_mul0 ([#"../checked_ops.rs" 97 14 97 18] [#"../checked_ops.rs" 97 14 97 18] (50 : uint8)) ([#"../checked_ops.rs" 97 35 97 37] [#"../checked_ops.rs" 97 35 97 37] (10 : uint8)));
+    [#"../checked_ops.rs" 97 14 97 38] res1 <- ([#"../checked_ops.rs" 97 14 97 38] overflowing_mul0 (50 : uint8) (10 : uint8));
     goto BB27
   }
   BB24 {
@@ -1426,14 +1543,16 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB27 {
-    switch ([#"../checked_ops.rs" 98 12 98 24] ([#"../checked_ops.rs" 98 12 98 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 98 21 98 24] [#"../checked_ops.rs" 98 21 98 24] (244 : uint8)))
+    [#"../checked_ops.rs" 98 12 98 24] _36 <- ([#"../checked_ops.rs" 98 12 98 24] (let (a, _) = res1 in a) = (244 : uint8));
+    switch (_36)
       | False -> goto BB31
       | True -> goto BB28
       end
   }
   BB28 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb ([#"../checked_ops.rs" 98 28 98 33] let (_, a) = res1 in a) ([#"../checked_ops.rs" 98 37 98 41] [#"../checked_ops.rs" 98 37 98 41] true))
+    [#"../checked_ops.rs" 98 28 98 41] _38 <- ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb (let (_, a) = res1 in a) true);
+    switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
@@ -1539,16 +1658,21 @@ module CheckedOps_TestU8MulZero
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : uint8 = a;
+  var _3 : bool;
   var _4 : uint8;
   var _5 : Core_Option_Option_Type.t_option uint8;
+  var _9 : bool;
   var _10 : uint8;
+  var _14 : bool;
   var _15 : uint8;
   var res : (uint8, bool);
+  var _21 : bool;
+  var _23 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 103 12 103 30] _5 <- ([#"../checked_ops.rs" 103 12 103 30] checked_mul0 ([#"../checked_ops.rs" 103 12 103 15] [#"../checked_ops.rs" 103 12 103 15] (0 : uint8)) ([#"../checked_ops.rs" 103 28 103 29] a));
+    [#"../checked_ops.rs" 103 12 103 30] _5 <- ([#"../checked_ops.rs" 103 12 103 30] checked_mul0 (0 : uint8) a);
     goto BB1
   }
   BB1 {
@@ -1557,13 +1681,15 @@ module CheckedOps_TestU8MulZero
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 103 12 103 44] _4 = ([#"../checked_ops.rs" 103 43 103 44] [#"../checked_ops.rs" 103 43 103 44] (0 : uint8)))
+    [#"../checked_ops.rs" 103 12 103 44] _3 <- ([#"../checked_ops.rs" 103 12 103 44] _4 = (0 : uint8));
+    _4 <- any uint8;
+    switch (_3)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 104 12 104 31] _10 <- ([#"../checked_ops.rs" 104 12 104 31] wrapping_mul0 ([#"../checked_ops.rs" 104 12 104 15] [#"../checked_ops.rs" 104 12 104 15] (0 : uint8)) ([#"../checked_ops.rs" 104 29 104 30] a));
+    [#"../checked_ops.rs" 104 12 104 31] _10 <- ([#"../checked_ops.rs" 104 12 104 31] wrapping_mul0 (0 : uint8) a);
     goto BB5
   }
   BB4 {
@@ -1571,13 +1697,15 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 104 12 104 36] _10 = ([#"../checked_ops.rs" 104 35 104 36] [#"../checked_ops.rs" 104 35 104 36] (0 : uint8)))
+    [#"../checked_ops.rs" 104 12 104 36] _9 <- ([#"../checked_ops.rs" 104 12 104 36] _10 = (0 : uint8));
+    _10 <- any uint8;
+    switch (_9)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 105 12 105 33] _15 <- ([#"../checked_ops.rs" 105 12 105 33] saturating_mul0 ([#"../checked_ops.rs" 105 12 105 15] [#"../checked_ops.rs" 105 12 105 15] (0 : uint8)) ([#"../checked_ops.rs" 105 31 105 32] a));
+    [#"../checked_ops.rs" 105 12 105 33] _15 <- ([#"../checked_ops.rs" 105 12 105 33] saturating_mul0 (0 : uint8) a);
     goto BB8
   }
   BB7 {
@@ -1585,13 +1713,15 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 105 12 105 38] _15 = ([#"../checked_ops.rs" 105 37 105 38] [#"../checked_ops.rs" 105 37 105 38] (0 : uint8)))
+    [#"../checked_ops.rs" 105 12 105 38] _14 <- ([#"../checked_ops.rs" 105 12 105 38] _15 = (0 : uint8));
+    _15 <- any uint8;
+    switch (_14)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 106 14 106 36] res <- ([#"../checked_ops.rs" 106 14 106 36] overflowing_mul0 ([#"../checked_ops.rs" 106 14 106 17] [#"../checked_ops.rs" 106 14 106 17] (0 : uint8)) ([#"../checked_ops.rs" 106 34 106 35] a));
+    [#"../checked_ops.rs" 106 14 106 36] res <- ([#"../checked_ops.rs" 106 14 106 36] overflowing_mul0 (0 : uint8) a);
     goto BB11
   }
   BB10 {
@@ -1599,14 +1729,16 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 107 12 107 22] ([#"../checked_ops.rs" 107 12 107 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 107 21 107 22] [#"../checked_ops.rs" 107 21 107 22] (0 : uint8)))
+    [#"../checked_ops.rs" 107 12 107 22] _21 <- ([#"../checked_ops.rs" 107 12 107 22] (let (a, _) = res in a) = (0 : uint8));
+    switch (_21)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb ([#"../checked_ops.rs" 107 26 107 31] let (_, a) = res in a) ([#"../checked_ops.rs" 107 35 107 40] [#"../checked_ops.rs" 107 35 107 40] false))
+    [#"../checked_ops.rs" 107 26 107 40] _23 <- ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb (let (_, a) = res in a) false);
+    switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -1697,8 +1829,10 @@ module CheckedOps_TestU8OverflowingMul
   var _0 : ();
   var a : uint8 = a;
   var b : uint8 = b;
+  var _4 : bool;
   var _6 : (uint8, bool);
   var _9 : uint8;
+  var _14 : bool;
   var _16 : (uint8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option uint8;
@@ -1706,22 +1840,24 @@ module CheckedOps_TestU8OverflowingMul
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 112 12 112 32] _6 <- ([#"../checked_ops.rs" 112 12 112 32] overflowing_mul0 ([#"../checked_ops.rs" 112 12 112 13] a) ([#"../checked_ops.rs" 112 30 112 31] b));
+    [#"../checked_ops.rs" 112 12 112 32] _6 <- ([#"../checked_ops.rs" 112 12 112 32] overflowing_mul0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 112 38 112 55] _9 <- ([#"../checked_ops.rs" 112 38 112 55] wrapping_mul0 ([#"../checked_ops.rs" 112 38 112 39] a) ([#"../checked_ops.rs" 112 53 112 54] b));
+    [#"../checked_ops.rs" 112 38 112 55] _9 <- ([#"../checked_ops.rs" 112 38 112 55] wrapping_mul0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 112 12 112 55] ([#"../checked_ops.rs" 112 12 112 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 112 12 112 55] _4 <- ([#"../checked_ops.rs" 112 12 112 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any uint8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 113 12 113 32] _16 <- ([#"../checked_ops.rs" 113 12 113 32] overflowing_mul0 ([#"../checked_ops.rs" 113 12 113 13] a) ([#"../checked_ops.rs" 113 30 113 31] b));
+    [#"../checked_ops.rs" 113 12 113 32] _16 <- ([#"../checked_ops.rs" 113 12 113 32] overflowing_mul0 a b);
     goto BB5
   }
   BB4 {
@@ -1730,15 +1866,17 @@ module CheckedOps_TestU8OverflowingMul
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 113 38 113 54] _21 <- ([#"../checked_ops.rs" 113 38 113 54] checked_mul0 ([#"../checked_ops.rs" 113 38 113 39] a) ([#"../checked_ops.rs" 113 52 113 53] b));
+    [#"../checked_ops.rs" 113 38 113 54] _21 <- ([#"../checked_ops.rs" 113 38 113 54] checked_mul0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 113 38 113 64] _19 <- ([#"../checked_ops.rs" 113 38 113 64] is_none0 ([#"../checked_ops.rs" 113 38 113 54] _21));
+    [#"../checked_ops.rs" 113 38 113 64] _19 <- ([#"../checked_ops.rs" 113 38 113 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 113 12 113 64] Bool.eqb ([#"../checked_ops.rs" 113 12 113 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 113 12 113 64] _14 <- ([#"../checked_ops.rs" 113 12 113 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -1843,20 +1981,25 @@ module CheckedOps_TestU8DivExample
   var _0 : ();
   var _2 : bool;
   var _4 : Core_Option_Option_Type.t_option uint8;
+  var _7 : bool;
   var _8 : uint8;
   var _9 : Core_Option_Option_Type.t_option uint8;
+  var _12 : bool;
   var _13 : uint8;
+  var _16 : bool;
   var _17 : uint8;
   var res : (uint8, bool);
+  var _21 : bool;
+  var _23 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 118 12 118 30] _4 <- ([#"../checked_ops.rs" 118 12 118 30] checked_div0 ([#"../checked_ops.rs" 118 12 118 15] [#"../checked_ops.rs" 118 12 118 15] (5 : uint8)) ([#"../checked_ops.rs" 118 28 118 29] [#"../checked_ops.rs" 118 28 118 29] (0 : uint8)));
+    [#"../checked_ops.rs" 118 12 118 30] _4 <- ([#"../checked_ops.rs" 118 12 118 30] checked_div0 (5 : uint8) (0 : uint8));
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 118 12 118 40] _2 <- ([#"../checked_ops.rs" 118 12 118 40] is_none0 ([#"../checked_ops.rs" 118 12 118 30] _4));
+    [#"../checked_ops.rs" 118 12 118 40] _2 <- ([#"../checked_ops.rs" 118 12 118 40] is_none0 _4);
     goto BB2
   }
   BB2 {
@@ -1866,7 +2009,7 @@ module CheckedOps_TestU8DivExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 119 12 119 30] _9 <- ([#"../checked_ops.rs" 119 12 119 30] checked_div0 ([#"../checked_ops.rs" 119 12 119 15] [#"../checked_ops.rs" 119 12 119 15] (5 : uint8)) ([#"../checked_ops.rs" 119 28 119 29] [#"../checked_ops.rs" 119 28 119 29] (2 : uint8)));
+    [#"../checked_ops.rs" 119 12 119 30] _9 <- ([#"../checked_ops.rs" 119 12 119 30] checked_div0 (5 : uint8) (2 : uint8));
     goto BB5
   }
   BB4 {
@@ -1879,13 +2022,15 @@ module CheckedOps_TestU8DivExample
     goto BB6
   }
   BB6 {
-    switch ([#"../checked_ops.rs" 119 12 119 44] _8 = ([#"../checked_ops.rs" 119 43 119 44] [#"../checked_ops.rs" 119 43 119 44] (2 : uint8)))
+    [#"../checked_ops.rs" 119 12 119 44] _7 <- ([#"../checked_ops.rs" 119 12 119 44] _8 = (2 : uint8));
+    _8 <- any uint8;
+    switch (_7)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 120 12 120 31] _13 <- ([#"../checked_ops.rs" 120 12 120 31] wrapping_div0 ([#"../checked_ops.rs" 120 12 120 15] [#"../checked_ops.rs" 120 12 120 15] (5 : uint8)) ([#"../checked_ops.rs" 120 29 120 30] [#"../checked_ops.rs" 120 29 120 30] (2 : uint8)));
+    [#"../checked_ops.rs" 120 12 120 31] _13 <- ([#"../checked_ops.rs" 120 12 120 31] wrapping_div0 (5 : uint8) (2 : uint8));
     goto BB9
   }
   BB8 {
@@ -1893,13 +2038,15 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB9 {
-    switch ([#"../checked_ops.rs" 120 12 120 36] _13 = ([#"../checked_ops.rs" 120 35 120 36] [#"../checked_ops.rs" 120 35 120 36] (2 : uint8)))
+    [#"../checked_ops.rs" 120 12 120 36] _12 <- ([#"../checked_ops.rs" 120 12 120 36] _13 = (2 : uint8));
+    _13 <- any uint8;
+    switch (_12)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 121 12 121 33] _17 <- ([#"../checked_ops.rs" 121 12 121 33] saturating_div0 ([#"../checked_ops.rs" 121 12 121 15] [#"../checked_ops.rs" 121 12 121 15] (5 : uint8)) ([#"../checked_ops.rs" 121 31 121 32] [#"../checked_ops.rs" 121 31 121 32] (2 : uint8)));
+    [#"../checked_ops.rs" 121 12 121 33] _17 <- ([#"../checked_ops.rs" 121 12 121 33] saturating_div0 (5 : uint8) (2 : uint8));
     goto BB12
   }
   BB11 {
@@ -1907,13 +2054,15 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB12 {
-    switch ([#"../checked_ops.rs" 121 12 121 38] _17 = ([#"../checked_ops.rs" 121 37 121 38] [#"../checked_ops.rs" 121 37 121 38] (2 : uint8)))
+    [#"../checked_ops.rs" 121 12 121 38] _16 <- ([#"../checked_ops.rs" 121 12 121 38] _17 = (2 : uint8));
+    _17 <- any uint8;
+    switch (_16)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 122 14 122 36] res <- ([#"../checked_ops.rs" 122 14 122 36] overflowing_div0 ([#"../checked_ops.rs" 122 14 122 17] [#"../checked_ops.rs" 122 14 122 17] (5 : uint8)) ([#"../checked_ops.rs" 122 34 122 35] [#"../checked_ops.rs" 122 34 122 35] (2 : uint8)));
+    [#"../checked_ops.rs" 122 14 122 36] res <- ([#"../checked_ops.rs" 122 14 122 36] overflowing_div0 (5 : uint8) (2 : uint8));
     goto BB15
   }
   BB14 {
@@ -1921,14 +2070,16 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB15 {
-    switch ([#"../checked_ops.rs" 123 12 123 22] ([#"../checked_ops.rs" 123 12 123 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 123 21 123 22] [#"../checked_ops.rs" 123 21 123 22] (2 : uint8)))
+    [#"../checked_ops.rs" 123 12 123 22] _21 <- ([#"../checked_ops.rs" 123 12 123 22] (let (a, _) = res in a) = (2 : uint8));
+    switch (_21)
       | False -> goto BB19
       | True -> goto BB16
       end
   }
   BB16 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb ([#"../checked_ops.rs" 123 26 123 31] let (_, a) = res in a) ([#"../checked_ops.rs" 123 35 123 40] [#"../checked_ops.rs" 123 35 123 40] false))
+    [#"../checked_ops.rs" 123 26 123 40] _23 <- ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb (let (_, a) = res in a) false);
+    switch (_23)
       | False -> goto BB18
       | True -> goto BB17
       end
@@ -2026,24 +2177,33 @@ module CheckedOps_TestU8DivNoOverflow
   var _0 : ();
   var a : uint8 = a;
   var b : uint8 = b;
+  var _5 : bool;
   var _6 : uint8;
   var _7 : Core_Option_Option_Type.t_option uint8;
+  var _10 : uint8;
   var _12 : uint8;
   var _13 : bool;
+  var _16 : bool;
   var _17 : uint8;
+  var _20 : uint8;
   var _22 : uint8;
   var _23 : bool;
+  var _26 : bool;
   var _27 : uint8;
+  var _30 : uint8;
   var _32 : uint8;
   var _33 : bool;
   var res : (uint8, bool);
+  var _39 : bool;
+  var _41 : uint8;
   var _43 : uint8;
   var _44 : bool;
+  var _45 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 129 12 129 28] _7 <- ([#"../checked_ops.rs" 129 12 129 28] checked_div0 ([#"../checked_ops.rs" 129 12 129 13] a) ([#"../checked_ops.rs" 129 26 129 27] b));
+    [#"../checked_ops.rs" 129 12 129 28] _7 <- ([#"../checked_ops.rs" 129 12 129 28] checked_div0 a b);
     goto BB1
   }
   BB1 {
@@ -2053,18 +2213,23 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB2 {
     [#"../checked_ops.rs" 129 45 129 46] _12 <- ([#"../checked_ops.rs" 129 45 129 46] b);
-    [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = ([#"../checked_ops.rs" 129 41 129 46] [#"../checked_ops.rs" 129 41 129 46] (0 : uint8)));
+    [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 129 41 129 46] not _13 };
     goto BB3
   }
   BB3 {
-    switch ([#"../checked_ops.rs" 129 12 129 46] _6 = ([#"../checked_ops.rs" 129 41 129 46] ([#"../checked_ops.rs" 129 41 129 42] a) / _12))
+    [#"../checked_ops.rs" 129 41 129 46] _10 <- ([#"../checked_ops.rs" 129 41 129 46] a / _12);
+    _12 <- any uint8;
+    [#"../checked_ops.rs" 129 12 129 46] _5 <- ([#"../checked_ops.rs" 129 12 129 46] _6 = _10);
+    _6 <- any uint8;
+    _10 <- any uint8;
+    switch (_5)
       | False -> goto BB5
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../checked_ops.rs" 130 12 130 29] _17 <- ([#"../checked_ops.rs" 130 12 130 29] wrapping_div0 ([#"../checked_ops.rs" 130 12 130 13] a) ([#"../checked_ops.rs" 130 27 130 28] b));
+    [#"../checked_ops.rs" 130 12 130 29] _17 <- ([#"../checked_ops.rs" 130 12 130 29] wrapping_div0 a b);
     goto BB6
   }
   BB5 {
@@ -2073,18 +2238,23 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB6 {
     [#"../checked_ops.rs" 130 37 130 38] _22 <- ([#"../checked_ops.rs" 130 37 130 38] b);
-    [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = ([#"../checked_ops.rs" 130 33 130 38] [#"../checked_ops.rs" 130 33 130 38] (0 : uint8)));
+    [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 130 33 130 38] not _23 };
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 130 12 130 38] _17 = ([#"../checked_ops.rs" 130 33 130 38] ([#"../checked_ops.rs" 130 33 130 34] a) / _22))
+    [#"../checked_ops.rs" 130 33 130 38] _20 <- ([#"../checked_ops.rs" 130 33 130 38] a / _22);
+    _22 <- any uint8;
+    [#"../checked_ops.rs" 130 12 130 38] _16 <- ([#"../checked_ops.rs" 130 12 130 38] _17 = _20);
+    _17 <- any uint8;
+    _20 <- any uint8;
+    switch (_16)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 131 12 131 31] _27 <- ([#"../checked_ops.rs" 131 12 131 31] saturating_div0 ([#"../checked_ops.rs" 131 12 131 13] a) ([#"../checked_ops.rs" 131 29 131 30] b));
+    [#"../checked_ops.rs" 131 12 131 31] _27 <- ([#"../checked_ops.rs" 131 12 131 31] saturating_div0 a b);
     goto BB10
   }
   BB9 {
@@ -2093,18 +2263,23 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB10 {
     [#"../checked_ops.rs" 131 39 131 40] _32 <- ([#"../checked_ops.rs" 131 39 131 40] b);
-    [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = ([#"../checked_ops.rs" 131 35 131 40] [#"../checked_ops.rs" 131 35 131 40] (0 : uint8)));
+    [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 131 35 131 40] not _33 };
     goto BB11
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 131 12 131 40] _27 = ([#"../checked_ops.rs" 131 35 131 40] ([#"../checked_ops.rs" 131 35 131 36] a) / _32))
+    [#"../checked_ops.rs" 131 35 131 40] _30 <- ([#"../checked_ops.rs" 131 35 131 40] a / _32);
+    _32 <- any uint8;
+    [#"../checked_ops.rs" 131 12 131 40] _26 <- ([#"../checked_ops.rs" 131 12 131 40] _27 = _30);
+    _27 <- any uint8;
+    _30 <- any uint8;
+    switch (_26)
       | False -> goto BB13
       | True -> goto BB12
       end
   }
   BB12 {
-    [#"../checked_ops.rs" 132 14 132 34] res <- ([#"../checked_ops.rs" 132 14 132 34] overflowing_div0 ([#"../checked_ops.rs" 132 14 132 15] a) ([#"../checked_ops.rs" 132 32 132 33] b));
+    [#"../checked_ops.rs" 132 14 132 34] res <- ([#"../checked_ops.rs" 132 14 132 34] overflowing_div0 a b);
     goto BB14
   }
   BB13 {
@@ -2113,19 +2288,24 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB14 {
     [#"../checked_ops.rs" 133 25 133 26] _43 <- ([#"../checked_ops.rs" 133 25 133 26] b);
-    [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = ([#"../checked_ops.rs" 133 21 133 26] [#"../checked_ops.rs" 133 21 133 26] (0 : uint8)));
+    [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 133 21 133 26] not _44 };
     goto BB15
   }
   BB15 {
-    switch ([#"../checked_ops.rs" 133 12 133 26] ([#"../checked_ops.rs" 133 12 133 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 133 21 133 26] ([#"../checked_ops.rs" 133 21 133 22] a) / _43))
+    [#"../checked_ops.rs" 133 21 133 26] _41 <- ([#"../checked_ops.rs" 133 21 133 26] a / _43);
+    _43 <- any uint8;
+    [#"../checked_ops.rs" 133 12 133 26] _39 <- ([#"../checked_ops.rs" 133 12 133 26] (let (a, _) = res in a) = _41);
+    _41 <- any uint8;
+    switch (_39)
       | False -> goto BB19
       | True -> goto BB16
       end
   }
   BB16 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb ([#"../checked_ops.rs" 133 30 133 35] let (_, a) = res in a) ([#"../checked_ops.rs" 133 39 133 44] [#"../checked_ops.rs" 133 39 133 44] false))
+    [#"../checked_ops.rs" 133 30 133 44] _45 <- ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb (let (_, a) = res in a) false);
+    switch (_45)
       | False -> goto BB18
       | True -> goto BB17
       end
@@ -2184,11 +2364,11 @@ module CheckedOps_TestU8DivZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 138 12 138 28] _5 <- ([#"../checked_ops.rs" 138 12 138 28] checked_div0 ([#"../checked_ops.rs" 138 12 138 13] a) ([#"../checked_ops.rs" 138 26 138 27] [#"../checked_ops.rs" 138 26 138 27] (0 : uint8)));
+    [#"../checked_ops.rs" 138 12 138 28] _5 <- ([#"../checked_ops.rs" 138 12 138 28] checked_div0 a (0 : uint8));
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 138 12 138 38] _3 <- ([#"../checked_ops.rs" 138 12 138 38] is_none0 ([#"../checked_ops.rs" 138 12 138 28] _5));
+    [#"../checked_ops.rs" 138 12 138 38] _3 <- ([#"../checked_ops.rs" 138 12 138 38] is_none0 _5);
     goto BB2
   }
   BB2 {
@@ -2305,26 +2485,39 @@ module CheckedOps_TestI8AddExample
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _2 : bool;
   var _3 : int8;
   var _4 : Core_Option_Option_Type.t_option int8;
   var _7 : bool;
   var _9 : Core_Option_Option_Type.t_option int8;
   var _12 : bool;
   var _14 : Core_Option_Option_Type.t_option int8;
+  var _17 : bool;
   var _18 : int8;
+  var _21 : bool;
   var _22 : int8;
+  var _25 : bool;
   var _26 : int8;
+  var _29 : bool;
   var _30 : int8;
+  var _33 : bool;
   var _34 : int8;
+  var _37 : bool;
   var _38 : int8;
   var res : (int8, bool);
+  var _42 : bool;
+  var _44 : bool;
   var res1 : (int8, bool);
+  var _49 : bool;
+  var _51 : bool;
   var res2 : (int8, bool);
+  var _56 : bool;
+  var _58 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 143 12 143 31] _4 <- ([#"../checked_ops.rs" 143 12 143 31] checked_add0 ([#"../checked_ops.rs" 143 12 143 15] [#"../checked_ops.rs" 143 12 143 15] (5 : int8)) ([#"../checked_ops.rs" 143 28 143 30] [#"../checked_ops.rs" 143 28 143 30] (10 : int8)));
+    [#"../checked_ops.rs" 143 12 143 31] _4 <- ([#"../checked_ops.rs" 143 12 143 31] checked_add0 (5 : int8) (10 : int8));
     goto BB1
   }
   BB1 {
@@ -2333,13 +2526,15 @@ module CheckedOps_TestI8AddExample
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 143 12 143 46] _3 = ([#"../checked_ops.rs" 143 44 143 46] [#"../checked_ops.rs" 143 44 143 46] (15 : int8)))
+    [#"../checked_ops.rs" 143 12 143 46] _2 <- ([#"../checked_ops.rs" 143 12 143 46] _3 = (15 : int8));
+    _3 <- any int8;
+    switch (_2)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 144 12 144 33] _9 <- ([#"../checked_ops.rs" 144 12 144 33] checked_add0 ([#"../checked_ops.rs" 144 12 144 17] [#"../checked_ops.rs" 144 12 144 17] (120 : int8)) ([#"../checked_ops.rs" 144 30 144 32] [#"../checked_ops.rs" 144 30 144 32] (10 : int8)));
+    [#"../checked_ops.rs" 144 12 144 33] _9 <- ([#"../checked_ops.rs" 144 12 144 33] checked_add0 (120 : int8) (10 : int8));
     goto BB5
   }
   BB4 {
@@ -2347,7 +2542,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 144 12 144 43] _7 <- ([#"../checked_ops.rs" 144 12 144 43] is_none0 ([#"../checked_ops.rs" 144 12 144 33] _9));
+    [#"../checked_ops.rs" 144 12 144 43] _7 <- ([#"../checked_ops.rs" 144 12 144 43] is_none0 _9);
     goto BB6
   }
   BB6 {
@@ -2357,7 +2552,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 145 12 145 37] _14 <- ([#"../checked_ops.rs" 145 12 145 37] checked_add0 ([#"../checked_ops.rs" 145 12 145 20] [#"../checked_ops.rs" 145 12 145 20] (-120 : int8)) ([#"../checked_ops.rs" 145 33 145 36] [#"../checked_ops.rs" 145 33 145 36] (-10 : int8)));
+    [#"../checked_ops.rs" 145 12 145 37] _14 <- ([#"../checked_ops.rs" 145 12 145 37] checked_add0 (-120 : int8) (-10 : int8));
     goto BB9
   }
   BB8 {
@@ -2365,7 +2560,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 145 12 145 47] _12 <- ([#"../checked_ops.rs" 145 12 145 47] is_none0 ([#"../checked_ops.rs" 145 12 145 37] _14));
+    [#"../checked_ops.rs" 145 12 145 47] _12 <- ([#"../checked_ops.rs" 145 12 145 47] is_none0 _14);
     goto BB10
   }
   BB10 {
@@ -2375,7 +2570,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 147 12 147 32] _18 <- ([#"../checked_ops.rs" 147 12 147 32] wrapping_add0 ([#"../checked_ops.rs" 147 12 147 15] [#"../checked_ops.rs" 147 12 147 15] (5 : int8)) ([#"../checked_ops.rs" 147 29 147 31] [#"../checked_ops.rs" 147 29 147 31] (10 : int8)));
+    [#"../checked_ops.rs" 147 12 147 32] _18 <- ([#"../checked_ops.rs" 147 12 147 32] wrapping_add0 (5 : int8) (10 : int8));
     goto BB13
   }
   BB12 {
@@ -2383,13 +2578,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB13 {
-    switch ([#"../checked_ops.rs" 147 12 147 38] _18 = ([#"../checked_ops.rs" 147 36 147 38] [#"../checked_ops.rs" 147 36 147 38] (15 : int8)))
+    [#"../checked_ops.rs" 147 12 147 38] _17 <- ([#"../checked_ops.rs" 147 12 147 38] _18 = (15 : int8));
+    _18 <- any int8;
+    switch (_17)
       | False -> goto BB15
       | True -> goto BB14
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 148 12 148 34] _22 <- ([#"../checked_ops.rs" 148 12 148 34] wrapping_add0 ([#"../checked_ops.rs" 148 12 148 17] [#"../checked_ops.rs" 148 12 148 17] (120 : int8)) ([#"../checked_ops.rs" 148 31 148 33] [#"../checked_ops.rs" 148 31 148 33] (10 : int8)));
+    [#"../checked_ops.rs" 148 12 148 34] _22 <- ([#"../checked_ops.rs" 148 12 148 34] wrapping_add0 (120 : int8) (10 : int8));
     goto BB16
   }
   BB15 {
@@ -2397,13 +2594,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB16 {
-    switch ([#"../checked_ops.rs" 148 12 148 42] _22 = ([#"../checked_ops.rs" 148 38 148 42] [#"../checked_ops.rs" 148 38 148 42] (-126 : int8)))
+    [#"../checked_ops.rs" 148 12 148 42] _21 <- ([#"../checked_ops.rs" 148 12 148 42] _22 = (-126 : int8));
+    _22 <- any int8;
+    switch (_21)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 149 12 149 38] _26 <- ([#"../checked_ops.rs" 149 12 149 38] wrapping_add0 ([#"../checked_ops.rs" 149 12 149 20] [#"../checked_ops.rs" 149 12 149 20] (-120 : int8)) ([#"../checked_ops.rs" 149 34 149 37] [#"../checked_ops.rs" 149 34 149 37] (-10 : int8)));
+    [#"../checked_ops.rs" 149 12 149 38] _26 <- ([#"../checked_ops.rs" 149 12 149 38] wrapping_add0 (-120 : int8) (-10 : int8));
     goto BB19
   }
   BB18 {
@@ -2411,13 +2610,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB19 {
-    switch ([#"../checked_ops.rs" 149 12 149 45] _26 = ([#"../checked_ops.rs" 149 42 149 45] [#"../checked_ops.rs" 149 42 149 45] (126 : int8)))
+    [#"../checked_ops.rs" 149 12 149 45] _25 <- ([#"../checked_ops.rs" 149 12 149 45] _26 = (126 : int8));
+    _26 <- any int8;
+    switch (_25)
       | False -> goto BB21
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 151 12 151 34] _30 <- ([#"../checked_ops.rs" 151 12 151 34] saturating_add0 ([#"../checked_ops.rs" 151 12 151 15] [#"../checked_ops.rs" 151 12 151 15] (5 : int8)) ([#"../checked_ops.rs" 151 31 151 33] [#"../checked_ops.rs" 151 31 151 33] (10 : int8)));
+    [#"../checked_ops.rs" 151 12 151 34] _30 <- ([#"../checked_ops.rs" 151 12 151 34] saturating_add0 (5 : int8) (10 : int8));
     goto BB22
   }
   BB21 {
@@ -2425,13 +2626,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB22 {
-    switch ([#"../checked_ops.rs" 151 12 151 40] _30 = ([#"../checked_ops.rs" 151 38 151 40] [#"../checked_ops.rs" 151 38 151 40] (15 : int8)))
+    [#"../checked_ops.rs" 151 12 151 40] _29 <- ([#"../checked_ops.rs" 151 12 151 40] _30 = (15 : int8));
+    _30 <- any int8;
+    switch (_29)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 152 12 152 36] _34 <- ([#"../checked_ops.rs" 152 12 152 36] saturating_add0 ([#"../checked_ops.rs" 152 12 152 17] [#"../checked_ops.rs" 152 12 152 17] (120 : int8)) ([#"../checked_ops.rs" 152 33 152 35] [#"../checked_ops.rs" 152 33 152 35] (10 : int8)));
+    [#"../checked_ops.rs" 152 12 152 36] _34 <- ([#"../checked_ops.rs" 152 12 152 36] saturating_add0 (120 : int8) (10 : int8));
     goto BB25
   }
   BB24 {
@@ -2439,13 +2642,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB25 {
-    switch ([#"../checked_ops.rs" 152 12 152 43] _34 = ([#"../checked_ops.rs" 152 40 152 43] [#"../checked_ops.rs" 152 40 152 43] (127 : int8)))
+    [#"../checked_ops.rs" 152 12 152 43] _33 <- ([#"../checked_ops.rs" 152 12 152 43] _34 = (127 : int8));
+    _34 <- any int8;
+    switch (_33)
       | False -> goto BB27
       | True -> goto BB26
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 153 12 153 40] _38 <- ([#"../checked_ops.rs" 153 12 153 40] saturating_add0 ([#"../checked_ops.rs" 153 12 153 20] [#"../checked_ops.rs" 153 12 153 20] (-120 : int8)) ([#"../checked_ops.rs" 153 36 153 39] [#"../checked_ops.rs" 153 36 153 39] (-10 : int8)));
+    [#"../checked_ops.rs" 153 12 153 40] _38 <- ([#"../checked_ops.rs" 153 12 153 40] saturating_add0 (-120 : int8) (-10 : int8));
     goto BB28
   }
   BB27 {
@@ -2453,13 +2658,15 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB28 {
-    switch ([#"../checked_ops.rs" 153 12 153 48] _38 = ([#"../checked_ops.rs" 153 44 153 48] [#"../checked_ops.rs" 153 44 153 48] (-128 : int8)))
+    [#"../checked_ops.rs" 153 12 153 48] _37 <- ([#"../checked_ops.rs" 153 12 153 48] _38 = (-128 : int8));
+    _38 <- any int8;
+    switch (_37)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 155 14 155 37] res <- ([#"../checked_ops.rs" 155 14 155 37] overflowing_add0 ([#"../checked_ops.rs" 155 14 155 17] [#"../checked_ops.rs" 155 14 155 17] (5 : int8)) ([#"../checked_ops.rs" 155 34 155 36] [#"../checked_ops.rs" 155 34 155 36] (10 : int8)));
+    [#"../checked_ops.rs" 155 14 155 37] res <- ([#"../checked_ops.rs" 155 14 155 37] overflowing_add0 (5 : int8) (10 : int8));
     goto BB31
   }
   BB30 {
@@ -2467,20 +2674,22 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB31 {
-    switch ([#"../checked_ops.rs" 156 12 156 23] ([#"../checked_ops.rs" 156 12 156 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 156 21 156 23] [#"../checked_ops.rs" 156 21 156 23] (15 : int8)))
+    [#"../checked_ops.rs" 156 12 156 23] _42 <- ([#"../checked_ops.rs" 156 12 156 23] (let (a, _) = res in a) = (15 : int8));
+    switch (_42)
       | False -> goto BB35
       | True -> goto BB32
       end
   }
   BB32 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb ([#"../checked_ops.rs" 156 27 156 32] let (_, a) = res in a) ([#"../checked_ops.rs" 156 36 156 41] [#"../checked_ops.rs" 156 36 156 41] false))
+    [#"../checked_ops.rs" 156 27 156 41] _44 <- ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb (let (_, a) = res in a) false);
+    switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 157 14 157 39] res1 <- ([#"../checked_ops.rs" 157 14 157 39] overflowing_add0 ([#"../checked_ops.rs" 157 14 157 19] [#"../checked_ops.rs" 157 14 157 19] (120 : int8)) ([#"../checked_ops.rs" 157 36 157 38] [#"../checked_ops.rs" 157 36 157 38] (10 : int8)));
+    [#"../checked_ops.rs" 157 14 157 39] res1 <- ([#"../checked_ops.rs" 157 14 157 39] overflowing_add0 (120 : int8) (10 : int8));
     goto BB37
   }
   BB34 {
@@ -2495,20 +2704,22 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB37 {
-    switch ([#"../checked_ops.rs" 158 12 158 25] ([#"../checked_ops.rs" 158 12 158 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 158 21 158 25] [#"../checked_ops.rs" 158 21 158 25] (-126 : int8)))
+    [#"../checked_ops.rs" 158 12 158 25] _49 <- ([#"../checked_ops.rs" 158 12 158 25] (let (a, _) = res1 in a) = (-126 : int8));
+    switch (_49)
       | False -> goto BB41
       | True -> goto BB38
       end
   }
   BB38 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb ([#"../checked_ops.rs" 158 29 158 34] let (_, a) = res1 in a) ([#"../checked_ops.rs" 158 38 158 42] [#"../checked_ops.rs" 158 38 158 42] true))
+    [#"../checked_ops.rs" 158 29 158 42] _51 <- ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb (let (_, a) = res1 in a) true);
+    switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 159 14 159 43] res2 <- ([#"../checked_ops.rs" 159 14 159 43] overflowing_add0 ([#"../checked_ops.rs" 159 14 159 22] [#"../checked_ops.rs" 159 14 159 22] (-120 : int8)) ([#"../checked_ops.rs" 159 39 159 42] [#"../checked_ops.rs" 159 39 159 42] (-10 : int8)));
+    [#"../checked_ops.rs" 159 14 159 43] res2 <- ([#"../checked_ops.rs" 159 14 159 43] overflowing_add0 (-120 : int8) (-10 : int8));
     goto BB43
   }
   BB40 {
@@ -2523,14 +2734,16 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB43 {
-    switch ([#"../checked_ops.rs" 160 12 160 24] ([#"../checked_ops.rs" 160 12 160 17] let (a, _) = res2 in a) = ([#"../checked_ops.rs" 160 21 160 24] [#"../checked_ops.rs" 160 21 160 24] (126 : int8)))
+    [#"../checked_ops.rs" 160 12 160 24] _56 <- ([#"../checked_ops.rs" 160 12 160 24] (let (a, _) = res2 in a) = (126 : int8));
+    switch (_56)
       | False -> goto BB47
       | True -> goto BB44
       end
   }
   BB44 {
     assume { resolve0 res2 };
-    switch ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb ([#"../checked_ops.rs" 160 28 160 33] let (_, a) = res2 in a) ([#"../checked_ops.rs" 160 37 160 41] [#"../checked_ops.rs" 160 37 160 41] true))
+    [#"../checked_ops.rs" 160 28 160 41] _58 <- ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb (let (_, a) = res2 in a) true);
+    switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
@@ -2628,18 +2841,26 @@ module CheckedOps_TestI8AddOverflowPos
   var a : int8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option int8;
+  var _10 : bool;
   var _11 : int8;
+  var _13 : int8;
+  var _14 : int8;
+  var _18 : bool;
   var _19 : int8;
   var res : (int8, bool);
+  var _25 : bool;
+  var _27 : int8;
+  var _28 : int8;
+  var _30 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 166 12 166 32] _6 <- ([#"../checked_ops.rs" 166 12 166 32] checked_add0 ([#"../checked_ops.rs" 166 12 166 17] [#"../checked_ops.rs" 166 12 166 17] (127 : int8)) ([#"../checked_ops.rs" 166 30 166 31] a));
+    [#"../checked_ops.rs" 166 12 166 32] _6 <- ([#"../checked_ops.rs" 166 12 166 32] checked_add0 (127 : int8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 166 12 166 42] _4 <- ([#"../checked_ops.rs" 166 12 166 42] is_none0 ([#"../checked_ops.rs" 166 12 166 32] _6));
+    [#"../checked_ops.rs" 166 12 166 42] _4 <- ([#"../checked_ops.rs" 166 12 166 42] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -2649,7 +2870,7 @@ module CheckedOps_TestI8AddOverflowPos
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 167 12 167 33] _11 <- ([#"../checked_ops.rs" 167 12 167 33] wrapping_add0 ([#"../checked_ops.rs" 167 12 167 17] [#"../checked_ops.rs" 167 12 167 17] (127 : int8)) ([#"../checked_ops.rs" 167 31 167 32] a));
+    [#"../checked_ops.rs" 167 12 167 33] _11 <- ([#"../checked_ops.rs" 167 12 167 33] wrapping_add0 (127 : int8) a);
     goto BB5
   }
   BB4 {
@@ -2657,13 +2878,19 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 167 12 167 48] _11 = ([#"../checked_ops.rs" 167 37 167 48] ([#"../checked_ops.rs" 167 37 167 44] ([#"../checked_ops.rs" 167 37 167 38] a) - ([#"../checked_ops.rs" 167 41 167 44] [#"../checked_ops.rs" 167 41 167 44] (127 : int8))) - ([#"../checked_ops.rs" 167 47 167 48] [#"../checked_ops.rs" 167 47 167 48] (2 : int8))))
+    [#"../checked_ops.rs" 167 37 167 44] _14 <- ([#"../checked_ops.rs" 167 37 167 44] a - (127 : int8));
+    [#"../checked_ops.rs" 167 37 167 48] _13 <- ([#"../checked_ops.rs" 167 37 167 48] _14 - (2 : int8));
+    _14 <- any int8;
+    [#"../checked_ops.rs" 167 12 167 48] _10 <- ([#"../checked_ops.rs" 167 12 167 48] _11 = _13);
+    _11 <- any int8;
+    _13 <- any int8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 168 12 168 35] _19 <- ([#"../checked_ops.rs" 168 12 168 35] saturating_add0 ([#"../checked_ops.rs" 168 12 168 17] [#"../checked_ops.rs" 168 12 168 17] (127 : int8)) ([#"../checked_ops.rs" 168 33 168 34] a));
+    [#"../checked_ops.rs" 168 12 168 35] _19 <- ([#"../checked_ops.rs" 168 12 168 35] saturating_add0 (127 : int8) a);
     goto BB8
   }
   BB7 {
@@ -2671,13 +2898,15 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 168 12 168 42] _19 = ([#"../checked_ops.rs" 168 39 168 42] [#"../checked_ops.rs" 168 39 168 42] (127 : int8)))
+    [#"../checked_ops.rs" 168 12 168 42] _18 <- ([#"../checked_ops.rs" 168 12 168 42] _19 = (127 : int8));
+    _19 <- any int8;
+    switch (_18)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 169 14 169 38] res <- ([#"../checked_ops.rs" 169 14 169 38] overflowing_add0 ([#"../checked_ops.rs" 169 14 169 19] [#"../checked_ops.rs" 169 14 169 19] (127 : int8)) ([#"../checked_ops.rs" 169 36 169 37] a));
+    [#"../checked_ops.rs" 169 14 169 38] res <- ([#"../checked_ops.rs" 169 14 169 38] overflowing_add0 (127 : int8) a);
     goto BB11
   }
   BB10 {
@@ -2685,14 +2914,20 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 170 12 170 32] ([#"../checked_ops.rs" 170 12 170 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 170 21 170 32] ([#"../checked_ops.rs" 170 21 170 28] ([#"../checked_ops.rs" 170 21 170 22] a) - ([#"../checked_ops.rs" 170 25 170 28] [#"../checked_ops.rs" 170 25 170 28] (127 : int8))) - ([#"../checked_ops.rs" 170 31 170 32] [#"../checked_ops.rs" 170 31 170 32] (2 : int8))))
+    [#"../checked_ops.rs" 170 21 170 28] _28 <- ([#"../checked_ops.rs" 170 21 170 28] a - (127 : int8));
+    [#"../checked_ops.rs" 170 21 170 32] _27 <- ([#"../checked_ops.rs" 170 21 170 32] _28 - (2 : int8));
+    _28 <- any int8;
+    [#"../checked_ops.rs" 170 12 170 32] _25 <- ([#"../checked_ops.rs" 170 12 170 32] (let (a, _) = res in a) = _27);
+    _27 <- any int8;
+    switch (_25)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb ([#"../checked_ops.rs" 170 36 170 41] let (_, a) = res in a) ([#"../checked_ops.rs" 170 45 170 49] [#"../checked_ops.rs" 170 45 170 49] true))
+    [#"../checked_ops.rs" 170 36 170 49] _30 <- ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb (let (_, a) = res in a) true);
+    switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -2790,18 +3025,26 @@ module CheckedOps_TestI8AddOverflowNeg
   var a : int8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option int8;
+  var _10 : bool;
   var _11 : int8;
+  var _13 : int8;
+  var _14 : int8;
+  var _18 : bool;
   var _19 : int8;
   var res : (int8, bool);
+  var _25 : bool;
+  var _27 : int8;
+  var _28 : int8;
+  var _30 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 176 12 176 35] _6 <- ([#"../checked_ops.rs" 176 12 176 35] checked_add0 ([#"../checked_ops.rs" 176 12 176 20] [#"../checked_ops.rs" 176 12 176 20] (-128 : int8)) ([#"../checked_ops.rs" 176 33 176 34] a));
+    [#"../checked_ops.rs" 176 12 176 35] _6 <- ([#"../checked_ops.rs" 176 12 176 35] checked_add0 (-128 : int8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 176 12 176 45] _4 <- ([#"../checked_ops.rs" 176 12 176 45] is_none0 ([#"../checked_ops.rs" 176 12 176 35] _6));
+    [#"../checked_ops.rs" 176 12 176 45] _4 <- ([#"../checked_ops.rs" 176 12 176 45] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -2811,7 +3054,7 @@ module CheckedOps_TestI8AddOverflowNeg
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 177 12 177 36] _11 <- ([#"../checked_ops.rs" 177 12 177 36] wrapping_add0 ([#"../checked_ops.rs" 177 12 177 20] [#"../checked_ops.rs" 177 12 177 20] (-128 : int8)) ([#"../checked_ops.rs" 177 34 177 35] a));
+    [#"../checked_ops.rs" 177 12 177 36] _11 <- ([#"../checked_ops.rs" 177 12 177 36] wrapping_add0 (-128 : int8) a);
     goto BB5
   }
   BB4 {
@@ -2819,13 +3062,19 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 177 12 177 51] _11 = ([#"../checked_ops.rs" 177 40 177 51] ([#"../checked_ops.rs" 177 40 177 47] ([#"../checked_ops.rs" 177 40 177 41] a) + ([#"../checked_ops.rs" 177 44 177 47] [#"../checked_ops.rs" 177 44 177 47] (127 : int8))) + ([#"../checked_ops.rs" 177 50 177 51] [#"../checked_ops.rs" 177 50 177 51] (1 : int8))))
+    [#"../checked_ops.rs" 177 40 177 47] _14 <- ([#"../checked_ops.rs" 177 40 177 47] a + (127 : int8));
+    [#"../checked_ops.rs" 177 40 177 51] _13 <- ([#"../checked_ops.rs" 177 40 177 51] _14 + (1 : int8));
+    _14 <- any int8;
+    [#"../checked_ops.rs" 177 12 177 51] _10 <- ([#"../checked_ops.rs" 177 12 177 51] _11 = _13);
+    _11 <- any int8;
+    _13 <- any int8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 178 12 178 38] _19 <- ([#"../checked_ops.rs" 178 12 178 38] saturating_add0 ([#"../checked_ops.rs" 178 12 178 20] [#"../checked_ops.rs" 178 12 178 20] (-128 : int8)) ([#"../checked_ops.rs" 178 36 178 37] a));
+    [#"../checked_ops.rs" 178 12 178 38] _19 <- ([#"../checked_ops.rs" 178 12 178 38] saturating_add0 (-128 : int8) a);
     goto BB8
   }
   BB7 {
@@ -2833,13 +3082,15 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 178 12 178 46] _19 = ([#"../checked_ops.rs" 178 42 178 46] [#"../checked_ops.rs" 178 42 178 46] (-128 : int8)))
+    [#"../checked_ops.rs" 178 12 178 46] _18 <- ([#"../checked_ops.rs" 178 12 178 46] _19 = (-128 : int8));
+    _19 <- any int8;
+    switch (_18)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 179 14 179 41] res <- ([#"../checked_ops.rs" 179 14 179 41] overflowing_add0 ([#"../checked_ops.rs" 179 14 179 22] [#"../checked_ops.rs" 179 14 179 22] (-128 : int8)) ([#"../checked_ops.rs" 179 39 179 40] a));
+    [#"../checked_ops.rs" 179 14 179 41] res <- ([#"../checked_ops.rs" 179 14 179 41] overflowing_add0 (-128 : int8) a);
     goto BB11
   }
   BB10 {
@@ -2847,14 +3098,20 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 180 12 180 32] ([#"../checked_ops.rs" 180 12 180 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 180 21 180 32] ([#"../checked_ops.rs" 180 21 180 28] ([#"../checked_ops.rs" 180 21 180 22] a) + ([#"../checked_ops.rs" 180 25 180 28] [#"../checked_ops.rs" 180 25 180 28] (127 : int8))) + ([#"../checked_ops.rs" 180 31 180 32] [#"../checked_ops.rs" 180 31 180 32] (1 : int8))))
+    [#"../checked_ops.rs" 180 21 180 28] _28 <- ([#"../checked_ops.rs" 180 21 180 28] a + (127 : int8));
+    [#"../checked_ops.rs" 180 21 180 32] _27 <- ([#"../checked_ops.rs" 180 21 180 32] _28 + (1 : int8));
+    _28 <- any int8;
+    [#"../checked_ops.rs" 180 12 180 32] _25 <- ([#"../checked_ops.rs" 180 12 180 32] (let (a, _) = res in a) = _27);
+    _27 <- any int8;
+    switch (_25)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb ([#"../checked_ops.rs" 180 36 180 41] let (_, a) = res in a) ([#"../checked_ops.rs" 180 45 180 49] [#"../checked_ops.rs" 180 45 180 49] true))
+    [#"../checked_ops.rs" 180 36 180 49] _30 <- ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb (let (_, a) = res in a) true);
+    switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -2907,7 +3164,7 @@ module CheckedOps_TestI8WrappingAdd
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 187 4 187 21] _0 <- ([#"../checked_ops.rs" 187 4 187 21] wrapping_add0 ([#"../checked_ops.rs" 187 4 187 5] a) ([#"../checked_ops.rs" 187 19 187 20] b));
+    [#"../checked_ops.rs" 187 4 187 21] _0 <- ([#"../checked_ops.rs" 187 4 187 21] wrapping_add0 a b);
     goto BB1
   }
   BB1 {
@@ -2984,8 +3241,10 @@ module CheckedOps_TestI8OverflowingAdd
   var _0 : ();
   var a : int8 = a;
   var b : int8 = b;
+  var _4 : bool;
   var _6 : (int8, bool);
   var _9 : int8;
+  var _14 : bool;
   var _16 : (int8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option int8;
@@ -2993,22 +3252,24 @@ module CheckedOps_TestI8OverflowingAdd
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 192 12 192 32] _6 <- ([#"../checked_ops.rs" 192 12 192 32] overflowing_add0 ([#"../checked_ops.rs" 192 12 192 13] a) ([#"../checked_ops.rs" 192 30 192 31] b));
+    [#"../checked_ops.rs" 192 12 192 32] _6 <- ([#"../checked_ops.rs" 192 12 192 32] overflowing_add0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 192 38 192 55] _9 <- ([#"../checked_ops.rs" 192 38 192 55] wrapping_add0 ([#"../checked_ops.rs" 192 38 192 39] a) ([#"../checked_ops.rs" 192 53 192 54] b));
+    [#"../checked_ops.rs" 192 38 192 55] _9 <- ([#"../checked_ops.rs" 192 38 192 55] wrapping_add0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 192 12 192 55] ([#"../checked_ops.rs" 192 12 192 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 192 12 192 55] _4 <- ([#"../checked_ops.rs" 192 12 192 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any int8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 193 12 193 32] _16 <- ([#"../checked_ops.rs" 193 12 193 32] overflowing_add0 ([#"../checked_ops.rs" 193 12 193 13] a) ([#"../checked_ops.rs" 193 30 193 31] b));
+    [#"../checked_ops.rs" 193 12 193 32] _16 <- ([#"../checked_ops.rs" 193 12 193 32] overflowing_add0 a b);
     goto BB5
   }
   BB4 {
@@ -3017,15 +3278,17 @@ module CheckedOps_TestI8OverflowingAdd
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 193 38 193 54] _21 <- ([#"../checked_ops.rs" 193 38 193 54] checked_add0 ([#"../checked_ops.rs" 193 38 193 39] a) ([#"../checked_ops.rs" 193 52 193 53] b));
+    [#"../checked_ops.rs" 193 38 193 54] _21 <- ([#"../checked_ops.rs" 193 38 193 54] checked_add0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 193 38 193 64] _19 <- ([#"../checked_ops.rs" 193 38 193 64] is_none0 ([#"../checked_ops.rs" 193 38 193 54] _21));
+    [#"../checked_ops.rs" 193 38 193 64] _19 <- ([#"../checked_ops.rs" 193 38 193 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 193 12 193 64] Bool.eqb ([#"../checked_ops.rs" 193 12 193 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 193 12 193 64] _14 <- ([#"../checked_ops.rs" 193 12 193 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -3138,26 +3401,40 @@ module CheckedOps_TestI8SubExample
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _2 : bool;
   var _3 : int8;
   var _4 : Core_Option_Option_Type.t_option int8;
+  var _7 : bool;
   var _8 : int8;
   var _9 : Core_Option_Option_Type.t_option int8;
   var _12 : bool;
   var _14 : Core_Option_Option_Type.t_option int8;
+  var _17 : bool;
   var _18 : int8;
+  var _21 : bool;
   var _22 : int8;
+  var _25 : bool;
   var _26 : int8;
+  var _29 : bool;
   var _30 : int8;
+  var _33 : bool;
   var _34 : int8;
+  var _37 : bool;
   var _38 : int8;
   var res : (int8, bool);
+  var _42 : bool;
+  var _44 : bool;
   var res1 : (int8, bool);
+  var _49 : bool;
+  var _51 : bool;
   var res2 : (int8, bool);
+  var _56 : bool;
+  var _58 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 198 12 198 31] _4 <- ([#"../checked_ops.rs" 198 12 198 31] checked_sub0 ([#"../checked_ops.rs" 198 12 198 15] [#"../checked_ops.rs" 198 12 198 15] (5 : int8)) ([#"../checked_ops.rs" 198 28 198 30] [#"../checked_ops.rs" 198 28 198 30] (10 : int8)));
+    [#"../checked_ops.rs" 198 12 198 31] _4 <- ([#"../checked_ops.rs" 198 12 198 31] checked_sub0 (5 : int8) (10 : int8));
     goto BB1
   }
   BB1 {
@@ -3166,13 +3443,15 @@ module CheckedOps_TestI8SubExample
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 198 12 198 46] _3 = ([#"../checked_ops.rs" 198 44 198 46] [#"../checked_ops.rs" 198 44 198 46] (-5 : int8)))
+    [#"../checked_ops.rs" 198 12 198 46] _2 <- ([#"../checked_ops.rs" 198 12 198 46] _3 = (-5 : int8));
+    _3 <- any int8;
+    switch (_2)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 199 12 199 33] _9 <- ([#"../checked_ops.rs" 199 12 199 33] checked_sub0 ([#"../checked_ops.rs" 199 12 199 17] [#"../checked_ops.rs" 199 12 199 17] (120 : int8)) ([#"../checked_ops.rs" 199 30 199 32] [#"../checked_ops.rs" 199 30 199 32] (10 : int8)));
+    [#"../checked_ops.rs" 199 12 199 33] _9 <- ([#"../checked_ops.rs" 199 12 199 33] checked_sub0 (120 : int8) (10 : int8));
     goto BB5
   }
   BB4 {
@@ -3185,13 +3464,15 @@ module CheckedOps_TestI8SubExample
     goto BB6
   }
   BB6 {
-    switch ([#"../checked_ops.rs" 199 12 199 49] _8 = ([#"../checked_ops.rs" 199 46 199 49] [#"../checked_ops.rs" 199 46 199 49] (110 : int8)))
+    [#"../checked_ops.rs" 199 12 199 49] _7 <- ([#"../checked_ops.rs" 199 12 199 49] _8 = (110 : int8));
+    _8 <- any int8;
+    switch (_7)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 200 12 200 36] _14 <- ([#"../checked_ops.rs" 200 12 200 36] checked_sub0 ([#"../checked_ops.rs" 200 12 200 20] [#"../checked_ops.rs" 200 12 200 20] (-120 : int8)) ([#"../checked_ops.rs" 200 33 200 35] [#"../checked_ops.rs" 200 33 200 35] (10 : int8)));
+    [#"../checked_ops.rs" 200 12 200 36] _14 <- ([#"../checked_ops.rs" 200 12 200 36] checked_sub0 (-120 : int8) (10 : int8));
     goto BB9
   }
   BB8 {
@@ -3199,7 +3480,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 200 12 200 46] _12 <- ([#"../checked_ops.rs" 200 12 200 46] is_none0 ([#"../checked_ops.rs" 200 12 200 36] _14));
+    [#"../checked_ops.rs" 200 12 200 46] _12 <- ([#"../checked_ops.rs" 200 12 200 46] is_none0 _14);
     goto BB10
   }
   BB10 {
@@ -3209,7 +3490,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 202 12 202 32] _18 <- ([#"../checked_ops.rs" 202 12 202 32] wrapping_sub0 ([#"../checked_ops.rs" 202 12 202 15] [#"../checked_ops.rs" 202 12 202 15] (5 : int8)) ([#"../checked_ops.rs" 202 29 202 31] [#"../checked_ops.rs" 202 29 202 31] (10 : int8)));
+    [#"../checked_ops.rs" 202 12 202 32] _18 <- ([#"../checked_ops.rs" 202 12 202 32] wrapping_sub0 (5 : int8) (10 : int8));
     goto BB13
   }
   BB12 {
@@ -3217,13 +3498,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB13 {
-    switch ([#"../checked_ops.rs" 202 12 202 38] _18 = ([#"../checked_ops.rs" 202 36 202 38] [#"../checked_ops.rs" 202 36 202 38] (-5 : int8)))
+    [#"../checked_ops.rs" 202 12 202 38] _17 <- ([#"../checked_ops.rs" 202 12 202 38] _18 = (-5 : int8));
+    _18 <- any int8;
+    switch (_17)
       | False -> goto BB15
       | True -> goto BB14
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 203 12 203 34] _22 <- ([#"../checked_ops.rs" 203 12 203 34] wrapping_sub0 ([#"../checked_ops.rs" 203 12 203 17] [#"../checked_ops.rs" 203 12 203 17] (120 : int8)) ([#"../checked_ops.rs" 203 31 203 33] [#"../checked_ops.rs" 203 31 203 33] (10 : int8)));
+    [#"../checked_ops.rs" 203 12 203 34] _22 <- ([#"../checked_ops.rs" 203 12 203 34] wrapping_sub0 (120 : int8) (10 : int8));
     goto BB16
   }
   BB15 {
@@ -3231,13 +3514,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB16 {
-    switch ([#"../checked_ops.rs" 203 12 203 41] _22 = ([#"../checked_ops.rs" 203 38 203 41] [#"../checked_ops.rs" 203 38 203 41] (110 : int8)))
+    [#"../checked_ops.rs" 203 12 203 41] _21 <- ([#"../checked_ops.rs" 203 12 203 41] _22 = (110 : int8));
+    _22 <- any int8;
+    switch (_21)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 204 12 204 37] _26 <- ([#"../checked_ops.rs" 204 12 204 37] wrapping_sub0 ([#"../checked_ops.rs" 204 12 204 20] [#"../checked_ops.rs" 204 12 204 20] (-120 : int8)) ([#"../checked_ops.rs" 204 34 204 36] [#"../checked_ops.rs" 204 34 204 36] (10 : int8)));
+    [#"../checked_ops.rs" 204 12 204 37] _26 <- ([#"../checked_ops.rs" 204 12 204 37] wrapping_sub0 (-120 : int8) (10 : int8));
     goto BB19
   }
   BB18 {
@@ -3245,13 +3530,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB19 {
-    switch ([#"../checked_ops.rs" 204 12 204 44] _26 = ([#"../checked_ops.rs" 204 41 204 44] [#"../checked_ops.rs" 204 41 204 44] (126 : int8)))
+    [#"../checked_ops.rs" 204 12 204 44] _25 <- ([#"../checked_ops.rs" 204 12 204 44] _26 = (126 : int8));
+    _26 <- any int8;
+    switch (_25)
       | False -> goto BB21
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 206 12 206 34] _30 <- ([#"../checked_ops.rs" 206 12 206 34] saturating_sub0 ([#"../checked_ops.rs" 206 12 206 15] [#"../checked_ops.rs" 206 12 206 15] (5 : int8)) ([#"../checked_ops.rs" 206 31 206 33] [#"../checked_ops.rs" 206 31 206 33] (10 : int8)));
+    [#"../checked_ops.rs" 206 12 206 34] _30 <- ([#"../checked_ops.rs" 206 12 206 34] saturating_sub0 (5 : int8) (10 : int8));
     goto BB22
   }
   BB21 {
@@ -3259,13 +3546,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB22 {
-    switch ([#"../checked_ops.rs" 206 12 206 40] _30 = ([#"../checked_ops.rs" 206 38 206 40] [#"../checked_ops.rs" 206 38 206 40] (-5 : int8)))
+    [#"../checked_ops.rs" 206 12 206 40] _29 <- ([#"../checked_ops.rs" 206 12 206 40] _30 = (-5 : int8));
+    _30 <- any int8;
+    switch (_29)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 207 12 207 36] _34 <- ([#"../checked_ops.rs" 207 12 207 36] saturating_sub0 ([#"../checked_ops.rs" 207 12 207 17] [#"../checked_ops.rs" 207 12 207 17] (120 : int8)) ([#"../checked_ops.rs" 207 33 207 35] [#"../checked_ops.rs" 207 33 207 35] (10 : int8)));
+    [#"../checked_ops.rs" 207 12 207 36] _34 <- ([#"../checked_ops.rs" 207 12 207 36] saturating_sub0 (120 : int8) (10 : int8));
     goto BB25
   }
   BB24 {
@@ -3273,13 +3562,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB25 {
-    switch ([#"../checked_ops.rs" 207 12 207 43] _34 = ([#"../checked_ops.rs" 207 40 207 43] [#"../checked_ops.rs" 207 40 207 43] (110 : int8)))
+    [#"../checked_ops.rs" 207 12 207 43] _33 <- ([#"../checked_ops.rs" 207 12 207 43] _34 = (110 : int8));
+    _34 <- any int8;
+    switch (_33)
       | False -> goto BB27
       | True -> goto BB26
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 208 12 208 39] _38 <- ([#"../checked_ops.rs" 208 12 208 39] saturating_sub0 ([#"../checked_ops.rs" 208 12 208 20] [#"../checked_ops.rs" 208 12 208 20] (-120 : int8)) ([#"../checked_ops.rs" 208 36 208 38] [#"../checked_ops.rs" 208 36 208 38] (10 : int8)));
+    [#"../checked_ops.rs" 208 12 208 39] _38 <- ([#"../checked_ops.rs" 208 12 208 39] saturating_sub0 (-120 : int8) (10 : int8));
     goto BB28
   }
   BB27 {
@@ -3287,13 +3578,15 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB28 {
-    switch ([#"../checked_ops.rs" 208 12 208 47] _38 = ([#"../checked_ops.rs" 208 43 208 47] [#"../checked_ops.rs" 208 43 208 47] (-128 : int8)))
+    [#"../checked_ops.rs" 208 12 208 47] _37 <- ([#"../checked_ops.rs" 208 12 208 47] _38 = (-128 : int8));
+    _38 <- any int8;
+    switch (_37)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 210 14 210 37] res <- ([#"../checked_ops.rs" 210 14 210 37] overflowing_sub0 ([#"../checked_ops.rs" 210 14 210 17] [#"../checked_ops.rs" 210 14 210 17] (5 : int8)) ([#"../checked_ops.rs" 210 34 210 36] [#"../checked_ops.rs" 210 34 210 36] (10 : int8)));
+    [#"../checked_ops.rs" 210 14 210 37] res <- ([#"../checked_ops.rs" 210 14 210 37] overflowing_sub0 (5 : int8) (10 : int8));
     goto BB31
   }
   BB30 {
@@ -3301,20 +3594,22 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB31 {
-    switch ([#"../checked_ops.rs" 211 12 211 23] ([#"../checked_ops.rs" 211 12 211 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 211 21 211 23] [#"../checked_ops.rs" 211 21 211 23] (-5 : int8)))
+    [#"../checked_ops.rs" 211 12 211 23] _42 <- ([#"../checked_ops.rs" 211 12 211 23] (let (a, _) = res in a) = (-5 : int8));
+    switch (_42)
       | False -> goto BB35
       | True -> goto BB32
       end
   }
   BB32 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb ([#"../checked_ops.rs" 211 27 211 32] let (_, a) = res in a) ([#"../checked_ops.rs" 211 36 211 41] [#"../checked_ops.rs" 211 36 211 41] false))
+    [#"../checked_ops.rs" 211 27 211 41] _44 <- ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb (let (_, a) = res in a) false);
+    switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 212 14 212 39] res1 <- ([#"../checked_ops.rs" 212 14 212 39] overflowing_sub0 ([#"../checked_ops.rs" 212 14 212 19] [#"../checked_ops.rs" 212 14 212 19] (120 : int8)) ([#"../checked_ops.rs" 212 36 212 38] [#"../checked_ops.rs" 212 36 212 38] (10 : int8)));
+    [#"../checked_ops.rs" 212 14 212 39] res1 <- ([#"../checked_ops.rs" 212 14 212 39] overflowing_sub0 (120 : int8) (10 : int8));
     goto BB37
   }
   BB34 {
@@ -3329,20 +3624,22 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB37 {
-    switch ([#"../checked_ops.rs" 213 12 213 24] ([#"../checked_ops.rs" 213 12 213 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 213 21 213 24] [#"../checked_ops.rs" 213 21 213 24] (110 : int8)))
+    [#"../checked_ops.rs" 213 12 213 24] _49 <- ([#"../checked_ops.rs" 213 12 213 24] (let (a, _) = res1 in a) = (110 : int8));
+    switch (_49)
       | False -> goto BB41
       | True -> goto BB38
       end
   }
   BB38 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb ([#"../checked_ops.rs" 213 28 213 33] let (_, a) = res1 in a) ([#"../checked_ops.rs" 213 37 213 42] [#"../checked_ops.rs" 213 37 213 42] false))
+    [#"../checked_ops.rs" 213 28 213 42] _51 <- ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb (let (_, a) = res1 in a) false);
+    switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 214 14 214 42] res2 <- ([#"../checked_ops.rs" 214 14 214 42] overflowing_sub0 ([#"../checked_ops.rs" 214 14 214 22] [#"../checked_ops.rs" 214 14 214 22] (-120 : int8)) ([#"../checked_ops.rs" 214 39 214 41] [#"../checked_ops.rs" 214 39 214 41] (10 : int8)));
+    [#"../checked_ops.rs" 214 14 214 42] res2 <- ([#"../checked_ops.rs" 214 14 214 42] overflowing_sub0 (-120 : int8) (10 : int8));
     goto BB43
   }
   BB40 {
@@ -3357,14 +3654,16 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB43 {
-    switch ([#"../checked_ops.rs" 215 12 215 24] ([#"../checked_ops.rs" 215 12 215 17] let (a, _) = res2 in a) = ([#"../checked_ops.rs" 215 21 215 24] [#"../checked_ops.rs" 215 21 215 24] (126 : int8)))
+    [#"../checked_ops.rs" 215 12 215 24] _56 <- ([#"../checked_ops.rs" 215 12 215 24] (let (a, _) = res2 in a) = (126 : int8));
+    switch (_56)
       | False -> goto BB47
       | True -> goto BB44
       end
   }
   BB44 {
     assume { resolve0 res2 };
-    switch ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb ([#"../checked_ops.rs" 215 28 215 33] let (_, a) = res2 in a) ([#"../checked_ops.rs" 215 37 215 41] [#"../checked_ops.rs" 215 37 215 41] true))
+    [#"../checked_ops.rs" 215 28 215 41] _58 <- ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb (let (_, a) = res2 in a) true);
+    switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
@@ -3462,18 +3761,26 @@ module CheckedOps_TestI8SubOverflowPos
   var a : int8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option int8;
+  var _10 : bool;
   var _11 : int8;
+  var _13 : int8;
+  var _14 : int8;
+  var _18 : bool;
   var _19 : int8;
   var res : (int8, bool);
+  var _25 : bool;
+  var _27 : int8;
+  var _28 : int8;
+  var _30 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 221 12 221 35] _6 <- ([#"../checked_ops.rs" 221 12 221 35] checked_sub0 ([#"../checked_ops.rs" 221 12 221 20] [#"../checked_ops.rs" 221 12 221 20] (-128 : int8)) ([#"../checked_ops.rs" 221 33 221 34] a));
+    [#"../checked_ops.rs" 221 12 221 35] _6 <- ([#"../checked_ops.rs" 221 12 221 35] checked_sub0 (-128 : int8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 221 12 221 45] _4 <- ([#"../checked_ops.rs" 221 12 221 45] is_none0 ([#"../checked_ops.rs" 221 12 221 35] _6));
+    [#"../checked_ops.rs" 221 12 221 45] _4 <- ([#"../checked_ops.rs" 221 12 221 45] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -3483,7 +3790,7 @@ module CheckedOps_TestI8SubOverflowPos
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 222 12 222 36] _11 <- ([#"../checked_ops.rs" 222 12 222 36] wrapping_sub0 ([#"../checked_ops.rs" 222 12 222 20] [#"../checked_ops.rs" 222 12 222 20] (-128 : int8)) ([#"../checked_ops.rs" 222 34 222 35] a));
+    [#"../checked_ops.rs" 222 12 222 36] _11 <- ([#"../checked_ops.rs" 222 12 222 36] wrapping_sub0 (-128 : int8) a);
     goto BB5
   }
   BB4 {
@@ -3491,13 +3798,19 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 222 12 222 51] _11 = ([#"../checked_ops.rs" 222 40 222 51] ([#"../checked_ops.rs" 222 40 222 47] ([#"../checked_ops.rs" 222 40 222 43] [#"../checked_ops.rs" 222 40 222 43] (127 : int8)) - ([#"../checked_ops.rs" 222 46 222 47] a)) + ([#"../checked_ops.rs" 222 50 222 51] [#"../checked_ops.rs" 222 50 222 51] (1 : int8))))
+    [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 47] (127 : int8) - a);
+    [#"../checked_ops.rs" 222 40 222 51] _13 <- ([#"../checked_ops.rs" 222 40 222 51] _14 + (1 : int8));
+    _14 <- any int8;
+    [#"../checked_ops.rs" 222 12 222 51] _10 <- ([#"../checked_ops.rs" 222 12 222 51] _11 = _13);
+    _11 <- any int8;
+    _13 <- any int8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 223 12 223 38] _19 <- ([#"../checked_ops.rs" 223 12 223 38] saturating_sub0 ([#"../checked_ops.rs" 223 12 223 20] [#"../checked_ops.rs" 223 12 223 20] (-128 : int8)) ([#"../checked_ops.rs" 223 36 223 37] a));
+    [#"../checked_ops.rs" 223 12 223 38] _19 <- ([#"../checked_ops.rs" 223 12 223 38] saturating_sub0 (-128 : int8) a);
     goto BB8
   }
   BB7 {
@@ -3505,13 +3818,15 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 223 12 223 46] _19 = ([#"../checked_ops.rs" 223 42 223 46] [#"../checked_ops.rs" 223 42 223 46] (-128 : int8)))
+    [#"../checked_ops.rs" 223 12 223 46] _18 <- ([#"../checked_ops.rs" 223 12 223 46] _19 = (-128 : int8));
+    _19 <- any int8;
+    switch (_18)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 224 14 224 41] res <- ([#"../checked_ops.rs" 224 14 224 41] overflowing_sub0 ([#"../checked_ops.rs" 224 14 224 22] [#"../checked_ops.rs" 224 14 224 22] (-128 : int8)) ([#"../checked_ops.rs" 224 39 224 40] a));
+    [#"../checked_ops.rs" 224 14 224 41] res <- ([#"../checked_ops.rs" 224 14 224 41] overflowing_sub0 (-128 : int8) a);
     goto BB11
   }
   BB10 {
@@ -3519,14 +3834,20 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 225 12 225 32] ([#"../checked_ops.rs" 225 12 225 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 225 21 225 32] ([#"../checked_ops.rs" 225 21 225 28] ([#"../checked_ops.rs" 225 21 225 24] [#"../checked_ops.rs" 225 21 225 24] (127 : int8)) - ([#"../checked_ops.rs" 225 27 225 28] a)) + ([#"../checked_ops.rs" 225 31 225 32] [#"../checked_ops.rs" 225 31 225 32] (1 : int8))))
+    [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 28] (127 : int8) - a);
+    [#"../checked_ops.rs" 225 21 225 32] _27 <- ([#"../checked_ops.rs" 225 21 225 32] _28 + (1 : int8));
+    _28 <- any int8;
+    [#"../checked_ops.rs" 225 12 225 32] _25 <- ([#"../checked_ops.rs" 225 12 225 32] (let (a, _) = res in a) = _27);
+    _27 <- any int8;
+    switch (_25)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb ([#"../checked_ops.rs" 225 36 225 41] let (_, a) = res in a) ([#"../checked_ops.rs" 225 45 225 49] [#"../checked_ops.rs" 225 45 225 49] true))
+    [#"../checked_ops.rs" 225 36 225 49] _30 <- ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb (let (_, a) = res in a) true);
+    switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -3624,18 +3945,28 @@ module CheckedOps_TestI8SubOverflowNeg
   var a : int8 = a;
   var _4 : bool;
   var _6 : Core_Option_Option_Type.t_option int8;
+  var _10 : bool;
   var _11 : int8;
+  var _13 : int8;
+  var _14 : int8;
+  var _15 : int8;
+  var _19 : bool;
   var _20 : int8;
   var res : (int8, bool);
+  var _26 : bool;
+  var _28 : int8;
+  var _29 : int8;
+  var _30 : int8;
+  var _32 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 231 12 231 32] _6 <- ([#"../checked_ops.rs" 231 12 231 32] checked_sub0 ([#"../checked_ops.rs" 231 12 231 17] [#"../checked_ops.rs" 231 12 231 17] (127 : int8)) ([#"../checked_ops.rs" 231 30 231 31] a));
+    [#"../checked_ops.rs" 231 12 231 32] _6 <- ([#"../checked_ops.rs" 231 12 231 32] checked_sub0 (127 : int8) a);
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 231 12 231 42] _4 <- ([#"../checked_ops.rs" 231 12 231 42] is_none0 ([#"../checked_ops.rs" 231 12 231 32] _6));
+    [#"../checked_ops.rs" 231 12 231 42] _4 <- ([#"../checked_ops.rs" 231 12 231 42] is_none0 _6);
     goto BB2
   }
   BB2 {
@@ -3645,7 +3976,7 @@ module CheckedOps_TestI8SubOverflowNeg
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 232 12 232 33] _11 <- ([#"../checked_ops.rs" 232 12 232 33] wrapping_sub0 ([#"../checked_ops.rs" 232 12 232 17] [#"../checked_ops.rs" 232 12 232 17] (127 : int8)) ([#"../checked_ops.rs" 232 31 232 32] a));
+    [#"../checked_ops.rs" 232 12 232 33] _11 <- ([#"../checked_ops.rs" 232 12 232 33] wrapping_sub0 (127 : int8) a);
     goto BB5
   }
   BB4 {
@@ -3653,13 +3984,21 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 232 12 232 51] _11 = ([#"../checked_ops.rs" 232 37 232 51] ([#"../checked_ops.rs" 232 37 232 45] - ([#"../checked_ops.rs" 232 38 232 45] ([#"../checked_ops.rs" 232 39 232 40] [#"../checked_ops.rs" 232 39 232 40] (2 : int8)) + ([#"../checked_ops.rs" 232 43 232 44] a))) - ([#"../checked_ops.rs" 232 48 232 51] [#"../checked_ops.rs" 232 48 232 51] (127 : int8))))
+    [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 38 232 45] (2 : int8) + a);
+    [#"../checked_ops.rs" 232 37 232 45] _14 <- ([#"../checked_ops.rs" 232 37 232 45] - _15);
+    _15 <- any int8;
+    [#"../checked_ops.rs" 232 37 232 51] _13 <- ([#"../checked_ops.rs" 232 37 232 51] _14 - (127 : int8));
+    _14 <- any int8;
+    [#"../checked_ops.rs" 232 12 232 51] _10 <- ([#"../checked_ops.rs" 232 12 232 51] _11 = _13);
+    _11 <- any int8;
+    _13 <- any int8;
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 233 12 233 35] _20 <- ([#"../checked_ops.rs" 233 12 233 35] saturating_sub0 ([#"../checked_ops.rs" 233 12 233 17] [#"../checked_ops.rs" 233 12 233 17] (127 : int8)) ([#"../checked_ops.rs" 233 33 233 34] a));
+    [#"../checked_ops.rs" 233 12 233 35] _20 <- ([#"../checked_ops.rs" 233 12 233 35] saturating_sub0 (127 : int8) a);
     goto BB8
   }
   BB7 {
@@ -3667,13 +4006,15 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 233 12 233 42] _20 = ([#"../checked_ops.rs" 233 39 233 42] [#"../checked_ops.rs" 233 39 233 42] (127 : int8)))
+    [#"../checked_ops.rs" 233 12 233 42] _19 <- ([#"../checked_ops.rs" 233 12 233 42] _20 = (127 : int8));
+    _20 <- any int8;
+    switch (_19)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 234 14 234 38] res <- ([#"../checked_ops.rs" 234 14 234 38] overflowing_sub0 ([#"../checked_ops.rs" 234 14 234 19] [#"../checked_ops.rs" 234 14 234 19] (127 : int8)) ([#"../checked_ops.rs" 234 36 234 37] a));
+    [#"../checked_ops.rs" 234 14 234 38] res <- ([#"../checked_ops.rs" 234 14 234 38] overflowing_sub0 (127 : int8) a);
     goto BB11
   }
   BB10 {
@@ -3681,14 +4022,22 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 235 12 235 35] ([#"../checked_ops.rs" 235 12 235 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 235 21 235 35] ([#"../checked_ops.rs" 235 21 235 29] - ([#"../checked_ops.rs" 235 22 235 29] ([#"../checked_ops.rs" 235 23 235 24] [#"../checked_ops.rs" 235 23 235 24] (2 : int8)) + ([#"../checked_ops.rs" 235 27 235 28] a))) - ([#"../checked_ops.rs" 235 32 235 35] [#"../checked_ops.rs" 235 32 235 35] (127 : int8))))
+    [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 22 235 29] (2 : int8) + a);
+    [#"../checked_ops.rs" 235 21 235 29] _29 <- ([#"../checked_ops.rs" 235 21 235 29] - _30);
+    _30 <- any int8;
+    [#"../checked_ops.rs" 235 21 235 35] _28 <- ([#"../checked_ops.rs" 235 21 235 35] _29 - (127 : int8));
+    _29 <- any int8;
+    [#"../checked_ops.rs" 235 12 235 35] _26 <- ([#"../checked_ops.rs" 235 12 235 35] (let (a, _) = res in a) = _28);
+    _28 <- any int8;
+    switch (_26)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb ([#"../checked_ops.rs" 235 39 235 44] let (_, a) = res in a) ([#"../checked_ops.rs" 235 48 235 52] [#"../checked_ops.rs" 235 48 235 52] true))
+    [#"../checked_ops.rs" 235 39 235 52] _32 <- ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb (let (_, a) = res in a) true);
+    switch (_32)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -3741,7 +4090,7 @@ module CheckedOps_TestI8WrappingSub
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 242 4 242 21] _0 <- ([#"../checked_ops.rs" 242 4 242 21] wrapping_sub0 ([#"../checked_ops.rs" 242 4 242 5] a) ([#"../checked_ops.rs" 242 19 242 20] b));
+    [#"../checked_ops.rs" 242 4 242 21] _0 <- ([#"../checked_ops.rs" 242 4 242 21] wrapping_sub0 a b);
     goto BB1
   }
   BB1 {
@@ -3818,8 +4167,10 @@ module CheckedOps_TestI8OverflowingSub
   var _0 : ();
   var a : int8 = a;
   var b : int8 = b;
+  var _4 : bool;
   var _6 : (int8, bool);
   var _9 : int8;
+  var _14 : bool;
   var _16 : (int8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option int8;
@@ -3827,22 +4178,24 @@ module CheckedOps_TestI8OverflowingSub
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 247 12 247 32] _6 <- ([#"../checked_ops.rs" 247 12 247 32] overflowing_sub0 ([#"../checked_ops.rs" 247 12 247 13] a) ([#"../checked_ops.rs" 247 30 247 31] b));
+    [#"../checked_ops.rs" 247 12 247 32] _6 <- ([#"../checked_ops.rs" 247 12 247 32] overflowing_sub0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 247 38 247 55] _9 <- ([#"../checked_ops.rs" 247 38 247 55] wrapping_sub0 ([#"../checked_ops.rs" 247 38 247 39] a) ([#"../checked_ops.rs" 247 53 247 54] b));
+    [#"../checked_ops.rs" 247 38 247 55] _9 <- ([#"../checked_ops.rs" 247 38 247 55] wrapping_sub0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 247 12 247 55] ([#"../checked_ops.rs" 247 12 247 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 247 12 247 55] _4 <- ([#"../checked_ops.rs" 247 12 247 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any int8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 248 12 248 32] _16 <- ([#"../checked_ops.rs" 248 12 248 32] overflowing_sub0 ([#"../checked_ops.rs" 248 12 248 13] a) ([#"../checked_ops.rs" 248 30 248 31] b));
+    [#"../checked_ops.rs" 248 12 248 32] _16 <- ([#"../checked_ops.rs" 248 12 248 32] overflowing_sub0 a b);
     goto BB5
   }
   BB4 {
@@ -3851,15 +4204,17 @@ module CheckedOps_TestI8OverflowingSub
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 248 38 248 54] _21 <- ([#"../checked_ops.rs" 248 38 248 54] checked_sub0 ([#"../checked_ops.rs" 248 38 248 39] a) ([#"../checked_ops.rs" 248 52 248 53] b));
+    [#"../checked_ops.rs" 248 38 248 54] _21 <- ([#"../checked_ops.rs" 248 38 248 54] checked_sub0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 248 38 248 64] _19 <- ([#"../checked_ops.rs" 248 38 248 64] is_none0 ([#"../checked_ops.rs" 248 38 248 54] _21));
+    [#"../checked_ops.rs" 248 38 248 64] _19 <- ([#"../checked_ops.rs" 248 38 248 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 248 12 248 64] Bool.eqb ([#"../checked_ops.rs" 248 12 248 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 248 12 248 64] _14 <- ([#"../checked_ops.rs" 248 12 248 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -3972,26 +4327,39 @@ module CheckedOps_TestI8MulExample
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _2 : bool;
   var _3 : int8;
   var _4 : Core_Option_Option_Type.t_option int8;
   var _7 : bool;
   var _9 : Core_Option_Option_Type.t_option int8;
   var _12 : bool;
   var _14 : Core_Option_Option_Type.t_option int8;
+  var _17 : bool;
   var _18 : int8;
+  var _21 : bool;
   var _22 : int8;
+  var _25 : bool;
   var _26 : int8;
+  var _29 : bool;
   var _30 : int8;
+  var _33 : bool;
   var _34 : int8;
+  var _37 : bool;
   var _38 : int8;
   var res : (int8, bool);
+  var _42 : bool;
+  var _44 : bool;
   var res1 : (int8, bool);
+  var _49 : bool;
+  var _51 : bool;
   var res2 : (int8, bool);
+  var _56 : bool;
+  var _58 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 253 12 253 31] _4 <- ([#"../checked_ops.rs" 253 12 253 31] checked_mul0 ([#"../checked_ops.rs" 253 12 253 15] [#"../checked_ops.rs" 253 12 253 15] (5 : int8)) ([#"../checked_ops.rs" 253 28 253 30] [#"../checked_ops.rs" 253 28 253 30] (10 : int8)));
+    [#"../checked_ops.rs" 253 12 253 31] _4 <- ([#"../checked_ops.rs" 253 12 253 31] checked_mul0 (5 : int8) (10 : int8));
     goto BB1
   }
   BB1 {
@@ -4000,13 +4368,15 @@ module CheckedOps_TestI8MulExample
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 253 12 253 46] _3 = ([#"../checked_ops.rs" 253 44 253 46] [#"../checked_ops.rs" 253 44 253 46] (50 : int8)))
+    [#"../checked_ops.rs" 253 12 253 46] _2 <- ([#"../checked_ops.rs" 253 12 253 46] _3 = (50 : int8));
+    _3 <- any int8;
+    switch (_2)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 254 12 254 32] _9 <- ([#"../checked_ops.rs" 254 12 254 32] checked_mul0 ([#"../checked_ops.rs" 254 12 254 16] [#"../checked_ops.rs" 254 12 254 16] (50 : int8)) ([#"../checked_ops.rs" 254 29 254 31] [#"../checked_ops.rs" 254 29 254 31] (10 : int8)));
+    [#"../checked_ops.rs" 254 12 254 32] _9 <- ([#"../checked_ops.rs" 254 12 254 32] checked_mul0 (50 : int8) (10 : int8));
     goto BB5
   }
   BB4 {
@@ -4014,7 +4384,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 254 12 254 42] _7 <- ([#"../checked_ops.rs" 254 12 254 42] is_none0 ([#"../checked_ops.rs" 254 12 254 32] _9));
+    [#"../checked_ops.rs" 254 12 254 42] _7 <- ([#"../checked_ops.rs" 254 12 254 42] is_none0 _9);
     goto BB6
   }
   BB6 {
@@ -4024,7 +4394,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 255 12 255 33] _14 <- ([#"../checked_ops.rs" 255 12 255 33] checked_mul0 ([#"../checked_ops.rs" 255 12 255 16] [#"../checked_ops.rs" 255 12 255 16] (50 : int8)) ([#"../checked_ops.rs" 255 29 255 32] [#"../checked_ops.rs" 255 29 255 32] (-10 : int8)));
+    [#"../checked_ops.rs" 255 12 255 33] _14 <- ([#"../checked_ops.rs" 255 12 255 33] checked_mul0 (50 : int8) (-10 : int8));
     goto BB9
   }
   BB8 {
@@ -4032,7 +4402,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 255 12 255 43] _12 <- ([#"../checked_ops.rs" 255 12 255 43] is_none0 ([#"../checked_ops.rs" 255 12 255 33] _14));
+    [#"../checked_ops.rs" 255 12 255 43] _12 <- ([#"../checked_ops.rs" 255 12 255 43] is_none0 _14);
     goto BB10
   }
   BB10 {
@@ -4042,7 +4412,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 257 12 257 32] _18 <- ([#"../checked_ops.rs" 257 12 257 32] wrapping_mul0 ([#"../checked_ops.rs" 257 12 257 15] [#"../checked_ops.rs" 257 12 257 15] (5 : int8)) ([#"../checked_ops.rs" 257 29 257 31] [#"../checked_ops.rs" 257 29 257 31] (10 : int8)));
+    [#"../checked_ops.rs" 257 12 257 32] _18 <- ([#"../checked_ops.rs" 257 12 257 32] wrapping_mul0 (5 : int8) (10 : int8));
     goto BB13
   }
   BB12 {
@@ -4050,13 +4420,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB13 {
-    switch ([#"../checked_ops.rs" 257 12 257 38] _18 = ([#"../checked_ops.rs" 257 36 257 38] [#"../checked_ops.rs" 257 36 257 38] (50 : int8)))
+    [#"../checked_ops.rs" 257 12 257 38] _17 <- ([#"../checked_ops.rs" 257 12 257 38] _18 = (50 : int8));
+    _18 <- any int8;
+    switch (_17)
       | False -> goto BB15
       | True -> goto BB14
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 258 12 258 33] _22 <- ([#"../checked_ops.rs" 258 12 258 33] wrapping_mul0 ([#"../checked_ops.rs" 258 12 258 16] [#"../checked_ops.rs" 258 12 258 16] (50 : int8)) ([#"../checked_ops.rs" 258 30 258 32] [#"../checked_ops.rs" 258 30 258 32] (10 : int8)));
+    [#"../checked_ops.rs" 258 12 258 33] _22 <- ([#"../checked_ops.rs" 258 12 258 33] wrapping_mul0 (50 : int8) (10 : int8));
     goto BB16
   }
   BB15 {
@@ -4064,13 +4436,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB16 {
-    switch ([#"../checked_ops.rs" 258 12 258 40] _22 = ([#"../checked_ops.rs" 258 37 258 40] [#"../checked_ops.rs" 258 37 258 40] (-12 : int8)))
+    [#"../checked_ops.rs" 258 12 258 40] _21 <- ([#"../checked_ops.rs" 258 12 258 40] _22 = (-12 : int8));
+    _22 <- any int8;
+    switch (_21)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 259 12 259 34] _26 <- ([#"../checked_ops.rs" 259 12 259 34] wrapping_mul0 ([#"../checked_ops.rs" 259 12 259 16] [#"../checked_ops.rs" 259 12 259 16] (50 : int8)) ([#"../checked_ops.rs" 259 30 259 33] [#"../checked_ops.rs" 259 30 259 33] (-10 : int8)));
+    [#"../checked_ops.rs" 259 12 259 34] _26 <- ([#"../checked_ops.rs" 259 12 259 34] wrapping_mul0 (50 : int8) (-10 : int8));
     goto BB19
   }
   BB18 {
@@ -4078,13 +4452,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB19 {
-    switch ([#"../checked_ops.rs" 259 12 259 40] _26 = ([#"../checked_ops.rs" 259 38 259 40] [#"../checked_ops.rs" 259 38 259 40] (12 : int8)))
+    [#"../checked_ops.rs" 259 12 259 40] _25 <- ([#"../checked_ops.rs" 259 12 259 40] _26 = (12 : int8));
+    _26 <- any int8;
+    switch (_25)
       | False -> goto BB21
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 261 12 261 34] _30 <- ([#"../checked_ops.rs" 261 12 261 34] saturating_mul0 ([#"../checked_ops.rs" 261 12 261 15] [#"../checked_ops.rs" 261 12 261 15] (5 : int8)) ([#"../checked_ops.rs" 261 31 261 33] [#"../checked_ops.rs" 261 31 261 33] (10 : int8)));
+    [#"../checked_ops.rs" 261 12 261 34] _30 <- ([#"../checked_ops.rs" 261 12 261 34] saturating_mul0 (5 : int8) (10 : int8));
     goto BB22
   }
   BB21 {
@@ -4092,13 +4468,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB22 {
-    switch ([#"../checked_ops.rs" 261 12 261 40] _30 = ([#"../checked_ops.rs" 261 38 261 40] [#"../checked_ops.rs" 261 38 261 40] (50 : int8)))
+    [#"../checked_ops.rs" 261 12 261 40] _29 <- ([#"../checked_ops.rs" 261 12 261 40] _30 = (50 : int8));
+    _30 <- any int8;
+    switch (_29)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 262 12 262 35] _34 <- ([#"../checked_ops.rs" 262 12 262 35] saturating_mul0 ([#"../checked_ops.rs" 262 12 262 16] [#"../checked_ops.rs" 262 12 262 16] (50 : int8)) ([#"../checked_ops.rs" 262 32 262 34] [#"../checked_ops.rs" 262 32 262 34] (10 : int8)));
+    [#"../checked_ops.rs" 262 12 262 35] _34 <- ([#"../checked_ops.rs" 262 12 262 35] saturating_mul0 (50 : int8) (10 : int8));
     goto BB25
   }
   BB24 {
@@ -4106,13 +4484,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB25 {
-    switch ([#"../checked_ops.rs" 262 12 262 42] _34 = ([#"../checked_ops.rs" 262 39 262 42] [#"../checked_ops.rs" 262 39 262 42] (127 : int8)))
+    [#"../checked_ops.rs" 262 12 262 42] _33 <- ([#"../checked_ops.rs" 262 12 262 42] _34 = (127 : int8));
+    _34 <- any int8;
+    switch (_33)
       | False -> goto BB27
       | True -> goto BB26
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 263 12 263 36] _38 <- ([#"../checked_ops.rs" 263 12 263 36] saturating_mul0 ([#"../checked_ops.rs" 263 12 263 16] [#"../checked_ops.rs" 263 12 263 16] (50 : int8)) ([#"../checked_ops.rs" 263 32 263 35] [#"../checked_ops.rs" 263 32 263 35] (-10 : int8)));
+    [#"../checked_ops.rs" 263 12 263 36] _38 <- ([#"../checked_ops.rs" 263 12 263 36] saturating_mul0 (50 : int8) (-10 : int8));
     goto BB28
   }
   BB27 {
@@ -4120,13 +4500,15 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB28 {
-    switch ([#"../checked_ops.rs" 263 12 263 44] _38 = ([#"../checked_ops.rs" 263 40 263 44] [#"../checked_ops.rs" 263 40 263 44] (-128 : int8)))
+    [#"../checked_ops.rs" 263 12 263 44] _37 <- ([#"../checked_ops.rs" 263 12 263 44] _38 = (-128 : int8));
+    _38 <- any int8;
+    switch (_37)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 265 14 265 37] res <- ([#"../checked_ops.rs" 265 14 265 37] overflowing_mul0 ([#"../checked_ops.rs" 265 14 265 17] [#"../checked_ops.rs" 265 14 265 17] (5 : int8)) ([#"../checked_ops.rs" 265 34 265 36] [#"../checked_ops.rs" 265 34 265 36] (10 : int8)));
+    [#"../checked_ops.rs" 265 14 265 37] res <- ([#"../checked_ops.rs" 265 14 265 37] overflowing_mul0 (5 : int8) (10 : int8));
     goto BB31
   }
   BB30 {
@@ -4134,20 +4516,22 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB31 {
-    switch ([#"../checked_ops.rs" 266 12 266 23] ([#"../checked_ops.rs" 266 12 266 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 266 21 266 23] [#"../checked_ops.rs" 266 21 266 23] (50 : int8)))
+    [#"../checked_ops.rs" 266 12 266 23] _42 <- ([#"../checked_ops.rs" 266 12 266 23] (let (a, _) = res in a) = (50 : int8));
+    switch (_42)
       | False -> goto BB35
       | True -> goto BB32
       end
   }
   BB32 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb ([#"../checked_ops.rs" 266 27 266 32] let (_, a) = res in a) ([#"../checked_ops.rs" 266 36 266 41] [#"../checked_ops.rs" 266 36 266 41] false))
+    [#"../checked_ops.rs" 266 27 266 41] _44 <- ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb (let (_, a) = res in a) false);
+    switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 267 14 267 38] res1 <- ([#"../checked_ops.rs" 267 14 267 38] overflowing_mul0 ([#"../checked_ops.rs" 267 14 267 18] [#"../checked_ops.rs" 267 14 267 18] (50 : int8)) ([#"../checked_ops.rs" 267 35 267 37] [#"../checked_ops.rs" 267 35 267 37] (10 : int8)));
+    [#"../checked_ops.rs" 267 14 267 38] res1 <- ([#"../checked_ops.rs" 267 14 267 38] overflowing_mul0 (50 : int8) (10 : int8));
     goto BB37
   }
   BB34 {
@@ -4162,20 +4546,22 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB37 {
-    switch ([#"../checked_ops.rs" 268 12 268 24] ([#"../checked_ops.rs" 268 12 268 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 268 21 268 24] [#"../checked_ops.rs" 268 21 268 24] (-12 : int8)))
+    [#"../checked_ops.rs" 268 12 268 24] _49 <- ([#"../checked_ops.rs" 268 12 268 24] (let (a, _) = res1 in a) = (-12 : int8));
+    switch (_49)
       | False -> goto BB41
       | True -> goto BB38
       end
   }
   BB38 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb ([#"../checked_ops.rs" 268 28 268 33] let (_, a) = res1 in a) ([#"../checked_ops.rs" 268 37 268 41] [#"../checked_ops.rs" 268 37 268 41] true))
+    [#"../checked_ops.rs" 268 28 268 41] _51 <- ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb (let (_, a) = res1 in a) true);
+    switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 269 14 269 39] res2 <- ([#"../checked_ops.rs" 269 14 269 39] overflowing_mul0 ([#"../checked_ops.rs" 269 14 269 18] [#"../checked_ops.rs" 269 14 269 18] (50 : int8)) ([#"../checked_ops.rs" 269 35 269 38] [#"../checked_ops.rs" 269 35 269 38] (-10 : int8)));
+    [#"../checked_ops.rs" 269 14 269 39] res2 <- ([#"../checked_ops.rs" 269 14 269 39] overflowing_mul0 (50 : int8) (-10 : int8));
     goto BB43
   }
   BB40 {
@@ -4190,14 +4576,16 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB43 {
-    switch ([#"../checked_ops.rs" 270 12 270 23] ([#"../checked_ops.rs" 270 12 270 17] let (a, _) = res2 in a) = ([#"../checked_ops.rs" 270 21 270 23] [#"../checked_ops.rs" 270 21 270 23] (12 : int8)))
+    [#"../checked_ops.rs" 270 12 270 23] _56 <- ([#"../checked_ops.rs" 270 12 270 23] (let (a, _) = res2 in a) = (12 : int8));
+    switch (_56)
       | False -> goto BB47
       | True -> goto BB44
       end
   }
   BB44 {
     assume { resolve0 res2 };
-    switch ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb ([#"../checked_ops.rs" 270 27 270 32] let (_, a) = res2 in a) ([#"../checked_ops.rs" 270 36 270 40] [#"../checked_ops.rs" 270 36 270 40] true))
+    [#"../checked_ops.rs" 270 27 270 40] _58 <- ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb (let (_, a) = res2 in a) true);
+    switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
@@ -4303,16 +4691,21 @@ module CheckedOps_TestI8MulZero
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : int8 = a;
+  var _3 : bool;
   var _4 : int8;
   var _5 : Core_Option_Option_Type.t_option int8;
+  var _9 : bool;
   var _10 : int8;
+  var _14 : bool;
   var _15 : int8;
   var res : (int8, bool);
+  var _21 : bool;
+  var _23 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 275 12 275 30] _5 <- ([#"../checked_ops.rs" 275 12 275 30] checked_mul0 ([#"../checked_ops.rs" 275 12 275 15] [#"../checked_ops.rs" 275 12 275 15] (0 : int8)) ([#"../checked_ops.rs" 275 28 275 29] a));
+    [#"../checked_ops.rs" 275 12 275 30] _5 <- ([#"../checked_ops.rs" 275 12 275 30] checked_mul0 (0 : int8) a);
     goto BB1
   }
   BB1 {
@@ -4321,13 +4714,15 @@ module CheckedOps_TestI8MulZero
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 275 12 275 44] _4 = ([#"../checked_ops.rs" 275 43 275 44] [#"../checked_ops.rs" 275 43 275 44] (0 : int8)))
+    [#"../checked_ops.rs" 275 12 275 44] _3 <- ([#"../checked_ops.rs" 275 12 275 44] _4 = (0 : int8));
+    _4 <- any int8;
+    switch (_3)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 276 12 276 31] _10 <- ([#"../checked_ops.rs" 276 12 276 31] wrapping_mul0 ([#"../checked_ops.rs" 276 12 276 15] [#"../checked_ops.rs" 276 12 276 15] (0 : int8)) ([#"../checked_ops.rs" 276 29 276 30] a));
+    [#"../checked_ops.rs" 276 12 276 31] _10 <- ([#"../checked_ops.rs" 276 12 276 31] wrapping_mul0 (0 : int8) a);
     goto BB5
   }
   BB4 {
@@ -4335,13 +4730,15 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB5 {
-    switch ([#"../checked_ops.rs" 276 12 276 36] _10 = ([#"../checked_ops.rs" 276 35 276 36] [#"../checked_ops.rs" 276 35 276 36] (0 : int8)))
+    [#"../checked_ops.rs" 276 12 276 36] _9 <- ([#"../checked_ops.rs" 276 12 276 36] _10 = (0 : int8));
+    _10 <- any int8;
+    switch (_9)
       | False -> goto BB7
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 277 12 277 33] _15 <- ([#"../checked_ops.rs" 277 12 277 33] saturating_mul0 ([#"../checked_ops.rs" 277 12 277 15] [#"../checked_ops.rs" 277 12 277 15] (0 : int8)) ([#"../checked_ops.rs" 277 31 277 32] a));
+    [#"../checked_ops.rs" 277 12 277 33] _15 <- ([#"../checked_ops.rs" 277 12 277 33] saturating_mul0 (0 : int8) a);
     goto BB8
   }
   BB7 {
@@ -4349,13 +4746,15 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB8 {
-    switch ([#"../checked_ops.rs" 277 12 277 38] _15 = ([#"../checked_ops.rs" 277 37 277 38] [#"../checked_ops.rs" 277 37 277 38] (0 : int8)))
+    [#"../checked_ops.rs" 277 12 277 38] _14 <- ([#"../checked_ops.rs" 277 12 277 38] _15 = (0 : int8));
+    _15 <- any int8;
+    switch (_14)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 278 14 278 36] res <- ([#"../checked_ops.rs" 278 14 278 36] overflowing_mul0 ([#"../checked_ops.rs" 278 14 278 17] [#"../checked_ops.rs" 278 14 278 17] (0 : int8)) ([#"../checked_ops.rs" 278 34 278 35] a));
+    [#"../checked_ops.rs" 278 14 278 36] res <- ([#"../checked_ops.rs" 278 14 278 36] overflowing_mul0 (0 : int8) a);
     goto BB11
   }
   BB10 {
@@ -4363,14 +4762,16 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB11 {
-    switch ([#"../checked_ops.rs" 279 12 279 22] ([#"../checked_ops.rs" 279 12 279 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 279 21 279 22] [#"../checked_ops.rs" 279 21 279 22] (0 : int8)))
+    [#"../checked_ops.rs" 279 12 279 22] _21 <- ([#"../checked_ops.rs" 279 12 279 22] (let (a, _) = res in a) = (0 : int8));
+    switch (_21)
       | False -> goto BB15
       | True -> goto BB12
       end
   }
   BB12 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb ([#"../checked_ops.rs" 279 26 279 31] let (_, a) = res in a) ([#"../checked_ops.rs" 279 35 279 40] [#"../checked_ops.rs" 279 35 279 40] false))
+    [#"../checked_ops.rs" 279 26 279 40] _23 <- ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb (let (_, a) = res in a) false);
+    switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -4461,8 +4862,10 @@ module CheckedOps_TestI8OverflowingMul
   var _0 : ();
   var a : int8 = a;
   var b : int8 = b;
+  var _4 : bool;
   var _6 : (int8, bool);
   var _9 : int8;
+  var _14 : bool;
   var _16 : (int8, bool);
   var _19 : bool;
   var _21 : Core_Option_Option_Type.t_option int8;
@@ -4470,22 +4873,24 @@ module CheckedOps_TestI8OverflowingMul
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 284 12 284 32] _6 <- ([#"../checked_ops.rs" 284 12 284 32] overflowing_mul0 ([#"../checked_ops.rs" 284 12 284 13] a) ([#"../checked_ops.rs" 284 30 284 31] b));
+    [#"../checked_ops.rs" 284 12 284 32] _6 <- ([#"../checked_ops.rs" 284 12 284 32] overflowing_mul0 a b);
     goto BB1
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../checked_ops.rs" 284 38 284 55] _9 <- ([#"../checked_ops.rs" 284 38 284 55] wrapping_mul0 ([#"../checked_ops.rs" 284 38 284 39] a) ([#"../checked_ops.rs" 284 53 284 54] b));
+    [#"../checked_ops.rs" 284 38 284 55] _9 <- ([#"../checked_ops.rs" 284 38 284 55] wrapping_mul0 a b);
     goto BB2
   }
   BB2 {
-    switch ([#"../checked_ops.rs" 284 12 284 55] ([#"../checked_ops.rs" 284 12 284 34] let (a, _) = _6 in a) = _9)
+    [#"../checked_ops.rs" 284 12 284 55] _4 <- ([#"../checked_ops.rs" 284 12 284 55] (let (a, _) = _6 in a) = _9);
+    _9 <- any int8;
+    switch (_4)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 285 12 285 32] _16 <- ([#"../checked_ops.rs" 285 12 285 32] overflowing_mul0 ([#"../checked_ops.rs" 285 12 285 13] a) ([#"../checked_ops.rs" 285 30 285 31] b));
+    [#"../checked_ops.rs" 285 12 285 32] _16 <- ([#"../checked_ops.rs" 285 12 285 32] overflowing_mul0 a b);
     goto BB5
   }
   BB4 {
@@ -4494,15 +4899,17 @@ module CheckedOps_TestI8OverflowingMul
   }
   BB5 {
     assume { resolve0 _16 };
-    [#"../checked_ops.rs" 285 38 285 54] _21 <- ([#"../checked_ops.rs" 285 38 285 54] checked_mul0 ([#"../checked_ops.rs" 285 38 285 39] a) ([#"../checked_ops.rs" 285 52 285 53] b));
+    [#"../checked_ops.rs" 285 38 285 54] _21 <- ([#"../checked_ops.rs" 285 38 285 54] checked_mul0 a b);
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 285 38 285 64] _19 <- ([#"../checked_ops.rs" 285 38 285 64] is_none0 ([#"../checked_ops.rs" 285 38 285 54] _21));
+    [#"../checked_ops.rs" 285 38 285 64] _19 <- ([#"../checked_ops.rs" 285 38 285 64] is_none0 _21);
     goto BB7
   }
   BB7 {
-    switch ([#"../checked_ops.rs" 285 12 285 64] Bool.eqb ([#"../checked_ops.rs" 285 12 285 34] let (_, a) = _16 in a) _19)
+    [#"../checked_ops.rs" 285 12 285 64] _14 <- ([#"../checked_ops.rs" 285 12 285 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    _19 <- any bool;
+    switch (_14)
       | False -> goto BB9
       | True -> goto BB8
       end
@@ -4607,30 +5014,44 @@ module CheckedOps_TestI8DivExample
   var _0 : ();
   var _2 : bool;
   var _4 : Core_Option_Option_Type.t_option int8;
+  var _7 : bool;
   var _8 : int8;
   var _9 : Core_Option_Option_Type.t_option int8;
+  var _12 : bool;
   var _13 : int8;
   var _14 : Core_Option_Option_Type.t_option int8;
   var _17 : bool;
   var _19 : Core_Option_Option_Type.t_option int8;
+  var _22 : bool;
   var _23 : int8;
+  var _26 : bool;
   var _27 : int8;
+  var _30 : bool;
   var _31 : int8;
+  var _34 : bool;
   var _35 : int8;
+  var _38 : bool;
   var _39 : int8;
+  var _42 : bool;
   var _43 : int8;
   var res : (int8, bool);
+  var _47 : bool;
+  var _49 : bool;
   var res1 : (int8, bool);
+  var _54 : bool;
+  var _56 : bool;
   var res2 : (int8, bool);
+  var _61 : bool;
+  var _63 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 290 12 290 30] _4 <- ([#"../checked_ops.rs" 290 12 290 30] checked_div0 ([#"../checked_ops.rs" 290 12 290 15] [#"../checked_ops.rs" 290 12 290 15] (5 : int8)) ([#"../checked_ops.rs" 290 28 290 29] [#"../checked_ops.rs" 290 28 290 29] (0 : int8)));
+    [#"../checked_ops.rs" 290 12 290 30] _4 <- ([#"../checked_ops.rs" 290 12 290 30] checked_div0 (5 : int8) (0 : int8));
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 290 12 290 40] _2 <- ([#"../checked_ops.rs" 290 12 290 40] is_none0 ([#"../checked_ops.rs" 290 12 290 30] _4));
+    [#"../checked_ops.rs" 290 12 290 40] _2 <- ([#"../checked_ops.rs" 290 12 290 40] is_none0 _4);
     goto BB2
   }
   BB2 {
@@ -4640,7 +5061,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 291 12 291 30] _9 <- ([#"../checked_ops.rs" 291 12 291 30] checked_div0 ([#"../checked_ops.rs" 291 12 291 15] [#"../checked_ops.rs" 291 12 291 15] (5 : int8)) ([#"../checked_ops.rs" 291 28 291 29] [#"../checked_ops.rs" 291 28 291 29] (2 : int8)));
+    [#"../checked_ops.rs" 291 12 291 30] _9 <- ([#"../checked_ops.rs" 291 12 291 30] checked_div0 (5 : int8) (2 : int8));
     goto BB5
   }
   BB4 {
@@ -4653,13 +5074,15 @@ module CheckedOps_TestI8DivExample
     goto BB6
   }
   BB6 {
-    switch ([#"../checked_ops.rs" 291 12 291 44] _8 = ([#"../checked_ops.rs" 291 43 291 44] [#"../checked_ops.rs" 291 43 291 44] (2 : int8)))
+    [#"../checked_ops.rs" 291 12 291 44] _7 <- ([#"../checked_ops.rs" 291 12 291 44] _8 = (2 : int8));
+    _8 <- any int8;
+    switch (_7)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 292 12 292 31] _14 <- ([#"../checked_ops.rs" 292 12 292 31] checked_div0 ([#"../checked_ops.rs" 292 12 292 15] [#"../checked_ops.rs" 292 12 292 15] (5 : int8)) ([#"../checked_ops.rs" 292 28 292 30] [#"../checked_ops.rs" 292 28 292 30] (-2 : int8)));
+    [#"../checked_ops.rs" 292 12 292 31] _14 <- ([#"../checked_ops.rs" 292 12 292 31] checked_div0 (5 : int8) (-2 : int8));
     goto BB9
   }
   BB8 {
@@ -4672,13 +5095,15 @@ module CheckedOps_TestI8DivExample
     goto BB10
   }
   BB10 {
-    switch ([#"../checked_ops.rs" 292 12 292 46] _13 = ([#"../checked_ops.rs" 292 44 292 46] [#"../checked_ops.rs" 292 44 292 46] (-2 : int8)))
+    [#"../checked_ops.rs" 292 12 292 46] _12 <- ([#"../checked_ops.rs" 292 12 292 46] _13 = (-2 : int8));
+    _13 <- any int8;
+    switch (_12)
       | False -> goto BB12
       | True -> goto BB11
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 293 12 293 36] _19 <- ([#"../checked_ops.rs" 293 12 293 36] checked_div0 ([#"../checked_ops.rs" 293 12 293 20] [#"../checked_ops.rs" 293 12 293 20] (-128 : int8)) ([#"../checked_ops.rs" 293 33 293 35] [#"../checked_ops.rs" 293 33 293 35] (-1 : int8)));
+    [#"../checked_ops.rs" 293 12 293 36] _19 <- ([#"../checked_ops.rs" 293 12 293 36] checked_div0 (-128 : int8) (-1 : int8));
     goto BB13
   }
   BB12 {
@@ -4686,7 +5111,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 293 12 293 46] _17 <- ([#"../checked_ops.rs" 293 12 293 46] is_none0 ([#"../checked_ops.rs" 293 12 293 36] _19));
+    [#"../checked_ops.rs" 293 12 293 46] _17 <- ([#"../checked_ops.rs" 293 12 293 46] is_none0 _19);
     goto BB14
   }
   BB14 {
@@ -4696,7 +5121,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB15 {
-    [#"../checked_ops.rs" 295 12 295 31] _23 <- ([#"../checked_ops.rs" 295 12 295 31] wrapping_div0 ([#"../checked_ops.rs" 295 12 295 15] [#"../checked_ops.rs" 295 12 295 15] (5 : int8)) ([#"../checked_ops.rs" 295 29 295 30] [#"../checked_ops.rs" 295 29 295 30] (2 : int8)));
+    [#"../checked_ops.rs" 295 12 295 31] _23 <- ([#"../checked_ops.rs" 295 12 295 31] wrapping_div0 (5 : int8) (2 : int8));
     goto BB17
   }
   BB16 {
@@ -4704,13 +5129,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB17 {
-    switch ([#"../checked_ops.rs" 295 12 295 36] _23 = ([#"../checked_ops.rs" 295 35 295 36] [#"../checked_ops.rs" 295 35 295 36] (2 : int8)))
+    [#"../checked_ops.rs" 295 12 295 36] _22 <- ([#"../checked_ops.rs" 295 12 295 36] _23 = (2 : int8));
+    _23 <- any int8;
+    switch (_22)
       | False -> goto BB19
       | True -> goto BB18
       end
   }
   BB18 {
-    [#"../checked_ops.rs" 296 12 296 32] _27 <- ([#"../checked_ops.rs" 296 12 296 32] wrapping_div0 ([#"../checked_ops.rs" 296 12 296 15] [#"../checked_ops.rs" 296 12 296 15] (5 : int8)) ([#"../checked_ops.rs" 296 29 296 31] [#"../checked_ops.rs" 296 29 296 31] (-2 : int8)));
+    [#"../checked_ops.rs" 296 12 296 32] _27 <- ([#"../checked_ops.rs" 296 12 296 32] wrapping_div0 (5 : int8) (-2 : int8));
     goto BB20
   }
   BB19 {
@@ -4718,13 +5145,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB20 {
-    switch ([#"../checked_ops.rs" 296 12 296 38] _27 = ([#"../checked_ops.rs" 296 36 296 38] [#"../checked_ops.rs" 296 36 296 38] (-2 : int8)))
+    [#"../checked_ops.rs" 296 12 296 38] _26 <- ([#"../checked_ops.rs" 296 12 296 38] _27 = (-2 : int8));
+    _27 <- any int8;
+    switch (_26)
       | False -> goto BB22
       | True -> goto BB21
       end
   }
   BB21 {
-    [#"../checked_ops.rs" 297 12 297 37] _31 <- ([#"../checked_ops.rs" 297 12 297 37] wrapping_div0 ([#"../checked_ops.rs" 297 12 297 20] [#"../checked_ops.rs" 297 12 297 20] (-128 : int8)) ([#"../checked_ops.rs" 297 34 297 36] [#"../checked_ops.rs" 297 34 297 36] (-1 : int8)));
+    [#"../checked_ops.rs" 297 12 297 37] _31 <- ([#"../checked_ops.rs" 297 12 297 37] wrapping_div0 (-128 : int8) (-1 : int8));
     goto BB23
   }
   BB22 {
@@ -4732,13 +5161,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB23 {
-    switch ([#"../checked_ops.rs" 297 12 297 45] _31 = ([#"../checked_ops.rs" 297 41 297 45] [#"../checked_ops.rs" 297 41 297 45] (-128 : int8)))
+    [#"../checked_ops.rs" 297 12 297 45] _30 <- ([#"../checked_ops.rs" 297 12 297 45] _31 = (-128 : int8));
+    _31 <- any int8;
+    switch (_30)
       | False -> goto BB25
       | True -> goto BB24
       end
   }
   BB24 {
-    [#"../checked_ops.rs" 299 12 299 33] _35 <- ([#"../checked_ops.rs" 299 12 299 33] saturating_div0 ([#"../checked_ops.rs" 299 12 299 15] [#"../checked_ops.rs" 299 12 299 15] (5 : int8)) ([#"../checked_ops.rs" 299 31 299 32] [#"../checked_ops.rs" 299 31 299 32] (2 : int8)));
+    [#"../checked_ops.rs" 299 12 299 33] _35 <- ([#"../checked_ops.rs" 299 12 299 33] saturating_div0 (5 : int8) (2 : int8));
     goto BB26
   }
   BB25 {
@@ -4746,13 +5177,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB26 {
-    switch ([#"../checked_ops.rs" 299 12 299 38] _35 = ([#"../checked_ops.rs" 299 37 299 38] [#"../checked_ops.rs" 299 37 299 38] (2 : int8)))
+    [#"../checked_ops.rs" 299 12 299 38] _34 <- ([#"../checked_ops.rs" 299 12 299 38] _35 = (2 : int8));
+    _35 <- any int8;
+    switch (_34)
       | False -> goto BB28
       | True -> goto BB27
       end
   }
   BB27 {
-    [#"../checked_ops.rs" 300 12 300 34] _39 <- ([#"../checked_ops.rs" 300 12 300 34] saturating_div0 ([#"../checked_ops.rs" 300 12 300 15] [#"../checked_ops.rs" 300 12 300 15] (5 : int8)) ([#"../checked_ops.rs" 300 31 300 33] [#"../checked_ops.rs" 300 31 300 33] (-2 : int8)));
+    [#"../checked_ops.rs" 300 12 300 34] _39 <- ([#"../checked_ops.rs" 300 12 300 34] saturating_div0 (5 : int8) (-2 : int8));
     goto BB29
   }
   BB28 {
@@ -4760,13 +5193,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB29 {
-    switch ([#"../checked_ops.rs" 300 12 300 40] _39 = ([#"../checked_ops.rs" 300 38 300 40] [#"../checked_ops.rs" 300 38 300 40] (-2 : int8)))
+    [#"../checked_ops.rs" 300 12 300 40] _38 <- ([#"../checked_ops.rs" 300 12 300 40] _39 = (-2 : int8));
+    _39 <- any int8;
+    switch (_38)
       | False -> goto BB31
       | True -> goto BB30
       end
   }
   BB30 {
-    [#"../checked_ops.rs" 301 12 301 39] _43 <- ([#"../checked_ops.rs" 301 12 301 39] saturating_div0 ([#"../checked_ops.rs" 301 12 301 20] [#"../checked_ops.rs" 301 12 301 20] (-128 : int8)) ([#"../checked_ops.rs" 301 36 301 38] [#"../checked_ops.rs" 301 36 301 38] (-1 : int8)));
+    [#"../checked_ops.rs" 301 12 301 39] _43 <- ([#"../checked_ops.rs" 301 12 301 39] saturating_div0 (-128 : int8) (-1 : int8));
     goto BB32
   }
   BB31 {
@@ -4774,13 +5209,15 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB32 {
-    switch ([#"../checked_ops.rs" 301 12 301 47] _43 = ([#"../checked_ops.rs" 301 43 301 47] [#"../checked_ops.rs" 301 43 301 47] (-128 : int8)))
+    [#"../checked_ops.rs" 301 12 301 47] _42 <- ([#"../checked_ops.rs" 301 12 301 47] _43 = (-128 : int8));
+    _43 <- any int8;
+    switch (_42)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 303 14 303 36] res <- ([#"../checked_ops.rs" 303 14 303 36] overflowing_div0 ([#"../checked_ops.rs" 303 14 303 17] [#"../checked_ops.rs" 303 14 303 17] (5 : int8)) ([#"../checked_ops.rs" 303 34 303 35] [#"../checked_ops.rs" 303 34 303 35] (2 : int8)));
+    [#"../checked_ops.rs" 303 14 303 36] res <- ([#"../checked_ops.rs" 303 14 303 36] overflowing_div0 (5 : int8) (2 : int8));
     goto BB35
   }
   BB34 {
@@ -4788,20 +5225,22 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB35 {
-    switch ([#"../checked_ops.rs" 304 12 304 22] ([#"../checked_ops.rs" 304 12 304 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 304 21 304 22] [#"../checked_ops.rs" 304 21 304 22] (2 : int8)))
+    [#"../checked_ops.rs" 304 12 304 22] _47 <- ([#"../checked_ops.rs" 304 12 304 22] (let (a, _) = res in a) = (2 : int8));
+    switch (_47)
       | False -> goto BB39
       | True -> goto BB36
       end
   }
   BB36 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb ([#"../checked_ops.rs" 304 26 304 31] let (_, a) = res in a) ([#"../checked_ops.rs" 304 35 304 40] [#"../checked_ops.rs" 304 35 304 40] false))
+    [#"../checked_ops.rs" 304 26 304 40] _49 <- ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb (let (_, a) = res in a) false);
+    switch (_49)
       | False -> goto BB38
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../checked_ops.rs" 305 14 305 37] res1 <- ([#"../checked_ops.rs" 305 14 305 37] overflowing_div0 ([#"../checked_ops.rs" 305 14 305 17] [#"../checked_ops.rs" 305 14 305 17] (5 : int8)) ([#"../checked_ops.rs" 305 34 305 36] [#"../checked_ops.rs" 305 34 305 36] (-2 : int8)));
+    [#"../checked_ops.rs" 305 14 305 37] res1 <- ([#"../checked_ops.rs" 305 14 305 37] overflowing_div0 (5 : int8) (-2 : int8));
     goto BB41
   }
   BB38 {
@@ -4816,20 +5255,22 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB41 {
-    switch ([#"../checked_ops.rs" 306 12 306 23] ([#"../checked_ops.rs" 306 12 306 17] let (a, _) = res1 in a) = ([#"../checked_ops.rs" 306 21 306 23] [#"../checked_ops.rs" 306 21 306 23] (-2 : int8)))
+    [#"../checked_ops.rs" 306 12 306 23] _54 <- ([#"../checked_ops.rs" 306 12 306 23] (let (a, _) = res1 in a) = (-2 : int8));
+    switch (_54)
       | False -> goto BB45
       | True -> goto BB42
       end
   }
   BB42 {
     assume { resolve0 res1 };
-    switch ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb ([#"../checked_ops.rs" 306 27 306 32] let (_, a) = res1 in a) ([#"../checked_ops.rs" 306 36 306 41] [#"../checked_ops.rs" 306 36 306 41] false))
+    [#"../checked_ops.rs" 306 27 306 41] _56 <- ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb (let (_, a) = res1 in a) false);
+    switch (_56)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../checked_ops.rs" 307 14 307 42] res2 <- ([#"../checked_ops.rs" 307 14 307 42] overflowing_div0 ([#"../checked_ops.rs" 307 14 307 22] [#"../checked_ops.rs" 307 14 307 22] (-128 : int8)) ([#"../checked_ops.rs" 307 39 307 41] [#"../checked_ops.rs" 307 39 307 41] (-1 : int8)));
+    [#"../checked_ops.rs" 307 14 307 42] res2 <- ([#"../checked_ops.rs" 307 14 307 42] overflowing_div0 (-128 : int8) (-1 : int8));
     goto BB47
   }
   BB44 {
@@ -4844,14 +5285,16 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB47 {
-    switch ([#"../checked_ops.rs" 308 12 308 25] ([#"../checked_ops.rs" 308 12 308 17] let (a, _) = res2 in a) = ([#"../checked_ops.rs" 308 21 308 25] [#"../checked_ops.rs" 308 21 308 25] (-128 : int8)))
+    [#"../checked_ops.rs" 308 12 308 25] _61 <- ([#"../checked_ops.rs" 308 12 308 25] (let (a, _) = res2 in a) = (-128 : int8));
+    switch (_61)
       | False -> goto BB51
       | True -> goto BB48
       end
   }
   BB48 {
     assume { resolve0 res2 };
-    switch ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb ([#"../checked_ops.rs" 308 29 308 34] let (_, a) = res2 in a) ([#"../checked_ops.rs" 308 38 308 42] [#"../checked_ops.rs" 308 38 308 42] true))
+    [#"../checked_ops.rs" 308 29 308 42] _63 <- ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb (let (_, a) = res2 in a) true);
+    switch (_63)
       | False -> goto BB50
       | True -> goto BB49
       end
@@ -4949,32 +5392,49 @@ module CheckedOps_TestI8DivNoOverflow
   var _0 : ();
   var a : int8 = a;
   var b : int8 = b;
+  var _5 : bool;
   var _6 : int8;
   var _7 : Core_Option_Option_Type.t_option int8;
+  var _10 : int8;
   var _11 : int8;
   var _12 : int8;
   var _13 : bool;
+  var _14 : bool;
+  var _15 : bool;
   var _16 : bool;
+  var _19 : bool;
   var _20 : int8;
+  var _23 : int8;
   var _24 : int8;
   var _25 : int8;
   var _26 : bool;
+  var _27 : bool;
+  var _28 : bool;
   var _29 : bool;
+  var _32 : bool;
   var _33 : int8;
+  var _36 : int8;
   var _37 : int8;
   var _38 : int8;
   var _39 : bool;
+  var _40 : bool;
+  var _41 : bool;
   var _42 : bool;
   var res : (int8, bool);
+  var _48 : bool;
+  var _50 : int8;
   var _51 : int8;
   var _52 : int8;
   var _53 : bool;
+  var _54 : bool;
+  var _55 : bool;
   var _56 : bool;
+  var _57 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 314 12 314 28] _7 <- ([#"../checked_ops.rs" 314 12 314 28] checked_div0 ([#"../checked_ops.rs" 314 12 314 13] a) ([#"../checked_ops.rs" 314 26 314 27] b));
+    [#"../checked_ops.rs" 314 12 314 28] _7 <- ([#"../checked_ops.rs" 314 12 314 28] checked_div0 a b);
     goto BB1
   }
   BB1 {
@@ -4985,23 +5445,33 @@ module CheckedOps_TestI8DivNoOverflow
   BB2 {
     [#"../checked_ops.rs" 314 41 314 42] _11 <- ([#"../checked_ops.rs" 314 41 314 42] a);
     [#"../checked_ops.rs" 314 45 314 46] _12 <- ([#"../checked_ops.rs" 314 45 314 46] b);
-    [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] [#"../checked_ops.rs" 314 41 314 46] (0 : int8)));
+    [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 314 41 314 46] not _13 };
     goto BB3
   }
   BB3 {
-    [#"../checked_ops.rs" 314 41 314 46] _16 <- ([#"../checked_ops.rs" 314 41 314 46] ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] [#"../checked_ops.rs" 314 41 314 46] (-1 : int8))) && ([#"../checked_ops.rs" 314 41 314 46] _11 = ([#"../checked_ops.rs" 314 41 314 46] [#"../checked_ops.rs" 314 41 314 46] (-128 : int8))));
+    [#"../checked_ops.rs" 314 41 314 46] _14 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (-1 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _15 <- ([#"../checked_ops.rs" 314 41 314 46] _11 = (-128 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _16 <- ([#"../checked_ops.rs" 314 41 314 46] _14 && _15);
+    _14 <- any bool;
+    _15 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 314 41 314 46] not _16 };
     goto BB4
   }
   BB4 {
-    switch ([#"../checked_ops.rs" 314 12 314 46] _6 = ([#"../checked_ops.rs" 314 41 314 46] _11 / _12))
+    [#"../checked_ops.rs" 314 41 314 46] _10 <- ([#"../checked_ops.rs" 314 41 314 46] _11 / _12);
+    _11 <- any int8;
+    _12 <- any int8;
+    [#"../checked_ops.rs" 314 12 314 46] _5 <- ([#"../checked_ops.rs" 314 12 314 46] _6 = _10);
+    _6 <- any int8;
+    _10 <- any int8;
+    switch (_5)
       | False -> goto BB6
       | True -> goto BB5
       end
   }
   BB5 {
-    [#"../checked_ops.rs" 315 12 315 29] _20 <- ([#"../checked_ops.rs" 315 12 315 29] wrapping_div0 ([#"../checked_ops.rs" 315 12 315 13] a) ([#"../checked_ops.rs" 315 27 315 28] b));
+    [#"../checked_ops.rs" 315 12 315 29] _20 <- ([#"../checked_ops.rs" 315 12 315 29] wrapping_div0 a b);
     goto BB7
   }
   BB6 {
@@ -5011,23 +5481,33 @@ module CheckedOps_TestI8DivNoOverflow
   BB7 {
     [#"../checked_ops.rs" 315 33 315 34] _24 <- ([#"../checked_ops.rs" 315 33 315 34] a);
     [#"../checked_ops.rs" 315 37 315 38] _25 <- ([#"../checked_ops.rs" 315 37 315 38] b);
-    [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] [#"../checked_ops.rs" 315 33 315 38] (0 : int8)));
+    [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 315 33 315 38] not _26 };
     goto BB8
   }
   BB8 {
-    [#"../checked_ops.rs" 315 33 315 38] _29 <- ([#"../checked_ops.rs" 315 33 315 38] ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] [#"../checked_ops.rs" 315 33 315 38] (-1 : int8))) && ([#"../checked_ops.rs" 315 33 315 38] _24 = ([#"../checked_ops.rs" 315 33 315 38] [#"../checked_ops.rs" 315 33 315 38] (-128 : int8))));
+    [#"../checked_ops.rs" 315 33 315 38] _27 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (-1 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _28 <- ([#"../checked_ops.rs" 315 33 315 38] _24 = (-128 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _29 <- ([#"../checked_ops.rs" 315 33 315 38] _27 && _28);
+    _27 <- any bool;
+    _28 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 315 33 315 38] not _29 };
     goto BB9
   }
   BB9 {
-    switch ([#"../checked_ops.rs" 315 12 315 38] _20 = ([#"../checked_ops.rs" 315 33 315 38] _24 / _25))
+    [#"../checked_ops.rs" 315 33 315 38] _23 <- ([#"../checked_ops.rs" 315 33 315 38] _24 / _25);
+    _24 <- any int8;
+    _25 <- any int8;
+    [#"../checked_ops.rs" 315 12 315 38] _19 <- ([#"../checked_ops.rs" 315 12 315 38] _20 = _23);
+    _20 <- any int8;
+    _23 <- any int8;
+    switch (_19)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 316 12 316 31] _33 <- ([#"../checked_ops.rs" 316 12 316 31] saturating_div0 ([#"../checked_ops.rs" 316 12 316 13] a) ([#"../checked_ops.rs" 316 29 316 30] b));
+    [#"../checked_ops.rs" 316 12 316 31] _33 <- ([#"../checked_ops.rs" 316 12 316 31] saturating_div0 a b);
     goto BB12
   }
   BB11 {
@@ -5037,23 +5517,33 @@ module CheckedOps_TestI8DivNoOverflow
   BB12 {
     [#"../checked_ops.rs" 316 35 316 36] _37 <- ([#"../checked_ops.rs" 316 35 316 36] a);
     [#"../checked_ops.rs" 316 39 316 40] _38 <- ([#"../checked_ops.rs" 316 39 316 40] b);
-    [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] [#"../checked_ops.rs" 316 35 316 40] (0 : int8)));
+    [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 316 35 316 40] not _39 };
     goto BB13
   }
   BB13 {
-    [#"../checked_ops.rs" 316 35 316 40] _42 <- ([#"../checked_ops.rs" 316 35 316 40] ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] [#"../checked_ops.rs" 316 35 316 40] (-1 : int8))) && ([#"../checked_ops.rs" 316 35 316 40] _37 = ([#"../checked_ops.rs" 316 35 316 40] [#"../checked_ops.rs" 316 35 316 40] (-128 : int8))));
+    [#"../checked_ops.rs" 316 35 316 40] _40 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (-1 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _41 <- ([#"../checked_ops.rs" 316 35 316 40] _37 = (-128 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _42 <- ([#"../checked_ops.rs" 316 35 316 40] _40 && _41);
+    _40 <- any bool;
+    _41 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 316 35 316 40] not _42 };
     goto BB14
   }
   BB14 {
-    switch ([#"../checked_ops.rs" 316 12 316 40] _33 = ([#"../checked_ops.rs" 316 35 316 40] _37 / _38))
+    [#"../checked_ops.rs" 316 35 316 40] _36 <- ([#"../checked_ops.rs" 316 35 316 40] _37 / _38);
+    _37 <- any int8;
+    _38 <- any int8;
+    [#"../checked_ops.rs" 316 12 316 40] _32 <- ([#"../checked_ops.rs" 316 12 316 40] _33 = _36);
+    _33 <- any int8;
+    _36 <- any int8;
+    switch (_32)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../checked_ops.rs" 317 14 317 34] res <- ([#"../checked_ops.rs" 317 14 317 34] overflowing_div0 ([#"../checked_ops.rs" 317 14 317 15] a) ([#"../checked_ops.rs" 317 32 317 33] b));
+    [#"../checked_ops.rs" 317 14 317 34] res <- ([#"../checked_ops.rs" 317 14 317 34] overflowing_div0 a b);
     goto BB17
   }
   BB16 {
@@ -5063,24 +5553,34 @@ module CheckedOps_TestI8DivNoOverflow
   BB17 {
     [#"../checked_ops.rs" 318 21 318 22] _51 <- ([#"../checked_ops.rs" 318 21 318 22] a);
     [#"../checked_ops.rs" 318 25 318 26] _52 <- ([#"../checked_ops.rs" 318 25 318 26] b);
-    [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] [#"../checked_ops.rs" 318 21 318 26] (0 : int8)));
+    [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 318 21 318 26] not _53 };
     goto BB18
   }
   BB18 {
-    [#"../checked_ops.rs" 318 21 318 26] _56 <- ([#"../checked_ops.rs" 318 21 318 26] ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] [#"../checked_ops.rs" 318 21 318 26] (-1 : int8))) && ([#"../checked_ops.rs" 318 21 318 26] _51 = ([#"../checked_ops.rs" 318 21 318 26] [#"../checked_ops.rs" 318 21 318 26] (-128 : int8))));
+    [#"../checked_ops.rs" 318 21 318 26] _54 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (-1 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _55 <- ([#"../checked_ops.rs" 318 21 318 26] _51 = (-128 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _56 <- ([#"../checked_ops.rs" 318 21 318 26] _54 && _55);
+    _54 <- any bool;
+    _55 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 318 21 318 26] not _56 };
     goto BB19
   }
   BB19 {
-    switch ([#"../checked_ops.rs" 318 12 318 26] ([#"../checked_ops.rs" 318 12 318 17] let (a, _) = res in a) = ([#"../checked_ops.rs" 318 21 318 26] _51 / _52))
+    [#"../checked_ops.rs" 318 21 318 26] _50 <- ([#"../checked_ops.rs" 318 21 318 26] _51 / _52);
+    _51 <- any int8;
+    _52 <- any int8;
+    [#"../checked_ops.rs" 318 12 318 26] _48 <- ([#"../checked_ops.rs" 318 12 318 26] (let (a, _) = res in a) = _50);
+    _50 <- any int8;
+    switch (_48)
       | False -> goto BB23
       | True -> goto BB20
       end
   }
   BB20 {
     assume { resolve0 res };
-    switch ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb ([#"../checked_ops.rs" 318 30 318 35] let (_, a) = res in a) ([#"../checked_ops.rs" 318 39 318 44] [#"../checked_ops.rs" 318 39 318 44] false))
+    [#"../checked_ops.rs" 318 30 318 44] _57 <- ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb (let (_, a) = res in a) false);
+    switch (_57)
       | False -> goto BB22
       | True -> goto BB21
       end
@@ -5139,11 +5639,11 @@ module CheckedOps_TestI8DivZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 323 12 323 28] _5 <- ([#"../checked_ops.rs" 323 12 323 28] checked_div0 ([#"../checked_ops.rs" 323 12 323 13] a) ([#"../checked_ops.rs" 323 26 323 27] [#"../checked_ops.rs" 323 26 323 27] (0 : int8)));
+    [#"../checked_ops.rs" 323 12 323 28] _5 <- ([#"../checked_ops.rs" 323 12 323 28] checked_div0 a (0 : int8));
     goto BB1
   }
   BB1 {
-    [#"../checked_ops.rs" 323 12 323 38] _3 <- ([#"../checked_ops.rs" 323 12 323 38] is_none0 ([#"../checked_ops.rs" 323 12 323 28] _5));
+    [#"../checked_ops.rs" 323 12 323 38] _3 <- ([#"../checked_ops.rs" 323 12 323 38] is_none0 _5);
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/checked_ops/why3session.xml b/creusot/tests/should_succeed/checked_ops/why3session.xml
index d6a1e024ed..759ec6ca8b 100644
--- a/creusot/tests/should_succeed/checked_ops/why3session.xml
+++ b/creusot/tests/should_succeed/checked_ops/why3session.xml
@@ -9,12 +9,12 @@
 <path name=".."/><path name="checked_ops.mlcfg"/>
 <theory name="CheckedOps_TestU8AddExample" proved="true">
  <goal name="test_u8_add_example&#39;vc" expl="VC for test_u8_add_example" proved="true">
- <proof prover="3"><result status="valid" time="0.171540" steps="24381"/></proof>
+ <proof prover="3"><result status="valid" time="0.171540" steps="26739"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8AddOverflow" proved="true">
  <goal name="test_u8_add_overflow&#39;vc" expl="VC for test_u8_add_overflow" proved="true">
- <proof prover="3"><result status="valid" time="0.174892" steps="25652"/></proof>
+ <proof prover="3"><result status="valid" time="0.174892" steps="27255"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8WrappingAdd" proved="true">
@@ -24,17 +24,17 @@
 </theory>
 <theory name="CheckedOps_TestU8OverflowingAdd" proved="true">
  <goal name="test_u8_overflowing_add&#39;vc" expl="VC for test_u8_overflowing_add" proved="true">
- <proof prover="3"><result status="valid" time="0.119107" steps="9606"/></proof>
+ <proof prover="3"><result status="valid" time="0.119107" steps="10057"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8SubExample" proved="true">
  <goal name="test_u8_sub_example&#39;vc" expl="VC for test_u8_sub_example" proved="true">
- <proof prover="3"><result status="valid" time="0.245991" steps="29138"/></proof>
+ <proof prover="3"><result status="valid" time="0.245991" steps="31449"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8SubOverflow" proved="true">
  <goal name="test_u8_sub_overflow&#39;vc" expl="VC for test_u8_sub_overflow" proved="true">
- <proof prover="3"><result status="valid" time="0.241533" steps="23573"/></proof>
+ <proof prover="3"><result status="valid" time="0.241533" steps="26187"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8WrappingSub" proved="true">
@@ -44,32 +44,32 @@
 </theory>
 <theory name="CheckedOps_TestU8OverflowingSub" proved="true">
  <goal name="test_u8_overflowing_sub&#39;vc" expl="VC for test_u8_overflowing_sub" proved="true">
- <proof prover="3"><result status="valid" time="0.136109" steps="9643"/></proof>
+ <proof prover="3"><result status="valid" time="0.136109" steps="10094"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8MulExample" proved="true">
  <goal name="test_u8_mul_example&#39;vc" expl="VC for test_u8_mul_example" proved="true">
- <proof prover="3"><result status="valid" time="0.206994" steps="24476"/></proof>
+ <proof prover="3"><result status="valid" time="0.206994" steps="26834"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8MulZero" proved="true">
  <goal name="test_u8_mul_zero&#39;vc" expl="VC for test_u8_mul_zero" proved="true">
- <proof prover="3"><result status="valid" time="0.110589" steps="10387"/></proof>
+ <proof prover="3"><result status="valid" time="0.110589" steps="11087"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8OverflowingMul" proved="true">
  <goal name="test_u8_overflowing_mul&#39;vc" expl="VC for test_u8_overflowing_mul" proved="true">
- <proof prover="3"><result status="valid" time="0.113614" steps="9496"/></proof>
+ <proof prover="3"><result status="valid" time="0.113614" steps="9931"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8DivExample" proved="true">
  <goal name="test_u8_div_example&#39;vc" expl="VC for test_u8_div_example" proved="true">
- <proof prover="1"><result status="valid" time="0.013333" steps="18895"/></proof>
+ <proof prover="1"><result status="valid" time="0.013333" steps="19972"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8DivNoOverflow" proved="true">
  <goal name="test_u8_div_no_overflow&#39;vc" expl="VC for test_u8_div_no_overflow" proved="true">
- <proof prover="1"><result status="valid" time="0.019153" steps="33003"/></proof>
+ <proof prover="1"><result status="valid" time="0.019153" steps="38508"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestU8DivZero" proved="true">
@@ -79,17 +79,17 @@
 </theory>
 <theory name="CheckedOps_TestI8AddExample" proved="true">
  <goal name="test_i8_add_example&#39;vc" expl="VC for test_i8_add_example" proved="true">
- <proof prover="3"><result status="valid" time="0.410887" steps="45429"/></proof>
+ <proof prover="3"><result status="valid" time="0.410887" steps="50661"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8AddOverflowPos" proved="true">
  <goal name="test_i8_add_overflow_pos&#39;vc" expl="VC for test_i8_add_overflow_pos" proved="true">
- <proof prover="3"><result status="valid" time="0.193894" steps="28252"/></proof>
+ <proof prover="3"><result status="valid" time="0.332443" steps="30894"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8AddOverflowNeg" proved="true">
  <goal name="test_i8_add_overflow_neg&#39;vc" expl="VC for test_i8_add_overflow_neg" proved="true">
- <proof prover="3"><result status="valid" time="0.199007" steps="28356"/></proof>
+ <proof prover="3"><result status="valid" time="0.346620" steps="30966"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8WrappingAdd" proved="true">
@@ -99,22 +99,22 @@
 </theory>
 <theory name="CheckedOps_TestI8OverflowingAdd" proved="true">
  <goal name="test_i8_overflowing_add&#39;vc" expl="VC for test_i8_overflowing_add" proved="true">
- <proof prover="3"><result status="valid" time="0.140895" steps="10428"/></proof>
+ <proof prover="3"><result status="valid" time="0.140895" steps="10887"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8SubExample" proved="true">
  <goal name="test_i8_sub_example&#39;vc" expl="VC for test_i8_sub_example" proved="true">
- <proof prover="3"><result status="valid" time="0.303115" steps="39807"/></proof>
+ <proof prover="3"><result status="valid" time="0.303115" steps="46045"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8SubOverflowPos" proved="true">
  <goal name="test_i8_sub_overflow_pos&#39;vc" expl="VC for test_i8_sub_overflow_pos" proved="true">
- <proof prover="3"><result status="valid" time="0.329305" steps="28694"/></proof>
+ <proof prover="3"><result status="valid" time="0.329305" steps="31428"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8SubOverflowNeg" proved="true">
  <goal name="test_i8_sub_overflow_neg&#39;vc" expl="VC for test_i8_sub_overflow_neg" proved="true">
- <proof prover="3"><result status="valid" time="0.288242" steps="26655"/></proof>
+ <proof prover="3"><result status="valid" time="0.288242" steps="30752"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8WrappingSub" proved="true">
@@ -124,32 +124,32 @@
 </theory>
 <theory name="CheckedOps_TestI8OverflowingSub" proved="true">
  <goal name="test_i8_overflowing_sub&#39;vc" expl="VC for test_i8_overflowing_sub" proved="true">
- <proof prover="3"><result status="valid" time="0.131299" steps="10465"/></proof>
+ <proof prover="3"><result status="valid" time="0.131299" steps="10924"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8MulExample" proved="true">
  <goal name="test_i8_mul_example&#39;vc" expl="VC for test_i8_mul_example" proved="true">
- <proof prover="3"><result status="valid" time="0.421070" steps="46379"/></proof>
+ <proof prover="3"><result status="valid" time="0.421070" steps="51611"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8MulZero" proved="true">
  <goal name="test_i8_mul_zero&#39;vc" expl="VC for test_i8_mul_zero" proved="true">
- <proof prover="3"><result status="valid" time="0.108364" steps="10449"/></proof>
+ <proof prover="3"><result status="valid" time="0.108364" steps="11157"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8OverflowingMul" proved="true">
  <goal name="test_i8_overflowing_mul&#39;vc" expl="VC for test_i8_overflowing_mul" proved="true">
- <proof prover="3"><result status="valid" time="0.118072" steps="10306"/></proof>
+ <proof prover="3"><result status="valid" time="0.118072" steps="10749"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8DivExample" proved="true">
  <goal name="test_i8_div_example&#39;vc" expl="VC for test_i8_div_example" proved="true">
- <proof prover="1"><result status="valid" time="0.023227" steps="43770"/></proof>
+ <proof prover="1"><result status="valid" time="0.023227" steps="48850"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8DivNoOverflow" proved="true">
  <goal name="test_i8_div_no_overflow&#39;vc" expl="VC for test_i8_div_no_overflow" proved="true">
- <proof prover="1"><result status="valid" time="0.024961" steps="47026"/></proof>
+ <proof prover="1"><result status="valid" time="0.024961" steps="56180"/></proof>
  </goal>
 </theory>
 <theory name="CheckedOps_TestI8DivZero" proved="true">
diff --git a/creusot/tests/should_succeed/checked_ops/why3shapes.gz b/creusot/tests/should_succeed/checked_ops/why3shapes.gz
index 046f3283e65b4b9f4fd37e101f75be36e555bdf5..ff6caa343fa3c19bab2d9de1553bb9e1d018705e 100644
GIT binary patch
literal 4210
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
IK~!-70DQ0;O#lD@

literal 4104
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
GaR2~E1sXK~

diff --git a/creusot/tests/should_succeed/clones/03.mlcfg b/creusot/tests/should_succeed/clones/03.mlcfg
index cacc974bb0..3700068abf 100644
--- a/creusot/tests/should_succeed/clones/03.mlcfg
+++ b/creusot/tests/should_succeed/clones/03.mlcfg
@@ -81,7 +81,7 @@ module C03_Prog2
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 15 4 15 11] _2 <- ([#"../03.rs" 15 4 15 11] prog0 ([#"../03.rs" 15 9 15 10] [#"../03.rs" 15 9 15 10] (0 : int32)));
+    [#"../03.rs" 15 4 15 11] _2 <- ([#"../03.rs" 15 4 15 11] prog0 (0 : int32));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/closures/01_basic.mlcfg b/creusot/tests/should_succeed/closures/01_basic.mlcfg
index 203254292a..6490d5da08 100644
--- a/creusot/tests/should_succeed/closures/01_basic.mlcfg
+++ b/creusot/tests/should_succeed/closures/01_basic.mlcfg
@@ -51,13 +51,16 @@ module C01Basic_UsesClosure
   var y : bool;
   var _x : bool;
   var _4 : C01Basic_UsesClosure_Closure0.c01basic_usesclosure_closure0;
+  var _6 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] [#"../01_basic.rs" 5 12 5 16] true);
-    [#"../01_basic.rs" 6 13 6 19] _4 <- ([#"../01_basic.rs" 6 13 6 19] C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 ([#"../01_basic.rs" 6 13 6 19] y));
-    [#"../01_basic.rs" 6 13 6 21] _x <- ([#"../01_basic.rs" 6 13 6 21] let () = [#"../01_basic.rs" 6 13 6 21] () in closure00 ([#"../01_basic.rs" 6 13 6 19] _4));
+    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] true);
+    [#"../01_basic.rs" 6 13 6 19] _4 <- ([#"../01_basic.rs" 6 13 6 19] C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y);
+    [#"../01_basic.rs" 6 13 6 21] _6 <- ([#"../01_basic.rs" 6 13 6 21] ());
+    [#"../01_basic.rs" 6 13 6 21] _x <- ([#"../01_basic.rs" 6 13 6 21] let () = _6 in closure00 _4);
+    _6 <- any ();
     goto BB1
   }
   BB1 {
@@ -90,7 +93,7 @@ module C01Basic_MultiArg_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 10 19 10 24] _0 <- ([#"../01_basic.rs" 10 19 10 24] ([#"../01_basic.rs" 10 19 10 20] a) + ([#"../01_basic.rs" 10 23 10 24] b));
+    [#"../01_basic.rs" 10 19 10 24] _0 <- ([#"../01_basic.rs" 10 19 10 24] a + b);
     return _0
   }
   
@@ -110,12 +113,15 @@ module C01Basic_MultiArg
   var _0 : ();
   var x : C01Basic_MultiArg_Closure0.c01basic_multiarg_closure0;
   var _a : int32;
+  var _4 : (int32, int32);
   {
     goto BB0
   }
   BB0 {
     [#"../01_basic.rs" 10 12 10 24] x <- ([#"../01_basic.rs" 10 12 10 24] C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0);
-    [#"../01_basic.rs" 11 13 11 22] _a <- ([#"../01_basic.rs" 11 13 11 22] let (a, b) = [#"../01_basic.rs" 11 13 11 22] (([#"../01_basic.rs" 11 17 11 18] [#"../01_basic.rs" 11 17 11 18] (0 : int32)), ([#"../01_basic.rs" 11 20 11 21] [#"../01_basic.rs" 11 20 11 21] (3 : int32))) in closure00 ([#"../01_basic.rs" 11 13 11 16] x) a b);
+    [#"../01_basic.rs" 11 13 11 22] _4 <- ([#"../01_basic.rs" 11 13 11 22] ((0 : int32), (3 : int32)));
+    [#"../01_basic.rs" 11 13 11 22] _a <- ([#"../01_basic.rs" 11 13 11 22] let (a, b) = _4 in closure00 x a b);
+    _4 <- any (int32, int32);
     goto BB1
   }
   BB1 {
@@ -166,7 +172,7 @@ module C01Basic_MoveClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15]  * field_00 ( * _1) + ([#"../01_basic.rs" 20 14 20 15] [#"../01_basic.rs" 20 14 20 15] (1 : int32))) ; })) ; };
+    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15]  * field_00 ( * _1) + (1 : int32)) ; })) ; };
     assume { resolve0 _1 };
     [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] ());
     return _0
@@ -214,28 +220,34 @@ module C01Basic_MoveClosure
   var x : C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
   var _4 : ();
   var _5 : borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
+  var _6 : ();
   var _7 : ();
   var _8 : borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
+  var _9 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] [#"../01_basic.rs" 17 17 17 21] (0 : int32));
+    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] (0 : int32));
     [#"../01_basic.rs" 17 12 17 21] a <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 17 12 17 21] _2 <-  ^ a;
     [#"../01_basic.rs" 19 16 21 5] x <- ([#"../01_basic.rs" 19 16 21 5] C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a);
     a <- any borrowed int32;
     [#"../01_basic.rs" 23 4 23 7] _5 <- Borrow.borrow_mut x;
     [#"../01_basic.rs" 23 4 23 7] x <-  ^ _5;
-    [#"../01_basic.rs" 23 4 23 9] _4 <- ([#"../01_basic.rs" 23 4 23 9] let () = [#"../01_basic.rs" 23 4 23 9] () in closure00 _5);
+    [#"../01_basic.rs" 23 4 23 9] _6 <- ([#"../01_basic.rs" 23 4 23 9] ());
+    [#"../01_basic.rs" 23 4 23 9] _4 <- ([#"../01_basic.rs" 23 4 23 9] let () = _6 in closure00 _5);
     _5 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
+    _6 <- any ();
     goto BB1
   }
   BB1 {
     [#"../01_basic.rs" 24 4 24 7] _8 <- Borrow.borrow_mut x;
     [#"../01_basic.rs" 24 4 24 7] x <-  ^ _8;
-    [#"../01_basic.rs" 24 4 24 9] _7 <- ([#"../01_basic.rs" 24 4 24 9] let () = [#"../01_basic.rs" 24 4 24 9] () in closure00 _8);
+    [#"../01_basic.rs" 24 4 24 9] _9 <- ([#"../01_basic.rs" 24 4 24 9] ());
+    [#"../01_basic.rs" 24 4 24 9] _7 <- ([#"../01_basic.rs" 24 4 24 9] let () = _9 in closure00 _8);
     _8 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
+    _9 <- any ();
     goto BB2
   }
   BB2 {
@@ -313,7 +325,7 @@ module C01Basic_MoveMut_Closure0
     [#"../01_basic.rs" 36 12 36 21] _2 <- Borrow.borrow_final ( * _3) (Borrow.get_id _3);
     [#"../01_basic.rs" 36 12 36 21] _3 <- { _3 with current = ( ^ _2) ; };
     [#"../01_basic.rs" 36 8 36 21] _1 <- { _1 with current = (let C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x0 =  * _1 in C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 ([#"../01_basic.rs" 36 8 36 21] _2)) ; };
-    [#"../01_basic.rs" 36 8 36 21] _2 <- any borrowed uint32;
+    _2 <- any borrowed uint32;
     assume { resolve0 (field_00 ( * _1)) };
     assume { resolve1 _1 };
     assume { resolve0 _3 };
@@ -375,28 +387,34 @@ module C01Basic_MoveMut
   var a : C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
   var _4 : ();
   var _5 : borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
+  var _6 : ();
   var _7 : ();
   var _8 : borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
+  var _9 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] [#"../01_basic.rs" 33 21 33 25] (0 : uint32));
+    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] (0 : uint32));
     [#"../01_basic.rs" 33 16 33 25] x <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 33 16 33 25] _2 <-  ^ x;
     [#"../01_basic.rs" 35 16 37 5] a <- ([#"../01_basic.rs" 35 16 37 5] C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x);
     x <- any borrowed uint32;
     [#"../01_basic.rs" 38 4 38 7] _5 <- Borrow.borrow_mut a;
     [#"../01_basic.rs" 38 4 38 7] a <-  ^ _5;
-    [#"../01_basic.rs" 38 4 38 9] _4 <- ([#"../01_basic.rs" 38 4 38 9] let () = [#"../01_basic.rs" 38 4 38 9] () in closure00 _5);
+    [#"../01_basic.rs" 38 4 38 9] _6 <- ([#"../01_basic.rs" 38 4 38 9] ());
+    [#"../01_basic.rs" 38 4 38 9] _4 <- ([#"../01_basic.rs" 38 4 38 9] let () = _6 in closure00 _5);
     _5 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
+    _6 <- any ();
     goto BB1
   }
   BB1 {
     [#"../01_basic.rs" 39 4 39 7] _8 <- Borrow.borrow_mut a;
     [#"../01_basic.rs" 39 4 39 7] a <-  ^ _8;
-    [#"../01_basic.rs" 39 4 39 9] _7 <- ([#"../01_basic.rs" 39 4 39 9] let () = [#"../01_basic.rs" 39 4 39 9] () in closure00 _8);
+    [#"../01_basic.rs" 39 4 39 9] _9 <- ([#"../01_basic.rs" 39 4 39 9] ());
+    [#"../01_basic.rs" 39 4 39 9] _7 <- ([#"../01_basic.rs" 39 4 39 9] let () = _9 in closure00 _8);
     _8 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
+    _9 <- any ();
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/closures/02_nested.mlcfg b/creusot/tests/should_succeed/closures/02_nested.mlcfg
index 32d2394222..333554df29 100644
--- a/creusot/tests/should_succeed/closures/02_nested.mlcfg
+++ b/creusot/tests/should_succeed/closures/02_nested.mlcfg
@@ -69,12 +69,15 @@ module C02Nested_NestedClosure_Closure0
   var _0 : bool;
   var _1 : C02Nested_NestedClosure_Closure0.c02nested_nestedclosure_closure0 = _1;
   var omg : C02Nested_NestedClosure_Closure0_Closure0.c02nested_nestedclosure_closure0_closure0;
+  var _5 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 6 18 6 22] omg <- ([#"../02_nested.rs" 6 18 6 22] C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 ([#"../02_nested.rs" 6 18 6 22] field_00 _1));
-    [#"../02_nested.rs" 7 8 7 15] _0 <- ([#"../02_nested.rs" 7 8 7 15] let () = [#"../02_nested.rs" 7 8 7 15] () in closure00 ([#"../02_nested.rs" 7 8 7 13] omg));
+    [#"../02_nested.rs" 6 18 6 22] omg <- ([#"../02_nested.rs" 6 18 6 22] C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 (field_00 _1));
+    [#"../02_nested.rs" 7 8 7 15] _5 <- ([#"../02_nested.rs" 7 8 7 15] ());
+    [#"../02_nested.rs" 7 8 7 15] _0 <- ([#"../02_nested.rs" 7 8 7 15] let () = _5 in closure00 omg);
+    _5 <- any ();
     goto BB1
   }
   BB1 {
@@ -120,13 +123,16 @@ module C02Nested_NestedClosure
   var a : bool;
   var _a : bool;
   var _4 : C02Nested_NestedClosure_Closure0.c02nested_nestedclosure_closure0;
+  var _6 : ();
   {
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] [#"../02_nested.rs" 4 12 4 16] true);
-    [#"../02_nested.rs" 5 13 8 6] _4 <- ([#"../02_nested.rs" 5 13 8 6] C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 ([#"../02_nested.rs" 5 13 8 6] a));
-    [#"../02_nested.rs" 5 13 8 8] _a <- ([#"../02_nested.rs" 5 13 8 8] let () = [#"../02_nested.rs" 5 13 8 8] () in closure00 ([#"../02_nested.rs" 5 13 8 6] _4));
+    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] true);
+    [#"../02_nested.rs" 5 13 8 6] _4 <- ([#"../02_nested.rs" 5 13 8 6] C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a);
+    [#"../02_nested.rs" 5 13 8 8] _6 <- ([#"../02_nested.rs" 5 13 8 8] ());
+    [#"../02_nested.rs" 5 13 8 8] _a <- ([#"../02_nested.rs" 5 13 8 8] let () = _6 in closure00 _4);
+    _6 <- any ();
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
index 57fdf87f38..f68b76137f 100644
--- a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
+++ b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
@@ -142,11 +142,14 @@ module C03GenericBound_ClosureParam
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var f : f = f;
+  var _3 : uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 4 4 4 10] _0 <- ([#"../03_generic_bound.rs" 4 4 4 10] call0 ([#"../03_generic_bound.rs" 4 4 4 7] f) ([#"../03_generic_bound.rs" 4 4 4 10] (([#"../03_generic_bound.rs" 4 8 4 9] [#"../03_generic_bound.rs" 4 8 4 9] (0 : uint32)))));
+    [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ([#"../03_generic_bound.rs" 4 4 4 10] ((0 : uint32)));
+    [#"../03_generic_bound.rs" 4 4 4 10] _0 <- ([#"../03_generic_bound.rs" 4 4 4 10] call0 f _3);
+    _3 <- any uint32;
     goto BB1
   }
   BB1 {
@@ -205,11 +208,14 @@ module C03GenericBound_Caller
   let rec cfg caller [#"../03_generic_bound.rs" 7 0 7 15] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _1 : C03GenericBound_Caller_Closure0.c03genericbound_caller_closure0;
   {
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 8 4 8 31] _0 <- ([#"../03_generic_bound.rs" 8 4 8 31] closure_param0 ([#"../03_generic_bound.rs" 8 18 8 30] C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0));
+    [#"../03_generic_bound.rs" 8 18 8 30] _1 <- ([#"../03_generic_bound.rs" 8 18 8 30] C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0);
+    [#"../03_generic_bound.rs" 8 4 8 31] _0 <- ([#"../03_generic_bound.rs" 8 4 8 31] closure_param0 _1);
+    _1 <- any C03GenericBound_Caller_Closure0.c03genericbound_caller_closure0;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
index aa4fdd7cef..1d07ea19da 100644
--- a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
+++ b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
@@ -152,12 +152,15 @@ module C04GenericClosure_GenericClosure
   var _0 : b;
   var f : f = f;
   var a : a = a;
+  var _4 : a;
   {
     goto BB0
   }
   BB0 {
-    [#"../04_generic_closure.rs" 4 4 4 8] _0 <- ([#"../04_generic_closure.rs" 4 4 4 8] call0 ([#"../04_generic_closure.rs" 4 4 4 5] f) ([#"../04_generic_closure.rs" 4 4 4 8] (([#"../04_generic_closure.rs" 4 6 4 7] a))));
-    [#"../04_generic_closure.rs" 4 6 4 7] a <- any a;
+    [#"../04_generic_closure.rs" 4 4 4 8] _4 <- ([#"../04_generic_closure.rs" 4 4 4 8] (a));
+    a <- any a;
+    [#"../04_generic_closure.rs" 4 4 4 8] _0 <- ([#"../04_generic_closure.rs" 4 4 4 8] call0 f _4);
+    _4 <- any a;
     goto BB1
   }
   BB1 {
@@ -270,12 +273,15 @@ module C04GenericClosure_Mapper
   var _0 : ();
   var x : a = x;
   var _2 : ();
+  var _3 : C04GenericClosure_Mapper_Closure0.c04genericclosure_mapper_closure0 a;
   {
     goto BB0
   }
   BB0 {
-    [#"../04_generic_closure.rs" 8 12 8 39] _2 <- ([#"../04_generic_closure.rs" 8 12 8 39] generic_closure0 ([#"../04_generic_closure.rs" 8 28 8 35] C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0) ([#"../04_generic_closure.rs" 8 37 8 38] x));
-    [#"../04_generic_closure.rs" 8 37 8 38] x <- any a;
+    [#"../04_generic_closure.rs" 8 28 8 35] _3 <- ([#"../04_generic_closure.rs" 8 28 8 35] C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0);
+    [#"../04_generic_closure.rs" 8 12 8 39] _2 <- ([#"../04_generic_closure.rs" 8 12 8 39] generic_closure0 _3 x);
+    _3 <- any C04GenericClosure_Mapper_Closure0.c04genericclosure_mapper_closure0 a;
+    x <- any a;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/closures/05_map.mlcfg b/creusot/tests/should_succeed/closures/05_map.mlcfg
index 15dad8e0a3..f0754d7255 100644
--- a/creusot/tests/should_succeed/closures/05_map.mlcfg
+++ b/creusot/tests/should_succeed/closures/05_map.mlcfg
@@ -230,6 +230,7 @@ module C05Map_Impl0_Next
   var _3 : borrowed i;
   var e : a;
   var _6 : b;
+  var _8 : a;
   {
     goto BB0
   }
@@ -252,11 +253,13 @@ module C05Map_Impl0_Next
   }
   BB3 {
     [#"../05_map.rs" 20 17 20 18] e <- ([#"../05_map.rs" 20 17 20 18] Core_Option_Option_Type.some_0 _2);
-    [#"../05_map.rs" 20 17 20 18] _2 <- (let Core_Option_Option_Type.C_Some x0 = _2 in Core_Option_Option_Type.C_Some (any a));
+    _2 <- (let Core_Option_Option_Type.C_Some x0 = _2 in Core_Option_Option_Type.C_Some (any a));
     assert { [@expl:type invariant] inv1 _2 };
     assume { resolve0 _2 };
-    [#"../05_map.rs" 20 28 20 42] _6 <- ([#"../05_map.rs" 20 28 20 42] call0 ([#"../05_map.rs" 20 28 20 39] C05Map_Map_Type.map_func ( * self)) ([#"../05_map.rs" 20 28 20 42] (([#"../05_map.rs" 20 40 20 41] e))));
-    [#"../05_map.rs" 20 40 20 41] e <- any a;
+    [#"../05_map.rs" 20 28 20 42] _8 <- ([#"../05_map.rs" 20 28 20 42] (e));
+    e <- any a;
+    [#"../05_map.rs" 20 28 20 42] _6 <- ([#"../05_map.rs" 20 28 20 42] call0 (C05Map_Map_Type.map_func ( * self)) _8);
+    _8 <- any a;
     goto BB6
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
index 860ffcbf71..421d85590a 100644
--- a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
+++ b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
@@ -66,9 +66,9 @@ module C06FnSpecs_Weaken3
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 33 4 33 27] _0 <- ([#"../06_fn_specs.rs" 33 4 33 27] call_once0 ([#"../06_fn_specs.rs" 33 22 33 23] f) ([#"../06_fn_specs.rs" 33 25 33 26] a));
-    [#"../06_fn_specs.rs" 33 22 33 23] f <- any f;
-    [#"../06_fn_specs.rs" 33 25 33 26] a <- any a;
+    [#"../06_fn_specs.rs" 33 4 33 27] _0 <- ([#"../06_fn_specs.rs" 33 4 33 27] call_once0 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -204,9 +204,9 @@ module C06FnSpecs_Weaken2
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 21 4 21 18] _0 <- ([#"../06_fn_specs.rs" 21 4 21 18] weaken_30 ([#"../06_fn_specs.rs" 21 13 21 14] f) ([#"../06_fn_specs.rs" 21 16 21 17] a));
-    [#"../06_fn_specs.rs" 21 13 21 14] f <- any f;
-    [#"../06_fn_specs.rs" 21 16 21 17] a <- any a;
+    [#"../06_fn_specs.rs" 21 4 21 18] _0 <- ([#"../06_fn_specs.rs" 21 4 21 18] weaken_30 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -367,9 +367,9 @@ module C06FnSpecs_Weaken
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 9 4 9 18] _0 <- ([#"../06_fn_specs.rs" 9 4 9 18] weaken_20 ([#"../06_fn_specs.rs" 9 13 9 14] f) ([#"../06_fn_specs.rs" 9 16 9 17] a));
-    [#"../06_fn_specs.rs" 9 13 9 14] f <- any f;
-    [#"../06_fn_specs.rs" 9 16 9 17] a <- any a;
+    [#"../06_fn_specs.rs" 9 4 9 18] _0 <- ([#"../06_fn_specs.rs" 9 4 9 18] weaken_20 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -450,9 +450,9 @@ module C06FnSpecs_Weaken3Std
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 39 4 39 27] _0 <- ([#"../06_fn_specs.rs" 39 4 39 27] call_once0 ([#"../06_fn_specs.rs" 39 22 39 23] f) ([#"../06_fn_specs.rs" 39 25 39 26] a));
-    [#"../06_fn_specs.rs" 39 22 39 23] f <- any f;
-    [#"../06_fn_specs.rs" 39 25 39 26] a <- any a;
+    [#"../06_fn_specs.rs" 39 4 39 27] _0 <- ([#"../06_fn_specs.rs" 39 4 39 27] call_once0 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -588,9 +588,9 @@ module C06FnSpecs_Weaken2Std
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 27 4 27 22] _0 <- ([#"../06_fn_specs.rs" 27 4 27 22] weaken_3_std0 ([#"../06_fn_specs.rs" 27 17 27 18] f) ([#"../06_fn_specs.rs" 27 20 27 21] a));
-    [#"../06_fn_specs.rs" 27 17 27 18] f <- any f;
-    [#"../06_fn_specs.rs" 27 20 27 21] a <- any a;
+    [#"../06_fn_specs.rs" 27 4 27 22] _0 <- ([#"../06_fn_specs.rs" 27 4 27 22] weaken_3_std0 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -751,9 +751,9 @@ module C06FnSpecs_WeakenStd
     goto BB2
   }
   BB2 {
-    [#"../06_fn_specs.rs" 15 4 15 22] _0 <- ([#"../06_fn_specs.rs" 15 4 15 22] weaken_2_std0 ([#"../06_fn_specs.rs" 15 17 15 18] f) ([#"../06_fn_specs.rs" 15 20 15 21] a));
-    [#"../06_fn_specs.rs" 15 17 15 18] f <- any f;
-    [#"../06_fn_specs.rs" 15 20 15 21] a <- any a;
+    [#"../06_fn_specs.rs" 15 4 15 22] _0 <- ([#"../06_fn_specs.rs" 15 4 15 22] weaken_2_std0 f a);
+    f <- any f;
+    a <- any a;
     goto BB3
   }
   BB3 {
@@ -822,6 +822,7 @@ module C06FnSpecs_FnOnceUser
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var f : f = f;
+  var _4 : usize;
   {
     goto BB0
   }
@@ -829,8 +830,10 @@ module C06FnSpecs_FnOnceUser
     goto BB1
   }
   BB1 {
-    [#"../06_fn_specs.rs" 45 4 45 8] _0 <- ([#"../06_fn_specs.rs" 45 4 45 8] call_once0 ([#"../06_fn_specs.rs" 45 4 45 5] f) ([#"../06_fn_specs.rs" 45 4 45 8] (([#"../06_fn_specs.rs" 45 6 45 7] [#"../06_fn_specs.rs" 45 6 45 7] (0 : usize)))));
-    [#"../06_fn_specs.rs" 45 4 45 5] f <- any f;
+    [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ([#"../06_fn_specs.rs" 45 4 45 8] ((0 : usize)));
+    [#"../06_fn_specs.rs" 45 4 45 8] _0 <- ([#"../06_fn_specs.rs" 45 4 45 8] call_once0 f _4);
+    f <- any f;
+    _4 <- any usize;
     goto BB2
   }
   BB2 {
@@ -896,11 +899,14 @@ module C06FnSpecs_Caller
   let rec cfg caller [#"../06_fn_specs.rs" 48 0 48 15] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _1 : C06FnSpecs_Caller_Closure0.c06fnspecs_caller_closure0;
   {
     goto BB0
   }
   BB0 {
-    [#"../06_fn_specs.rs" 49 4 49 24] _0 <- ([#"../06_fn_specs.rs" 49 4 49 24] fn_once_user0 ([#"../06_fn_specs.rs" 49 17 49 23] C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0));
+    [#"../06_fn_specs.rs" 49 17 49 23] _1 <- ([#"../06_fn_specs.rs" 49 17 49 23] C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0);
+    [#"../06_fn_specs.rs" 49 4 49 24] _0 <- ([#"../06_fn_specs.rs" 49 4 49 24] fn_once_user0 _1);
+    _1 <- any C06FnSpecs_Caller_Closure0.c06fnspecs_caller_closure0;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs/why3session.xml b/creusot/tests/should_succeed/closures/06_fn_specs/why3session.xml
index 82f34b3b23..e680c575f1 100644
--- a/creusot/tests/should_succeed/closures/06_fn_specs/why3session.xml
+++ b/creusot/tests/should_succeed/closures/06_fn_specs/why3session.xml
@@ -38,7 +38,7 @@
 </theory>
 <theory name="C06FnSpecs_FnOnceUser" proved="true">
  <goal name="fn_once_user&#39;vc" expl="VC for fn_once_user" proved="true">
- <proof prover="3"><result status="valid" time="0.006310" steps="10"/></proof>
+ <proof prover="3"><result status="valid" time="0.006310" steps="12"/></proof>
  </goal>
 </theory>
 <theory name="C06FnSpecs_Caller" proved="true">
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs/why3shapes.gz b/creusot/tests/should_succeed/closures/06_fn_specs/why3shapes.gz
index 3bea0ccc112364a67c8945bdffe5183fac2ca7b1..294a6c6a55a81967e6d29dfe724d9146b30a44b2 100644
GIT binary patch
literal 752
zcmV<M0uTKkiwFP!00000|D9C9j+-zLz4H|u+dX+^Y-1|zA&M3mskcfT8yPU_swvqG
z$@ceagPlM&QKFtOp68i2^Pc_XDII>9H#?*sc0auC`fsUBpS~uCck|kRV8x2CgbL!4
zRahibSgy?5Za6f%zI{Eo)0<u2SXNQRD_NT7N>-vMC#bj$6~$^Q!B<m$a@f5+K}S@1
zA5tXMI_-A*^shC)ZNH&Fn0y;%Z-?FX!!q;JCs}g&b38Cd1by0P^W>JWnrQQv_p7|Y
zgUcy91#VbQ+}xzhvG48Rl8Pz|yYVZ-SCl7^^uhB9IXkZ^74Yi3>lo&)jXcx`2n2wI
zVY|qc26G2+;Nqk%;7ndR>kE7m*rish`QRYGIyrEe<%spe^M4|Y5Aql915g!YMWmZu
zw*rVUOBUS#GHC6yEyW(8<zui*SKz`5bhRP!`cB<A^Q?l*H>@z4Aq*ZPsURAgNy$&r
z&nz&0`9l42c0$a~XJ;!dte{*QD%1}SfRi`WRVS#?3&rVvcvCEKt|_<8$Dzh?xvd+Q
zAwVMu5vRc8ji68Yy-~c{bBlQ~FDpz23&>bN#R6IMl$<#^pS@HpK2>;m>0Qw2<^$fL
z=x#s7w+d<Ddi?ZujigYF$HSB1{~$O8#Y;3XVsNJqF5NknFCT+lnE3Lc+YE>H(&kt8
z{LUjU?Q_K&R+P6OE*2AalLa=%!R}8(4>M=gr(U38-_4rIqW|$`n_;sy+pXPi*4y21
z+*?*2V%}y9Bnjmx@|L8LQq-+5bw{Y`rV%X)#af$kO&T?5mS7DAS|Zz!u@XrtMIA|0
z3i7&EHU+MMG&nS9U^>@IXIg5J2xvG-qFNGIB3XBN4Ye>_*j8ber6@FVjjj@E1dYs}
zhg^fwkZF(_#C@hHAE%1he^XWWsagdcSG8zdH7=0>tMgpiy35Eq;aN&dV;;CR9SY2x
ia0;wNsM{tJ)EV109h27blt>e5g5)2+9p|4+2mk;oI%n(v

literal 749
zcmV<J0uucniwFP!00000|D9A#Z`&{oz2{f>xb-BG`tpDtf}n;B>^8v11+pw-#j>Q0
zlkV?NvSr6k6SUaLvh+kg@;&j(L)QJWFTTs({IPpJ?7w9)d-%FKz1rvf8&<4HOQ>L6
zvI>jUa4gsM<<OnnVc$HT!tL#0?>wuh;*~7zV<jt5lmk@Uhl*l7q~PlzJ_YR2PtYD!
zehevA)h25X$Lz1Szx{qoi7>@7?9q3J-J56jXAH9B^5=YFfe6O1kM<!fVLj01Pp>z5
zLj;#YbV}T?9Jqx}+4FwyyAV`VD(#M6nZBZ&Kr$X)ZphhvUFn3^m)*cH4`t*jKR_Y?
zEHyiv+$b;)fB-HgbpdDc(nVk3gTNuQUe6l``OVHjh%9?-Y+n2mseO<?MIV5!Kouih
zb=wLc`Y3921IVOxjJ6cJhnAm%UAqDoR-l^&QPg*+CYWcPWWHmC-VCYnIFd@Dv6+;7
zl741^{>vBYm$MsUc3)krw6KB>W$2VYIRGYa=$lT^y%&n<eMD0%aiOTN&HJW~?Fw6W
z9z%kTB*fSSKE4Qg7e5*$sy(+@6!SX6V6cQ76X-F48a*XvPR?hOijAWRuOEFl47$aG
z=uix=pT=2*v~WGXn_WFA6#exyGU6X3r=WNmO^le_84s84?9-Q@gI$^UdeCjVQ*&+e
z8+&o5&*#|PG3r=(|7fDo4$^PWoj*>^PQ7N;yBb2m?{>pvvH$VnUANuX-OeAko86&1
zA3YnRx_*1Lq8vrukhD^Yx)HW+33ct9Xi#X@_>3DeXuz-))?lF_@{X*RNK$KRNut(}
z*R}Q;a06r@puqq$xzR=$X~ar^<0Oe{N#KcO-R3pa!gApojjhU17~}>+CNu~JS-cOq
z0c}7TkOsuZOi_NGDysjcsz0V$qiU4XNG(^cQOYUZGS8Y2#|e}?BW5s9T)EX;<lq5o
f39fYtg_lkOdJ@!zj6{ae5Ul<IIXW_MLI?l=jd*dT

diff --git a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
index 471b5e1219..6aa30a62af 100644
--- a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
+++ b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
@@ -47,9 +47,9 @@ module C07MutableCapture_TestFnmut_Closure1
     goto BB0
   }
   BB0 {
-    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18]  * field_00 ( * _1) + ([#"../07_mutable_capture.rs" 10 17 10 18] [#"../07_mutable_capture.rs" 10 17 10 18] (1 : uint32))) ; })) ; };
+    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18]  * field_00 ( * _1) + (1 : uint32)) ; })) ; };
     assume { resolve0 _1 };
-    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] [#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
+    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
     [#"../07_mutable_capture.rs" 7 8 7 35] res <- ([#"../07_mutable_capture.rs" 7 8 7 35] res1);
     [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- ([#"../07_mutable_capture.rs" 8 8 8 37] res);
     return _0
@@ -104,8 +104,10 @@ module C07MutableCapture_TestFnmut
   var _4 : borrowed uint32;
   var _5 : int32;
   var _6 : borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
+  var _7 : ();
   var _8 : int32;
   var _9 : borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
+  var _10 : ();
   {
     goto BB0
   }
@@ -116,15 +118,19 @@ module C07MutableCapture_TestFnmut
     _4 <- any borrowed uint32;
     [#"../07_mutable_capture.rs" 14 4 14 5] _6 <- Borrow.borrow_mut c;
     [#"../07_mutable_capture.rs" 14 4 14 5] c <-  ^ _6;
-    [#"../07_mutable_capture.rs" 14 4 14 7] _5 <- ([#"../07_mutable_capture.rs" 14 4 14 7] let () = [#"../07_mutable_capture.rs" 14 4 14 7] () in closure10 _6);
+    [#"../07_mutable_capture.rs" 14 4 14 7] _7 <- ([#"../07_mutable_capture.rs" 14 4 14 7] ());
+    [#"../07_mutable_capture.rs" 14 4 14 7] _5 <- ([#"../07_mutable_capture.rs" 14 4 14 7] let () = _7 in closure10 _6);
     _6 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
+    _7 <- any ();
     goto BB1
   }
   BB1 {
     [#"../07_mutable_capture.rs" 15 4 15 5] _9 <- Borrow.borrow_mut c;
     [#"../07_mutable_capture.rs" 15 4 15 5] c <-  ^ _9;
-    [#"../07_mutable_capture.rs" 15 4 15 7] _8 <- ([#"../07_mutable_capture.rs" 15 4 15 7] let () = [#"../07_mutable_capture.rs" 15 4 15 7] () in closure10 _9);
+    [#"../07_mutable_capture.rs" 15 4 15 7] _10 <- ([#"../07_mutable_capture.rs" 15 4 15 7] ());
+    [#"../07_mutable_capture.rs" 15 4 15 7] _8 <- ([#"../07_mutable_capture.rs" 15 4 15 7] let () = _10 in closure10 _9);
     _9 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
+    _10 <- any ();
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/closures/07_mutable_capture/why3shapes.gz b/creusot/tests/should_succeed/closures/07_mutable_capture/why3shapes.gz
index e46260f5388126c40dd52013bf89c6916c987ef0..99257d1192da05f21f581f4244039ea86ae2f080 100644
GIT binary patch
delta 416
zcmV;R0bl;D1FZv)7k`U4#!xkf2q{XW^j7&;G=Nc22}CUE@7E@Kb8*VSW1D%iJU{z6
z@cS>^>E7S#uCLnW)dxR#@e&-HM)w23KoR^@WPx)W+O%p03=$P%Lgf26U{>n{cf;7}
z^uxF>o9#HHN!|8lhbjxi*%giwN1(}?(>2ajq~y|CsbI2@hkwR)x^L^fCMvXhA!cpY
zwLiLe+I~AFxCSVJWz}G<7*>TD4hv!z#HPg26wld{8I9}gddYLTTwv9tSvxjGfA@1U
z^-SG+-WYf0?(Xin#<%NZ;Ex;wnZBi`62ELaKX*WSXSG-wESy~q%`G=IHD5Fs8!5%N
z8g%B>Aa6zJ&VO*6)5U+8i%-n02dg5-rfs#8&|?)%>I+olhPC(PLKv7p@P{zrOc>k}
z7CJW#cZ9(s*oO&|w%EhNpu!_xj@60@CKQ`2H-Qc_rsy#cJw5<OC7-Us`6dh|Xj<B+
zo);1>qbw?b@Dhc_BGwRV4p7R7=uG%@MLdSOM9zV0K^X)9P$tSSFQhaGDk=DU#k^l$
Kb~pc%1pojpfW}||

delta 416
zcmV;R0bl;D1FZv)7k|qbgTYmEh>%bsrMJq*qQMvyl|aOj{(fyjw&voLgU5z>vpm1y
z*>n3Z+^gO_sIITt=GA4c_u?ctHjU~BKu-XE3RvM1hc>I40lh?UOdxt62h3}g;C>i8
zm3?UUwAqbAmeg&p-w<JdxVXX*umtL?l5B7(ViBdrMuJV2$$wDWPW5elP#{9{F2ua;
zy7osEPrGlc1lIr&U|BU-3m>aOFUJFz1DKRJ>f)*Yq*v{_xIR)z(iK)smbYV5^miY(
zQ_sY{=dE`4?cMD?H~4ma4fK&~faysck+@~sxzYmZoYi7zFmV5JX?D4ZuKA)tuBF6p
zHE7MNM&63ho_}F3$?Ct%@e^}KLzXR@S|^!v5l`ClL~MsOQ*xn;=|JocU4b=S?3S+3
zx@C4p7kdQzAYG9u_4rc|;mnq0t-%Bfgg;rT108q1Aafux5C5#<(-@qmV9-Ic(nNKf
z5NH(ValwF=7$_{bVq8(i$|wev2QFEILpg<*$}(p(4;dv>u>_ebN_<K|@4%&N-}wat
Kwm=b&1polKp3FV~

diff --git a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
index 7bce55509c..671707d640 100644
--- a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
+++ b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
@@ -37,7 +37,7 @@ module C08MultipleCalls_MultiUse_Closure0
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] [#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
+    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
     [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- ([#"../08_multiple_calls.rs" 5 12 5 31] res);
     return _0
   }
@@ -121,9 +121,9 @@ module C08MultipleCalls_MultiUse
     goto BB0
   }
   BB0 {
-    [#"../08_multiple_calls.rs" 5 12 5 31] c <- ([#"../08_multiple_calls.rs" 5 12 5 31] C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 ([#"../08_multiple_calls.rs" 5 12 5 31] x));
+    [#"../08_multiple_calls.rs" 5 12 5 31] c <- ([#"../08_multiple_calls.rs" 5 12 5 31] C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 x);
     assume { resolve0 c };
-    [#"../08_multiple_calls.rs" 11 4 11 14] _4 <- ([#"../08_multiple_calls.rs" 11 4 11 14] uses_fn0 ([#"../08_multiple_calls.rs" 11 12 11 13] c));
+    [#"../08_multiple_calls.rs" 11 4 11 14] _4 <- ([#"../08_multiple_calls.rs" 11 4 11 14] uses_fn0 c);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/constrained_types.mlcfg b/creusot/tests/should_succeed/constrained_types.mlcfg
index 135be116ef..bb34822c50 100644
--- a/creusot/tests/should_succeed/constrained_types.mlcfg
+++ b/creusot/tests/should_succeed/constrained_types.mlcfg
@@ -105,7 +105,7 @@ module ConstrainedTypes_UsesConcreteInstance
     goto BB0
   }
   BB0 {
-    [#"../constrained_types.rs" 15 4 15 9] _0 <- ([#"../constrained_types.rs" 15 4 15 9] lt0 ([#"../constrained_types.rs" 15 4 15 5] x) ([#"../constrained_types.rs" 15 8 15 9] y));
+    [#"../constrained_types.rs" 15 4 15 9] _0 <- ([#"../constrained_types.rs" 15 4 15 9] lt0 x y);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/drop_pair.mlcfg b/creusot/tests/should_succeed/drop_pair.mlcfg
index d2e9a5a3b1..b4de795411 100644
--- a/creusot/tests/should_succeed/drop_pair.mlcfg
+++ b/creusot/tests/should_succeed/drop_pair.mlcfg
@@ -84,7 +84,7 @@ module DropPair_Drop
     [#"../drop_pair.rs" 16 9 16 10] _3 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../drop_pair.rs" 16 9 16 10] y <- { y with current = ( ^ _3) ; };
     [#"../drop_pair.rs" 16 4 16 10] _x <- ([#"../drop_pair.rs" 16 4 16 10] _3);
-    [#"../drop_pair.rs" 16 4 16 10] _3 <- any borrowed uint32;
+    _3 <- any borrowed uint32;
     assume { resolve0 _x };
     [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] ());
     assume { resolve0 y };
diff --git a/creusot/tests/should_succeed/duration.mlcfg b/creusot/tests/should_succeed/duration.mlcfg
index 8ac6454cd3..2b78a75c9e 100644
--- a/creusot/tests/should_succeed/duration.mlcfg
+++ b/creusot/tests/should_succeed/duration.mlcfg
@@ -166,6 +166,7 @@ module Duration_TestDuration
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var zero : Core_Time_Duration_Type.t_duration;
+  var _5 : bool;
   var _6 : uint128;
   var max : Core_Time_Duration_Type.t_duration;
   var d_secs : Core_Time_Duration_Type.t_duration;
@@ -174,14 +175,24 @@ module Duration_TestDuration
   var d_nanos : Core_Time_Duration_Type.t_duration;
   var _23 : bool;
   var _27 : bool;
+  var _31 : bool;
   var _32 : uint64;
+  var _36 : bool;
   var _37 : uint32;
+  var _41 : bool;
   var _42 : uint32;
+  var _46 : bool;
   var _47 : uint32;
+  var _51 : bool;
+  var _52 : uint128;
   var _53 : uint32;
   var _55 : uint128;
+  var _59 : bool;
+  var _60 : uint128;
   var _61 : uint32;
   var _63 : uint128;
+  var _67 : bool;
+  var _68 : uint128;
   var _69 : uint32;
   var _71 : uint128;
   var _75 : bool;
@@ -206,22 +217,24 @@ module Duration_TestDuration
     goto BB0
   }
   BB0 {
-    [#"../duration.rs" 8 15 8 34] zero <- ([#"../duration.rs" 8 15 8 34] new0 ([#"../duration.rs" 8 29 8 30] [#"../duration.rs" 8 29 8 30] (0 : uint64)) ([#"../duration.rs" 8 32 8 33] [#"../duration.rs" 8 32 8 33] (0 : uint32)));
+    [#"../duration.rs" 8 15 8 34] zero <- ([#"../duration.rs" 8 15 8 34] new0 (0 : uint64) (0 : uint32));
     goto BB1
   }
   BB1 {
     assert { [@expl:assertion] [#"../duration.rs" 9 18 9 28] shallow_model0 zero = 0 };
-    [#"../duration.rs" 10 12 10 27] _6 <- ([#"../duration.rs" 10 12 10 27] as_nanos0 ([#"../duration.rs" 10 12 10 16] zero));
+    [#"../duration.rs" 10 12 10 27] _6 <- ([#"../duration.rs" 10 12 10 27] as_nanos0 zero);
     goto BB2
   }
   BB2 {
-    switch ([#"../duration.rs" 10 12 10 32] _6 = ([#"../duration.rs" 10 31 10 32] [#"../duration.rs" 10 31 10 32] (0 : uint128)))
+    [#"../duration.rs" 10 12 10 32] _5 <- ([#"../duration.rs" 10 12 10 32] _6 = (0 : uint128));
+    _6 <- any uint128;
+    switch (_5)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../duration.rs" 12 14 12 50] max <- ([#"../duration.rs" 12 14 12 50] new0 ([#"../duration.rs" 12 28 12 36] [#"../duration.rs" 12 28 12 36] (18446744073709551615 : uint64)) ([#"../duration.rs" 12 38 12 49] [#"../duration.rs" 12 38 12 49] (999999999 : uint32)));
+    [#"../duration.rs" 12 14 12 50] max <- ([#"../duration.rs" 12 14 12 50] new0 (18446744073709551615 : uint64) (999999999 : uint32));
     goto BB5
   }
   BB4 {
@@ -229,27 +242,27 @@ module Duration_TestDuration
     absurd
   }
   BB5 {
-    [#"../duration.rs" 14 17 14 39] d_secs <- ([#"../duration.rs" 14 17 14 39] from_secs0 ([#"../duration.rs" 14 37 14 38] [#"../duration.rs" 14 37 14 38] (1 : uint64)));
+    [#"../duration.rs" 14 17 14 39] d_secs <- ([#"../duration.rs" 14 17 14 39] from_secs0 (1 : uint64));
     goto BB6
   }
   BB6 {
     assert { [@expl:assertion] [#"../duration.rs" 15 18 15 42] shallow_model0 d_secs = 1000000000 };
-    [#"../duration.rs" 17 19 17 43] d_millis <- ([#"../duration.rs" 17 19 17 43] from_millis0 ([#"../duration.rs" 17 41 17 42] [#"../duration.rs" 17 41 17 42] (1 : uint64)));
+    [#"../duration.rs" 17 19 17 43] d_millis <- ([#"../duration.rs" 17 19 17 43] from_millis0 (1 : uint64));
     goto BB7
   }
   BB7 {
     assert { [@expl:assertion] [#"../duration.rs" 18 18 18 40] shallow_model0 d_millis = 1000000 };
-    [#"../duration.rs" 20 19 20 43] d_micros <- ([#"../duration.rs" 20 19 20 43] from_micros0 ([#"../duration.rs" 20 41 20 42] [#"../duration.rs" 20 41 20 42] (1 : uint64)));
+    [#"../duration.rs" 20 19 20 43] d_micros <- ([#"../duration.rs" 20 19 20 43] from_micros0 (1 : uint64));
     goto BB8
   }
   BB8 {
     assert { [@expl:assertion] [#"../duration.rs" 21 18 21 36] shallow_model0 d_micros = 1000 };
-    [#"../duration.rs" 23 18 23 41] d_nanos <- ([#"../duration.rs" 23 18 23 41] from_nanos0 ([#"../duration.rs" 23 39 23 40] [#"../duration.rs" 23 39 23 40] (1 : uint64)));
+    [#"../duration.rs" 23 18 23 41] d_nanos <- ([#"../duration.rs" 23 18 23 41] from_nanos0 (1 : uint64));
     goto BB9
   }
   BB9 {
     assert { [@expl:assertion] [#"../duration.rs" 24 18 24 31] shallow_model0 d_nanos = 1 };
-    [#"../duration.rs" 26 12 26 26] _23 <- ([#"../duration.rs" 26 12 26 26] is_zero0 ([#"../duration.rs" 26 12 26 16] zero));
+    [#"../duration.rs" 26 12 26 26] _23 <- ([#"../duration.rs" 26 12 26 26] is_zero0 zero);
     goto BB10
   }
   BB10 {
@@ -259,7 +272,7 @@ module Duration_TestDuration
       end
   }
   BB11 {
-    [#"../duration.rs" 27 13 27 29] _27 <- ([#"../duration.rs" 27 13 27 29] is_zero0 ([#"../duration.rs" 27 13 27 19] d_secs));
+    [#"../duration.rs" 27 13 27 29] _27 <- ([#"../duration.rs" 27 13 27 29] is_zero0 d_secs);
     goto BB13
   }
   BB12 {
@@ -277,17 +290,19 @@ module Duration_TestDuration
     absurd
   }
   BB15 {
-    [#"../duration.rs" 29 17 29 33] _32 <- ([#"../duration.rs" 29 17 29 33] as_secs0 ([#"../duration.rs" 29 17 29 23] d_secs));
+    [#"../duration.rs" 29 17 29 33] _32 <- ([#"../duration.rs" 29 17 29 33] as_secs0 d_secs);
     goto BB16
   }
   BB16 {
-    switch ([#"../duration.rs" 29 12 29 33] ([#"../duration.rs" 29 12 29 13] [#"../duration.rs" 29 12 29 13] (1 : uint64)) = _32)
+    [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 33] (1 : uint64) = _32);
+    _32 <- any uint64;
+    switch (_31)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../duration.rs" 30 17 30 39] _37 <- ([#"../duration.rs" 30 17 30 39] subsec_millis0 ([#"../duration.rs" 30 17 30 23] d_secs));
+    [#"../duration.rs" 30 17 30 39] _37 <- ([#"../duration.rs" 30 17 30 39] subsec_millis0 d_secs);
     goto BB19
   }
   BB18 {
@@ -295,13 +310,15 @@ module Duration_TestDuration
     absurd
   }
   BB19 {
-    switch ([#"../duration.rs" 30 12 30 39] ([#"../duration.rs" 30 12 30 13] [#"../duration.rs" 30 12 30 13] (0 : uint32)) = _37)
+    [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 39] (0 : uint32) = _37);
+    _37 <- any uint32;
+    switch (_36)
       | False -> goto BB21
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../duration.rs" 31 17 31 39] _42 <- ([#"../duration.rs" 31 17 31 39] subsec_micros0 ([#"../duration.rs" 31 17 31 23] d_secs));
+    [#"../duration.rs" 31 17 31 39] _42 <- ([#"../duration.rs" 31 17 31 39] subsec_micros0 d_secs);
     goto BB22
   }
   BB21 {
@@ -309,13 +326,15 @@ module Duration_TestDuration
     absurd
   }
   BB22 {
-    switch ([#"../duration.rs" 31 12 31 39] ([#"../duration.rs" 31 12 31 13] [#"../duration.rs" 31 12 31 13] (0 : uint32)) = _42)
+    [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 39] (0 : uint32) = _42);
+    _42 <- any uint32;
+    switch (_41)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../duration.rs" 32 17 32 38] _47 <- ([#"../duration.rs" 32 17 32 38] subsec_nanos0 ([#"../duration.rs" 32 17 32 23] d_secs));
+    [#"../duration.rs" 32 17 32 38] _47 <- ([#"../duration.rs" 32 17 32 38] subsec_nanos0 d_secs);
     goto BB25
   }
   BB24 {
@@ -323,13 +342,15 @@ module Duration_TestDuration
     absurd
   }
   BB25 {
-    switch ([#"../duration.rs" 32 12 32 38] ([#"../duration.rs" 32 12 32 13] [#"../duration.rs" 32 12 32 13] (0 : uint32)) = _47)
+    [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 38] (0 : uint32) = _47);
+    _47 <- any uint32;
+    switch (_46)
       | False -> goto BB27
       | True -> goto BB26
       end
   }
   BB26 {
-    [#"../duration.rs" 34 12 34 36] _53 <- ([#"../duration.rs" 34 12 34 36] subsec_millis0 ([#"../duration.rs" 34 12 34 20] d_millis));
+    [#"../duration.rs" 34 12 34 36] _53 <- ([#"../duration.rs" 34 12 34 36] subsec_millis0 d_millis);
     goto BB28
   }
   BB27 {
@@ -337,17 +358,22 @@ module Duration_TestDuration
     absurd
   }
   BB28 {
-    [#"../duration.rs" 34 48 34 68] _55 <- ([#"../duration.rs" 34 48 34 68] as_millis0 ([#"../duration.rs" 34 48 34 56] d_millis));
+    [#"../duration.rs" 34 12 34 44] _52 <- ([#"../duration.rs" 34 12 34 44] UInt128.of_int (UInt32.to_int _53));
+    _53 <- any uint32;
+    [#"../duration.rs" 34 48 34 68] _55 <- ([#"../duration.rs" 34 48 34 68] as_millis0 d_millis);
     goto BB29
   }
   BB29 {
-    switch ([#"../duration.rs" 34 12 34 68] ([#"../duration.rs" 34 12 34 44] UInt128.of_int (UInt32.to_int _53)) = _55)
+    [#"../duration.rs" 34 12 34 68] _51 <- ([#"../duration.rs" 34 12 34 68] _52 = _55);
+    _52 <- any uint128;
+    _55 <- any uint128;
+    switch (_51)
       | False -> goto BB31
       | True -> goto BB30
       end
   }
   BB30 {
-    [#"../duration.rs" 35 12 35 36] _61 <- ([#"../duration.rs" 35 12 35 36] subsec_micros0 ([#"../duration.rs" 35 12 35 20] d_micros));
+    [#"../duration.rs" 35 12 35 36] _61 <- ([#"../duration.rs" 35 12 35 36] subsec_micros0 d_micros);
     goto BB32
   }
   BB31 {
@@ -355,17 +381,22 @@ module Duration_TestDuration
     absurd
   }
   BB32 {
-    [#"../duration.rs" 35 48 35 68] _63 <- ([#"../duration.rs" 35 48 35 68] as_micros0 ([#"../duration.rs" 35 48 35 56] d_micros));
+    [#"../duration.rs" 35 12 35 44] _60 <- ([#"../duration.rs" 35 12 35 44] UInt128.of_int (UInt32.to_int _61));
+    _61 <- any uint32;
+    [#"../duration.rs" 35 48 35 68] _63 <- ([#"../duration.rs" 35 48 35 68] as_micros0 d_micros);
     goto BB33
   }
   BB33 {
-    switch ([#"../duration.rs" 35 12 35 68] ([#"../duration.rs" 35 12 35 44] UInt128.of_int (UInt32.to_int _61)) = _63)
+    [#"../duration.rs" 35 12 35 68] _59 <- ([#"../duration.rs" 35 12 35 68] _60 = _63);
+    _60 <- any uint128;
+    _63 <- any uint128;
+    switch (_59)
       | False -> goto BB35
       | True -> goto BB34
       end
   }
   BB34 {
-    [#"../duration.rs" 36 12 36 34] _69 <- ([#"../duration.rs" 36 12 36 34] subsec_nanos0 ([#"../duration.rs" 36 12 36 19] d_nanos));
+    [#"../duration.rs" 36 12 36 34] _69 <- ([#"../duration.rs" 36 12 36 34] subsec_nanos0 d_nanos);
     goto BB36
   }
   BB35 {
@@ -373,17 +404,22 @@ module Duration_TestDuration
     absurd
   }
   BB36 {
-    [#"../duration.rs" 36 46 36 64] _71 <- ([#"../duration.rs" 36 46 36 64] as_nanos0 ([#"../duration.rs" 36 46 36 53] d_nanos));
+    [#"../duration.rs" 36 12 36 42] _68 <- ([#"../duration.rs" 36 12 36 42] UInt128.of_int (UInt32.to_int _69));
+    _69 <- any uint32;
+    [#"../duration.rs" 36 46 36 64] _71 <- ([#"../duration.rs" 36 46 36 64] as_nanos0 d_nanos);
     goto BB37
   }
   BB37 {
-    switch ([#"../duration.rs" 36 12 36 64] ([#"../duration.rs" 36 12 36 42] UInt128.of_int (UInt32.to_int _69)) = _71)
+    [#"../duration.rs" 36 12 36 64] _67 <- ([#"../duration.rs" 36 12 36 64] _68 = _71);
+    _68 <- any uint128;
+    _71 <- any uint128;
+    switch (_67)
       | False -> goto BB39
       | True -> goto BB38
       end
   }
   BB38 {
-    [#"../duration.rs" 38 12 38 35] _77 <- ([#"../duration.rs" 38 12 38 35] checked_add0 ([#"../duration.rs" 38 12 38 18] d_secs) ([#"../duration.rs" 38 31 38 34] max));
+    [#"../duration.rs" 38 12 38 35] _77 <- ([#"../duration.rs" 38 12 38 35] checked_add0 d_secs max);
     goto BB40
   }
   BB39 {
@@ -391,7 +427,7 @@ module Duration_TestDuration
     absurd
   }
   BB40 {
-    [#"../duration.rs" 38 12 38 45] _75 <- ([#"../duration.rs" 38 12 38 45] is_none0 ([#"../duration.rs" 38 12 38 35] _77));
+    [#"../duration.rs" 38 12 38 45] _75 <- ([#"../duration.rs" 38 12 38 45] is_none0 _77);
     goto BB41
   }
   BB41 {
@@ -401,7 +437,7 @@ module Duration_TestDuration
       end
   }
   BB42 {
-    [#"../duration.rs" 39 12 39 38] _84 <- ([#"../duration.rs" 39 12 39 38] checked_add0 ([#"../duration.rs" 39 12 39 18] d_secs) ([#"../duration.rs" 39 31 39 37] d_secs));
+    [#"../duration.rs" 39 12 39 38] _84 <- ([#"../duration.rs" 39 12 39 38] checked_add0 d_secs d_secs);
     goto BB44
   }
   BB43 {
@@ -409,7 +445,7 @@ module Duration_TestDuration
     absurd
   }
   BB44 {
-    [#"../duration.rs" 39 12 39 48] _82 <- ([#"../duration.rs" 39 12 39 48] is_some0 ([#"../duration.rs" 39 12 39 38] _84));
+    [#"../duration.rs" 39 12 39 48] _82 <- ([#"../duration.rs" 39 12 39 48] is_some0 _84);
     goto BB45
   }
   BB45 {
@@ -419,7 +455,7 @@ module Duration_TestDuration
       end
   }
   BB46 {
-    [#"../duration.rs" 41 12 41 35] _91 <- ([#"../duration.rs" 41 12 41 35] checked_sub0 ([#"../duration.rs" 41 12 41 18] d_secs) ([#"../duration.rs" 41 31 41 34] max));
+    [#"../duration.rs" 41 12 41 35] _91 <- ([#"../duration.rs" 41 12 41 35] checked_sub0 d_secs max);
     goto BB48
   }
   BB47 {
@@ -427,7 +463,7 @@ module Duration_TestDuration
     absurd
   }
   BB48 {
-    [#"../duration.rs" 41 12 41 45] _89 <- ([#"../duration.rs" 41 12 41 45] is_none0 ([#"../duration.rs" 41 12 41 35] _91));
+    [#"../duration.rs" 41 12 41 45] _89 <- ([#"../duration.rs" 41 12 41 45] is_none0 _91);
     goto BB49
   }
   BB49 {
@@ -437,7 +473,7 @@ module Duration_TestDuration
       end
   }
   BB50 {
-    [#"../duration.rs" 42 12 42 40] _98 <- ([#"../duration.rs" 42 12 42 40] checked_sub0 ([#"../duration.rs" 42 12 42 18] d_secs) ([#"../duration.rs" 42 31 42 39] d_millis));
+    [#"../duration.rs" 42 12 42 40] _98 <- ([#"../duration.rs" 42 12 42 40] checked_sub0 d_secs d_millis);
     goto BB52
   }
   BB51 {
@@ -445,7 +481,7 @@ module Duration_TestDuration
     absurd
   }
   BB52 {
-    [#"../duration.rs" 42 12 42 50] _96 <- ([#"../duration.rs" 42 12 42 50] is_some0 ([#"../duration.rs" 42 12 42 40] _98));
+    [#"../duration.rs" 42 12 42 50] _96 <- ([#"../duration.rs" 42 12 42 50] is_some0 _98);
     goto BB53
   }
   BB53 {
@@ -455,7 +491,7 @@ module Duration_TestDuration
       end
   }
   BB54 {
-    [#"../duration.rs" 44 12 44 30] _105 <- ([#"../duration.rs" 44 12 44 30] checked_mul0 ([#"../duration.rs" 44 12 44 15] max) ([#"../duration.rs" 44 28 44 29] [#"../duration.rs" 44 28 44 29] (2 : uint32)));
+    [#"../duration.rs" 44 12 44 30] _105 <- ([#"../duration.rs" 44 12 44 30] checked_mul0 max (2 : uint32));
     goto BB56
   }
   BB55 {
@@ -463,7 +499,7 @@ module Duration_TestDuration
     absurd
   }
   BB56 {
-    [#"../duration.rs" 44 12 44 40] _103 <- ([#"../duration.rs" 44 12 44 40] is_none0 ([#"../duration.rs" 44 12 44 30] _105));
+    [#"../duration.rs" 44 12 44 40] _103 <- ([#"../duration.rs" 44 12 44 40] is_none0 _105);
     goto BB57
   }
   BB57 {
@@ -473,7 +509,7 @@ module Duration_TestDuration
       end
   }
   BB58 {
-    [#"../duration.rs" 45 12 45 34] _111 <- ([#"../duration.rs" 45 12 45 34] checked_mul0 ([#"../duration.rs" 45 12 45 18] d_secs) ([#"../duration.rs" 45 31 45 33] [#"../duration.rs" 45 31 45 33] (10 : uint32)));
+    [#"../duration.rs" 45 12 45 34] _111 <- ([#"../duration.rs" 45 12 45 34] checked_mul0 d_secs (10 : uint32));
     goto BB60
   }
   BB59 {
@@ -481,7 +517,7 @@ module Duration_TestDuration
     absurd
   }
   BB60 {
-    [#"../duration.rs" 45 12 45 44] _109 <- ([#"../duration.rs" 45 12 45 44] is_some0 ([#"../duration.rs" 45 12 45 34] _111));
+    [#"../duration.rs" 45 12 45 44] _109 <- ([#"../duration.rs" 45 12 45 44] is_some0 _111);
     goto BB61
   }
   BB61 {
@@ -491,7 +527,7 @@ module Duration_TestDuration
       end
   }
   BB62 {
-    [#"../duration.rs" 47 12 47 33] _117 <- ([#"../duration.rs" 47 12 47 33] checked_div0 ([#"../duration.rs" 47 12 47 18] d_secs) ([#"../duration.rs" 47 31 47 32] [#"../duration.rs" 47 31 47 32] (0 : uint32)));
+    [#"../duration.rs" 47 12 47 33] _117 <- ([#"../duration.rs" 47 12 47 33] checked_div0 d_secs (0 : uint32));
     goto BB64
   }
   BB63 {
@@ -499,7 +535,7 @@ module Duration_TestDuration
     absurd
   }
   BB64 {
-    [#"../duration.rs" 47 12 47 43] _115 <- ([#"../duration.rs" 47 12 47 43] is_none0 ([#"../duration.rs" 47 12 47 33] _117));
+    [#"../duration.rs" 47 12 47 43] _115 <- ([#"../duration.rs" 47 12 47 43] is_none0 _117);
     goto BB65
   }
   BB65 {
@@ -509,7 +545,7 @@ module Duration_TestDuration
       end
   }
   BB66 {
-    [#"../duration.rs" 48 12 48 34] _123 <- ([#"../duration.rs" 48 12 48 34] checked_div0 ([#"../duration.rs" 48 12 48 18] d_secs) ([#"../duration.rs" 48 31 48 33] [#"../duration.rs" 48 31 48 33] (10 : uint32)));
+    [#"../duration.rs" 48 12 48 34] _123 <- ([#"../duration.rs" 48 12 48 34] checked_div0 d_secs (10 : uint32));
     goto BB68
   }
   BB67 {
@@ -517,7 +553,7 @@ module Duration_TestDuration
     absurd
   }
   BB68 {
-    [#"../duration.rs" 48 12 48 44] _121 <- ([#"../duration.rs" 48 12 48 44] is_some0 ([#"../duration.rs" 48 12 48 34] _123));
+    [#"../duration.rs" 48 12 48 44] _121 <- ([#"../duration.rs" 48 12 48 44] is_some0 _123);
     goto BB69
   }
   BB69 {
@@ -527,7 +563,7 @@ module Duration_TestDuration
       end
   }
   BB70 {
-    [#"../duration.rs" 50 14 50 33] sum <- ([#"../duration.rs" 50 14 50 33] add0 ([#"../duration.rs" 50 14 50 22] d_millis) ([#"../duration.rs" 50 25 50 33] d_micros));
+    [#"../duration.rs" 50 14 50 33] sum <- ([#"../duration.rs" 50 14 50 33] add0 d_millis d_micros);
     goto BB72
   }
   BB71 {
@@ -535,7 +571,7 @@ module Duration_TestDuration
     absurd
   }
   BB72 {
-    [#"../duration.rs" 51 21 51 40] difference <- ([#"../duration.rs" 51 21 51 40] sub0 ([#"../duration.rs" 51 21 51 29] d_millis) ([#"../duration.rs" 51 32 51 40] d_micros));
+    [#"../duration.rs" 51 21 51 40] difference <- ([#"../duration.rs" 51 21 51 40] sub0 d_millis d_micros);
     goto BB73
   }
   BB73 {
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index 736c16c50d..f32f455df0 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -317,12 +317,16 @@ module FilterPositive_M
   var count : usize;
   var i : usize;
   var _9 : ();
+  var _10 : bool;
   var _12 : usize;
   var _14 : ();
+  var _15 : bool;
   var _17 : int32;
   var u : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+  var _28 : bool;
   var _30 : usize;
   var _32 : ();
+  var _33 : bool;
   var _35 : int32;
   var _43 : int32;
   var _46 : borrowed int32;
@@ -331,8 +335,8 @@ module FilterPositive_M
     goto BB0
   }
   BB0 {
-    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] [#"../filter_positive.rs" 83 27 83 28] (0 : usize));
-    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] [#"../filter_positive.rs" 84 23 84 24] (0 : usize));
+    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] (0 : usize));
+    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -348,27 +352,30 @@ module FilterPositive_M
     goto BB4
   }
   BB4 {
-    [#"../filter_positive.rs" 89 14 89 21] _12 <- ([#"../filter_positive.rs" 89 14 89 21] len1 ([#"../filter_positive.rs" 89 14 89 15] t));
+    [#"../filter_positive.rs" 89 14 89 21] _12 <- ([#"../filter_positive.rs" 89 14 89 21] len1 t);
     goto BB5
   }
   BB5 {
-    switch ([#"../filter_positive.rs" 89 10 89 21] ([#"../filter_positive.rs" 89 10 89 11] i) < _12)
+    [#"../filter_positive.rs" 89 10 89 21] _10 <- ([#"../filter_positive.rs" 89 10 89 21] i < _12);
+    _12 <- any usize;
+    switch (_10)
       | False -> goto BB11
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../filter_positive.rs" 90 12 90 15] _17 <- ([#"../filter_positive.rs" 90 12 90 15] index0 ([#"../filter_positive.rs" 90 11 90 12] t) ([#"../filter_positive.rs" 90 13 90 14] i));
+    [#"../filter_positive.rs" 90 12 90 15] _17 <- ([#"../filter_positive.rs" 90 12 90 15] index0 t i);
     goto BB7
   }
   BB7 {
-    switch ([#"../filter_positive.rs" 90 11 90 19] ([#"../filter_positive.rs" 90 11 90 15] _17) > ([#"../filter_positive.rs" 90 18 90 19] [#"../filter_positive.rs" 90 18 90 19] (0 : int32)))
+    [#"../filter_positive.rs" 90 11 90 19] _15 <- ([#"../filter_positive.rs" 90 11 90 19] _17 > (0 : int32));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + ([#"../filter_positive.rs" 91 21 91 22] [#"../filter_positive.rs" 91 21 91 22] (1 : usize)));
+    [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + (1 : usize));
     [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] ());
     goto BB10
   }
@@ -377,17 +384,17 @@ module FilterPositive_M
     goto BB10
   }
   BB10 {
-    [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + ([#"../filter_positive.rs" 93 13 93 14] [#"../filter_positive.rs" 93 13 93 14] (1 : usize)));
+    [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + (1 : usize));
     [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] ());
     goto BB3
   }
   BB11 {
-    [#"../filter_positive.rs" 95 26 95 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 ([#"../filter_positive.rs" 95 31 95 32] [#"../filter_positive.rs" 95 31 95 32] (0 : int32)) ([#"../filter_positive.rs" 95 34 95 39] count));
+    [#"../filter_positive.rs" 95 26 95 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 (0 : int32) count);
     goto BB12
   }
   BB12 {
-    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] [#"../filter_positive.rs" 96 12 96 13] (0 : usize));
-    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] [#"../filter_positive.rs" 98 8 98 9] (0 : usize));
+    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] (0 : usize));
+    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -402,21 +409,24 @@ module FilterPositive_M
     goto BB16
   }
   BB16 {
-    [#"../filter_positive.rs" 102 14 102 21] _30 <- ([#"../filter_positive.rs" 102 14 102 21] len1 ([#"../filter_positive.rs" 102 14 102 15] t));
+    [#"../filter_positive.rs" 102 14 102 21] _30 <- ([#"../filter_positive.rs" 102 14 102 21] len1 t);
     goto BB17
   }
   BB17 {
-    switch ([#"../filter_positive.rs" 102 10 102 21] ([#"../filter_positive.rs" 102 10 102 11] i) < _30)
+    [#"../filter_positive.rs" 102 10 102 21] _28 <- ([#"../filter_positive.rs" 102 10 102 21] i < _30);
+    _30 <- any usize;
+    switch (_28)
       | False -> goto BB27
       | True -> goto BB18
       end
   }
   BB18 {
-    [#"../filter_positive.rs" 103 12 103 15] _35 <- ([#"../filter_positive.rs" 103 12 103 15] index0 ([#"../filter_positive.rs" 103 11 103 12] t) ([#"../filter_positive.rs" 103 13 103 14] i));
+    [#"../filter_positive.rs" 103 12 103 15] _35 <- ([#"../filter_positive.rs" 103 12 103 15] index0 t i);
     goto BB19
   }
   BB19 {
-    switch ([#"../filter_positive.rs" 103 11 103 19] ([#"../filter_positive.rs" 103 11 103 15] _35) > ([#"../filter_positive.rs" 103 18 103 19] [#"../filter_positive.rs" 103 18 103 19] (0 : int32)))
+    [#"../filter_positive.rs" 103 11 103 19] _33 <- ([#"../filter_positive.rs" 103 11 103 19] _35 > (0 : int32));
+    switch (_33)
       | False -> goto BB25
       | True -> goto BB20
       end
@@ -430,20 +440,20 @@ module FilterPositive_M
     goto BB22
   }
   BB22 {
-    [#"../filter_positive.rs" 113 24 113 27] _43 <- ([#"../filter_positive.rs" 113 24 113 27] index0 ([#"../filter_positive.rs" 113 23 113 24] t) ([#"../filter_positive.rs" 113 25 113 26] i));
+    [#"../filter_positive.rs" 113 24 113 27] _43 <- ([#"../filter_positive.rs" 113 24 113 27] index0 t i);
     goto BB23
   }
   BB23 {
     [#"../filter_positive.rs" 113 12 113 13] _47 <- Borrow.borrow_mut u;
     [#"../filter_positive.rs" 113 12 113 13] u <-  ^ _47;
-    [#"../filter_positive.rs" 113 13 113 20] _46 <- ([#"../filter_positive.rs" 113 13 113 20] index_mut0 _47 ([#"../filter_positive.rs" 113 14 113 19] count));
+    [#"../filter_positive.rs" 113 13 113 20] _46 <- ([#"../filter_positive.rs" 113 13 113 20] index_mut0 _47 count);
     _47 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB24
   }
   BB24 {
-    [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = ([#"../filter_positive.rs" 113 23 113 27] _43) ; };
+    [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = ([#"../filter_positive.rs" 113 12 113 27] _43) ; };
     assume { resolve1 _46 };
-    [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + ([#"../filter_positive.rs" 114 21 114 22] [#"../filter_positive.rs" 114 21 114 22] (1 : usize)));
+    [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + (1 : usize));
     [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] ());
     goto BB26
   }
@@ -452,14 +462,14 @@ module FilterPositive_M
     goto BB26
   }
   BB26 {
-    [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + ([#"../filter_positive.rs" 116 13 116 14] [#"../filter_positive.rs" 116 13 116 14] (1 : usize)));
+    [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + (1 : usize));
     [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] ());
     goto BB15
   }
   BB27 {
     assume { resolve0 t };
     [#"../filter_positive.rs" 118 11 118 12] _0 <- ([#"../filter_positive.rs" 118 11 118 12] u);
-    [#"../filter_positive.rs" 118 11 118 12] u <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+    u <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB28
   }
   BB28 {
diff --git a/creusot/tests/should_succeed/filter_positive/why3session.xml b/creusot/tests/should_succeed/filter_positive/why3session.xml
index 292fd0ed57..6ff4d0d310 100644
--- a/creusot/tests/should_succeed/filter_positive/why3session.xml
+++ b/creusot/tests/should_succeed/filter_positive/why3session.xml
@@ -23,7 +23,7 @@
 </theory>
 <theory name="FilterPositive_M" proved="true">
  <goal name="m&#39;vc" expl="VC for m" proved="true">
- <proof prover="0"><result status="valid" time="0.034295" steps="123611"/></proof>
+ <proof prover="0"><result status="valid" time="0.034295" steps="131194"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/filter_positive/why3shapes.gz b/creusot/tests/should_succeed/filter_positive/why3shapes.gz
index b339fc225aebbf6eb4c66a09bbbd38b09a1ae5af..bfed154a011f3011df10b06536d20ad68d454599 100644
GIT binary patch
literal 886
zcmV-+1Bv_}iwFP!00000|AkdukDE#ieb2Apt+!iM8qXJSwW$=XHkwFR_o?z@BL{|E
zR1&t3?6&{D9tde5$ySPB#$)@~=Xl6JcTxLHFTRalebbip?%&8pcOPdZ-P33KjF16}
z@J6wq`+0U;|K;=x?dx^9+tZWZqwF0svHG9B%uygLXZR2mbrbCl+jU*6U+Q*7bNaIr
z!3$+sj%`OoNuRFUGq{1wg$>AD<|tU9Mmw<>w5xJ|;YpuRGt3oly5}q=P=ImwW?+MH
z_tYn5c>Q0WW7P+&LIA%{d{lnBrS+fm+)37WYRlad7k-YLb(N1ToLg~ydNpQ2vo*-W
z4OD*jw0|B-LUkLs-8W^nuYR3Zu>V2j?lnfSJT7e@v|k#O!%~O5{gO)@mNK;2FPXw#
zhrS%*0j#R}ZN05?Ujfs0EPhKrx$Y2f;j#*5f$@-1V6vQ!P>R5c!(@okFcX4l0+@`^
z*~!@;LB}CG_lLtQh2$OLJCZTFL{JDC!Ibp%@KSm4w*VFqf{I-bi`K<ojx8|vF+zG_
zOxW1XRX7f$Ovgs@4=x5rhQ=kVCVfi?CnC(N6vOyPIL?pkDd+=G#*?grJ)O!YWk_%q
zck&$B(;EXK<%;Hfj51mBiVo~;^@lDdVNuWbHiKoDq4lOd?DF>VboEfslB(7}gq$%-
z({KBovWqc*vXc}hgGc(>96Tz%_;Y@i#{|L1bh4L{eXP#JW9P$HL_IG0d!y8XxW)A=
zRR_<U+Ht#z+YR1F4B5rY5yt(vr%}1k0|KfJdf--xtK0^#$K~RIZrx3tOf<fw&^5_V
z==#Q_7;#-{BT%PPsdYM5LYw!b4yPljb%HvG%f+D9C(U_h^+a>4C%O0w&SW;et*ckh
zUo#c*SVfz<Y3ethf7pIUlTcCas6s2L%=y^~VI^AVm1iJW+#;I3p}kHn|67R@_S#qN
z+p}+YZn%dFziUZH!!`{%;(qH&d&jR!e%G}!{DW*~GnrVjloqfll(#+y&97Wj?(<Et
z0U3c4v&1W%rryNaW&?a=L1z?O61wnNAw{H}a&nf$X<<|vE9Di%GK(RTWQxL&0G$*%
zvd*wuELEY?*c+da)?kw?H8!_~KpUSb5lL`TI7l5N4q^w^fpMT6C<oF3I1ny%iHm2y
M0qOo9-3kc+00-*0(EtDd

literal 879
zcmV-#1Cab5iwFP!00000|AkfCj@n2NedjCumfeXWb@kO=4Uy0a)RtCxiuy6Au-h}%
z8a#_(Ci(lVc4Gz`m`I2&*S$`iw*PoYx@UaxUGnPpUES{fN_6t@=d8v@{DNN`6yR7m
z9b4ezyg13fv3|uvyRLT!eDVj!qhrDHZ}@fYn1j{K{hd_pKG_|&>$Y0IwA~En`2NI#
zm*aIk)}1PH{Crzqz@5s}*if0;90dy}ot|iv(|LWk^2E<hQkfgx_()k)fWVplq{7OX
z{$HMvA^D$}BaZ=j2%z(fN8`6!T)(HMNs7J4uHHRS<Ck@dzVoq$atrED=3^8jX~TMG
zfX45h4$nhNPTVit9rkr`XntLGaQF}F-K%kIbrN*|G>XdcL6jkH6sg5Q<YCMx5`=LN
zu^l7=Hck7s-nON0fM7c{zr~-_cL=z0$%C3XGo)lLT}>&JIiQWhghW~31S6OLCN#RR
zTo4I*49Phf2QG!=eZ>z}M%B3k;Xpc2HGV(7G@kt~fR+ehi+vC+t&hK^EfDs`L3X7~
zN!jx%m;)$N+Hm^86>)eNoI^gDn?ta$z*o)&`fxb$herrvfa7M8b<k(i^>H2&T*RF{
zNBZmzK{(HGPG-l`6-js`Z!JIdF)1ze@>v(K3LIK*+T*V5uB~|;av8@}JOy2jQA!~v
zL8^cy!9=p)(WAd#b2^>i%SF5nf@Y-7*RR+dJwc_%QwW+OdOwak8kL4VEjYoJi+7*}
zy9rE4xm+!3ymzsrnk?uZytnpst}dr<ok4GI?@1ab^>j~Ck3p6Eqdf&{zb8qrP!TYZ
z(n*M?$|eg_*(92-Gr_m_UE92Ra4HQMREnE+zi;1s`Dy#FQv$1chmBJP>yrMLy%W97
zb=+u>7WbgVA5N*8ChAX}Yp;FNy*>Lq@j=41->sx05>10nb$|4&ec;z8e~6<55KozD
zKIN3`sYO<TRK%(2n|9{08uM6A$RUO=$aXg4sYZ=i1)EBE?Msk!loCr{ZmJFN1T34S
zUdSx-$`qRokV%6q&}d|`@<qj2BCW7|mYS?mA~QmGfrb|b3XZC(6f%%$B@=BGxpD7N
z>#Xt>dP)H)`m`*{jQJFlXDZ=fIkS*iNG%u(+JdqmEeH$T0$5-+v#B++{{e~Z$2<xN
F0043lu#o@&

diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index 58dd13058a..3f5801cef8 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -303,13 +303,13 @@ module GhostPtrToken_Test
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () }
     
   let constant promoted0 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
   let constant promoted1 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
   let constant promoted2 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
   let constant promoted3 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
   let rec cfg test [#"../ghost_ptr_token.rs" 3 0 3 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -327,12 +327,14 @@ module GhostPtrToken_Test
   var _17 : (int32, int32);
   var left_val : int32;
   var right_val : int32;
+  var _23 : bool;
   var kind : Core_Panicking_AssertKind_Type.t_assertkind;
   var _31 : int32;
   var _33 : int32;
   var _36 : (int32, int32);
   var left_val1 : int32;
   var right_val1 : int32;
+  var _42 : bool;
   var kind1 : Core_Panicking_AssertKind_Type.t_assertkind;
   var _50 : int32;
   var _52 : int32;
@@ -343,6 +345,7 @@ module GhostPtrToken_Test
   var _60 : int32;
   var left_val2 : int32;
   var right_val2 : int32;
+  var _67 : bool;
   var kind2 : Core_Panicking_AssertKind_Type.t_assertkind;
   var _75 : int32;
   var _77 : int32;
@@ -350,6 +353,7 @@ module GhostPtrToken_Test
   var _82 : int32;
   var left_val3 : int32;
   var right_val3 : int32;
+  var _89 : bool;
   var kind3 : Core_Panicking_AssertKind_Type.t_assertkind;
   var _97 : int32;
   var _99 : int32;
@@ -370,7 +374,7 @@ module GhostPtrToken_Test
     goto BB2
   }
   BB2 {
-    [#"../ghost_ptr_token.rs" 5 15 5 46] ptr1 <- ([#"../ghost_ptr_token.rs" 5 15 5 46] ptr_from_box0 _3 ([#"../ghost_ptr_token.rs" 5 43 5 44] [#"../ghost_ptr_token.rs" 5 43 5 44] (1 : int32)));
+    [#"../ghost_ptr_token.rs" 5 15 5 46] ptr1 <- ([#"../ghost_ptr_token.rs" 5 15 5 46] ptr_from_box0 _3 (1 : int32));
     _3 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB3
   }
@@ -380,7 +384,7 @@ module GhostPtrToken_Test
     goto BB4
   }
   BB4 {
-    [#"../ghost_ptr_token.rs" 6 15 6 46] ptr2 <- ([#"../ghost_ptr_token.rs" 6 15 6 46] ptr_from_box0 _6 ([#"../ghost_ptr_token.rs" 6 43 6 44] [#"../ghost_ptr_token.rs" 6 43 6 44] (2 : int32)));
+    [#"../ghost_ptr_token.rs" 6 15 6 46] ptr2 <- ([#"../ghost_ptr_token.rs" 6 15 6 46] ptr_from_box0 _6 (2 : int32));
     _6 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB5
   }
@@ -394,14 +398,14 @@ module GhostPtrToken_Test
   BB6 {
     [#"../ghost_ptr_token.rs" 9 13 9 22] _11 <- Borrow.borrow_mut token_mut;
     [#"../ghost_ptr_token.rs" 9 13 9 22] token_mut <-  ^ _11;
-    [#"../ghost_ptr_token.rs" 9 13 9 37] m1 <- ([#"../ghost_ptr_token.rs" 9 13 9 37] take_mut0 _11 ([#"../ghost_ptr_token.rs" 9 32 9 36] ptr1));
+    [#"../ghost_ptr_token.rs" 9 13 9 37] m1 <- ([#"../ghost_ptr_token.rs" 9 13 9 37] take_mut0 _11 ptr1);
     _11 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
     goto BB7
   }
   BB7 {
     [#"../ghost_ptr_token.rs" 10 13 10 22] _14 <- Borrow.borrow_mut token_mut;
     [#"../ghost_ptr_token.rs" 10 13 10 22] token_mut <-  ^ _14;
-    [#"../ghost_ptr_token.rs" 10 13 10 37] m2 <- ([#"../ghost_ptr_token.rs" 10 13 10 37] take_mut0 _14 ([#"../ghost_ptr_token.rs" 10 32 10 36] ptr2));
+    [#"../ghost_ptr_token.rs" 10 13 10 37] m2 <- ([#"../ghost_ptr_token.rs" 10 13 10 37] take_mut0 _14 ptr2);
     _14 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrTokenMut_Type.t_ghostptrtokenmut int32);
     goto BB8
   }
@@ -412,7 +416,8 @@ module GhostPtrToken_Test
     left_val <- (let (a, _) = _17 in a);
     right_val <- (let (_, a) = _17 in a);
     assume { resolve1 _17 };
-    switch (left_val = right_val)
+    _23 <- left_val = right_val;
+    switch (_23)
       | False -> goto BB10
       | True -> goto BB9
       end
@@ -423,7 +428,8 @@ module GhostPtrToken_Test
     left_val1 <- (let (a, _) = _36 in a);
     right_val1 <- (let (_, a) = _36 in a);
     assume { resolve1 _36 };
-    switch (left_val1 = right_val1)
+    _42 <- left_val1 = right_val1;
+    switch (_42)
       | False -> goto BB12
       | True -> goto BB11
       end
@@ -457,7 +463,7 @@ module GhostPtrToken_Test
   BB13 {
     assume { resolve2 m2 };
     assume { resolve2 m1 };
-    [#"../ghost_ptr_token.rs" 16 16 16 38] _60 <- ([#"../ghost_ptr_token.rs" 16 16 16 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 16 16 16 21] token) ([#"../ghost_ptr_token.rs" 16 33 16 37] ptr1));
+    [#"../ghost_ptr_token.rs" 16 16 16 38] _60 <- ([#"../ghost_ptr_token.rs" 16 16 16 38] ptr_as_ref0 token ptr1);
     goto BB14
   }
   BB14 {
@@ -466,13 +472,14 @@ module GhostPtrToken_Test
     left_val2 <- (let (a, _) = _58 in a);
     right_val2 <- (let (_, a) = _58 in a);
     assume { resolve1 _58 };
-    switch (left_val2 = right_val2)
+    _67 <- left_val2 = right_val2;
+    switch (_67)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../ghost_ptr_token.rs" 17 16 17 38] _82 <- ([#"../ghost_ptr_token.rs" 17 16 17 38] ptr_as_ref0 ([#"../ghost_ptr_token.rs" 17 16 17 21] token) ([#"../ghost_ptr_token.rs" 17 33 17 37] ptr2));
+    [#"../ghost_ptr_token.rs" 17 16 17 38] _82 <- ([#"../ghost_ptr_token.rs" 17 16 17 38] ptr_as_ref0 token ptr2);
     goto BB17
   }
   BB16 {
@@ -488,7 +495,8 @@ module GhostPtrToken_Test
     left_val3 <- (let (a, _) = _80 in a);
     right_val3 <- (let (_, a) = _80 in a);
     assume { resolve1 _80 };
-    switch (left_val3 = right_val3)
+    _89 <- left_val3 = right_val3;
+    switch (_89)
       | False -> goto BB19
       | True -> goto BB18
       end
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index e2130c43b3..8decff6f31 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -54,7 +54,7 @@ module Hashmap_Impl2_Hash
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 60 8 60 20] _0 <- ([#"../hashmap.rs" 60 8 60 20] UInt64.of_int (UIntSize.to_int ([#"../hashmap.rs" 60 8 60 13] self)));
+    [#"../hashmap.rs" 60 8 60 20] _0 <- ([#"../hashmap.rs" 60 8 60 20] UInt64.of_int (UIntSize.to_int self));
     return _0
   }
   
@@ -285,11 +285,14 @@ module Hashmap_Impl5_New
   var size : usize = size;
   var res : Hashmap_MyHashMap_Type.t_myhashmap k v;
   var _6 : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global);
+  var _7 : Hashmap_List_Type.t_list (k, v);
   {
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 99 39 99 60] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil) ([#"../hashmap.rs" 99 55 99 59] size));
+    [#"../hashmap.rs" 99 44 99 53] _7 <- ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil);
+    [#"../hashmap.rs" 99 39 99 60] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 _7 size);
+    _7 <- any Hashmap_List_Type.t_list (k, v);
     goto BB1
   }
   BB1 {
@@ -299,7 +302,7 @@ module Hashmap_Impl5_New
   }
   BB2 {
     [#"../hashmap.rs" 100 8 100 11] _0 <- ([#"../hashmap.rs" 100 8 100 11] res);
-    [#"../hashmap.rs" 100 8 100 11] res <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
+    res <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
     goto BB3
   }
   BB3 {
@@ -723,6 +726,7 @@ module Hashmap_Impl5_Add
   var old_self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
   var length : usize;
   var index : usize;
+  var _12 : usize;
   var _13 : uint64;
   var _15 : usize;
   var _16 : bool;
@@ -738,6 +742,9 @@ module Hashmap_Impl5_Add
   var _38 : bool;
   var _45 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _46 : borrowed (Hashmap_List_Type.t_list (k, v));
+  var _50 : Hashmap_List_Type.t_list (k, v);
+  var _51 : (k, v);
+  var _55 : Hashmap_List_Type.t_list (k, v);
   {
     goto BB0
   }
@@ -748,27 +755,29 @@ module Hashmap_Impl5_Add
   BB1 {
     assert { [@expl:type invariant] inv0 old_self };
     assume { resolve0 old_self };
-    [#"../hashmap.rs" 109 21 109 39] length <- ([#"../hashmap.rs" 109 21 109 39] len0 ([#"../hashmap.rs" 109 21 109 33] Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
+    [#"../hashmap.rs" 109 21 109 39] length <- ([#"../hashmap.rs" 109 21 109 39] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 110 27 110 37] _13 <- ([#"../hashmap.rs" 110 27 110 37] hash0 ([#"../hashmap.rs" 110 27 110 30] key));
+    [#"../hashmap.rs" 110 27 110 37] _13 <- ([#"../hashmap.rs" 110 27 110 37] hash0 key);
     goto BB3
   }
   BB3 {
+    [#"../hashmap.rs" 110 27 110 46] _12 <- ([#"../hashmap.rs" 110 27 110 46] UIntSize.of_int (UInt64.to_int _13));
+    _13 <- any uint64;
     [#"../hashmap.rs" 110 49 110 55] _15 <- ([#"../hashmap.rs" 110 49 110 55] length);
-    [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = ([#"../hashmap.rs" 110 27 110 55] [#"../hashmap.rs" 110 27 110 55] (0 : usize)));
+    [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = (0 : usize));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 110 27 110 55] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../hashmap.rs" 110 27 110 55] index <- ([#"../hashmap.rs" 110 27 110 55] ([#"../hashmap.rs" 110 27 110 46] UIntSize.of_int (UInt64.to_int _13)) % _15);
-    _13 <- any uint64;
+    [#"../hashmap.rs" 110 27 110 55] index <- ([#"../hashmap.rs" 110 27 110 55] _12 % _15);
+    _12 <- any usize;
     _15 <- any usize;
     [#"../hashmap.rs" 111 39 111 51] _20 <- Borrow.borrow_final (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../hashmap.rs" 111 39 111 51] self <- { self with current = (let Hashmap_MyHashMap_Type.C_MyHashMap x0 =  * self in Hashmap_MyHashMap_Type.C_MyHashMap ( ^ _20)) ; };
     assume { inv1 ( ^ _20) };
-    [#"../hashmap.rs" 111 51 111 58] _19 <- ([#"../hashmap.rs" 111 51 111 58] index_mut0 _20 ([#"../hashmap.rs" 111 52 111 57] index));
+    [#"../hashmap.rs" 111 51 111 58] _19 <- ([#"../hashmap.rs" 111 51 111 58] index_mut0 _20 index);
     _20 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global));
     goto BB5
   }
@@ -818,8 +827,8 @@ module Hashmap_Impl5_Add
     [#"../hashmap.rs" 121 31 121 33] l <- { l with current = (let Hashmap_List_Type.C_Cons x0 x1 =  * l in Hashmap_List_Type.C_Cons x0 ( ^ tl)) ; };
     assume { inv8 ( ^ tl) };
     [#"../hashmap.rs" 122 21 122 23] tl1 <- ([#"../hashmap.rs" 122 21 122 23] tl);
-    [#"../hashmap.rs" 122 21 122 23] tl <- any borrowed (Hashmap_List_Type.t_list (k, v));
-    [#"../hashmap.rs" 123 15 123 24] _38 <- ([#"../hashmap.rs" 123 15 123 24] eq0 ([#"../hashmap.rs" 123 15 123 17]  * k) ([#"../hashmap.rs" 123 21 123 24] key));
+    tl <- any borrowed (Hashmap_List_Type.t_list (k, v));
+    [#"../hashmap.rs" 123 15 123 24] _38 <- ([#"../hashmap.rs" 123 15 123 24] eq0 ( * k) key);
     goto BB11
   }
   BB11 {
@@ -837,7 +846,7 @@ module Hashmap_Impl5_Add
     assume { resolve6 key };
     assert { [@expl:type invariant] inv7 val' };
     assume { resolve7 val' };
-    [#"../hashmap.rs" 124 16 124 24] v <- { v with current = ([#"../hashmap.rs" 124 21 124 24] val') ; };
+    [#"../hashmap.rs" 124 16 124 24] v <- { v with current = ([#"../hashmap.rs" 124 16 124 24] val') ; };
     assert { [@expl:type invariant] inv7 ( * v) };
     assume { resolve7 ( * v) };
     assert { [@expl:type invariant] inv9 v };
@@ -866,7 +875,7 @@ module Hashmap_Impl5_Add
     assert { [@expl:type invariant] inv3 l };
     assume { resolve1 l };
     [#"../hashmap.rs" 128 12 128 25] l <- ([#"../hashmap.rs" 128 12 128 25] _45);
-    [#"../hashmap.rs" 128 12 128 25] _45 <- any borrowed (Hashmap_List_Type.t_list (k, v));
+    _45 <- any borrowed (Hashmap_List_Type.t_list (k, v));
     assert { [@expl:type invariant] inv3 _46 };
     assume { resolve1 _46 };
     assert { [@expl:type invariant] inv11 tl1 };
@@ -878,16 +887,22 @@ module Hashmap_Impl5_Add
     assume { resolve6 key };
     assert { [@expl:type invariant] inv7 val' };
     assume { resolve7 val' };
+    [#"../hashmap.rs" 131 18 131 28] _51 <- ([#"../hashmap.rs" 131 18 131 28] (key, val'));
+    [#"../hashmap.rs" 131 39 131 42] _55 <- ([#"../hashmap.rs" 131 39 131 42] Hashmap_List_Type.C_Nil);
     goto BB15
   }
   BB15 {
+    [#"../hashmap.rs" 131 13 131 44] _50 <- ([#"../hashmap.rs" 131 13 131 44] Hashmap_List_Type.C_Cons _51 _55);
+    _51 <- any (k, v);
+    _55 <- any Hashmap_List_Type.t_list (k, v);
     goto BB16
   }
   BB16 {
     goto BB17
   }
   BB17 {
-    [#"../hashmap.rs" 131 8 131 10] l <- { l with current = ([#"../hashmap.rs" 131 13 131 44] Hashmap_List_Type.C_Cons ([#"../hashmap.rs" 131 18 131 28] (([#"../hashmap.rs" 131 19 131 22] key), ([#"../hashmap.rs" 131 24 131 27] val'))) ([#"../hashmap.rs" 131 39 131 42] Hashmap_List_Type.C_Nil)) ; };
+    [#"../hashmap.rs" 131 8 131 10] l <- { l with current = ([#"../hashmap.rs" 131 8 131 10] _50) ; };
+    _50 <- any Hashmap_List_Type.t_list (k, v);
     assert { [@expl:type invariant] inv2 ( * l) };
     assume { resolve9 ( * l) };
     assert { [@expl:type invariant] inv3 l };
@@ -1197,11 +1212,11 @@ module Hashmap_Impl5_Get
   val resolve0 (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = resolve0 self }
     
-  use prelude.UInt64
   val len0 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global)) : usize
     requires {inv7 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model3 self) }
     
+  use prelude.UInt64
   use prelude.UInt64
   val hash0 [#"../hashmap.rs" 51 4 51 26] (self : k) : uint64
     requires {[#"../hashmap.rs" 51 13 51 17] inv2 self}
@@ -1222,6 +1237,7 @@ module Hashmap_Impl5_Get
   var self : Hashmap_MyHashMap_Type.t_myhashmap k v = self;
   var key : k = key;
   var index : usize;
+  var _7 : usize;
   var _8 : uint64;
   var _10 : usize;
   var _12 : bool;
@@ -1236,25 +1252,27 @@ module Hashmap_Impl5_Get
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 142 27 142 37] _8 <- ([#"../hashmap.rs" 142 27 142 37] hash0 ([#"../hashmap.rs" 142 27 142 30] key));
+    [#"../hashmap.rs" 142 27 142 37] _8 <- ([#"../hashmap.rs" 142 27 142 37] hash0 key);
     goto BB1
   }
   BB1 {
-    [#"../hashmap.rs" 142 49 142 67] _10 <- ([#"../hashmap.rs" 142 49 142 67] len0 ([#"../hashmap.rs" 142 49 142 61] Hashmap_MyHashMap_Type.myhashmap_buckets self));
+    [#"../hashmap.rs" 142 27 142 46] _7 <- ([#"../hashmap.rs" 142 27 142 46] UIntSize.of_int (UInt64.to_int _8));
+    _8 <- any uint64;
+    [#"../hashmap.rs" 142 49 142 67] _10 <- ([#"../hashmap.rs" 142 49 142 67] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets self));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = ([#"../hashmap.rs" 142 27 142 67] [#"../hashmap.rs" 142 27 142 67] (0 : usize)));
+    [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = (0 : usize));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 142 27 142 67] not _12 };
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 142 27 142 67] index <- ([#"../hashmap.rs" 142 27 142 67] ([#"../hashmap.rs" 142 27 142 46] UIntSize.of_int (UInt64.to_int _8)) % _10);
-    _8 <- any uint64;
+    [#"../hashmap.rs" 142 27 142 67] index <- ([#"../hashmap.rs" 142 27 142 67] _7 % _10);
+    _7 <- any usize;
     _10 <- any usize;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../hashmap.rs" 143 33 143 40] _14 <- ([#"../hashmap.rs" 143 33 143 40] index0 ([#"../hashmap.rs" 143 21 143 33] Hashmap_MyHashMap_Type.myhashmap_buckets self) ([#"../hashmap.rs" 143 34 143 39] index));
+    [#"../hashmap.rs" 143 33 143 40] _14 <- ([#"../hashmap.rs" 143 33 143 40] index0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) index);
     goto BB4
   }
   BB4 {
@@ -1284,7 +1302,7 @@ module Hashmap_Impl5_Get
     assume { resolve1 l };
     assert { [@expl:type invariant] inv2 k };
     assume { resolve2 k };
-    [#"../hashmap.rs" 147 15 147 24] _25 <- ([#"../hashmap.rs" 147 15 147 24] eq0 ([#"../hashmap.rs" 147 15 147 17] k) ([#"../hashmap.rs" 147 21 147 24] key));
+    [#"../hashmap.rs" 147 15 147 24] _25 <- ([#"../hashmap.rs" 147 15 147 24] eq0 k key);
     goto BB9
   }
   BB9 {
@@ -1300,7 +1318,7 @@ module Hashmap_Impl5_Get
     assume { resolve5 key };
     assert { [@expl:type invariant] inv3 v };
     assume { resolve3 v };
-    [#"../hashmap.rs" 148 23 148 30] _0 <- ([#"../hashmap.rs" 148 23 148 30] Core_Option_Option_Type.C_Some ([#"../hashmap.rs" 148 28 148 29] v));
+    [#"../hashmap.rs" 148 23 148 30] _0 <- ([#"../hashmap.rs" 148 23 148 30] Core_Option_Option_Type.C_Some v);
     goto BB13
   }
   BB11 {
@@ -1311,7 +1329,7 @@ module Hashmap_Impl5_Get
     assume { resolve4 tl };
     assert { [@expl:type invariant] inv1 _31 };
     assume { resolve1 _31 };
-    [#"../hashmap.rs" 150 12 150 21] l <- ([#"../hashmap.rs" 150 16 150 21] _31);
+    [#"../hashmap.rs" 150 12 150 21] l <- ([#"../hashmap.rs" 150 12 150 21] _31);
     goto BB5
   }
   BB12 {
@@ -1704,15 +1722,18 @@ module Hashmap_Impl5_Resize
   var self : borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v) = self;
   var old_self : Snapshot.snap_ty (borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v));
   var new : Hashmap_MyHashMap_Type.t_myhashmap k v;
+  var _9 : usize;
   var _10 : usize;
   var i : usize;
   var _21 : ();
+  var _22 : bool;
   var _24 : usize;
   var l : Hashmap_List_Type.t_list (k, v);
   var _27 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _28 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _29 : borrowed (Hashmap_List_Type.t_list (k, v));
   var _30 : borrowed (Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global));
+  var _32 : Hashmap_List_Type.t_list (k, v);
   var k : k;
   var v : v;
   var tl : Hashmap_List_Type.t_list (k, v);
@@ -1728,16 +1749,18 @@ module Hashmap_Impl5_Resize
   BB1 {
     assert { [@expl:type invariant] inv0 old_self };
     assume { resolve0 old_self };
-    [#"../hashmap.rs" 163 32 163 50] _10 <- ([#"../hashmap.rs" 163 32 163 50] len0 ([#"../hashmap.rs" 163 32 163 44] Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
+    [#"../hashmap.rs" 163 32 163 50] _10 <- ([#"../hashmap.rs" 163 32 163 50] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 163 22 163 55] new <- ([#"../hashmap.rs" 163 22 163 55] new1 ([#"../hashmap.rs" 163 32 163 54] _10 * ([#"../hashmap.rs" 163 53 163 54] [#"../hashmap.rs" 163 53 163 54] (2 : usize))));
+    [#"../hashmap.rs" 163 32 163 54] _9 <- ([#"../hashmap.rs" 163 32 163 54] _10 * (2 : usize));
     _10 <- any usize;
+    [#"../hashmap.rs" 163 22 163 55] new <- ([#"../hashmap.rs" 163 22 163 55] new1 _9);
+    _9 <- any usize;
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] [#"../hashmap.rs" 165 27 165 28] (0 : usize));
+    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -1757,11 +1780,13 @@ module Hashmap_Impl5_Resize
     goto BB7
   }
   BB7 {
-    [#"../hashmap.rs" 176 18 176 36] _24 <- ([#"../hashmap.rs" 176 18 176 36] len0 ([#"../hashmap.rs" 176 18 176 30] Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
+    [#"../hashmap.rs" 176 18 176 36] _24 <- ([#"../hashmap.rs" 176 18 176 36] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)));
     goto BB8
   }
   BB8 {
-    switch ([#"../hashmap.rs" 176 14 176 36] ([#"../hashmap.rs" 176 14 176 15] i) < _24)
+    [#"../hashmap.rs" 176 14 176 36] _22 <- ([#"../hashmap.rs" 176 14 176 36] i < _24);
+    _24 <- any usize;
+    switch (_22)
       | False -> goto BB29
       | True -> goto BB9
       end
@@ -1770,7 +1795,7 @@ module Hashmap_Impl5_Resize
     [#"../hashmap.rs" 177 56 177 68] _30 <- Borrow.borrow_mut (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self));
     [#"../hashmap.rs" 177 56 177 68] self <- { self with current = (let Hashmap_MyHashMap_Type.C_MyHashMap x0 =  * self in Hashmap_MyHashMap_Type.C_MyHashMap ( ^ _30)) ; };
     assume { inv4 ( ^ _30) };
-    [#"../hashmap.rs" 177 68 177 71] _29 <- ([#"../hashmap.rs" 177 68 177 71] index_mut0 _30 ([#"../hashmap.rs" 177 69 177 70] i));
+    [#"../hashmap.rs" 177 68 177 71] _29 <- ([#"../hashmap.rs" 177 68 177 71] index_mut0 _30 i);
     _30 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global));
     goto BB10
   }
@@ -1781,8 +1806,10 @@ module Hashmap_Impl5_Resize
     [#"../hashmap.rs" 177 51 177 71] _27 <- Borrow.borrow_final ( * _28) (Borrow.get_id _28);
     [#"../hashmap.rs" 177 51 177 71] _28 <- { _28 with current = ( ^ _27) ; };
     assume { inv5 ( ^ _27) };
-    [#"../hashmap.rs" 177 33 177 83] l <- ([#"../hashmap.rs" 177 33 177 83] replace0 _27 ([#"../hashmap.rs" 177 73 177 82] Hashmap_List_Type.C_Nil));
+    [#"../hashmap.rs" 177 73 177 82] _32 <- ([#"../hashmap.rs" 177 73 177 82] Hashmap_List_Type.C_Nil);
+    [#"../hashmap.rs" 177 33 177 83] l <- ([#"../hashmap.rs" 177 33 177 83] replace0 _27 _32);
     _27 <- any borrowed (Hashmap_List_Type.t_list (k, v));
+    _32 <- any Hashmap_List_Type.t_list (k, v);
     goto BB11
   }
   BB11 {
@@ -1832,7 +1859,7 @@ module Hashmap_Impl5_Resize
     [#"../hashmap.rs" 188 34 188 35] k <- ([#"../hashmap.rs" 188 34 188 35] let (a, _) = Hashmap_List_Type.cons_0 l in a);
     [#"../hashmap.rs" 188 37 188 38] v <- ([#"../hashmap.rs" 188 37 188 38] let (_, a) = Hashmap_List_Type.cons_0 l in a);
     [#"../hashmap.rs" 188 41 188 43] tl <- ([#"../hashmap.rs" 188 41 188 43] Hashmap_List_Type.cons_1 l);
-    [#"../hashmap.rs" 188 41 188 43] l <- (let Hashmap_List_Type.C_Cons x0 x1 = l in Hashmap_List_Type.C_Cons x0 (any Hashmap_List_Type.t_list (k, v)));
+    l <- (let Hashmap_List_Type.C_Cons x0 x1 = l in Hashmap_List_Type.C_Cons x0 (any Hashmap_List_Type.t_list (k, v)));
     assert { [@expl:type invariant] inv5 l };
     assume { resolve4 l };
     [#"../hashmap.rs" 189 16 189 19] _45 <- Borrow.borrow_mut new;
@@ -1842,7 +1869,7 @@ module Hashmap_Impl5_Resize
     assume { resolve5 k };
     assert { [@expl:type invariant] inv8 v };
     assume { resolve6 v };
-    [#"../hashmap.rs" 189 16 189 29] _44 <- ([#"../hashmap.rs" 189 16 189 29] add0 _45 ([#"../hashmap.rs" 189 24 189 25] k) ([#"../hashmap.rs" 189 27 189 28] v));
+    [#"../hashmap.rs" 189 16 189 29] _44 <- ([#"../hashmap.rs" 189 16 189 29] add0 _45 k v);
     _45 <- any borrowed (Hashmap_MyHashMap_Type.t_myhashmap k v);
     goto BB21
   }
@@ -1852,8 +1879,8 @@ module Hashmap_Impl5_Resize
     goto BB22
   }
   BB22 {
-    [#"../hashmap.rs" 190 16 190 17] l <- ([#"../hashmap.rs" 190 20 190 23] tl);
-    [#"../hashmap.rs" 190 20 190 23] tl <- any Hashmap_List_Type.t_list (k, v);
+    [#"../hashmap.rs" 190 16 190 17] l <- ([#"../hashmap.rs" 190 16 190 17] tl);
+    tl <- any Hashmap_List_Type.t_list (k, v);
     goto BB24
   }
   BB24 {
@@ -1870,7 +1897,7 @@ module Hashmap_Impl5_Resize
     goto BB17
   }
   BB27 {
-    [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + ([#"../hashmap.rs" 193 17 193 18] [#"../hashmap.rs" 193 17 193 18] (1 : usize)));
+    [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + (1 : usize));
     [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] ());
     goto BB28
   }
@@ -1881,8 +1908,8 @@ module Hashmap_Impl5_Resize
     goto BB30
   }
   BB30 {
-    [#"../hashmap.rs" 196 8 196 13] self <- { self with current = ([#"../hashmap.rs" 196 16 196 19] new) ; };
-    [#"../hashmap.rs" 196 16 196 19] new <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
+    [#"../hashmap.rs" 196 8 196 13] self <- { self with current = ([#"../hashmap.rs" 196 8 196 13] new) ; };
+    new <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
     assert { [@expl:type invariant] inv2 ( * self) };
     assume { resolve1 ( * self) };
     assert { [@expl:type invariant] inv3 self };
@@ -2158,92 +2185,92 @@ module Hashmap_Main
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 224 42 224 60] h1 <- ([#"../hashmap.rs" 224 42 224 60] new0 ([#"../hashmap.rs" 224 57 224 59] [#"../hashmap.rs" 224 57 224 59] (17 : usize)));
+    [#"../hashmap.rs" 224 42 224 60] h1 <- ([#"../hashmap.rs" 224 42 224 60] new0 (17 : usize));
     goto BB1
   }
   BB1 {
-    [#"../hashmap.rs" 225 42 225 60] h2 <- ([#"../hashmap.rs" 225 42 225 60] new0 ([#"../hashmap.rs" 225 57 225 59] [#"../hashmap.rs" 225 57 225 59] (42 : usize)));
+    [#"../hashmap.rs" 225 42 225 60] h2 <- ([#"../hashmap.rs" 225 42 225 60] new0 (42 : usize));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 226 17 226 26] _x <- ([#"../hashmap.rs" 226 17 226 26] get0 ([#"../hashmap.rs" 226 17 226 19] h1) ([#"../hashmap.rs" 226 24 226 25] [#"../hashmap.rs" 226 24 226 25] (1 : usize)));
+    [#"../hashmap.rs" 226 17 226 26] _x <- ([#"../hashmap.rs" 226 17 226 26] get0 h1 (1 : usize));
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 227 17 227 26] _y <- ([#"../hashmap.rs" 227 17 227 26] get0 ([#"../hashmap.rs" 227 17 227 19] h1) ([#"../hashmap.rs" 227 24 227 25] [#"../hashmap.rs" 227 24 227 25] (2 : usize)));
+    [#"../hashmap.rs" 227 17 227 26] _y <- ([#"../hashmap.rs" 227 17 227 26] get0 h1 (2 : usize));
     goto BB4
   }
   BB4 {
-    [#"../hashmap.rs" 228 17 228 26] _z <- ([#"../hashmap.rs" 228 17 228 26] get0 ([#"../hashmap.rs" 228 17 228 19] h2) ([#"../hashmap.rs" 228 24 228 25] [#"../hashmap.rs" 228 24 228 25] (1 : usize)));
+    [#"../hashmap.rs" 228 17 228 26] _z <- ([#"../hashmap.rs" 228 17 228 26] get0 h2 (1 : usize));
     goto BB5
   }
   BB5 {
-    [#"../hashmap.rs" 229 17 229 26] _t <- ([#"../hashmap.rs" 229 17 229 26] get0 ([#"../hashmap.rs" 229 17 229 19] h2) ([#"../hashmap.rs" 229 24 229 25] [#"../hashmap.rs" 229 24 229 25] (2 : usize)));
+    [#"../hashmap.rs" 229 17 229 26] _t <- ([#"../hashmap.rs" 229 17 229 26] get0 h2 (2 : usize));
     goto BB6
   }
   BB6 {
     [#"../hashmap.rs" 233 4 233 6] _12 <- Borrow.borrow_mut h1;
     [#"../hashmap.rs" 233 4 233 6] h1 <-  ^ _12;
-    [#"../hashmap.rs" 233 4 233 17] _11 <- ([#"../hashmap.rs" 233 4 233 17] add0 _12 ([#"../hashmap.rs" 233 11 233 12] [#"../hashmap.rs" 233 11 233 12] (1 : usize)) ([#"../hashmap.rs" 233 14 233 16] [#"../hashmap.rs" 233 14 233 16] (17 : isize)));
+    [#"../hashmap.rs" 233 4 233 17] _11 <- ([#"../hashmap.rs" 233 4 233 17] add0 _12 (1 : usize) (17 : isize));
     _12 <- any borrowed (Hashmap_MyHashMap_Type.t_myhashmap usize isize);
     goto BB7
   }
   BB7 {
-    [#"../hashmap.rs" 234 9 234 18] _13 <- ([#"../hashmap.rs" 234 9 234 18] get0 ([#"../hashmap.rs" 234 9 234 11] h1) ([#"../hashmap.rs" 234 16 234 17] [#"../hashmap.rs" 234 16 234 17] (1 : usize)));
+    [#"../hashmap.rs" 234 9 234 18] _13 <- ([#"../hashmap.rs" 234 9 234 18] get0 h1 (1 : usize));
     goto BB8
   }
   BB8 {
     [#"../hashmap.rs" 234 4 234 18] _x <- ([#"../hashmap.rs" 234 4 234 18] _13);
-    [#"../hashmap.rs" 234 4 234 18] _13 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 ([#"../hashmap.rs" 235 9 235 11] h1) ([#"../hashmap.rs" 235 16 235 17] [#"../hashmap.rs" 235 16 235 17] (2 : usize)));
+    _13 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 h1 (2 : usize));
     goto BB9
   }
   BB9 {
     [#"../hashmap.rs" 235 4 235 18] _y <- ([#"../hashmap.rs" 235 4 235 18] _15);
-    [#"../hashmap.rs" 235 4 235 18] _15 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 ([#"../hashmap.rs" 236 9 236 11] h2) ([#"../hashmap.rs" 236 16 236 17] [#"../hashmap.rs" 236 16 236 17] (1 : usize)));
+    _15 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 h2 (1 : usize));
     goto BB10
   }
   BB10 {
     [#"../hashmap.rs" 236 4 236 18] _z <- ([#"../hashmap.rs" 236 4 236 18] _17);
-    [#"../hashmap.rs" 236 4 236 18] _17 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 ([#"../hashmap.rs" 237 9 237 11] h2) ([#"../hashmap.rs" 237 16 237 17] [#"../hashmap.rs" 237 16 237 17] (2 : usize)));
+    _17 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 h2 (2 : usize));
     goto BB11
   }
   BB11 {
     [#"../hashmap.rs" 237 4 237 18] _t <- ([#"../hashmap.rs" 237 4 237 18] _19);
-    [#"../hashmap.rs" 237 4 237 18] _19 <- any Core_Option_Option_Type.t_option isize;
+    _19 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 240 4 240 6] _22 <- Borrow.borrow_mut h2;
     [#"../hashmap.rs" 240 4 240 6] h2 <-  ^ _22;
-    [#"../hashmap.rs" 240 4 240 17] _21 <- ([#"../hashmap.rs" 240 4 240 17] add0 _22 ([#"../hashmap.rs" 240 11 240 12] [#"../hashmap.rs" 240 11 240 12] (1 : usize)) ([#"../hashmap.rs" 240 14 240 16] [#"../hashmap.rs" 240 14 240 16] (42 : isize)));
+    [#"../hashmap.rs" 240 4 240 17] _21 <- ([#"../hashmap.rs" 240 4 240 17] add0 _22 (1 : usize) (42 : isize));
     _22 <- any borrowed (Hashmap_MyHashMap_Type.t_myhashmap usize isize);
     goto BB12
   }
   BB12 {
-    [#"../hashmap.rs" 241 9 241 18] _23 <- ([#"../hashmap.rs" 241 9 241 18] get0 ([#"../hashmap.rs" 241 9 241 11] h1) ([#"../hashmap.rs" 241 16 241 17] [#"../hashmap.rs" 241 16 241 17] (1 : usize)));
+    [#"../hashmap.rs" 241 9 241 18] _23 <- ([#"../hashmap.rs" 241 9 241 18] get0 h1 (1 : usize));
     goto BB13
   }
   BB13 {
     [#"../hashmap.rs" 241 4 241 18] _x <- ([#"../hashmap.rs" 241 4 241 18] _23);
-    [#"../hashmap.rs" 241 4 241 18] _23 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 ([#"../hashmap.rs" 242 9 242 11] h1) ([#"../hashmap.rs" 242 16 242 17] [#"../hashmap.rs" 242 16 242 17] (2 : usize)));
+    _23 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 h1 (2 : usize));
     goto BB14
   }
   BB14 {
     [#"../hashmap.rs" 242 4 242 18] _y <- ([#"../hashmap.rs" 242 4 242 18] _25);
-    [#"../hashmap.rs" 242 4 242 18] _25 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 ([#"../hashmap.rs" 243 9 243 11] h2) ([#"../hashmap.rs" 243 16 243 17] [#"../hashmap.rs" 243 16 243 17] (1 : usize)));
+    _25 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 h2 (1 : usize));
     goto BB15
   }
   BB15 {
     [#"../hashmap.rs" 243 4 243 18] _z <- ([#"../hashmap.rs" 243 4 243 18] _27);
-    [#"../hashmap.rs" 243 4 243 18] _27 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 ([#"../hashmap.rs" 244 9 244 11] h2) ([#"../hashmap.rs" 244 16 244 17] [#"../hashmap.rs" 244 16 244 17] (2 : usize)));
+    _27 <- any Core_Option_Option_Type.t_option isize;
+    [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 h2 (2 : usize));
     goto BB16
   }
   BB16 {
     [#"../hashmap.rs" 244 4 244 18] _t <- ([#"../hashmap.rs" 244 4 244 18] _29);
-    [#"../hashmap.rs" 244 4 244 18] _29 <- any Core_Option_Option_Type.t_option isize;
+    _29 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] ());
     goto BB17
   }
diff --git a/creusot/tests/should_succeed/hashmap/why3session.xml b/creusot/tests/should_succeed/hashmap/why3session.xml
index a607e2c377..59f0b1a1a5 100644
--- a/creusot/tests/should_succeed/hashmap/why3session.xml
+++ b/creusot/tests/should_succeed/hashmap/why3session.xml
@@ -14,7 +14,7 @@
 </theory>
 <theory name="Hashmap_Impl5_New" proved="true">
  <goal name="new&#39;vc" expl="VC for new" proved="true">
- <proof prover="3"><result status="valid" time="0.020000" steps="335"/></proof>
+ <proof prover="3"><result status="valid" time="0.020000" steps="336"/></proof>
  </goal>
 </theory>
 <theory name="Hashmap_Impl5_Add" proved="true">
@@ -29,11 +29,11 @@
   <goal name="add&#39;vc.2" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.050551" steps="22"/></proof>
   </goal>
-  <goal name="add&#39;vc.3" expl="remainder by zero" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="45"/></proof>
+  <goal name="add&#39;vc.3" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="24"/></proof>
   </goal>
-  <goal name="add&#39;vc.4" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="39"/></proof>
+  <goal name="add&#39;vc.4" expl="remainder by zero" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="52"/></proof>
   </goal>
   <goal name="add&#39;vc.5" expl="division by zero" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="34"/></proof>
@@ -42,7 +42,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="257"/></proof>
   </goal>
   <goal name="add&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="358"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="360"/></proof>
   </goal>
   <goal name="add&#39;vc.8" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.023065" steps="85"/></proof>
@@ -69,7 +69,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="168"/></proof>
   </goal>
   <goal name="add&#39;vc.16" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="561"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="560"/></proof>
   </goal>
   <goal name="add&#39;vc.17" expl="loop invariant init" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="130"/></proof>
@@ -84,7 +84,7 @@
   <proof prover="3"><result status="valid" time="0.038618" steps="235"/></proof>
   </goal>
   <goal name="add&#39;vc.21" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.026865" steps="237"/></proof>
+  <proof prover="3"><result status="valid" time="0.030997" steps="237"/></proof>
   </goal>
   <goal name="add&#39;vc.22" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.041230" steps="263"/></proof>
@@ -96,34 +96,34 @@
   <proof prover="3"><result status="valid" time="0.029787" steps="263"/></proof>
   </goal>
   <goal name="add&#39;vc.25" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.046695" steps="140150"/></proof>
+  <proof prover="2"><result status="valid" time="0.046695" steps="140146"/></proof>
   </goal>
   <goal name="add&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.336146" steps="41041"/></proof>
+  <proof prover="1"><result status="valid" time="0.336146" steps="40989"/></proof>
   </goal>
   <goal name="add&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.224426" steps="28896"/></proof>
+  <proof prover="1"><result status="valid" time="0.224426" steps="28870"/></proof>
   </goal>
   <goal name="add&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.030000" steps="328955"/></proof>
+  <proof prover="2"><result status="valid" time="0.030000" steps="328951"/></proof>
   </goal>
   <goal name="add&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.239705" steps="28904"/></proof>
+  <proof prover="1"><result status="valid" time="0.239705" steps="28878"/></proof>
   </goal>
   <goal name="add&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.074204" steps="335947"/></proof>
+  <proof prover="2"><result status="valid" time="0.074204" steps="335943"/></proof>
   </goal>
   <goal name="add&#39;vc.31" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.023273" steps="235"/></proof>
   </goal>
   <goal name="add&#39;vc.32" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.030997" steps="238"/></proof>
+  <proof prover="3"><result status="valid" time="0.026865" steps="238"/></proof>
   </goal>
   <goal name="add&#39;vc.33" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.037778" steps="158"/></proof>
+  <proof prover="3"><result status="valid" time="0.039024" steps="158"/></proof>
   </goal>
   <goal name="add&#39;vc.34" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.046851" steps="159"/></proof>
+  <proof prover="3"><result status="valid" time="0.026545" steps="159"/></proof>
   </goal>
   <goal name="add&#39;vc.35" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.026727" steps="164"/></proof>
@@ -132,93 +132,93 @@
   <proof prover="3"><result status="valid" time="0.026151" steps="248"/></proof>
   </goal>
   <goal name="add&#39;vc.37" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.026823" steps="251"/></proof>
+  <proof prover="3"><result status="valid" time="0.034607" steps="251"/></proof>
   </goal>
   <goal name="add&#39;vc.38" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.027034" steps="260"/></proof>
   </goal>
   <goal name="add&#39;vc.39" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.033467" steps="255"/></proof>
+  <proof prover="3"><result status="valid" time="0.023549" steps="255"/></proof>
   </goal>
   <goal name="add&#39;vc.40" expl="assertion" proved="true">
   <transf name="inline_goal" proved="true" >
    <goal name="add&#39;vc.40.0" expl="assertion" proved="true">
    <transf name="split_all_full" proved="true" >
     <goal name="add&#39;vc.40.0.0" expl="VC for add" proved="true">
-    <proof prover="3"><result status="valid" time="0.010000" steps="451"/></proof>
+    <proof prover="3"><result status="valid" time="0.020000" steps="451"/></proof>
     </goal>
     <goal name="add&#39;vc.40.0.1" expl="VC for add" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="add&#39;vc.40.0.1.0" expl="VC for add" proved="true">
      <transf name="inline_goal" proved="true" >
       <goal name="add&#39;vc.40.0.1.0.0" expl="VC for add" proved="true">
-      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.585221" steps="63147"/></proof>
+      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="3.067385" steps="71094"/></proof>
       </goal>
      </transf>
      </goal>
     </transf>
     </goal>
     <goal name="add&#39;vc.40.0.2" expl="VC for add" proved="true">
-    <proof prover="3"><result status="valid" time="0.468194" steps="12928"/></proof>
+    <proof prover="1"><result status="valid" time="0.516297" steps="47106"/></proof>
     </goal>
    </transf>
    </goal>
   </transf>
   </goal>
   <goal name="add&#39;vc.41" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="352"/></proof>
+  <proof prover="3"><result status="valid" time="0.030000" steps="352"/></proof>
   </goal>
   <goal name="add&#39;vc.42" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="278"/></proof>
   </goal>
   <goal name="add&#39;vc.43" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.030000" steps="200"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="200"/></proof>
   </goal>
   <goal name="add&#39;vc.44" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.039024" steps="87"/></proof>
+  <proof prover="3"><result status="valid" time="0.037778" steps="87"/></proof>
   </goal>
   <goal name="add&#39;vc.45" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.026545" steps="88"/></proof>
+  <proof prover="3"><result status="valid" time="0.046851" steps="88"/></proof>
   </goal>
   <goal name="add&#39;vc.46" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.017641" steps="140"/></proof>
+  <proof prover="3"><result status="valid" time="0.017641" steps="149"/></proof>
   </goal>
   <goal name="add&#39;vc.47" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.033278" steps="143"/></proof>
+  <proof prover="3"><result status="valid" time="0.033278" steps="154"/></proof>
   </goal>
   <goal name="add&#39;vc.48" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.034607" steps="145"/></proof>
+  <proof prover="3"><result status="valid" time="0.026823" steps="154"/></proof>
   </goal>
   <goal name="add&#39;vc.49" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.023549" steps="145"/></proof>
+  <proof prover="3"><result status="valid" time="0.033467" steps="154"/></proof>
   </goal>
   <goal name="add&#39;vc.50" expl="assertion" proved="true">
   <transf name="inline_goal" proved="true" >
    <goal name="add&#39;vc.50.0" expl="assertion" proved="true">
    <transf name="split_all_full" proved="true" >
     <goal name="add&#39;vc.50.0.0" expl="VC for add" proved="true">
-    <proof prover="3"><result status="valid" time="0.020000" steps="206"/></proof>
+    <proof prover="3"><result status="valid" time="0.010000" steps="219"/></proof>
     </goal>
     <goal name="add&#39;vc.50.0.1" expl="VC for add" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="add&#39;vc.50.0.1.0" expl="VC for add" proved="true">
      <transf name="inline_goal" proved="true" >
       <goal name="add&#39;vc.50.0.1.0.0" expl="VC for add" proved="true">
-      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.740503" steps="17463"/></proof>
+      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.896837" steps="20340"/></proof>
       </goal>
      </transf>
      </goal>
     </transf>
     </goal>
     <goal name="add&#39;vc.50.0.2" expl="VC for add" proved="true">
-    <proof prover="1"><result status="valid" time="0.516297" steps="44168"/></proof>
+    <proof prover="3"><result status="valid" time="0.162916" steps="3693"/></proof>
     </goal>
    </transf>
    </goal>
   </transf>
   </goal>
   <goal name="add&#39;vc.51" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.082778" steps="346869"/></proof>
+  <proof prover="2"><result status="valid" time="0.082778" steps="347021"/></proof>
   </goal>
   <goal name="add&#39;vc.52" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -235,7 +235,7 @@
         <goal name="add&#39;vc.52.0.0.0.0.0.0" expl="postcondition" proved="true">
         <transf name="split_all_full" proved="true" >
          <goal name="add&#39;vc.52.0.0.0.0.0.0.0" expl="postcondition" proved="true">
-         <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.764376" steps="20383"/></proof>
+         <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="1.278036" steps="32026"/></proof>
          </goal>
         </transf>
         </goal>
@@ -250,7 +250,7 @@
    </transf>
    </goal>
    <goal name="add&#39;vc.52.1" expl="postcondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.314198" steps="8362"/></proof>
+   <proof prover="3"><result status="valid" time="0.314198" steps="9100"/></proof>
    </goal>
   </transf>
   </goal>
@@ -263,20 +263,20 @@
   <goal name="get&#39;vc.0" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.017460" steps="12"/></proof>
   </goal>
-  <goal name="get&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.023465" steps="15"/></proof>
+  <goal name="get&#39;vc.1" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.030489" steps="15"/></proof>
   </goal>
-  <goal name="get&#39;vc.2" expl="remainder by zero" proved="true">
-  <proof prover="3"><result status="valid" time="0.040109" steps="54"/></proof>
+  <goal name="get&#39;vc.2" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.023465" steps="20"/></proof>
   </goal>
-  <goal name="get&#39;vc.3" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.030489" steps="27"/></proof>
+  <goal name="get&#39;vc.3" expl="remainder by zero" proved="true">
+  <proof prover="3"><result status="valid" time="0.040109" steps="64"/></proof>
   </goal>
   <goal name="get&#39;vc.4" expl="division by zero" proved="true">
   <proof prover="3"><result status="valid" time="0.029645" steps="24"/></proof>
   </goal>
   <goal name="get&#39;vc.5" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.052343" steps="222"/></proof>
+  <proof prover="3"><result status="valid" time="0.052343" steps="221"/></proof>
   </goal>
   <goal name="get&#39;vc.6" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.030365" steps="26"/></proof>
@@ -318,13 +318,13 @@
   <proof prover="3"><result status="valid" time="0.029799" steps="85"/></proof>
   </goal>
   <goal name="get&#39;vc.19" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.057105" steps="222"/></proof>
+  <proof prover="3"><result status="valid" time="0.057105" steps="221"/></proof>
   </goal>
   <goal name="get&#39;vc.20" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.038290" steps="78"/></proof>
   </goal>
   <goal name="get&#39;vc.21" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.036566" steps="60"/></proof>
+  <proof prover="3"><result status="valid" time="0.045509" steps="60"/></proof>
   </goal>
   <goal name="get&#39;vc.22" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.033107" steps="81"/></proof>
@@ -333,10 +333,10 @@
   <proof prover="3"><result status="valid" time="0.013955" steps="55"/></proof>
   </goal>
   <goal name="get&#39;vc.24" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.045509" steps="42"/></proof>
+  <proof prover="3"><result status="valid" time="0.036566" steps="42"/></proof>
   </goal>
   <goal name="get&#39;vc.25" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.204543" steps="22519"/></proof>
+  <proof prover="1"><result status="valid" time="0.204543" steps="22492"/></proof>
   </goal>
   <goal name="get&#39;vc.26" expl="postcondition" proved="true">
   <proof prover="3"><result status="valid" time="0.030945" steps="58"/></proof>
@@ -383,131 +383,131 @@
   <goal name="resize&#39;vc.11" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.019989" steps="51"/></proof>
   </goal>
-  <goal name="resize&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="86"/></proof>
+  <goal name="resize&#39;vc.12" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.030380" steps="71"/></proof>
   </goal>
-  <goal name="resize&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.024363" steps="83"/></proof>
+  <goal name="resize&#39;vc.13" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.031425" steps="72"/></proof>
   </goal>
-  <goal name="resize&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.047560" steps="83"/></proof>
+  <goal name="resize&#39;vc.14" expl="postcondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="79"/></proof>
   </goal>
-  <goal name="resize&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.035052" steps="111"/></proof>
+  <goal name="resize&#39;vc.15" expl="postcondition" proved="true">
+  <proof prover="2"><result status="valid" time="0.030000" steps="119862"/></proof>
   </goal>
   <goal name="resize&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041292" steps="114"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="87"/></proof>
   </goal>
-  <goal name="resize&#39;vc.17" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.058543" steps="121"/></proof>
+  <goal name="resize&#39;vc.17" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.024363" steps="83"/></proof>
   </goal>
-  <goal name="resize&#39;vc.18" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.050285" steps="124"/></proof>
+  <goal name="resize&#39;vc.18" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.047560" steps="85"/></proof>
   </goal>
-  <goal name="resize&#39;vc.19" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="93"/></proof>
+  <goal name="resize&#39;vc.19" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.035052" steps="114"/></proof>
   </goal>
-  <goal name="resize&#39;vc.20" expl="loop invariant init" proved="true">
-  <proof prover="2"><result status="valid" time="0.081917" steps="117507"/></proof>
+  <goal name="resize&#39;vc.20" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.041292" steps="115"/></proof>
   </goal>
-  <goal name="resize&#39;vc.21" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="131"/></proof>
+  <goal name="resize&#39;vc.21" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.058543" steps="124"/></proof>
   </goal>
-  <goal name="resize&#39;vc.22" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="715"/></proof>
+  <goal name="resize&#39;vc.22" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.050285" steps="127"/></proof>
   </goal>
   <goal name="resize&#39;vc.23" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="405"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="95"/></proof>
   </goal>
   <goal name="resize&#39;vc.24" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.143185" steps="509"/></proof>
+  <proof prover="2"><result status="valid" time="0.081917" steps="117676"/></proof>
   </goal>
-  <goal name="resize&#39;vc.25" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.057361" steps="161"/></proof>
+  <goal name="resize&#39;vc.25" expl="loop invariant init" proved="true">
+  <proof prover="3"><result status="valid" time="0.020000" steps="134"/></proof>
   </goal>
-  <goal name="resize&#39;vc.26" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.054759" steps="164"/></proof>
+  <goal name="resize&#39;vc.26" expl="loop invariant init" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="718"/></proof>
   </goal>
-  <goal name="resize&#39;vc.27" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.060589" steps="166"/></proof>
+  <goal name="resize&#39;vc.27" expl="loop invariant init" proved="true">
+  <proof prover="3"><result status="valid" time="0.020000" steps="405"/></proof>
   </goal>
-  <goal name="resize&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.020000" steps="58831"/></proof>
+  <goal name="resize&#39;vc.28" expl="loop invariant init" proved="true">
+  <proof prover="3"><result status="valid" time="0.143185" steps="505"/></proof>
   </goal>
-  <goal name="resize&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.033517" steps="170"/></proof>
+  <goal name="resize&#39;vc.29" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.057361" steps="162"/></proof>
   </goal>
-  <goal name="resize&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.053581" steps="123"/></proof>
+  <goal name="resize&#39;vc.30" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.054759" steps="166"/></proof>
   </goal>
-  <goal name="resize&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.051338" steps="123"/></proof>
+  <goal name="resize&#39;vc.31" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.060589" steps="169"/></proof>
   </goal>
-  <goal name="resize&#39;vc.32" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.046327" steps="170"/></proof>
+  <goal name="resize&#39;vc.32" expl="precondition" proved="true">
+  <proof prover="2"><result status="valid" time="0.020000" steps="59018"/></proof>
   </goal>
-  <goal name="resize&#39;vc.33" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="128"/></proof>
+  <goal name="resize&#39;vc.33" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.033517" steps="173"/></proof>
   </goal>
-  <goal name="resize&#39;vc.34" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.186472" steps="2166"/></proof>
+  <goal name="resize&#39;vc.34" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.053581" steps="127"/></proof>
   </goal>
-  <goal name="resize&#39;vc.35" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.191667" steps="2020"/></proof>
+  <goal name="resize&#39;vc.35" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.051338" steps="127"/></proof>
   </goal>
-  <goal name="resize&#39;vc.36" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.815775" steps="34957"/></proof>
+  <goal name="resize&#39;vc.36" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.046327" steps="172"/></proof>
   </goal>
   <goal name="resize&#39;vc.37" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.030000" steps="122667"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="132"/></proof>
   </goal>
   <goal name="resize&#39;vc.38" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.187169" steps="1948"/></proof>
+  <proof prover="3"><result status="valid" time="0.186472" steps="2170"/></proof>
   </goal>
-  <goal name="resize&#39;vc.39" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="147"/></proof>
+  <goal name="resize&#39;vc.39" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.191667" steps="2020"/></proof>
   </goal>
-  <goal name="resize&#39;vc.40" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.059040" steps="96"/></proof>
+  <goal name="resize&#39;vc.40" expl="loop invariant preservation" proved="true">
+  <proof prover="1"><result status="valid" time="0.283013" steps="34981"/></proof>
   </goal>
-  <goal name="resize&#39;vc.41" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.332965" steps="5742"/></proof>
+  <goal name="resize&#39;vc.41" expl="loop invariant preservation" proved="true">
+  <proof prover="2"><result status="valid" time="0.030000" steps="122836"/></proof>
   </goal>
-  <goal name="resize&#39;vc.42" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="304"/></proof>
+  <goal name="resize&#39;vc.42" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.187169" steps="1945"/></proof>
   </goal>
-  <goal name="resize&#39;vc.43" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.084944" steps="25300"/></proof>
+  <goal name="resize&#39;vc.43" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.020000" steps="150"/></proof>
   </goal>
-  <goal name="resize&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="147"/></proof>
+  <goal name="resize&#39;vc.44" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.059040" steps="99"/></proof>
   </goal>
-  <goal name="resize&#39;vc.45" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="323"/></proof>
+  <goal name="resize&#39;vc.45" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.197998" steps="5701"/></proof>
   </goal>
-  <goal name="resize&#39;vc.46" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="102"/></proof>
+  <goal name="resize&#39;vc.46" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="308"/></proof>
   </goal>
   <goal name="resize&#39;vc.47" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.020000" steps="34120"/></proof>
+  <proof prover="1"><result status="valid" time="0.220708" steps="25324"/></proof>
   </goal>
   <goal name="resize&#39;vc.48" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="155"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="149"/></proof>
   </goal>
   <goal name="resize&#39;vc.49" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="112"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="325"/></proof>
   </goal>
-  <goal name="resize&#39;vc.50" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.030380" steps="69"/></proof>
+  <goal name="resize&#39;vc.50" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="104"/></proof>
   </goal>
-  <goal name="resize&#39;vc.51" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.031425" steps="71"/></proof>
+  <goal name="resize&#39;vc.51" expl="loop invariant preservation" proved="true">
+  <proof prover="2"><result status="valid" time="0.020000" steps="34309"/></proof>
   </goal>
-  <goal name="resize&#39;vc.52" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="78"/></proof>
+  <goal name="resize&#39;vc.52" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.020000" steps="158"/></proof>
   </goal>
-  <goal name="resize&#39;vc.53" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.030000" steps="115847"/></proof>
+  <goal name="resize&#39;vc.53" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.010000" steps="114"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/hashmap/why3shapes.gz b/creusot/tests/should_succeed/hashmap/why3shapes.gz
index df19aca4c92f0b762a0881bc9a7ca8caa15c7f37..89987a474ea690ac720e62de0610ddded9b10a50 100644
GIT binary patch
literal 10206
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
Yv2>)H)x84Ppo~BJ|8j*l3Tp!a05QkW;{X5v

literal 10107
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

diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index 72aa82241c..a476984f29 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -550,12 +550,18 @@ module HeapsortGeneric_SiftDown
   var end' : usize = end';
   var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var i : usize;
+  var _24 : bool;
+  var _26 : usize;
   var _28 : bool;
   var child : usize;
+  var _31 : usize;
   var _33 : ();
+  var _34 : bool;
+  var _35 : usize;
   var _38 : bool;
   var _40 : t;
   var _44 : t;
+  var _46 : usize;
   var _49 : bool;
   var _51 : t;
   var _55 : t;
@@ -587,12 +593,15 @@ module HeapsortGeneric_SiftDown
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] ([#"../heapsort_generic.rs" 60 22 60 23] [#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)) = ([#"../heapsort_generic.rs" 60 16 60 23] [#"../heapsort_generic.rs" 60 16 60 23] (0 : usize)));
+    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 60 16 60 23] not _28 };
     goto BB4
   }
   BB4 {
-    switch ([#"../heapsort_generic.rs" 60 11 60 23] ([#"../heapsort_generic.rs" 60 11 60 12] i) >= ([#"../heapsort_generic.rs" 60 16 60 23] ([#"../heapsort_generic.rs" 60 16 60 19] end') / ([#"../heapsort_generic.rs" 60 22 60 23] [#"../heapsort_generic.rs" 60 22 60 23] (2 : usize))))
+    [#"../heapsort_generic.rs" 60 16 60 23] _26 <- ([#"../heapsort_generic.rs" 60 16 60 23] end' / (2 : usize));
+    [#"../heapsort_generic.rs" 60 11 60 23] _24 <- ([#"../heapsort_generic.rs" 60 11 60 23] i >= _26);
+    _26 <- any usize;
+    switch (_24)
       | False -> goto BB6
       | True -> goto BB5
       end
@@ -604,14 +613,19 @@ module HeapsortGeneric_SiftDown
     goto BB23
   }
   BB6 {
-    [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] ([#"../heapsort_generic.rs" 64 24 64 29] ([#"../heapsort_generic.rs" 64 24 64 25] [#"../heapsort_generic.rs" 64 24 64 25] (2 : usize)) * ([#"../heapsort_generic.rs" 64 28 64 29] i)) + ([#"../heapsort_generic.rs" 64 32 64 33] [#"../heapsort_generic.rs" 64 32 64 33] (1 : usize)));
-    switch ([#"../heapsort_generic.rs" 65 11 65 26] ([#"../heapsort_generic.rs" 65 11 65 20] ([#"../heapsort_generic.rs" 65 11 65 16] child) + ([#"../heapsort_generic.rs" 65 19 65 20] [#"../heapsort_generic.rs" 65 19 65 20] (1 : usize))) < ([#"../heapsort_generic.rs" 65 23 65 26] end'))
+    [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 29] (2 : usize) * i);
+    [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] _31 + (1 : usize));
+    _31 <- any usize;
+    [#"../heapsort_generic.rs" 65 11 65 20] _35 <- ([#"../heapsort_generic.rs" 65 11 65 20] child + (1 : usize));
+    [#"../heapsort_generic.rs" 65 11 65 26] _34 <- ([#"../heapsort_generic.rs" 65 11 65 26] _35 < end');
+    _35 <- any usize;
+    switch (_34)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../heapsort_generic.rs" 65 31 65 38] _40 <- ([#"../heapsort_generic.rs" 65 31 65 38] index0 ([#"../heapsort_generic.rs" 65 30 65 31]  * v) ([#"../heapsort_generic.rs" 65 32 65 37] child));
+    [#"../heapsort_generic.rs" 65 31 65 38] _40 <- ([#"../heapsort_generic.rs" 65 31 65 38] index0 ( * v) child);
     goto BB9
   }
   BB8 {
@@ -620,13 +634,15 @@ module HeapsortGeneric_SiftDown
   BB9 {
     assert { [@expl:type invariant] inv2 _40 };
     assume { resolve1 _40 };
-    [#"../heapsort_generic.rs" 65 42 65 53] _44 <- ([#"../heapsort_generic.rs" 65 42 65 53] index0 ([#"../heapsort_generic.rs" 65 41 65 42]  * v) ([#"../heapsort_generic.rs" 65 43 65 52] ([#"../heapsort_generic.rs" 65 43 65 48] child) + ([#"../heapsort_generic.rs" 65 51 65 52] [#"../heapsort_generic.rs" 65 51 65 52] (1 : usize))));
+    [#"../heapsort_generic.rs" 65 43 65 52] _46 <- ([#"../heapsort_generic.rs" 65 43 65 52] child + (1 : usize));
+    [#"../heapsort_generic.rs" 65 42 65 53] _44 <- ([#"../heapsort_generic.rs" 65 42 65 53] index0 ( * v) _46);
+    _46 <- any usize;
     goto BB10
   }
   BB10 {
     assert { [@expl:type invariant] inv2 _44 };
     assume { resolve1 _44 };
-    [#"../heapsort_generic.rs" 65 30 65 53] _38 <- ([#"../heapsort_generic.rs" 65 30 65 53] lt0 ([#"../heapsort_generic.rs" 65 30 65 38] _40) ([#"../heapsort_generic.rs" 65 41 65 53] _44));
+    [#"../heapsort_generic.rs" 65 30 65 53] _38 <- ([#"../heapsort_generic.rs" 65 30 65 53] lt0 _40 _44);
     goto BB11
   }
   BB11 {
@@ -636,7 +652,7 @@ module HeapsortGeneric_SiftDown
       end
   }
   BB12 {
-    [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + ([#"../heapsort_generic.rs" 66 21 66 22] [#"../heapsort_generic.rs" 66 21 66 22] (1 : usize)));
+    [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + (1 : usize));
     [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] ());
     goto BB15
   }
@@ -648,19 +664,19 @@ module HeapsortGeneric_SiftDown
     goto BB15
   }
   BB15 {
-    [#"../heapsort_generic.rs" 68 12 68 19] _51 <- ([#"../heapsort_generic.rs" 68 12 68 19] index0 ([#"../heapsort_generic.rs" 68 11 68 12]  * v) ([#"../heapsort_generic.rs" 68 13 68 18] child));
+    [#"../heapsort_generic.rs" 68 12 68 19] _51 <- ([#"../heapsort_generic.rs" 68 12 68 19] index0 ( * v) child);
     goto BB16
   }
   BB16 {
     assert { [@expl:type invariant] inv2 _51 };
     assume { resolve1 _51 };
-    [#"../heapsort_generic.rs" 68 24 68 27] _55 <- ([#"../heapsort_generic.rs" 68 24 68 27] index0 ([#"../heapsort_generic.rs" 68 23 68 24]  * v) ([#"../heapsort_generic.rs" 68 25 68 26] i));
+    [#"../heapsort_generic.rs" 68 24 68 27] _55 <- ([#"../heapsort_generic.rs" 68 24 68 27] index0 ( * v) i);
     goto BB17
   }
   BB17 {
     assert { [@expl:type invariant] inv2 _55 };
     assume { resolve1 _55 };
-    [#"../heapsort_generic.rs" 68 11 68 27] _49 <- ([#"../heapsort_generic.rs" 68 11 68 27] le0 ([#"../heapsort_generic.rs" 68 11 68 19] _51) ([#"../heapsort_generic.rs" 68 23 68 27] _55));
+    [#"../heapsort_generic.rs" 68 11 68 27] _49 <- ([#"../heapsort_generic.rs" 68 11 68 27] le0 _51 _55);
     goto BB18
   }
   BB18 {
@@ -687,14 +703,14 @@ module HeapsortGeneric_SiftDown
     [#"../heapsort_generic.rs" 71 8 71 9] _60 <- Borrow.borrow_final ( * _61) (Borrow.get_id _61);
     [#"../heapsort_generic.rs" 71 8 71 9] _61 <- { _61 with current = ( ^ _60) ; };
     assume { inv4 ( ^ _60) };
-    [#"../heapsort_generic.rs" 71 8 71 24] _59 <- ([#"../heapsort_generic.rs" 71 8 71 24] swap0 _60 ([#"../heapsort_generic.rs" 71 15 71 16] i) ([#"../heapsort_generic.rs" 71 18 71 23] child));
+    [#"../heapsort_generic.rs" 71 8 71 24] _59 <- ([#"../heapsort_generic.rs" 71 8 71 24] swap0 _60 i child);
     _60 <- any borrowed (slice t);
     goto BB22
   }
   BB22 {
     assert { [@expl:type invariant] inv5 _61 };
     assume { resolve2 _61 };
-    [#"../heapsort_generic.rs" 72 8 72 17] i <- ([#"../heapsort_generic.rs" 72 12 72 17] child);
+    [#"../heapsort_generic.rs" 72 8 72 17] i <- ([#"../heapsort_generic.rs" 72 8 72 17] child);
     goto BB2
   }
   BB23 {
@@ -1058,10 +1074,12 @@ module HeapsortGeneric_HeapSort
   var _8 : usize;
   var _10 : bool;
   var _15 : ();
+  var _16 : bool;
   var _18 : ();
   var _19 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
   var _21 : usize;
   var end' : usize;
+  var _33 : bool;
   var _35 : ();
   var _36 : borrowed (slice t);
   var _37 : borrowed (slice t);
@@ -1078,16 +1096,16 @@ module HeapsortGeneric_HeapSort
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../heapsort_generic.rs" 99 20 99 27] _8 <- ([#"../heapsort_generic.rs" 99 20 99 27] len0 ([#"../heapsort_generic.rs" 99 20 99 21]  * v));
+    [#"../heapsort_generic.rs" 99 20 99 27] _8 <- ([#"../heapsort_generic.rs" 99 20 99 27] len0 ( * v));
     goto BB2
   }
   BB2 {
-    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] ([#"../heapsort_generic.rs" 99 30 99 31] [#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)) = ([#"../heapsort_generic.rs" 99 20 99 31] [#"../heapsort_generic.rs" 99 20 99 31] (0 : usize)));
+    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 99 20 99 31] not _10 };
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / ([#"../heapsort_generic.rs" 99 30 99 31] [#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)));
+    [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / (2 : usize));
     _8 <- any usize;
     goto BB4
   }
@@ -1098,21 +1116,22 @@ module HeapsortGeneric_HeapSort
     goto BB5
   }
   BB5 {
-    switch ([#"../heapsort_generic.rs" 103 10 103 19] ([#"../heapsort_generic.rs" 103 10 103 15] start) > ([#"../heapsort_generic.rs" 103 18 103 19] [#"../heapsort_generic.rs" 103 18 103 19] (0 : usize)))
+    [#"../heapsort_generic.rs" 103 10 103 19] _16 <- ([#"../heapsort_generic.rs" 103 10 103 19] start > (0 : usize));
+    switch (_16)
       | False -> goto BB9
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - ([#"../heapsort_generic.rs" 104 17 104 18] [#"../heapsort_generic.rs" 104 17 104 18] (1 : usize)));
+    [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - (1 : usize));
     [#"../heapsort_generic.rs" 105 18 105 19] _19 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 105 18 105 19] v <- { v with current = ( ^ _19) ; };
     assume { inv2 ( ^ _19) };
-    [#"../heapsort_generic.rs" 105 28 105 35] _21 <- ([#"../heapsort_generic.rs" 105 28 105 35] len0 ([#"../heapsort_generic.rs" 105 28 105 29]  * _19));
+    [#"../heapsort_generic.rs" 105 28 105 35] _21 <- ([#"../heapsort_generic.rs" 105 28 105 35] len0 ( * _19));
     goto BB7
   }
   BB7 {
-    [#"../heapsort_generic.rs" 105 8 105 36] _18 <- ([#"../heapsort_generic.rs" 105 8 105 36] sift_down0 _19 ([#"../heapsort_generic.rs" 105 21 105 26] start) _21);
+    [#"../heapsort_generic.rs" 105 8 105 36] _18 <- ([#"../heapsort_generic.rs" 105 8 105 36] sift_down0 _19 start _21);
     _19 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     _21 <- any usize;
     goto BB8
@@ -1122,7 +1141,7 @@ module HeapsortGeneric_HeapSort
     goto BB4
   }
   BB9 {
-    [#"../heapsort_generic.rs" 108 18 108 25] end' <- ([#"../heapsort_generic.rs" 108 18 108 25] len0 ([#"../heapsort_generic.rs" 108 18 108 19]  * v));
+    [#"../heapsort_generic.rs" 108 18 108 25] end' <- ([#"../heapsort_generic.rs" 108 18 108 25] len0 ( * v));
     goto BB10
   }
   BB10 {
@@ -1137,13 +1156,14 @@ module HeapsortGeneric_HeapSort
     goto BB12
   }
   BB12 {
-    switch ([#"../heapsort_generic.rs" 115 10 115 17] ([#"../heapsort_generic.rs" 115 10 115 13] end') > ([#"../heapsort_generic.rs" 115 16 115 17] [#"../heapsort_generic.rs" 115 16 115 17] (1 : usize)))
+    [#"../heapsort_generic.rs" 115 10 115 17] _33 <- ([#"../heapsort_generic.rs" 115 10 115 17] end' > (1 : usize));
+    switch (_33)
       | False -> goto BB17
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - ([#"../heapsort_generic.rs" 116 15 116 16] [#"../heapsort_generic.rs" 116 15 116 16] (1 : usize)));
+    [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - (1 : usize));
     [#"../heapsort_generic.rs" 117 8 117 9] _38 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 117 8 117 9] v <- { v with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
@@ -1155,7 +1175,7 @@ module HeapsortGeneric_HeapSort
     [#"../heapsort_generic.rs" 117 8 117 9] _36 <- Borrow.borrow_final ( * _37) (Borrow.get_id _37);
     [#"../heapsort_generic.rs" 117 8 117 9] _37 <- { _37 with current = ( ^ _36) ; };
     assume { inv3 ( ^ _36) };
-    [#"../heapsort_generic.rs" 117 8 117 22] _35 <- ([#"../heapsort_generic.rs" 117 8 117 22] swap0 _36 ([#"../heapsort_generic.rs" 117 15 117 16] [#"../heapsort_generic.rs" 117 15 117 16] (0 : usize)) ([#"../heapsort_generic.rs" 117 18 117 21] end'));
+    [#"../heapsort_generic.rs" 117 8 117 22] _35 <- ([#"../heapsort_generic.rs" 117 8 117 22] swap0 _36 (0 : usize) end');
     _36 <- any borrowed (slice t);
     goto BB15
   }
@@ -1166,7 +1186,7 @@ module HeapsortGeneric_HeapSort
     [#"../heapsort_generic.rs" 123 18 123 19] _43 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 123 18 123 19] v <- { v with current = ( ^ _43) ; };
     assume { inv2 ( ^ _43) };
-    [#"../heapsort_generic.rs" 123 8 123 28] _42 <- ([#"../heapsort_generic.rs" 123 8 123 28] sift_down0 _43 ([#"../heapsort_generic.rs" 123 21 123 22] [#"../heapsort_generic.rs" 123 21 123 22] (0 : usize)) ([#"../heapsort_generic.rs" 123 24 123 27] end'));
+    [#"../heapsort_generic.rs" 123 8 123 28] _42 <- ([#"../heapsort_generic.rs" 123 8 123 28] sift_down0 _43 (0 : usize) end');
     _43 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB16
   }
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3session.xml b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
index e28544f122..29a8903bd5 100644
--- a/creusot/tests/should_succeed/heapsort_generic/why3session.xml
+++ b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
@@ -49,56 +49,56 @@
   <goal name="sift_down&#39;vc.10" expl="integer overflow" proved="true">
   <proof prover="2"><result status="valid" time="0.039010" steps="168965"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.11" expl="type invariant" proved="true">
-  <proof prover="5"><result status="valid" time="0.019246" steps="102"/></proof>
+  <goal name="sift_down&#39;vc.11" expl="integer overflow" proved="true">
+  <proof prover="5"><result status="valid" time="0.034036" steps="416"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.12" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.034036" steps="416"/></proof>
+  <proof prover="5"><result status="valid" time="0.035707" steps="448"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.13" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.035707" steps="449"/></proof>
+  <proof prover="5"><result status="valid" time="0.043446" steps="511"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.14" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.043446" steps="507"/></proof>
+  <goal name="sift_down&#39;vc.14" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.050653" steps="486"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.050653" steps="484"/></proof>
+  <proof prover="5"><result status="valid" time="0.022349" steps="140"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.039960" steps="170720"/></proof>
+  <proof prover="5"><result status="valid" time="0.021568" steps="140"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.021568" steps="138"/></proof>
+  <goal name="sift_down&#39;vc.17" expl="type invariant" proved="true">
+  <proof prover="2"><result status="valid" time="0.015296" steps="13512"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.18" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.015296" steps="13482"/></proof>
+  <goal name="sift_down&#39;vc.18" expl="integer overflow" proved="true">
+  <proof prover="5"><result status="valid" time="0.021657" steps="144"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.19" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.021657" steps="142"/></proof>
+  <goal name="sift_down&#39;vc.19" expl="precondition" proved="true">
+  <proof prover="2"><result status="valid" time="0.041698" steps="178364"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.041698" steps="178279"/></proof>
+  <proof prover="2"><result status="valid" time="0.039960" steps="171392"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.022349" steps="155"/></proof>
+  <proof prover="5"><result status="valid" time="0.022619" steps="158"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.022619" steps="155"/></proof>
+  <goal name="sift_down&#39;vc.22" expl="type invariant" proved="true">
+  <proof prover="2"><result status="valid" time="0.015883" steps="13549"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.23" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.015883" steps="13519"/></proof>
+  <goal name="sift_down&#39;vc.23" expl="precondition" proved="true">
+  <proof prover="2"><result status="valid" time="0.015660" steps="13559"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.015660" steps="13529"/></proof>
+  <proof prover="2"><result status="valid" time="0.015521" steps="13564"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.015521" steps="13534"/></proof>
+  <goal name="sift_down&#39;vc.25" expl="integer overflow" proved="true">
+  <proof prover="5"><result status="valid" time="0.023618" steps="166"/></proof>
   </goal>
-  <goal name="sift_down&#39;vc.26" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.023618" steps="164"/></proof>
+  <goal name="sift_down&#39;vc.26" expl="type invariant" proved="true">
+  <proof prover="5"><result status="valid" time="0.019246" steps="102"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.439627" steps="77022"/></proof>
+  <proof prover="3"><result status="valid" time="0.439627" steps="78180"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.28" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.025269" steps="65"/></proof>
@@ -110,7 +110,7 @@
   <proof prover="5"><result status="valid" time="0.015883" steps="43"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.061332" steps="298"/></proof>
+  <proof prover="5"><result status="valid" time="0.061332" steps="297"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.32" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.024699" steps="71"/></proof>
@@ -119,10 +119,10 @@
   <proof prover="5"><result status="valid" time="0.024289" steps="71"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.34" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.015384" steps="15988"/></proof>
+  <proof prover="2"><result status="valid" time="0.015384" steps="18174"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.015215" steps="15998"/></proof>
+  <proof prover="2"><result status="valid" time="0.015215" steps="18184"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.36" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.016094" steps="51"/></proof>
@@ -131,10 +131,10 @@
   <proof prover="5"><result status="valid" time="0.025544" steps="85"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.068048" steps="387"/></proof>
+  <proof prover="5"><result status="valid" time="0.068048" steps="389"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.473313" steps="80949"/></proof>
+  <proof prover="3"><result status="valid" time="0.473313" steps="82298"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.40" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.026685" steps="105"/></proof>
@@ -143,36 +143,32 @@
   <proof prover="5"><result status="valid" time="0.026065" steps="107"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.42" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.077758" steps="440"/></proof>
+  <proof prover="5"><result status="valid" time="0.077758" steps="441"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.43" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.506906" steps="83647"/></proof>
+  <proof prover="3"><result status="valid" time="0.506906" steps="85003"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.591638" steps="65963"/></proof>
+  <proof prover="3"><result status="valid" time="0.591638" steps="67382"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.45" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.45.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.45.0.0" expl="loop invariant preservation" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="sift_down&#39;vc.45.0.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="0" timelimit="10"><result status="valid" time="1.538140" steps="304729"/></proof>
-     </goal>
-    </transf>
+    <proof prover="0"><result status="valid" time="1.471645" steps="203095"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="sift_down&#39;vc.45.1" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.45.1.0" expl="loop invariant preservation" proved="true">
-    <proof prover="0"><result status="valid" time="1.471645" steps="244698"/></proof>
-    </goal>
-    <goal name="sift_down&#39;vc.45.1.1" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="sift_down&#39;vc.45.1.1.0" expl="loop invariant preservation" proved="true">
-     <proof prover="0"><result status="valid" time="1.904934" steps="393514"/></proof>
+     <goal name="sift_down&#39;vc.45.1.0.0" expl="loop invariant preservation" proved="true">
+     <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="3.351503" steps="368269"/></proof>
+     </goal>
+     <goal name="sift_down&#39;vc.45.1.0.1" expl="loop invariant preservation" proved="true">
+     <proof prover="0" timelimit="10"><result status="valid" time="1.538140" steps="349823"/></proof>
      </goal>
     </transf>
     </goal>
@@ -183,17 +179,25 @@
   <goal name="sift_down&#39;vc.46" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.46.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.916978" steps="108653"/></proof>
+   <transf name="split_vc" proved="true" >
+    <goal name="sift_down&#39;vc.46.0.0" expl="loop invariant preservation" proved="true">
+    <proof prover="3"><result status="valid" time="0.938938" steps="108822"/></proof>
+    </goal>
+   </transf>
    </goal>
    <goal name="sift_down&#39;vc.46.1" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.46.1.0" expl="loop invariant preservation" proved="true">
-    <proof prover="3"><result status="valid" time="0.656595" steps="81109"/></proof>
-    </goal>
-    <goal name="sift_down&#39;vc.46.1.1" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="sift_down&#39;vc.46.1.1.0" expl="loop invariant preservation" proved="true">
-     <proof prover="0" memlimit="2000"><result status="valid" time="1.800689" steps="295759"/></proof>
+     <goal name="sift_down&#39;vc.46.1.0.0" expl="loop invariant preservation" proved="true">
+     <proof prover="3"><result status="valid" time="0.716238" steps="81135"/></proof>
+     </goal>
+     <goal name="sift_down&#39;vc.46.1.0.1" expl="loop invariant preservation" proved="true">
+     <transf name="split_vc" proved="true" >
+      <goal name="sift_down&#39;vc.46.1.0.1.0" expl="loop invariant preservation" proved="true">
+      <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.318427" steps="145146"/></proof>
+      </goal>
+     </transf>
      </goal>
     </transf>
     </goal>
@@ -204,62 +208,70 @@
   <goal name="sift_down&#39;vc.47" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.47.0" expl="loop invariant preservation" proved="true">
+   <proof prover="3"><result status="valid" time="0.961927" steps="82473"/></proof>
+   </goal>
+   <goal name="sift_down&#39;vc.47.1" expl="loop invariant preservation" proved="true">
+   <proof prover="3"><result status="valid" time="0.842804" steps="80867"/></proof>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="sift_down&#39;vc.48" expl="loop invariant preservation" proved="true">
+  <transf name="split_vc" proved="true" >
+   <goal name="sift_down&#39;vc.48.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="sift_down&#39;vc.47.0.0" expl="loop invariant preservation" proved="true">
+    <goal name="sift_down&#39;vc.48.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="sift_down&#39;vc.47.0.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.854658" steps="82755"/></proof>
+     <goal name="sift_down&#39;vc.48.0.0.0" expl="loop invariant preservation" proved="true">
+     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.869049" steps="90310"/></proof>
      </goal>
     </transf>
     </goal>
    </transf>
    </goal>
-   <goal name="sift_down&#39;vc.47.1" expl="loop invariant preservation" proved="true">
+   <goal name="sift_down&#39;vc.48.1" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="sift_down&#39;vc.47.1.0" expl="loop invariant preservation" proved="true">
+    <goal name="sift_down&#39;vc.48.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="sift_down&#39;vc.47.1.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.265036" steps="28842"/></proof>
+     <goal name="sift_down&#39;vc.48.1.0.0" expl="loop invariant preservation" proved="true">
+     <proof prover="2"><result status="valid" time="0.051307" steps="186215"/></proof>
+     </goal>
+     <goal name="sift_down&#39;vc.48.1.0.1" expl="loop invariant preservation" proved="true">
+     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.854658" steps="95658"/></proof>
      </goal>
     </transf>
     </goal>
-    <goal name="sift_down&#39;vc.47.1.1" expl="loop invariant preservation" proved="true">
-    <proof prover="3"><result status="valid" time="0.648804" steps="73135"/></proof>
-    </goal>
    </transf>
    </goal>
   </transf>
   </goal>
-  <goal name="sift_down&#39;vc.48" expl="loop invariant preservation" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="sift_down&#39;vc.48.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.842804" steps="90314"/></proof>
-   </goal>
-   <goal name="sift_down&#39;vc.48.1" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.961927" steps="98731"/></proof>
-   </goal>
-  </transf>
-  </goal>
   <goal name="sift_down&#39;vc.49" expl="type invariant" proved="true">
   <proof prover="5"><result status="valid" time="0.027420" steps="76"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.50" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.50.0" expl="postcondition" proved="true">
-   <proof prover="5"><result status="valid" time="0.553515" steps="2150"/></proof>
+   <proof prover="5"><result status="valid" time="0.203016" steps="2145"/></proof>
    </goal>
    <goal name="sift_down&#39;vc.50.1" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.50.1.0" expl="postcondition" proved="true">
-    <proof prover="3"><result status="valid" time="0.860124" steps="106958"/></proof>
+    <transf name="split_vc" proved="true" >
+     <goal name="sift_down&#39;vc.50.1.0.0" expl="postcondition" proved="true">
+     <proof prover="3"><result status="valid" time="0.824943" steps="107127"/></proof>
+     </goal>
+    </transf>
     </goal>
     <goal name="sift_down&#39;vc.50.1.1" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="sift_down&#39;vc.50.1.1.0" expl="postcondition" proved="true">
-     <proof prover="3"><result status="valid" time="0.824943" steps="101705"/></proof>
-     </goal>
-     <goal name="sift_down&#39;vc.50.1.1.1" expl="postcondition" proved="true">
-     <proof prover="0"><result status="valid" time="1.786954" steps="596365"/></proof>
+     <transf name="split_vc" proved="true" >
+      <goal name="sift_down&#39;vc.50.1.1.0.0" expl="postcondition" proved="true">
+      <proof prover="3"><result status="valid" time="0.831382" steps="101731"/></proof>
+      </goal>
+      <goal name="sift_down&#39;vc.50.1.1.0.1" expl="postcondition" proved="true">
+      <proof prover="3"><result status="valid" time="0.903259" steps="105590"/></proof>
+      </goal>
+     </transf>
      </goal>
     </transf>
     </goal>
@@ -268,13 +280,13 @@
   </transf>
   </goal>
   <goal name="sift_down&#39;vc.51" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.045758" steps="175231"/></proof>
+  <proof prover="2"><result status="valid" time="0.045758" steps="177698"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.52" expl="postcondition" proved="true">
   <proof prover="5"><result status="valid" time="0.055685" steps="468"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.53" expl="postcondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.201430" steps="1913"/></proof>
+  <proof prover="5"><result status="valid" time="0.201430" steps="2779"/></proof>
   </goal>
  </transf>
  </goal>
@@ -306,105 +318,87 @@
   <goal name="heap_sort&#39;vc.7" expl="loop invariant init" proved="true">
   <proof prover="5"><result status="valid" time="0.050000" steps="113"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.8" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.050000" steps="131"/></proof>
+  <goal name="heap_sort&#39;vc.8" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.082669" steps="118"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.046440" steps="132"/></proof>
+  <goal name="heap_sort&#39;vc.9" expl="loop invariant init" proved="true">
+  <proof prover="5"><result status="valid" time="0.070000" steps="137"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="0" memlimit="2000"><result status="valid" time="0.241869" steps="31564"/></proof>
+  <goal name="heap_sort&#39;vc.10" expl="loop invariant init" proved="true">
+  <proof prover="5"><result status="valid" time="0.050000" steps="43"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.070000" steps="187"/></proof>
+  <goal name="heap_sort&#39;vc.11" expl="loop invariant init" proved="true">
+  <proof prover="5"><result status="valid" time="0.060356" steps="162"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.030000" steps="163"/></proof>
+  <goal name="heap_sort&#39;vc.12" expl="loop invariant init" proved="true">
+  <proof prover="5"><result status="valid" time="0.080000" steps="224"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.056983" steps="156"/></proof>
+  <goal name="heap_sort&#39;vc.13" expl="loop invariant init" proved="true">
+  <proof prover="5"><result status="valid" time="0.060000" steps="151"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.14" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.293555" steps="1490"/></proof>
+  <goal name="heap_sort&#39;vc.14" expl="type invariant" proved="true">
+  <proof prover="5"><result status="valid" time="0.051245" steps="146"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.15" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.110000" steps="625"/></proof>
+  <goal name="heap_sort&#39;vc.15" expl="postcondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.180000" steps="1382"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.16" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.160000" steps="791"/></proof>
+  <goal name="heap_sort&#39;vc.16" expl="postcondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.070000" steps="159"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.082669" steps="117"/></proof>
+  <goal name="heap_sort&#39;vc.17" expl="integer overflow" proved="true">
+  <proof prover="5"><result status="valid" time="0.060000" steps="163"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.070000" steps="136"/></proof>
+  <goal name="heap_sort&#39;vc.18" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.041137" steps="164"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.19" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.050000" steps="41"/></proof>
+  <goal name="heap_sort&#39;vc.19" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.040000" steps="190"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.20" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.060356" steps="160"/></proof>
+  <goal name="heap_sort&#39;vc.20" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.060000" steps="192"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.21" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.080000" steps="223"/></proof>
+  <goal name="heap_sort&#39;vc.21" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.019194" steps="183"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.22" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.060000" steps="150"/></proof>
+  <goal name="heap_sort&#39;vc.22" expl="type invariant" proved="true">
+  <proof prover="5"><result status="valid" time="0.036699" steps="186"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.23" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.060000" steps="162"/></proof>
+  <goal name="heap_sort&#39;vc.23" expl="assertion" proved="true">
+  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="1.156512" steps="300766"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.041137" steps="161"/></proof>
+  <proof prover="0"><result status="valid" time="0.319274" steps="51073"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.040000" steps="189"/></proof>
+  <proof prover="5"><result status="valid" time="0.060000" steps="93"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.26" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.060000" steps="190"/></proof>
+  <proof prover="5"><result status="valid" time="0.090000" steps="210"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.019194" steps="180"/></proof>
+  <proof prover="5"><result status="valid" time="0.036609" steps="201"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.28" expl="type invariant" proved="true">
-  <proof prover="5"><result status="valid" time="0.036699" steps="183"/></proof>
+  <goal name="heap_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.160000" steps="788"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.29" expl="assertion" proved="true">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="1.156512" steps="257319"/></proof>
+  <goal name="heap_sort&#39;vc.29" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.151073" steps="1833"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.467799" steps="51022"/></proof>
+  <goal name="heap_sort&#39;vc.30" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.130000" steps="214"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.060000" steps="89"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.32" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.090000" steps="208"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.036609" steps="198"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.34" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.160000" steps="783"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.35" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.420636" steps="1823"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.36" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.130000" steps="212"/></proof>
-  </goal>
-  <goal name="heap_sort&#39;vc.37" expl="loop invariant preservation" proved="true">
+  <goal name="heap_sort&#39;vc.31" expl="loop invariant preservation" proved="true">
   <transf name="remove" proved="true" arg1="to_int_in_bounds,extensionality,zero_unsigned_is_zero,(==)&#39;spec,create&#39;spec,set&#39;spec,set&#39;def,([&lt;-])&#39;def,singleton&#39;spec,cons&#39;spec,snoc&#39;spec,([..])&#39;spec,([..])&#39;def,([_..])&#39;def,([.._])&#39;def,(++)&#39;spec,mem_append,mem_tail,occ_cons,occ_snoc,occ_tail,append_num_occ">
-   <goal name="heap_sort&#39;vc.37.0" expl="loop invariant preservation" proved="true">
+   <goal name="heap_sort&#39;vc.31.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="heap_sort&#39;vc.37.0.0" expl="loop invariant preservation" proved="true">
+    <goal name="heap_sort&#39;vc.31.0.0" expl="loop invariant preservation" proved="true">
     <transf name="inline_goal" proved="true" >
-     <goal name="heap_sort&#39;vc.37.0.0.0" expl="loop invariant preservation" proved="true">
+     <goal name="heap_sort&#39;vc.31.0.0.0" expl="loop invariant preservation" proved="true">
      <transf name="split_all_full" proved="true" >
-      <goal name="heap_sort&#39;vc.37.0.0.0.0" expl="loop invariant preservation" proved="true">
+      <goal name="heap_sort&#39;vc.31.0.0.0.0" expl="loop invariant preservation" proved="true">
       <transf name="split_vc" proved="true" >
-       <goal name="heap_sort&#39;vc.37.0.0.0.0.0" expl="loop invariant preservation" proved="true">
-       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="2.053087" steps="627924"/></proof>
+       <goal name="heap_sort&#39;vc.31.0.0.0.0.0" expl="loop invariant preservation" proved="true">
+       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="2.053087" steps="432103"/></proof>
        </goal>
       </transf>
       </goal>
@@ -416,17 +410,35 @@
    </goal>
   </transf>
   </goal>
-  <goal name="heap_sort&#39;vc.38" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.444174" steps="61613"/></proof>
+  <goal name="heap_sort&#39;vc.32" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.444174" steps="60851"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.39" expl="type invariant" proved="true">
-  <proof prover="5"><result status="valid" time="0.051245" steps="144"/></proof>
+  <goal name="heap_sort&#39;vc.33" expl="integer overflow" proved="true">
+  <proof prover="5"><result status="valid" time="0.050000" steps="132"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.40" expl="postcondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.180000" steps="1383"/></proof>
+  <goal name="heap_sort&#39;vc.34" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.046440" steps="133"/></proof>
   </goal>
-  <goal name="heap_sort&#39;vc.41" expl="postcondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.070000" steps="156"/></proof>
+  <goal name="heap_sort&#39;vc.35" expl="precondition" proved="true">
+  <proof prover="0" memlimit="2000"><result status="valid" time="0.241869" steps="31590"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.36" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.070000" steps="187"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.37" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.030000" steps="165"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.38" expl="precondition" proved="true">
+  <proof prover="5"><result status="valid" time="0.056983" steps="157"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.39" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.109330" steps="1491"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.40" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.110000" steps="625"/></proof>
+  </goal>
+  <goal name="heap_sort&#39;vc.41" expl="loop invariant preservation" proved="true">
+  <proof prover="5"><result status="valid" time="0.160000" steps="791"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz b/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz
index 2b14177726e1b1d57eb487f4fcc5db028580eb2e..34d7d0264c255d6285bc457c7a719b650c4ced7e 100644
GIT binary patch
literal 9128
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

literal 8766
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

diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index f96c442327..bf40bfcafc 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -187,6 +187,7 @@ module Hillel_RightPad
   var len : usize = len;
   var pad : t = pad;
   var old_str : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
+  var _18 : bool;
   var _19 : usize;
   var _22 : ();
   var _23 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
@@ -211,11 +212,13 @@ module Hillel_RightPad
     goto BB3
   }
   BB3 {
-    [#"../hillel.rs" 24 10 24 19] _19 <- ([#"../hillel.rs" 24 10 24 19] len1 ([#"../hillel.rs" 24 10 24 13]  * str));
+    [#"../hillel.rs" 24 10 24 19] _19 <- ([#"../hillel.rs" 24 10 24 19] len1 ( * str));
     goto BB4
   }
   BB4 {
-    switch ([#"../hillel.rs" 24 10 24 25] _19 < ([#"../hillel.rs" 24 22 24 25] len))
+    [#"../hillel.rs" 24 10 24 25] _18 <- ([#"../hillel.rs" 24 10 24 25] _19 < len);
+    _19 <- any usize;
+    switch (_18)
       | False -> goto BB7
       | True -> goto BB5
       end
@@ -224,7 +227,7 @@ module Hillel_RightPad
     [#"../hillel.rs" 25 8 25 11] _23 <- Borrow.borrow_mut ( * str);
     [#"../hillel.rs" 25 8 25 11] str <- { str with current = ( ^ _23) ; };
     assume { inv3 ( ^ _23) };
-    [#"../hillel.rs" 25 8 25 21] _22 <- ([#"../hillel.rs" 25 8 25 21] push0 _23 ([#"../hillel.rs" 25 17 25 20] pad));
+    [#"../hillel.rs" 25 8 25 21] _22 <- ([#"../hillel.rs" 25 8 25 21] push0 _23 pad);
     _23 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB6
   }
@@ -404,6 +407,7 @@ module Hillel_LeftPad
   var pad : t = pad;
   var old_str : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var c : Snapshot.snap_ty usize;
+  var _19 : bool;
   var _20 : usize;
   var _23 : ();
   var _24 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
@@ -434,11 +438,13 @@ module Hillel_LeftPad
     goto BB4
   }
   BB4 {
-    [#"../hillel.rs" 43 10 43 19] _20 <- ([#"../hillel.rs" 43 10 43 19] len1 ([#"../hillel.rs" 43 10 43 13]  * str));
+    [#"../hillel.rs" 43 10 43 19] _20 <- ([#"../hillel.rs" 43 10 43 19] len1 ( * str));
     goto BB5
   }
   BB5 {
-    switch ([#"../hillel.rs" 43 10 43 25] _20 < ([#"../hillel.rs" 43 22 43 25] len))
+    [#"../hillel.rs" 43 10 43 25] _19 <- ([#"../hillel.rs" 43 10 43 25] _20 < len);
+    _20 <- any usize;
+    switch (_19)
       | False -> goto BB9
       | True -> goto BB6
       end
@@ -447,7 +453,7 @@ module Hillel_LeftPad
     [#"../hillel.rs" 44 8 44 11] _24 <- Borrow.borrow_mut ( * str);
     [#"../hillel.rs" 44 8 44 11] str <- { str with current = ( ^ _24) ; };
     assume { inv3 ( ^ _24) };
-    [#"../hillel.rs" 44 8 44 26] _23 <- ([#"../hillel.rs" 44 8 44 26] insert0 _24 ([#"../hillel.rs" 44 19 44 20] [#"../hillel.rs" 44 19 44 20] (0 : usize)) ([#"../hillel.rs" 44 22 44 25] pad));
+    [#"../hillel.rs" 44 8 44 26] _23 <- ([#"../hillel.rs" 44 8 44 26] insert0 _24 (0 : usize) pad);
     _24 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB7
   }
@@ -457,7 +463,7 @@ module Hillel_LeftPad
   }
   BB8 {
     [#"../hillel.rs" 45 8 45 37] c <- ([#"../hillel.rs" 45 8 45 37] _26);
-    [#"../hillel.rs" 45 8 45 37] _26 <- any Snapshot.snap_ty usize;
+    _26 <- any Snapshot.snap_ty usize;
     goto BB3
   }
   BB9 {
@@ -998,13 +1004,13 @@ module Hillel_InsertUnique
   BB5 {
     assert { [@expl:type invariant] inv0 ghost_vec };
     assume { resolve1 ghost_vec };
-    [#"../hillel.rs" 85 13 85 23] _18 <- ([#"../hillel.rs" 85 13 85 23] deref0 ([#"../hillel.rs" 85 13 85 16]  * vec));
+    [#"../hillel.rs" 85 13 85 23] _18 <- ([#"../hillel.rs" 85 13 85 23] deref0 ( * vec));
     goto BB6
   }
   BB6 {
     assert { [@expl:type invariant] inv1 _18 };
     assume { resolve2 _18 };
-    [#"../hillel.rs" 85 13 85 23] _16 <- ([#"../hillel.rs" 85 13 85 23] iter0 ([#"../hillel.rs" 85 13 85 16] _18));
+    [#"../hillel.rs" 85 13 85 23] _16 <- ([#"../hillel.rs" 85 13 85 23] iter0 _18);
     goto BB7
   }
   BB7 {
@@ -1081,7 +1087,7 @@ module Hillel_InsertUnique
   }
   BB19 {
     [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] _33);
-    [#"../hillel.rs" 84 4 84 111] _33 <- any Snapshot.snap_ty (Seq.seq t);
+    _33 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve4 produced };
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
@@ -1089,7 +1095,7 @@ module Hillel_InsertUnique
     assume { resolve7 __creusot_proc_iter_elem };
     assert { [@expl:assertion] [#"../hillel.rs" 86 24 86 57] e = index_logic1 (Snapshot.inner ghost_vec) (Seq.length (Snapshot.inner produced) - 1) };
     [#"../hillel.rs" 87 16 87 21] _41 <- ([#"../hillel.rs" 87 16 87 21] elem);
-    [#"../hillel.rs" 87 11 87 21] _38 <- ([#"../hillel.rs" 87 11 87 21] eq0 ([#"../hillel.rs" 87 11 87 12] e) ([#"../hillel.rs" 87 16 87 21] _41));
+    [#"../hillel.rs" 87 11 87 21] _38 <- ([#"../hillel.rs" 87 11 87 21] eq0 e _41);
     goto BB20
   }
   BB20 {
@@ -1126,9 +1132,9 @@ module Hillel_InsertUnique
     [#"../hillel.rs" 94 4 94 7] _49 <- Borrow.borrow_final ( * vec) (Borrow.get_id vec);
     [#"../hillel.rs" 94 4 94 7] vec <- { vec with current = ( ^ _49) ; };
     assume { inv8 ( ^ _49) };
-    [#"../hillel.rs" 94 4 94 18] _48 <- ([#"../hillel.rs" 94 4 94 18] push1 _49 ([#"../hillel.rs" 94 13 94 17] elem));
+    [#"../hillel.rs" 94 4 94 18] _48 <- ([#"../hillel.rs" 94 4 94 18] push1 _49 elem);
     _49 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
-    [#"../hillel.rs" 94 13 94 17] elem <- any t;
+    elem <- any t;
     goto BB25
   }
   BB25 {
@@ -1498,6 +1504,7 @@ module Hillel_Unique
   var unique : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
   var sub_str : Snapshot.snap_ty (Seq.seq t);
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _10 : Core_Ops_Range_Range_Type.t_range usize;
   var _11 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
@@ -1509,6 +1516,7 @@ module Hillel_Unique
   var i : usize;
   var elem : t;
   var _32 : usize;
+  var _33 : usize;
   var _34 : bool;
   var _35 : ();
   var _36 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
@@ -1528,12 +1536,14 @@ module Hillel_Unique
   BB2 {
     assert { [@expl:type invariant] inv0 sub_str };
     assume { resolve0 sub_str };
-    [#"../hillel.rs" 107 16 107 25] _11 <- ([#"../hillel.rs" 107 16 107 25] len0 ([#"../hillel.rs" 107 16 107 19] str));
+    [#"../hillel.rs" 107 16 107 25] _11 <- ([#"../hillel.rs" 107 16 107 25] len0 str);
     goto BB3
   }
   BB3 {
-    [#"../hillel.rs" 104 4 104 48] iter <- ([#"../hillel.rs" 104 4 104 48] into_iter0 ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 107 13 107 14] [#"../hillel.rs" 107 13 107 14] (0 : usize)) _11));
+    [#"../hillel.rs" 107 13 107 25] _10 <- ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range (0 : usize) _11);
     _11 <- any usize;
+    [#"../hillel.rs" 104 4 104 48] iter <- ([#"../hillel.rs" 104 4 104 48] into_iter0 _10);
+    _10 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB4
   }
   BB4 {
@@ -1604,10 +1614,11 @@ module Hillel_Unique
   }
   BB17 {
     [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] _28);
-    [#"../hillel.rs" 104 4 104 48] _28 <- any Snapshot.snap_ty (Seq.seq usize);
+    _28 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../hillel.rs" 108 26 108 27] _32 <- ([#"../hillel.rs" 108 26 108 27] i);
-    [#"../hillel.rs" 108 22 108 28] _34 <- ([#"../hillel.rs" 108 22 108 28] _32 < ([#"../hillel.rs" 108 22 108 28] Slice.length str));
+    [#"../hillel.rs" 108 22 108 28] _33 <- ([#"../hillel.rs" 108 22 108 28] Slice.length str);
+    [#"../hillel.rs" 108 22 108 28] _34 <- ([#"../hillel.rs" 108 22 108 28] _32 < _33);
     assert { [@expl:index in bounds] [#"../hillel.rs" 108 22 108 28] _34 };
     goto BB18
   }
@@ -1621,7 +1632,7 @@ module Hillel_Unique
     assume { inv2 ( ^ _36) };
     assert { [@expl:type invariant] inv3 elem };
     assume { resolve2 elem };
-    [#"../hillel.rs" 109 8 109 40] _35 <- ([#"../hillel.rs" 109 8 109 40] insert_unique0 _36 ([#"../hillel.rs" 109 35 109 39] elem));
+    [#"../hillel.rs" 109 8 109 40] _35 <- ([#"../hillel.rs" 109 8 109 40] insert_unique0 _36 elem);
     _36 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB19
   }
@@ -1633,7 +1644,7 @@ module Hillel_Unique
   }
   BB20 {
     [#"../hillel.rs" 110 8 110 50] sub_str <- ([#"../hillel.rs" 110 8 110 50] _39);
-    [#"../hillel.rs" 110 8 110 50] _39 <- any Snapshot.snap_ty (Seq.seq t);
+    _39 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv0 sub_str };
     assume { resolve0 sub_str };
     goto BB10
@@ -1641,7 +1652,7 @@ module Hillel_Unique
   BB21 {
     assert { [@expl:assertion] [#"../hillel.rs" 114 20 114 88] Seq.(==) (SeqExt.subsequence (deep_model1 str) 0 (Seq.length (shallow_model0 str))) (deep_model1 str) };
     [#"../hillel.rs" 115 4 115 10] _0 <- ([#"../hillel.rs" 115 4 115 10] unique);
-    [#"../hillel.rs" 115 4 115 10] unique <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
+    unique <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     goto BB22
   }
   BB22 {
@@ -2098,6 +2109,7 @@ module Hillel_Fulcrum
   var min_dist : uint32;
   var sum : uint32;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
+  var _36 : Core_Ops_Range_Range_Type.t_range usize;
   var _37 : usize;
   var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced1 : Snapshot.snap_ty (Seq.seq usize);
@@ -2108,15 +2120,18 @@ module Hillel_Fulcrum
   var _55 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var dist : uint32;
+  var _60 : uint32;
   var _63 : ();
+  var _64 : bool;
   var _70 : usize;
+  var _71 : usize;
   var _72 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] [#"../hillel.rs" 157 25 157 26] (0 : uint32));
-    [#"../hillel.rs" 159 4 159 60] iter <- ([#"../hillel.rs" 159 4 159 60] into_iter0 ([#"../hillel.rs" 161 14 161 15] s));
+    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] (0 : uint32));
+    [#"../hillel.rs" 159 4 159 60] iter <- ([#"../hillel.rs" 159 4 159 60] into_iter0 s);
     goto BB1
   }
   BB1 {
@@ -2155,10 +2170,10 @@ module Hillel_Fulcrum
   }
   BB7 {
     assert { [@expl:assertion] [#"../hillel.rs" 165 20 165 56] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) };
-    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] [#"../hillel.rs" 167 27 167 28] (0 : usize));
+    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] (0 : usize));
     [#"../hillel.rs" 168 28 168 33] min_dist <- ([#"../hillel.rs" 168 28 168 33] total);
-    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] [#"../hillel.rs" 170 23 170 24] (0 : uint32));
-    [#"../hillel.rs" 176 16 176 23] _37 <- ([#"../hillel.rs" 176 16 176 23] len2 ([#"../hillel.rs" 176 16 176 17] s));
+    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] (0 : uint32));
+    [#"../hillel.rs" 176 16 176 23] _37 <- ([#"../hillel.rs" 176 16 176 23] len2 s);
     goto BB12
   }
   BB8 {
@@ -2175,15 +2190,17 @@ module Hillel_Fulcrum
   }
   BB11 {
     [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] _24);
-    [#"../hillel.rs" 159 4 159 60] _24 <- any Snapshot.snap_ty (Seq.seq uint32);
+    _24 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../hillel.rs" 161 9 161 10] x <- ([#"../hillel.rs" 161 9 161 10] __creusot_proc_iter_elem);
-    [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + ([#"../hillel.rs" 162 17 162 18] x));
+    [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + x);
     [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] ());
     goto BB4
   }
   BB12 {
-    [#"../hillel.rs" 171 4 171 58] iter1 <- ([#"../hillel.rs" 171 4 171 58] into_iter1 ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 176 13 176 14] [#"../hillel.rs" 176 13 176 14] (0 : usize)) _37));
+    [#"../hillel.rs" 176 13 176 23] _36 <- ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _37);
     _37 <- any usize;
+    [#"../hillel.rs" 171 4 171 58] iter1 <- ([#"../hillel.rs" 171 4 171 58] into_iter1 _36);
+    _36 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB13
   }
   BB13 {
@@ -2237,20 +2254,23 @@ module Hillel_Fulcrum
   }
   BB22 {
     [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] _55);
-    [#"../hillel.rs" 171 4 171 58] _55 <- any Snapshot.snap_ty (Seq.seq usize);
+    _55 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 ([#"../hillel.rs" 177 19 177 22] sum) ([#"../hillel.rs" 177 32 177 43] ([#"../hillel.rs" 177 32 177 37] total) - ([#"../hillel.rs" 177 40 177 43] sum)));
+    [#"../hillel.rs" 177 32 177 43] _60 <- ([#"../hillel.rs" 177 32 177 43] total - sum);
+    [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 sum _60);
+    _60 <- any uint32;
     goto BB23
   }
   BB23 {
-    switch ([#"../hillel.rs" 178 11 178 26] ([#"../hillel.rs" 178 11 178 15] dist) < ([#"../hillel.rs" 178 18 178 26] min_dist))
+    [#"../hillel.rs" 178 11 178 26] _64 <- ([#"../hillel.rs" 178 11 178 26] dist < min_dist);
+    switch (_64)
       | False -> goto BB25
       | True -> goto BB24
       end
   }
   BB24 {
-    [#"../hillel.rs" 179 12 179 21] min_i <- ([#"../hillel.rs" 179 20 179 21] i);
-    [#"../hillel.rs" 180 12 180 27] min_dist <- ([#"../hillel.rs" 180 23 180 27] dist);
+    [#"../hillel.rs" 179 12 179 21] min_i <- ([#"../hillel.rs" 179 12 179 21] i);
+    [#"../hillel.rs" 180 12 180 27] min_dist <- ([#"../hillel.rs" 180 12 180 27] dist);
     [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] ());
     goto BB26
   }
@@ -2260,12 +2280,13 @@ module Hillel_Fulcrum
   }
   BB26 {
     [#"../hillel.rs" 183 17 183 18] _70 <- ([#"../hillel.rs" 183 17 183 18] i);
-    [#"../hillel.rs" 183 15 183 19] _72 <- ([#"../hillel.rs" 183 15 183 19] _70 < ([#"../hillel.rs" 183 15 183 19] Slice.length s));
+    [#"../hillel.rs" 183 15 183 19] _71 <- ([#"../hillel.rs" 183 15 183 19] Slice.length s);
+    [#"../hillel.rs" 183 15 183 19] _72 <- ([#"../hillel.rs" 183 15 183 19] _70 < _71);
     assert { [@expl:index in bounds] [#"../hillel.rs" 183 15 183 19] _72 };
     goto BB27
   }
   BB27 {
-    [#"../hillel.rs" 183 8 183 19] sum <- ([#"../hillel.rs" 183 8 183 19] sum + ([#"../hillel.rs" 183 15 183 19] Slice.get s _70));
+    [#"../hillel.rs" 183 8 183 19] sum <- ([#"../hillel.rs" 183 8 183 19] sum + Slice.get s _70);
     [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] ());
     goto BB16
   }
diff --git a/creusot/tests/should_succeed/hillel/why3session.xml b/creusot/tests/should_succeed/hillel/why3session.xml
index 2fab57c547..d768271e21 100644
--- a/creusot/tests/should_succeed/hillel/why3session.xml
+++ b/creusot/tests/should_succeed/hillel/why3session.xml
@@ -10,12 +10,12 @@
 <path name=".."/><path name="hillel.mlcfg"/>
 <theory name="Hillel_RightPad" proved="true">
  <goal name="right_pad&#39;vc" expl="VC for right_pad" proved="true">
- <proof prover="4"><result status="valid" time="0.130000" steps="1093"/></proof>
+ <proof prover="4"><result status="valid" time="0.130000" steps="958"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_LeftPad" proved="true">
  <goal name="left_pad&#39;vc" expl="VC for left_pad" proved="true">
- <proof prover="4"><result status="valid" time="0.179477" steps="3248"/></proof>
+ <proof prover="4"><result status="valid" time="0.179477" steps="3185"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_SubsetPush_Impl" proved="true">
@@ -152,7 +152,7 @@
  <goal name="unique&#39;vc" expl="VC for unique" proved="true">
  <transf name="remove" proved="true" arg1="zero,one,(-),(&gt;),(&lt;=),(&gt;=),abs,uint64&#39;maxInt,uint64&#39;minInt,max_uint64,length1,radix,min_unsigned,in_bounds,singleton,cons,snoc,(++),mAX&#39;7,index_logic2,resolve4,Assoc1,Unit_def_l,Unit_def_r,Inv_def_l,Inv_def_r,Comm1,Assoc,Mul_distr_l,Mul_distr_r,Comm,Unitary,NonTrivialRing,Refl,Trans,Antisymm,Total,ZeroLessOne,CompatOrderAdd,CompatOrderMult,Abs_le,Abs_pos,Div_mod,Div_bound,Mod_bound,Div_sign_pos,Div_sign_neg,Mod_sign_pos,Mod_sign_neg,Rounds_toward_zero,Div_1,Mod_1,Div_inf,Mod_inf,Div_mult,Mod_mult,to_int_in_bounds,extensionality,zero_unsigned_is_zero,set&#39;spec,set&#39;spec&#39;0,set&#39;spec&#39;1,([&lt;-])&#39;def,singleton&#39;spec,singleton&#39;spec&#39;0,cons&#39;spec,cons&#39;spec&#39;0,cons&#39;spec&#39;1,([..])&#39;spec,([_..])&#39;def,([.._])&#39;def,(++)&#39;spec,(++)&#39;spec&#39;0,(++)&#39;spec&#39;1,inner_spec,slice&#39;invariant,slice_ext">
   <goal name="unique&#39;vc.0" expl="VC for unique" proved="true">
-  <proof prover="1"><result status="valid" time="0.165112" steps="741741"/></proof>
+  <proof prover="1"><result status="valid" time="0.165112" steps="1045430"/></proof>
   </goal>
  </transf>
  </goal>
@@ -200,88 +200,88 @@
   <proof prover="4"><result status="valid" time="0.015936" steps="73"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="52"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="54"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020505" steps="81"/></proof>
+  <proof prover="4"><result status="valid" time="0.020505" steps="82"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.10" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="60"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="62"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.11" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="97"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="98"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.12" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="222"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="223"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="110"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="112"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.14" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="126"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="127"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.15" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="135"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="136"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.16" expl="loop invariant init" proved="true">
   <proof prover="4"><result status="valid" time="0.010000" steps="159"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.023869" steps="135"/></proof>
+  <proof prover="4"><result status="valid" time="0.023869" steps="137"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.18" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020000" steps="139"/></proof>
+  <proof prover="4"><result status="valid" time="0.020000" steps="141"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.19" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.050000" steps="674"/></proof>
+  <proof prover="4"><result status="valid" time="0.050000" steps="676"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.20" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.020000" steps="174"/></proof>
+  <proof prover="4"><result status="valid" time="0.020000" steps="175"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.21" expl="index in bounds" proved="true">
-  <proof prover="0"><result status="valid" time="0.190000" steps="28950"/></proof>
+  <proof prover="0"><result status="valid" time="0.190000" steps="29019"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020000" steps="164"/></proof>
+  <proof prover="4"><result status="valid" time="0.020000" steps="170"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.23" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.422001" steps="55546"/></proof>
+  <proof prover="0"><result status="valid" time="0.422001" steps="55615"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.24" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="165"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="169"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.25" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.078788" steps="23923"/></proof>
+  <proof prover="0"><result status="valid" time="0.203075" steps="23992"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.26" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="fulcrum&#39;vc.26.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="fulcrum&#39;vc.26.0.0" expl="loop invariant preservation" proved="true">
-    <proof prover="1" memlimit="2000"><result status="valid" time="1.839260" steps="2873831"/></proof>
+    <proof prover="1" memlimit="2000"><result status="valid" time="0.924004" steps="3339754"/></proof>
     </goal>
     <goal name="fulcrum&#39;vc.26.0.1" expl="loop invariant preservation" proved="true">
-    <proof prover="2"><result status="valid" time="2.267951" steps="470231"/></proof>
+    <proof prover="2"><result status="valid" time="2.267951" steps="462387"/></proof>
     </goal>
    </transf>
    </goal>
   </transf>
   </goal>
   <goal name="fulcrum&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.511288" steps="70855"/></proof>
+  <proof prover="2"><result status="valid" time="0.511288" steps="70981"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.276216" steps="31021"/></proof>
+  <proof prover="0"><result status="valid" time="0.276216" steps="31090"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.29" expl="loop invariant preservation" proved="true">
   <transf name="remove" proved="true" arg1="singleton,snoc">
    <goal name="fulcrum&#39;vc.29.0" expl="loop invariant preservation" proved="true">
-   <proof prover="1" memlimit="2000"><result status="valid" time="0.536290" steps="1078878"/></proof>
+   <proof prover="1" memlimit="2000"><result status="valid" time="0.194523" steps="1102561"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="fulcrum&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="1.120212" steps="1824838"/></proof>
+  <proof prover="1"><result status="valid" time="0.493091" steps="1939288"/></proof>
   </goal>
   <goal name="fulcrum&#39;vc.31" expl="integer overflow" proved="true">
   <proof prover="0"><result status="valid" time="0.967856" steps="59038"/></proof>
diff --git a/creusot/tests/should_succeed/hillel/why3shapes.gz b/creusot/tests/should_succeed/hillel/why3shapes.gz
index 0e91db8a857bf3d498bdc904550ca483a4ba0c5a..16937cf781d53f6db266a8c1ed9f6c04a7f61eff 100644
GIT binary patch
literal 7317
zcmV;G9BShqiwFP!00000|Lr|%ZydRi-}Ni>?e5lCfK_}S)(Z@b2ra-!fV-eSX24hP
zYERZUlDygc`zw<DoS7btpNVV-J8m`~#j0Yl9%QxhpFdna{OaDOhs)p7{lm@f?!Pb9
z<q!XL@%VRlbN9P!*;QW@EnHo=pI*A#boa~SuZ~9D-tPXfeY1<{mbd60ciWr0NB744
z!8T>=L6_@XP0s-&Z~0KfRt!aG<xpg;y1IDfUQ#)xKeo5KUv2_(e`|FMs<qedCwlht
zwq~=29F+c7o1<{_vhIgcS0L*(V0ogzs6zpHlpPuNh}gCJc`UEPJOycG&~>Kxvq1jK
zS%hue&mRE$iBTih9<SYfdf46mp0EYDu2KT9846=FWKk%BV>kWNUAfzbw7=j#w8&b7
zDme%%2qIgRBwF+g;82t*WZbKy*SmCI#$cHeSE2SYg}5qH8L`#jS;STcov}e?y$I3O
zX`TjEdaccIO{5*HI9T^^w+s8d!49i=(Z0IucK4U}H^2P)xP9y5sumJYYaub$LdP_V
zd(nb%KOTpFO019Q5mWTYiJe*Xh*?ohwpVfXL(mz3+f{)&Iebk4i1QS{6R4dWbzA}9
zpa5`C0Qf-)09(|(0?-ErN)6jkAKl_K)~s!D_hW8609YnklK{lBj}8XWh%)~{!-^ol
zY0a{_>DLFH&?k77KEW@bPe=e>7H-L_Qj+d2{i8*Z-`qQbtHgg~=qTKa0E-%al?7$%
zckk}v!=PYpQ&;uN;D@lu56QmI&BONLoqtG=Bp^j+wb=4r@c5?oBdyXyt6jHm-#z>~
z0GxSKP~54$JadTvC!Yvl<`l8XE3(-uTKB~Cfer+5(5IknT0Outtr?26J%*wp?q7|r
zAi&HQ#B~&?Ctu?5@<@l9NdF#1FE?NJ3<KiEB)|mpK6TrN^mkeju_iDgPxwoE-0R+g
zoNr!PtBQt|$0rzcsJyCp^1b$c?SWRwy}jSXcOgBn?2^79BT^K2wt01h!Hy+j{;and
z`pqGf;bsAr{FU_P?c+bQ|1tW{h?4`2li=h{Fp4g1kBc>TF6)%OA*S?pt_Uj&m$g}E
zPBk!RC)DO%v93)v*RNTU_u%(ZiE3}RnSQ%bQ_n^=lx$X(rT4qLo4>zHYzC6K-&43K
zGCh`*OSkDwX2{lLec}H4?(J=27lSQfR6n15A6#`-_ABR1sqh~j()}ZaQ+cLee%(Dh
zZgamp;SVD&Y-+i9{O8+rNp<f2#@#)R=)kN?)d~IhxA!UR?&8fb$8r<6E$kU1n9U2h
zd7J|4+a8Eqt7;4FW7^D*>3&O-X3(lY;X`R`B}7ZJ%ddT(T6|fa+udy}EU1<J{CsT7
z{d$3~{ffXBKsYvx<HS^TyW72;m`A0X$Jy4YHhRLKzK#=BWU^ek-{|Rn8>DyH@8Zvd
z-L%eozWxa9w?kPtYap2rb}%&WCeDuI1N~m&?5bz=4{poZ*>uCuzpf3qzYVWck9O8d
zU2_GggY8WmYUu&a@9yt+|48va-uz!4PMx}&J9nEK>oDs3%7xt<+G39>veM<%_RqV!
zG()q__i%If3-#LFwH$h2ueSfYdy`r!7b*N*)Kb6xvfxl~Aq7#Pj*V*3)l?D}YU0d&
zT-YJ(uzPxTh>;zAEj<p{AqIA2$a&bX|4eP|HB%`a21aH4VPqsqeZ_51Y%?ZghPgk=
z`!?LCcMm&qLGE{<?$A8UJy4e|tNfYF!odC2adnn+I<nQK*@Q1%9LVF-pxuj=y>LDm
zg@_NDyyfWjhf!VGqxi%g#jB5*m!HFS3P7miaWo2!{G(Vu_s|cRP@S|bO_8<s2f?4~
ze$1fu)IJ{3`<Mr%6Cg|czuw#f)F+Wj3ooaqY_jM-9%l;nn^M5ER{>ob3e-?pW^VdW
z^{@Bu(!x*(ntJ{=4XGmr@^bY=Nq#H!X;zzN#u)akB^h<{RepEXlQ`3Q;Gj`g?IoUP
z_wbm-?8(e58L1eQ-ryMZ&K)^Hj|BPQ&`~>tx)=&8PGeTR#lfN#o;<8qU1j>?<~?TI
zEN9$|3VX98YBM>en>~}YnJr>}o|QI><=%{9P(_Fsck$|RZ)%w4hQpJEGmOn<X16x)
zVed9&6Ii#~^rmw+Gn|`ZU3b;CZr<BCukxxG|IO$z^uEEfTEflyD~HWY-)ufcac!Pf
zjGNP{b#qcLZ;oj4&7QX3?3;tl%)smlt@J3Safb`jx8qA|w}ZLq+VO0y#^J)18c~Lb
zsncM$#r*Vi2b2G?o8T8*bK8qt+rRQdPasc;C!C}COjx%mk#>${J{0?t5$vI^JKno*
zJ=aq{wy6dXXZPNVf+!Z)tRk2D?&Eg$_`RML+-B7zP~-JNtF}^9Wl#!7?lmMorckN6
z;#9OLz0p{LuvDdaY|*4`jic!Cr_ztN693d|QY!YUv>;BJG}ru4`<_sx$2c@7tX8N=
znp#=$B%I+)6?y_Tu*%=ev0NCm=fDlMiimDiuOUles>Puei+*fXVW#5iN|OLAUkf+s
zL6g@K98sECnJl$stJqvkwo>+}<U)o*g+EPdj=J}k7P&y}Bt5pSs4ZvK(v(%DXR8D~
z6lpXysH0YvQ?=Rq{J5N2sp)DQE?uc9=bB1RoqCO?<V>T{fKj7Sm$9T?=Mzi<lS`Fg
z!Rri)U=$*!&H-M}g7@5bOo9rvvJXD#eK;m35lZ)uy|hjT-)wg94b#ClPUqEpI<FSf
zd9|F5tJQQ`t)~-Hvwm)!uZ{MP&h0^${vOIs2e0{ze13Wh<@^_i^W}O*EQfQ;>DZW$
zRX9|^;ux3@Am+deWWImmT#tr94S>{i77TiJjd6nfd`5lp*uHeg$M*IZYo;Uae0jTi
z<UGH|o@)+dheyt=-q$ZQ@oalyZ9d~NKlHcu#YbDh@0SzVD#mPfQ8rf|h=&-9a!JV7
zFz%ZR#(WKCMVB9<E6SBu<uI1(>zX*DS4>>K23SzL+A}xp4O}sWxo5s?6Qsq<wHwJu
z21niQLfV57))E#Lc-7fH5uocifgcNyOqSeyYJk_1S-`3aWMy|P49BDIIcwF@k}oDx
z>(0-@5T0D`3}o+6AREMC!nO}zfC?jNG|F68jibzFC}g=&WTJGru2s62KBdZaEj?Rh
z=|OtC+|JWWZ()=iY*)=?psrI>F@~ctqLzHqJGQ>A_eQ1LV9B@|(d1+~ud9VnVlx!3
zSHi=;k!!KIugX)exY?!ep64ac9>3SKf?Hdl!I1VA)cyRj<$+z_xbn>Zl8w)I-yHMZ
zcUD*}8G=^iG>n!+=uhtFoV?INU{{&b?V#=2qB~oX%6<XzLX@tu4ye_&{5mJj1h}4n
zT_1r3BP^I*l)u^DySrafIRzhHSV0o=QPGRRD)p!@I@M`uo{5OegLxm4(N^~Oj2=-5
z@p40tkGR^KUbVW-?$KVAT~^rET;DwIk0hIZFqG;J$7Zf+lGvZ=rMPHg9$#DTN^_se
zxRTpaIR|waZ1yyM90rzkpmGoKx`Mnu0aA|;_2F7<AKu>POSBnbwW?=KYj66S)Bf@L
zNXLpw?p(3iXYt_7ELqjpiv2oKJf_Tx!E{zuysS;NgtKe=a_C<2%VvP&s56Ua^)fq8
z<NIG+8CdyrYT%e%_1ZcAu#Goe$M$<?$cw6Suir1HS;Cr{%DC4Dt%p<hcj=+uSo#P+
zebD#yoc1-qlQe|geHwjlHu>H#`QAAB-hA@C#pHX-$@f;1&#Y$-Eac7dqR8{i6~_L0
zzfb*yl9g0yhGZ{uJp%!37(N4=VY0<cBs;yU%ttqT<|>PI_qgPboN|wAf=Mi#EaCk@
z>vd%r$km({wc^IYn2@pTzL&quYt=G+c{yU9yj=XtW%H0_r<MUmS)iP!0)r2#isxN(
zgzP**sVTOI$C6x@2`$4?Oo=P3B(5x#1j?FOGPeX!OhIW`b|sC2Dw_jc?Sam(hZdnE
zlC+%lMq#{SZ?SIA(l~hH_Ufn_<oWWCJfW70r&S@Rn2@>$r~^nHaxvTr&Mg&fB66(v
zY)4;f_v;8rQ}G|Q39qWFG}TfbIGkqcD&1vUlf|R|7PeHdNyUkt{6*&?@@EY$Ap%VA
zRk3Cd@uy|OV14^<3nqa3*((n#9(Ha4#@NML#$q0s+5EVBbho*<m(KFgUo<`(rm{Rt
zi7aePWEmu|z&j7&y+o2JYyZ8V?6({s10RA79HMh3oI`vHpK>+_yk8ay!XgW$zUF#1
zYb{wQY|KKzKIs7tvryQOg@VuzgZ(TNc03D(%?`2z_Q1w06tH97lbz>_5e@|xuwxd=
zr{d^K_vYqqdoxII1(~bj&BNozFZcUFIwgP~4~Yg=GFSQxws*^Qy&qP@?f=O$<vW#J
zx!Bk_`A7}fZu}rmtyET#gTB}BGUckln5<UoM<&8NJ8g6>_9PwlSwEj*;2Tl>LCd&Y
z#|&kECGyq$;I3pDTI1_x0<`RSIODP9F6Ll$u?oNwNdi3`=RjHQ^xGakKTHkcK11Oc
zN0*#}6R?hVJZB5RS?oBUajWoJQBESoTGr4IstbPAZxPaw65m7OaTw8S_o7nkdv1VP
zbJo)mM)h86>2aXmsZ+1sCHBK`$PSbXMPDKADSGH<o+*0XgB=yUWJ7L^WV1}%j7`Og
zjf#Gfi0vuKI_&gGBw@?Wk%BE-mw<BfEyPn2P~xJeiRgXC1$OjaG{C9?`Zy8@_y;Vx
zIJV@&%08V#31bqaT$rpU@9N>~EJ`?$DF7$)D9_0mfYnS&d=Fw)avIM<pcV2Un-ZzA
z$fJBp9_3m-<(YG<vzCA&NTJqHDTu0%T!s@_mBb8H(<-H0Nvk|-iiP9CGqj>_PYoEq
zjB-EDPmV{UKdZ}z@`4KKmvn!*`#s%vv^jIOT%Rz|d$4&JPI_%KIJP*LsNr+HsdN5!
z*6*fIjZ!7sf*y-o{-5SJ?c=zZwltP(v_aeM#v?p9ZvVIC);>S_%%d6X9h}Fb&1s%*
z4i;%MTltz(M2{l4JHC+1omfiZ4j1`OB8$;DT)R?JPKbn_It}}3@k#p*XZcQx<fxLF
zl=Gd$@G6dM)jTIZrN-uS@jl~;pSNw!)6EC^T^D1N3xiA6o8GO)BLY=F7c9dTuh0*v
z8LH&~?(*jDvj3d$aBxp#x_x}8aq_UgUhK=s-c3z5a0K9DDRk5k&mTGkH}B)R@o~sv
z>bwcgQwp;kR@$H5WEUU2vHOujUi89`#}5hz_yDrzAWv%O;y_7Vd=4eIAC2IX@!j!{
zd5;BnYac7{V?HRJ6=UG37>}PFs;p1;+jPS69-p{?{fN&lC@$C^_Ef|)512lDUUBB<
z9;<Hq(x?CApL>XUM!!Yz$v*c$kt_aylizY2Rhs?z+N|ae*wb013!XD<Jm_7huYUXo
zs1ZCoTs;%cL6G!nbr0o}%KkfgEmpg<rnuH-=~}mXxFa+*F|fzA)$)wVHlqs4GatXX
z5;)U8vu^Y0$61XSi^9y&F=Cx<G{t@%Oa{AW>2kiw(Aa9#=d5UzZz_yv4Ilq%K$Qoo
zSx8K)VbO~7zaVhB=j&pQ^BU-U6*K=s1lrDh1L{)Hsh<ICredvKbx<;x*_&Y{!Nv?s
z$y1jaZCh=wuIJu4Ep)3(QmPg?=cYGNxf&Ss^}2qFLp9l}%a2tXokuNrQ8SmRmVTu?
zt|`4AIt7_|L($e8S!-Kc^J8alty#DsBreMpC?mCLZOI9yCAYf3s!2yy)qGo<(=s?c
z1*y|q>hGm&{j&hG3N=r;wV65fD}o9_xLPObFfnx;u3OpsO9C1+<=xsbCB=%8cT13R
zsTbCocWcFPC*Qrh4fpTfTwHLTjOk*CLRrQkbi@)1w)2)pG%Q@2MmMUFjc9m-4K(aR
zqDo#x1R1O~3_4{xosvz0iC~Pl1ZaSbgKQZjm^CIEn_`0CASmfkp-f%};e7I!AR7=3
z@P?d46Rb<xG6RZnpHR{?olD#V^6$0gm%ynX$A+7R>xQd_%ZAfryvdc&aMqx0&@`wU
zR1L}oMT0~DHV6%}1_&$DfNnrt1QDDU5u#wSlVnFUYJeD00523%mx2fpjo^*IMnEH2
z!|kV;8U@ksi38dRZ<FbmMiv6mucA{aTnf_&-3ax$5P;4D3e)+(P*|Td7*8uBZSoy5
z#7hZ{WR0+&7Y)W31SX{>5m79Xe)q_g0Fun;WwMzMl9&JRvm;}YWXPCwELzQclBm6B
ztfNg~td_CxgfJ0b5T!2AJ_Dz@Qk|1rF=;&40jy+!B~wtM4JW@SRyqcx{b@lm$z$-T
z^Aa#6N4r~j&;={~uRx5^j@HT<kI}0H5kx`-EOBW)(>{xn;*G*aL8DkBZ6nQ>M$#ga
ziYG^6#)L^|Qb>qha-f7ZhFvO|5mVw{k17L8I}vy^q#t>wEGlI~u))S8J7Y4cO8vWF
zOY#^%a1B0aZ9RhF-f53U3yZ<Yf-Rv+GNAvB(Dncl5^y6p%1#>~#n&aWc1elOdYy$<
zo5rw4+g#AP(W=q1(W243(b#BcH2b%pMS4yWO#~!oNN4fH1q4jW39{fRuxwHdZwxjD
zo()ktc`{NExq%pEw1!?JBi9L2h+QbQ(hx1WF{&{{pm=^XlHv7+Y@YR^Bgu=MW)z5n
zcF9H?c$aAu&!0?+;*vBvk)MMUHh@7MoiqrDiky&QAS`Q)ecohRE{Uu_g!)d3sALqV
zI<%Uc@J@u-s}zfkg=aucu%uRublzyA&@o492Dt5<mkQ7nFOkB*#@fabRl2dNv9htE
zvAkcl=R&IHB_cEA!cd&7l)^w>IY*0VN#E#7Dg{A|VloC_3)y5dg2hg9$E3F`x)@_H
z6fSle0!1m=ZUD<a@img4o#{x%Us&aXVkWYVb&<kkh+0uhn6)o3>dMsD%m!|djF1Bo
zbz*>yic_=`r9yIzJS1J&V7>)bc;0d4bO&UpQUq_%q4Y{fV{J!nVbKHmyai|+vtK(q
zbOK8uh~vR^+OYsCMx_jyG!humVPyxA4frjwMf&8lMj1Mwpe!iTBCg|1(?$Xvg}DSE
z`tu1}K4Sa!_=6&Lh9VHzg%A=LnIyUGNs=qUF(02){^)O+N8qiAf}(uS3`J|!S)LMk
z$Q@Z<5j6HZq7hI6=Wm={Dx^e=VnHTy)l%prVj>B1(FAAmp>eO6@ta^r=PdIg#!iyw
z!pKoK#w3?xM&e0CcA%KQ5w;kP3dyBQN+o7Pr?Lh2$hku%MLpk#9914{qi=&j(P&5l
zq!kp}C@-u5(#pz8Z#r^%OCV0u0m8S<Coqh66a{G;AxUP9<i>Z5RE`3kWDSfkU!LK2
ze&wTrl<y=YBl~V;B87ys_q3Lrf(V|py95FOn3-mt0XbS2p(IMdd?%b^!dPy}%0%nB
zL;=E#9Pu?AT!CPQv?XZ(rUE#rl<*z;M4D4#@ODP8{uaa;EMv}ULv9Aez=0^F(AWtl
zAo&DZ^!%{TNTiuh9H4We>l{V6Oe>Jdb<%43S7}vA;_R7`r68v_XboML$etO{s5>;|
zT60EW2z#bv0k~v+a9#x?w22m(cP0j{EEmG|0!UDwA882QfEAr{6fu*(DovzUExmFw
zdXY0zNS_cQkdK`t4JM2r`?G`=5MGdNFChnn9T0jz_(3+pgdq@$KsW-=?4f>KT#)59
zQE?H4H;R+19CQQ`t*0rY!SKl^)Sf%(T#NyIB&FJs3xUaK4}xTrCz_BtN^t?sJBg5j
z@gZ5GWY)vUqR@%F43<06475ZbX$DDVmJ#cMF&<nOopDBn&TA1O7ah7zUji*J(E5^_
zLO(VRq?iDx6LVch`-2Iqqx8vY#mMus9b9r!;yf#HGG9RU3$iamN}C)ZS~tQ%=k+6C
zBv(L!MM{u<)Q@BfNVtHc3l#NJ)Gvptiux()r!qfieK7`!owpEGXDlrSA~+-tNmkAm
z4UHok3S>lqtmx;!BM_e@I3-A}cU?e3=%^^Qi{KonQ1P%|1Q#VKbc;F#8mK!FoJ=Ap
zA&g8ZDj)NuIgqW)do}ML_SrGg#%h%LFx-QT$;b}LgF^w)lZ0~BCmnoQq@dH*dJMvQ
zfi9mYvAku-S&0!9_{t{y@`%w^73jU9y&FQ8G|9E_h%72n+#NF&G5)VXj#Llx-Wuyj
zg;9k?Ppd1L0@3BGjvT!pd2kdH(~nd&ZGNQ9k1T8Jj3dD%9}dWg1DmnW#E36RK`_jc
z6Y5zay_Nsvq~B;J@=L)BK5SK_5DS6K5Ba3X$N({YHdSAa8WtT=5TPvSXgX5EOh{T3
zE+kn%ZfvFoDR4vz91-xDPzAONkpf~eDWu80kR)LciJnde$t_l@<TIp91PWPILLsBF
zq;67V<X=WErT5XWk}8Je%^+k6G<{h;Gb%mVAc_ZaVC$T-!3OEHLgqrp6Q`grQ%TO-
z^QV+$?Gb=fwc|We588|(l7sCrI+vhQ3SSAe6d(k0=g3}$kdjjY1v!kN3)#t`c&}26
zUlGO0=l`2MM~lg|P{|t<f_n-vw2W3tUMc2Z8P&m1Fc>J#?W`kTNZ8=YA%!L{(o1q@
z3)SK)q}-$glDsXhyPRn%V@_DfmenvBxUKp*2ci^-($KGy3HhWhlKR%pq2`IUJ36JE
zbzC~5r7Y%`B2=UZl{iH|qL3m~ay#fpR8Z`WJoh0=bNHU)cYN+#5kTgvGm+(-WNoEL
zTu?+sRy;V{DJ%ykq!8&x=!;y=rxip31@}n7Jq0}UW9w}DD%fN#L(c+3tCb*Dc^yfT
z61SZ}a(H}YQ<fk}qzL<+Wf$OFv=|}lT)~{@o#8I!b8|@|C-o&NLRS&GgcIpw`VmQz
zNRmX7B$8xiDUl_qpPaEy;y1QQS-D#=orJ_XffP7*=tKybS;Lbwmq>$=1|to|tifq8
zW~Kh^vMgC`j8TTd_YjpKDO6SmQv4cS^r>ij4d1!8v<9Tigy=dT9p`-l^eJe^LnJnI
zkYe4l8o#q`89_MhQqHSMV604`Bfk>KG)OJ;w+go8CZW!(<KJ1gbWMFeoJ_%W0Xt@l
zl!CnTE-L1@mFRlb$?xnt9@9YTqW8?OkfKOR0;j+gfMMV%nwk}dG|_h!uIjveu;`Pc
z-HR;AfL>EDD6|Z^6JDqDSZH#6zR;t0t-kv-PqN)5t71q*uqR}lja>4`ILR&1Z-qFI
z?S#bVV>|S$|C-n?xMLw&ng6H&hQPbPMMz|~G#9A7I#b%Ij*vnF-=+Tj^mT`UxGA;Q
zBA*^x?6?j|pm)sZ=zI3d?>hS=8x=`z${A-m8K<PP^gqVE&wn1mkiXxv@jENexW?`@
zpo$%ME25*3-bY~)`D22JGJ_u0-`RPdWC|{&l^``n&4hC*Fdr@Yz&Ui1e`n`=u`^QW
z9%O>VeJ7O`%%cZEy#vLmObz-nCsUQLKE8AIZ2!wkEr1+fX#qQGMVUhhR*sZH5H-{%
zw2;t3OX%DDPUz>P)FDk3Ezx1wS+srmtcYNvlbx|SZ8HSgkrWnDsOenN`OD>gGZLCe
zXg*^)(JQ7v<-c*GFdtL{(d=~oqcTFr#K-T)z5-eqZNWs!G%6p26kSp_O6ycd(JuH<
v4-9xl_3NP5a1!87#srSUR|^$7qdLQdGM1UhdwSt(qWS*;Ka;}Yu9*M;^N%!T

literal 7279
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
Jz8Bq?000MR2BH7}

diff --git a/creusot/tests/should_succeed/immut.mlcfg b/creusot/tests/should_succeed/immut.mlcfg
index 6aba3d09e9..ef59f377ef 100644
--- a/creusot/tests/should_succeed/immut.mlcfg
+++ b/creusot/tests/should_succeed/immut.mlcfg
@@ -18,7 +18,7 @@ module Immut_F
     goto BB0
   }
   BB0 {
-    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] [#"../immut.rs" 4 16 4 18] (10 : uint32));
+    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] (10 : uint32));
     [#"../immut.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../immut.rs" 5 12 5 18] a <-  ^ b;
     [#"../immut.rs" 6 19 6 20] _c <- ([#"../immut.rs" 6 19 6 20]  * b);
diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg
index 830716187c..c17e4d2486 100644
--- a/creusot/tests/should_succeed/index_range.mlcfg
+++ b/creusot/tests/should_succeed/index_range.mlcfg
@@ -148,53 +148,47 @@ module IndexRange_CreateArr
   BB1 {
     [#"../index_range.rs" 17 4 17 7] _4 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 17 4 17 7] arr <-  ^ _4;
-    [#"../index_range.rs" 17 4 17 15] _3 <- ([#"../index_range.rs" 17 4 17 15] push0 _4 ([#"../index_range.rs" 17 13 17 14] [#"../index_range.rs" 17 13 17 14] (0 : int32)));
+    [#"../index_range.rs" 17 4 17 15] _3 <- ([#"../index_range.rs" 17 4 17 15] push0 _4 (0 : int32));
     _4 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 18 4 18 7] _6 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 18 4 18 7] arr <-  ^ _6;
-    [#"../index_range.rs" 18 4 18 15] _5 <- ([#"../index_range.rs" 18 4 18 15] push0 _6 ([#"../index_range.rs" 18 13 18 14] [#"../index_range.rs" 18 13 18 14] (1 : int32)));
+    [#"../index_range.rs" 18 4 18 15] _5 <- ([#"../index_range.rs" 18 4 18 15] push0 _6 (1 : int32));
     _6 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB3
   }
   BB3 {
     [#"../index_range.rs" 19 4 19 7] _8 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 19 4 19 7] arr <-  ^ _8;
-    [#"../index_range.rs" 19 4 19 15] _7 <- ([#"../index_range.rs" 19 4 19 15] push0 _8 ([#"../index_range.rs" 19 13 19 14] [#"../index_range.rs" 19 13 19 14] (2 : int32)));
+    [#"../index_range.rs" 19 4 19 15] _7 <- ([#"../index_range.rs" 19 4 19 15] push0 _8 (2 : int32));
     _8 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB4
   }
   BB4 {
     [#"../index_range.rs" 20 4 20 7] _10 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 20 4 20 7] arr <-  ^ _10;
-    [#"../index_range.rs" 20 4 20 15] _9 <- ([#"../index_range.rs" 20 4 20 15] push0 _10 ([#"../index_range.rs" 20 13 20 14] [#"../index_range.rs" 20 13 20 14] (3 : int32)));
+    [#"../index_range.rs" 20 4 20 15] _9 <- ([#"../index_range.rs" 20 4 20 15] push0 _10 (3 : int32));
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB5
   }
   BB5 {
     [#"../index_range.rs" 21 4 21 7] _12 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 21 4 21 7] arr <-  ^ _12;
-    [#"../index_range.rs" 21 4 21 15] _11 <- ([#"../index_range.rs" 21 4 21 15] push0 _12 ([#"../index_range.rs" 21 13 21 14] [#"../index_range.rs" 21 13 21 14] (4 : int32)));
+    [#"../index_range.rs" 21 4 21 15] _11 <- ([#"../index_range.rs" 21 4 21 15] push0 _12 (4 : int32));
     _12 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB6
   }
   BB6 {
     [#"../index_range.rs" 23 4 23 7] _0 <- ([#"../index_range.rs" 23 4 23 7] arr);
-    [#"../index_range.rs" 23 4 23 7] arr <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+    arr <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB7
   }
   BB7 {
     return _0
   }
   
-end
-module Core_Option_Option_Type
-  type t_option 't =
-    | C_None
-    | C_Some 't
-    
 end
 module Core_Ops_Range_Range_Type
   type t_range 'idx =
@@ -209,6 +203,12 @@ module Core_Ops_Range_Range_Type
       | C_Range _ a -> a
       end
 end
+module Core_Option_Option_Type
+  type t_option 't =
+    | C_None
+    | C_Some 't
+    
+end
 module IndexRange_TestRange
   use prelude.Int32
   use prelude.Slice
@@ -483,49 +483,81 @@ module IndexRange_TestRange
   var arr : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var s : slice int32;
   var _3 : slice int32;
+  var _5 : Core_Ops_Range_Range_Type.t_range usize;
+  var _7 : bool;
   var _8 : usize;
+  var _10 : bool;
   var _12 : usize;
+  var _13 : usize;
   var _14 : bool;
+  var _15 : bool;
   var _17 : usize;
+  var _18 : usize;
   var _19 : bool;
   var s1 : slice int32;
   var _22 : slice int32;
+  var _24 : Core_Ops_Range_Range_Type.t_range usize;
+  var _26 : bool;
   var _27 : usize;
+  var _29 : bool;
   var _31 : usize;
+  var _32 : usize;
   var _33 : bool;
+  var _34 : bool;
   var _36 : usize;
+  var _37 : usize;
   var _38 : bool;
+  var _41 : bool;
   var _42 : usize;
   var _44 : slice int32;
+  var _46 : Core_Ops_Range_Range_Type.t_range usize;
+  var _49 : bool;
   var _50 : usize;
   var _52 : slice int32;
+  var _54 : Core_Ops_Range_Range_Type.t_range usize;
   var _57 : bool;
   var _59 : Core_Option_Option_Type.t_option (slice int32);
   var _61 : slice int32;
+  var _63 : Core_Ops_Range_Range_Type.t_range usize;
   var _66 : bool;
   var _68 : Core_Option_Option_Type.t_option (slice int32);
   var _70 : slice int32;
+  var _72 : Core_Ops_Range_Range_Type.t_range usize;
   var _75 : bool;
   var _77 : Core_Option_Option_Type.t_option (slice int32);
   var _79 : slice int32;
+  var _81 : Core_Ops_Range_Range_Type.t_range usize;
   var _84 : bool;
   var _86 : Core_Option_Option_Type.t_option (slice int32);
   var _88 : slice int32;
+  var _90 : Core_Ops_Range_Range_Type.t_range usize;
   var s2 : borrowed (slice int32);
   var _93 : borrowed (slice int32);
   var _94 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _95 : Core_Ops_Range_Range_Type.t_range usize;
+  var _97 : bool;
   var _98 : usize;
   var _101 : usize;
+  var _102 : usize;
   var _103 : bool;
   var _104 : usize;
+  var _105 : usize;
   var _106 : bool;
+  var _108 : bool;
   var _110 : usize;
+  var _111 : usize;
   var _112 : bool;
+  var _115 : bool;
   var _116 : usize;
+  var _120 : bool;
   var _122 : int32;
+  var _126 : bool;
   var _128 : int32;
+  var _132 : bool;
   var _134 : int32;
+  var _138 : bool;
   var _140 : int32;
+  var _144 : bool;
   var _146 : int32;
   {
     goto BB0
@@ -535,46 +567,56 @@ module IndexRange_TestRange
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 34 16 34 22] _3 <- ([#"../index_range.rs" 34 16 34 22] index0 ([#"../index_range.rs" 34 13 34 16] arr) ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 34 17 34 18] [#"../index_range.rs" 34 17 34 18] (0 : usize)) ([#"../index_range.rs" 34 20 34 21] [#"../index_range.rs" 34 20 34 21] (2 : usize))));
+    [#"../index_range.rs" 34 17 34 21] _5 <- ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range (0 : usize) (2 : usize));
+    [#"../index_range.rs" 34 16 34 22] _3 <- ([#"../index_range.rs" 34 16 34 22] index0 arr _5);
+    _5 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 34 12 34 22] s <- ([#"../index_range.rs" 34 12 34 22] _3);
-    [#"../index_range.rs" 35 12 35 19] _8 <- ([#"../index_range.rs" 35 12 35 19] len0 ([#"../index_range.rs" 35 12 35 13] s));
+    [#"../index_range.rs" 35 12 35 19] _8 <- ([#"../index_range.rs" 35 12 35 19] len0 s);
     goto BB3
   }
   BB3 {
-    switch ([#"../index_range.rs" 35 12 35 24] _8 = ([#"../index_range.rs" 35 23 35 24] [#"../index_range.rs" 35 23 35 24] (2 : usize)))
+    [#"../index_range.rs" 35 12 35 24] _7 <- ([#"../index_range.rs" 35 12 35 24] _8 = (2 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB11
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] [#"../index_range.rs" 35 30 35 31] (0 : usize));
-    [#"../index_range.rs" 35 28 35 32] _14 <- ([#"../index_range.rs" 35 28 35 32] _12 < ([#"../index_range.rs" 35 28 35 32] Slice.length s));
+    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] (0 : usize));
+    [#"../index_range.rs" 35 28 35 32] _13 <- ([#"../index_range.rs" 35 28 35 32] Slice.length s);
+    [#"../index_range.rs" 35 28 35 32] _14 <- ([#"../index_range.rs" 35 28 35 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 28 35 32] _14 };
     goto BB5
   }
   BB5 {
-    switch ([#"../index_range.rs" 35 28 35 37] ([#"../index_range.rs" 35 28 35 32] Slice.get s _12) = ([#"../index_range.rs" 35 36 35 37] [#"../index_range.rs" 35 36 35 37] (0 : int32)))
+    [#"../index_range.rs" 35 28 35 37] _10 <- ([#"../index_range.rs" 35 28 35 37] Slice.get s _12 = (0 : int32));
+    switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] [#"../index_range.rs" 35 43 35 44] (1 : usize));
-    [#"../index_range.rs" 35 41 35 45] _19 <- ([#"../index_range.rs" 35 41 35 45] _17 < ([#"../index_range.rs" 35 41 35 45] Slice.length s));
+    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] (1 : usize));
+    [#"../index_range.rs" 35 41 35 45] _18 <- ([#"../index_range.rs" 35 41 35 45] Slice.length s);
+    [#"../index_range.rs" 35 41 35 45] _19 <- ([#"../index_range.rs" 35 41 35 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 41 35 45] _19 };
     goto BB7
   }
   BB7 {
-    switch ([#"../index_range.rs" 35 41 35 50] ([#"../index_range.rs" 35 41 35 45] Slice.get s _17) = ([#"../index_range.rs" 35 49 35 50] [#"../index_range.rs" 35 49 35 50] (1 : int32)))
+    [#"../index_range.rs" 35 41 35 50] _15 <- ([#"../index_range.rs" 35 41 35 50] Slice.get s _17 = (1 : int32));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 37 16 37 22] _22 <- ([#"../index_range.rs" 37 16 37 22] index0 ([#"../index_range.rs" 37 13 37 16] arr) ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 37 17 37 18] [#"../index_range.rs" 37 17 37 18] (3 : usize)) ([#"../index_range.rs" 37 20 37 21] [#"../index_range.rs" 37 20 37 21] (5 : usize))));
+    [#"../index_range.rs" 37 17 37 21] _24 <- ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range (3 : usize) (5 : usize));
+    [#"../index_range.rs" 37 16 37 22] _22 <- ([#"../index_range.rs" 37 16 37 22] index0 arr _24);
+    _24 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB13
   }
   BB9 {
@@ -595,41 +637,49 @@ module IndexRange_TestRange
   }
   BB13 {
     [#"../index_range.rs" 37 12 37 22] s1 <- ([#"../index_range.rs" 37 12 37 22] _22);
-    [#"../index_range.rs" 38 12 38 19] _27 <- ([#"../index_range.rs" 38 12 38 19] len0 ([#"../index_range.rs" 38 12 38 13] s1));
+    [#"../index_range.rs" 38 12 38 19] _27 <- ([#"../index_range.rs" 38 12 38 19] len0 s1);
     goto BB14
   }
   BB14 {
-    switch ([#"../index_range.rs" 38 12 38 24] _27 = ([#"../index_range.rs" 38 23 38 24] [#"../index_range.rs" 38 23 38 24] (2 : usize)))
+    [#"../index_range.rs" 38 12 38 24] _26 <- ([#"../index_range.rs" 38 12 38 24] _27 = (2 : usize));
+    _27 <- any usize;
+    switch (_26)
       | False -> goto BB22
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] [#"../index_range.rs" 38 30 38 31] (0 : usize));
-    [#"../index_range.rs" 38 28 38 32] _33 <- ([#"../index_range.rs" 38 28 38 32] _31 < ([#"../index_range.rs" 38 28 38 32] Slice.length s1));
+    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] (0 : usize));
+    [#"../index_range.rs" 38 28 38 32] _32 <- ([#"../index_range.rs" 38 28 38 32] Slice.length s1);
+    [#"../index_range.rs" 38 28 38 32] _33 <- ([#"../index_range.rs" 38 28 38 32] _31 < _32);
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 28 38 32] _33 };
     goto BB16
   }
   BB16 {
-    switch ([#"../index_range.rs" 38 28 38 37] ([#"../index_range.rs" 38 28 38 32] Slice.get s1 _31) = ([#"../index_range.rs" 38 36 38 37] [#"../index_range.rs" 38 36 38 37] (3 : int32)))
+    [#"../index_range.rs" 38 28 38 37] _29 <- ([#"../index_range.rs" 38 28 38 37] Slice.get s1 _31 = (3 : int32));
+    switch (_29)
       | False -> goto BB21
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] [#"../index_range.rs" 38 43 38 44] (1 : usize));
-    [#"../index_range.rs" 38 41 38 45] _38 <- ([#"../index_range.rs" 38 41 38 45] _36 < ([#"../index_range.rs" 38 41 38 45] Slice.length s1));
+    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] (1 : usize));
+    [#"../index_range.rs" 38 41 38 45] _37 <- ([#"../index_range.rs" 38 41 38 45] Slice.length s1);
+    [#"../index_range.rs" 38 41 38 45] _38 <- ([#"../index_range.rs" 38 41 38 45] _36 < _37);
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 41 38 45] _38 };
     goto BB18
   }
   BB18 {
-    switch ([#"../index_range.rs" 38 41 38 50] ([#"../index_range.rs" 38 41 38 45] Slice.get s1 _36) = ([#"../index_range.rs" 38 49 38 50] [#"../index_range.rs" 38 49 38 50] (4 : int32)))
+    [#"../index_range.rs" 38 41 38 50] _34 <- ([#"../index_range.rs" 38 41 38 50] Slice.get s1 _36 = (4 : int32));
+    switch (_34)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../index_range.rs" 43 15 43 21] _44 <- ([#"../index_range.rs" 43 15 43 21] index0 ([#"../index_range.rs" 43 12 43 15] arr) ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 43 16 43 17] [#"../index_range.rs" 43 16 43 17] (2 : usize)) ([#"../index_range.rs" 43 19 43 20] [#"../index_range.rs" 43 19 43 20] (2 : usize))));
+    [#"../index_range.rs" 43 16 43 20] _46 <- ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range (2 : usize) (2 : usize));
+    [#"../index_range.rs" 43 15 43 21] _44 <- ([#"../index_range.rs" 43 15 43 21] index0 arr _46);
+    _46 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB24
   }
   BB20 {
@@ -649,17 +699,21 @@ module IndexRange_TestRange
     absurd
   }
   BB24 {
-    [#"../index_range.rs" 43 12 43 27] _42 <- ([#"../index_range.rs" 43 12 43 27] len0 ([#"../index_range.rs" 43 12 43 21] _44));
+    [#"../index_range.rs" 43 12 43 27] _42 <- ([#"../index_range.rs" 43 12 43 27] len0 _44);
     goto BB25
   }
   BB25 {
-    switch ([#"../index_range.rs" 43 12 43 32] _42 = ([#"../index_range.rs" 43 31 43 32] [#"../index_range.rs" 43 31 43 32] (0 : usize)))
+    [#"../index_range.rs" 43 12 43 32] _41 <- ([#"../index_range.rs" 43 12 43 32] _42 = (0 : usize));
+    _42 <- any usize;
+    switch (_41)
       | False -> goto BB27
       | True -> goto BB26
       end
   }
   BB26 {
-    [#"../index_range.rs" 45 15 45 21] _52 <- ([#"../index_range.rs" 45 15 45 21] index0 ([#"../index_range.rs" 45 12 45 15] arr) ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 45 16 45 17] [#"../index_range.rs" 45 16 45 17] (5 : usize)) ([#"../index_range.rs" 45 19 45 20] [#"../index_range.rs" 45 19 45 20] (5 : usize))));
+    [#"../index_range.rs" 45 16 45 20] _54 <- ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range (5 : usize) (5 : usize));
+    [#"../index_range.rs" 45 15 45 21] _52 <- ([#"../index_range.rs" 45 15 45 21] index0 arr _54);
+    _54 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB28
   }
   BB27 {
@@ -668,17 +722,19 @@ module IndexRange_TestRange
     absurd
   }
   BB28 {
-    [#"../index_range.rs" 45 12 45 27] _50 <- ([#"../index_range.rs" 45 12 45 27] len0 ([#"../index_range.rs" 45 12 45 21] _52));
+    [#"../index_range.rs" 45 12 45 27] _50 <- ([#"../index_range.rs" 45 12 45 27] len0 _52);
     goto BB29
   }
   BB29 {
-    switch ([#"../index_range.rs" 45 12 45 32] _50 = ([#"../index_range.rs" 45 31 45 32] [#"../index_range.rs" 45 31 45 32] (0 : usize)))
+    [#"../index_range.rs" 45 12 45 32] _49 <- ([#"../index_range.rs" 45 12 45 32] _50 = (0 : usize));
+    _50 <- any usize;
+    switch (_49)
       | False -> goto BB31
       | True -> goto BB30
       end
   }
   BB30 {
-    [#"../index_range.rs" 50 12 50 25] _61 <- ([#"../index_range.rs" 50 12 50 25] deref0 ([#"../index_range.rs" 50 12 50 15] arr));
+    [#"../index_range.rs" 50 12 50 25] _61 <- ([#"../index_range.rs" 50 12 50 25] deref0 arr);
     goto BB32
   }
   BB31 {
@@ -687,11 +743,13 @@ module IndexRange_TestRange
     absurd
   }
   BB32 {
-    [#"../index_range.rs" 50 12 50 25] _59 <- ([#"../index_range.rs" 50 12 50 25] get0 ([#"../index_range.rs" 50 12 50 15] _61) ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 50 20 50 21] [#"../index_range.rs" 50 20 50 21] (2 : usize)) ([#"../index_range.rs" 50 23 50 24] [#"../index_range.rs" 50 23 50 24] (6 : usize))));
+    [#"../index_range.rs" 50 20 50 24] _63 <- ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (6 : usize));
+    [#"../index_range.rs" 50 12 50 25] _59 <- ([#"../index_range.rs" 50 12 50 25] get0 _61 _63);
+    _63 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB33
   }
   BB33 {
-    [#"../index_range.rs" 50 12 50 35] _57 <- ([#"../index_range.rs" 50 12 50 35] is_none0 ([#"../index_range.rs" 50 12 50 25] _59));
+    [#"../index_range.rs" 50 12 50 35] _57 <- ([#"../index_range.rs" 50 12 50 35] is_none0 _59);
     goto BB34
   }
   BB34 {
@@ -701,7 +759,7 @@ module IndexRange_TestRange
       end
   }
   BB35 {
-    [#"../index_range.rs" 52 12 52 25] _70 <- ([#"../index_range.rs" 52 12 52 25] deref0 ([#"../index_range.rs" 52 12 52 15] arr));
+    [#"../index_range.rs" 52 12 52 25] _70 <- ([#"../index_range.rs" 52 12 52 25] deref0 arr);
     goto BB37
   }
   BB36 {
@@ -710,11 +768,13 @@ module IndexRange_TestRange
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 52 12 52 25] _68 <- ([#"../index_range.rs" 52 12 52 25] get0 ([#"../index_range.rs" 52 12 52 15] _70) ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 52 20 52 21] [#"../index_range.rs" 52 20 52 21] (2 : usize)) ([#"../index_range.rs" 52 23 52 24] [#"../index_range.rs" 52 23 52 24] (1 : usize))));
+    [#"../index_range.rs" 52 20 52 24] _72 <- ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (1 : usize));
+    [#"../index_range.rs" 52 12 52 25] _68 <- ([#"../index_range.rs" 52 12 52 25] get0 _70 _72);
+    _72 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB38
   }
   BB38 {
-    [#"../index_range.rs" 52 12 52 35] _66 <- ([#"../index_range.rs" 52 12 52 35] is_none0 ([#"../index_range.rs" 52 12 52 25] _68));
+    [#"../index_range.rs" 52 12 52 35] _66 <- ([#"../index_range.rs" 52 12 52 35] is_none0 _68);
     goto BB39
   }
   BB39 {
@@ -724,7 +784,7 @@ module IndexRange_TestRange
       end
   }
   BB40 {
-    [#"../index_range.rs" 54 12 54 25] _79 <- ([#"../index_range.rs" 54 12 54 25] deref0 ([#"../index_range.rs" 54 12 54 15] arr));
+    [#"../index_range.rs" 54 12 54 25] _79 <- ([#"../index_range.rs" 54 12 54 25] deref0 arr);
     goto BB42
   }
   BB41 {
@@ -733,11 +793,13 @@ module IndexRange_TestRange
     absurd
   }
   BB42 {
-    [#"../index_range.rs" 54 12 54 25] _77 <- ([#"../index_range.rs" 54 12 54 25] get0 ([#"../index_range.rs" 54 12 54 15] _79) ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 54 20 54 21] [#"../index_range.rs" 54 20 54 21] (6 : usize)) ([#"../index_range.rs" 54 23 54 24] [#"../index_range.rs" 54 23 54 24] (6 : usize))));
+    [#"../index_range.rs" 54 20 54 24] _81 <- ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range (6 : usize) (6 : usize));
+    [#"../index_range.rs" 54 12 54 25] _77 <- ([#"../index_range.rs" 54 12 54 25] get0 _79 _81);
+    _81 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB43
   }
   BB43 {
-    [#"../index_range.rs" 54 12 54 35] _75 <- ([#"../index_range.rs" 54 12 54 35] is_none0 ([#"../index_range.rs" 54 12 54 25] _77));
+    [#"../index_range.rs" 54 12 54 35] _75 <- ([#"../index_range.rs" 54 12 54 35] is_none0 _77);
     goto BB44
   }
   BB44 {
@@ -747,7 +809,7 @@ module IndexRange_TestRange
       end
   }
   BB45 {
-    [#"../index_range.rs" 56 12 56 27] _88 <- ([#"../index_range.rs" 56 12 56 27] deref0 ([#"../index_range.rs" 56 12 56 15] arr));
+    [#"../index_range.rs" 56 12 56 27] _88 <- ([#"../index_range.rs" 56 12 56 27] deref0 arr);
     goto BB47
   }
   BB46 {
@@ -756,11 +818,13 @@ module IndexRange_TestRange
     absurd
   }
   BB47 {
-    [#"../index_range.rs" 56 12 56 27] _86 <- ([#"../index_range.rs" 56 12 56 27] get0 ([#"../index_range.rs" 56 12 56 15] _88) ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 56 20 56 22] [#"../index_range.rs" 56 20 56 22] (10 : usize)) ([#"../index_range.rs" 56 24 56 26] [#"../index_range.rs" 56 24 56 26] (10 : usize))));
+    [#"../index_range.rs" 56 20 56 26] _90 <- ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range (10 : usize) (10 : usize));
+    [#"../index_range.rs" 56 12 56 27] _86 <- ([#"../index_range.rs" 56 12 56 27] get0 _88 _90);
+    _90 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB48
   }
   BB48 {
-    [#"../index_range.rs" 56 12 56 37] _84 <- ([#"../index_range.rs" 56 12 56 37] is_none0 ([#"../index_range.rs" 56 12 56 27] _86));
+    [#"../index_range.rs" 56 12 56 37] _84 <- ([#"../index_range.rs" 56 12 56 37] is_none0 _86);
     goto BB49
   }
   BB49 {
@@ -772,8 +836,10 @@ module IndexRange_TestRange
   BB50 {
     [#"../index_range.rs" 59 17 59 20] _94 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 59 17 59 20] arr <-  ^ _94;
-    [#"../index_range.rs" 59 20 59 26] _93 <- ([#"../index_range.rs" 59 20 59 26] index_mut0 _94 ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 59 21 59 22] [#"../index_range.rs" 59 21 59 22] (1 : usize)) ([#"../index_range.rs" 59 24 59 25] [#"../index_range.rs" 59 24 59 25] (4 : usize))));
+    [#"../index_range.rs" 59 21 59 25] _95 <- ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range (1 : usize) (4 : usize));
+    [#"../index_range.rs" 59 20 59 26] _93 <- ([#"../index_range.rs" 59 20 59 26] index_mut0 _94 _95);
     _94 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+    _95 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB52
   }
   BB51 {
@@ -784,18 +850,21 @@ module IndexRange_TestRange
   BB52 {
     [#"../index_range.rs" 59 12 59 26] s2 <- Borrow.borrow_final ( * _93) (Borrow.get_id _93);
     [#"../index_range.rs" 59 12 59 26] _93 <- { _93 with current = ( ^ s2) ; };
-    [#"../index_range.rs" 60 12 60 19] _98 <- ([#"../index_range.rs" 60 12 60 19] len0 ([#"../index_range.rs" 60 12 60 13]  * s2));
+    [#"../index_range.rs" 60 12 60 19] _98 <- ([#"../index_range.rs" 60 12 60 19] len0 ( * s2));
     goto BB53
   }
   BB53 {
-    switch ([#"../index_range.rs" 60 12 60 24] _98 = ([#"../index_range.rs" 60 23 60 24] [#"../index_range.rs" 60 23 60 24] (3 : usize)))
+    [#"../index_range.rs" 60 12 60 24] _97 <- ([#"../index_range.rs" 60 12 60 24] _98 = (3 : usize));
+    _98 <- any usize;
+    switch (_97)
       | False -> goto BB55
       | True -> goto BB54
       end
   }
   BB54 {
-    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] [#"../index_range.rs" 61 6 61 7] (0 : usize));
-    [#"../index_range.rs" 61 4 61 8] _103 <- ([#"../index_range.rs" 61 4 61 8] _101 < ([#"../index_range.rs" 61 4 61 8] Slice.length ( * s2)));
+    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] (0 : usize));
+    [#"../index_range.rs" 61 4 61 8] _102 <- ([#"../index_range.rs" 61 4 61 8] Slice.length ( * s2));
+    [#"../index_range.rs" 61 4 61 8] _103 <- ([#"../index_range.rs" 61 4 61 8] _101 < _102);
     assert { [@expl:index in bounds] [#"../index_range.rs" 61 4 61 8] _103 };
     goto BB56
   }
@@ -807,29 +876,32 @@ module IndexRange_TestRange
     absurd
   }
   BB56 {
-    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] [#"../index_range.rs" 61 11 61 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] [#"../index_range.rs" 62 6 62 7] (1 : usize));
-    [#"../index_range.rs" 62 4 62 8] _106 <- ([#"../index_range.rs" 62 4 62 8] _104 < ([#"../index_range.rs" 62 4 62 8] Slice.length ( * s2)));
+    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] (1 : usize));
+    [#"../index_range.rs" 62 4 62 8] _105 <- ([#"../index_range.rs" 62 4 62 8] Slice.length ( * s2));
+    [#"../index_range.rs" 62 4 62 8] _106 <- ([#"../index_range.rs" 62 4 62 8] _104 < _105);
     assert { [@expl:index in bounds] [#"../index_range.rs" 62 4 62 8] _106 };
     goto BB57
   }
   BB57 {
-    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] [#"../index_range.rs" 62 11 62 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] [#"../index_range.rs" 67 14 67 15] (2 : usize));
-    [#"../index_range.rs" 67 12 67 16] _112 <- ([#"../index_range.rs" 67 12 67 16] _110 < ([#"../index_range.rs" 67 12 67 16] Slice.length ( * s2)));
+    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] (2 : usize));
+    [#"../index_range.rs" 67 12 67 16] _111 <- ([#"../index_range.rs" 67 12 67 16] Slice.length ( * s2));
+    [#"../index_range.rs" 67 12 67 16] _112 <- ([#"../index_range.rs" 67 12 67 16] _110 < _111);
     assert { [@expl:index in bounds] [#"../index_range.rs" 67 12 67 16] _112 };
     goto BB58
   }
   BB58 {
     assume { resolve1 s2 };
+    [#"../index_range.rs" 67 12 67 21] _108 <- ([#"../index_range.rs" 67 12 67 21] Slice.get ( * s2) _110 = (3 : int32));
     assume { resolve1 _93 };
-    switch ([#"../index_range.rs" 67 12 67 21] ([#"../index_range.rs" 67 12 67 16] Slice.get ( * s2) _110) = ([#"../index_range.rs" 67 20 67 21] [#"../index_range.rs" 67 20 67 21] (3 : int32)))
+    switch (_108)
       | False -> goto BB60
       | True -> goto BB59
       end
   }
   BB59 {
-    [#"../index_range.rs" 69 12 69 21] _116 <- ([#"../index_range.rs" 69 12 69 21] len1 ([#"../index_range.rs" 69 12 69 15] arr));
+    [#"../index_range.rs" 69 12 69 21] _116 <- ([#"../index_range.rs" 69 12 69 21] len1 arr);
     goto BB61
   }
   BB60 {
@@ -838,13 +910,15 @@ module IndexRange_TestRange
     absurd
   }
   BB61 {
-    switch ([#"../index_range.rs" 69 12 69 26] _116 = ([#"../index_range.rs" 69 25 69 26] [#"../index_range.rs" 69 25 69 26] (5 : usize)))
+    [#"../index_range.rs" 69 12 69 26] _115 <- ([#"../index_range.rs" 69 12 69 26] _116 = (5 : usize));
+    _116 <- any usize;
+    switch (_115)
       | False -> goto BB63
       | True -> goto BB62
       end
   }
   BB62 {
-    [#"../index_range.rs" 70 15 70 18] _122 <- ([#"../index_range.rs" 70 15 70 18] index1 ([#"../index_range.rs" 70 12 70 15] arr) ([#"../index_range.rs" 70 16 70 17] [#"../index_range.rs" 70 16 70 17] (0 : usize)));
+    [#"../index_range.rs" 70 15 70 18] _122 <- ([#"../index_range.rs" 70 15 70 18] index1 arr (0 : usize));
     goto BB64
   }
   BB63 {
@@ -853,13 +927,14 @@ module IndexRange_TestRange
     absurd
   }
   BB64 {
-    switch ([#"../index_range.rs" 70 12 70 23] ([#"../index_range.rs" 70 12 70 18] _122) = ([#"../index_range.rs" 70 22 70 23] [#"../index_range.rs" 70 22 70 23] (0 : int32)))
+    [#"../index_range.rs" 70 12 70 23] _120 <- ([#"../index_range.rs" 70 12 70 23] _122 = (0 : int32));
+    switch (_120)
       | False -> goto BB66
       | True -> goto BB65
       end
   }
   BB65 {
-    [#"../index_range.rs" 71 15 71 18] _128 <- ([#"../index_range.rs" 71 15 71 18] index1 ([#"../index_range.rs" 71 12 71 15] arr) ([#"../index_range.rs" 71 16 71 17] [#"../index_range.rs" 71 16 71 17] (1 : usize)));
+    [#"../index_range.rs" 71 15 71 18] _128 <- ([#"../index_range.rs" 71 15 71 18] index1 arr (1 : usize));
     goto BB67
   }
   BB66 {
@@ -868,13 +943,14 @@ module IndexRange_TestRange
     absurd
   }
   BB67 {
-    switch ([#"../index_range.rs" 71 12 71 24] ([#"../index_range.rs" 71 12 71 18] _128) = ([#"../index_range.rs" 71 22 71 24] [#"../index_range.rs" 71 22 71 24] (-1 : int32)))
+    [#"../index_range.rs" 71 12 71 24] _126 <- ([#"../index_range.rs" 71 12 71 24] _128 = (-1 : int32));
+    switch (_126)
       | False -> goto BB69
       | True -> goto BB68
       end
   }
   BB68 {
-    [#"../index_range.rs" 72 15 72 18] _134 <- ([#"../index_range.rs" 72 15 72 18] index1 ([#"../index_range.rs" 72 12 72 15] arr) ([#"../index_range.rs" 72 16 72 17] [#"../index_range.rs" 72 16 72 17] (2 : usize)));
+    [#"../index_range.rs" 72 15 72 18] _134 <- ([#"../index_range.rs" 72 15 72 18] index1 arr (2 : usize));
     goto BB70
   }
   BB69 {
@@ -883,13 +959,14 @@ module IndexRange_TestRange
     absurd
   }
   BB70 {
-    switch ([#"../index_range.rs" 72 12 72 24] ([#"../index_range.rs" 72 12 72 18] _134) = ([#"../index_range.rs" 72 22 72 24] [#"../index_range.rs" 72 22 72 24] (-1 : int32)))
+    [#"../index_range.rs" 72 12 72 24] _132 <- ([#"../index_range.rs" 72 12 72 24] _134 = (-1 : int32));
+    switch (_132)
       | False -> goto BB72
       | True -> goto BB71
       end
   }
   BB71 {
-    [#"../index_range.rs" 73 15 73 18] _140 <- ([#"../index_range.rs" 73 15 73 18] index1 ([#"../index_range.rs" 73 12 73 15] arr) ([#"../index_range.rs" 73 16 73 17] [#"../index_range.rs" 73 16 73 17] (3 : usize)));
+    [#"../index_range.rs" 73 15 73 18] _140 <- ([#"../index_range.rs" 73 15 73 18] index1 arr (3 : usize));
     goto BB73
   }
   BB72 {
@@ -898,13 +975,14 @@ module IndexRange_TestRange
     absurd
   }
   BB73 {
-    switch ([#"../index_range.rs" 73 12 73 23] ([#"../index_range.rs" 73 12 73 18] _140) = ([#"../index_range.rs" 73 22 73 23] [#"../index_range.rs" 73 22 73 23] (3 : int32)))
+    [#"../index_range.rs" 73 12 73 23] _138 <- ([#"../index_range.rs" 73 12 73 23] _140 = (3 : int32));
+    switch (_138)
       | False -> goto BB75
       | True -> goto BB74
       end
   }
   BB74 {
-    [#"../index_range.rs" 74 15 74 18] _146 <- ([#"../index_range.rs" 74 15 74 18] index1 ([#"../index_range.rs" 74 12 74 15] arr) ([#"../index_range.rs" 74 16 74 17] [#"../index_range.rs" 74 16 74 17] (4 : usize)));
+    [#"../index_range.rs" 74 15 74 18] _146 <- ([#"../index_range.rs" 74 15 74 18] index1 arr (4 : usize));
     goto BB76
   }
   BB75 {
@@ -914,7 +992,8 @@ module IndexRange_TestRange
   }
   BB76 {
     assume { resolve0 arr };
-    switch ([#"../index_range.rs" 74 12 74 23] ([#"../index_range.rs" 74 12 74 18] _146) = ([#"../index_range.rs" 74 22 74 23] [#"../index_range.rs" 74 22 74 23] (4 : int32)))
+    [#"../index_range.rs" 74 12 74 23] _144 <- ([#"../index_range.rs" 74 12 74 23] _146 = (4 : int32));
+    switch (_144)
       | False -> goto BB78
       | True -> goto BB77
       end
@@ -1215,31 +1294,52 @@ module IndexRange_TestRangeTo
   var arr : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var s : slice int32;
   var _3 : slice int32;
+  var _5 : Core_Ops_Range_RangeTo_Type.t_rangeto usize;
+  var _7 : bool;
   var _8 : usize;
+  var _10 : bool;
   var _12 : usize;
+  var _13 : usize;
   var _14 : bool;
+  var _15 : bool;
   var _17 : usize;
+  var _18 : usize;
   var _19 : bool;
+  var _22 : bool;
   var _23 : usize;
   var _25 : slice int32;
+  var _27 : Core_Ops_Range_RangeTo_Type.t_rangeto usize;
   var _30 : bool;
   var _32 : Core_Option_Option_Type.t_option (slice int32);
   var _34 : slice int32;
+  var _36 : Core_Ops_Range_RangeTo_Type.t_rangeto usize;
   var s1 : borrowed (slice int32);
   var _39 : borrowed (slice int32);
   var _40 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _41 : Core_Ops_Range_RangeTo_Type.t_rangeto usize;
+  var _43 : bool;
   var _44 : usize;
   var _47 : usize;
+  var _48 : usize;
   var _49 : bool;
   var _50 : usize;
+  var _51 : usize;
   var _52 : bool;
+  var _54 : bool;
   var _56 : usize;
+  var _57 : usize;
   var _58 : bool;
+  var _61 : bool;
   var _62 : usize;
+  var _66 : bool;
   var _68 : int32;
+  var _72 : bool;
   var _74 : int32;
+  var _78 : bool;
   var _80 : int32;
+  var _84 : bool;
   var _86 : int32;
+  var _90 : bool;
   var _92 : int32;
   {
     goto BB0
@@ -1249,46 +1349,56 @@ module IndexRange_TestRangeTo
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 85 16 85 21] _3 <- ([#"../index_range.rs" 85 16 85 21] index0 ([#"../index_range.rs" 85 13 85 16] arr) ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 85 19 85 20] [#"../index_range.rs" 85 19 85 20] (2 : usize))));
+    [#"../index_range.rs" 85 17 85 20] _5 <- ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo (2 : usize));
+    [#"../index_range.rs" 85 16 85 21] _3 <- ([#"../index_range.rs" 85 16 85 21] index0 arr _5);
+    _5 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 85 12 85 21] s <- ([#"../index_range.rs" 85 12 85 21] _3);
-    [#"../index_range.rs" 86 12 86 19] _8 <- ([#"../index_range.rs" 86 12 86 19] len0 ([#"../index_range.rs" 86 12 86 13] s));
+    [#"../index_range.rs" 86 12 86 19] _8 <- ([#"../index_range.rs" 86 12 86 19] len0 s);
     goto BB3
   }
   BB3 {
-    switch ([#"../index_range.rs" 86 12 86 24] _8 = ([#"../index_range.rs" 86 23 86 24] [#"../index_range.rs" 86 23 86 24] (2 : usize)))
+    [#"../index_range.rs" 86 12 86 24] _7 <- ([#"../index_range.rs" 86 12 86 24] _8 = (2 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB11
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] [#"../index_range.rs" 86 30 86 31] (0 : usize));
-    [#"../index_range.rs" 86 28 86 32] _14 <- ([#"../index_range.rs" 86 28 86 32] _12 < ([#"../index_range.rs" 86 28 86 32] Slice.length s));
+    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] (0 : usize));
+    [#"../index_range.rs" 86 28 86 32] _13 <- ([#"../index_range.rs" 86 28 86 32] Slice.length s);
+    [#"../index_range.rs" 86 28 86 32] _14 <- ([#"../index_range.rs" 86 28 86 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 28 86 32] _14 };
     goto BB5
   }
   BB5 {
-    switch ([#"../index_range.rs" 86 28 86 37] ([#"../index_range.rs" 86 28 86 32] Slice.get s _12) = ([#"../index_range.rs" 86 36 86 37] [#"../index_range.rs" 86 36 86 37] (0 : int32)))
+    [#"../index_range.rs" 86 28 86 37] _10 <- ([#"../index_range.rs" 86 28 86 37] Slice.get s _12 = (0 : int32));
+    switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] [#"../index_range.rs" 86 43 86 44] (1 : usize));
-    [#"../index_range.rs" 86 41 86 45] _19 <- ([#"../index_range.rs" 86 41 86 45] _17 < ([#"../index_range.rs" 86 41 86 45] Slice.length s));
+    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] (1 : usize));
+    [#"../index_range.rs" 86 41 86 45] _18 <- ([#"../index_range.rs" 86 41 86 45] Slice.length s);
+    [#"../index_range.rs" 86 41 86 45] _19 <- ([#"../index_range.rs" 86 41 86 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 41 86 45] _19 };
     goto BB7
   }
   BB7 {
-    switch ([#"../index_range.rs" 86 41 86 50] ([#"../index_range.rs" 86 41 86 45] Slice.get s _17) = ([#"../index_range.rs" 86 49 86 50] [#"../index_range.rs" 86 49 86 50] (1 : int32)))
+    [#"../index_range.rs" 86 41 86 50] _15 <- ([#"../index_range.rs" 86 41 86 50] Slice.get s _17 = (1 : int32));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 91 15 91 20] _25 <- ([#"../index_range.rs" 91 15 91 20] index0 ([#"../index_range.rs" 91 12 91 15] arr) ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 91 18 91 19] [#"../index_range.rs" 91 18 91 19] (0 : usize))));
+    [#"../index_range.rs" 91 16 91 19] _27 <- ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo (0 : usize));
+    [#"../index_range.rs" 91 15 91 20] _25 <- ([#"../index_range.rs" 91 15 91 20] index0 arr _27);
+    _27 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB13
   }
   BB9 {
@@ -1308,17 +1418,19 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 91 12 91 26] _23 <- ([#"../index_range.rs" 91 12 91 26] len0 ([#"../index_range.rs" 91 12 91 20] _25));
+    [#"../index_range.rs" 91 12 91 26] _23 <- ([#"../index_range.rs" 91 12 91 26] len0 _25);
     goto BB14
   }
   BB14 {
-    switch ([#"../index_range.rs" 91 12 91 31] _23 = ([#"../index_range.rs" 91 30 91 31] [#"../index_range.rs" 91 30 91 31] (0 : usize)))
+    [#"../index_range.rs" 91 12 91 31] _22 <- ([#"../index_range.rs" 91 12 91 31] _23 = (0 : usize));
+    _23 <- any usize;
+    switch (_22)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../index_range.rs" 96 12 96 24] _34 <- ([#"../index_range.rs" 96 12 96 24] deref0 ([#"../index_range.rs" 96 12 96 15] arr));
+    [#"../index_range.rs" 96 12 96 24] _34 <- ([#"../index_range.rs" 96 12 96 24] deref0 arr);
     goto BB17
   }
   BB16 {
@@ -1327,11 +1439,13 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 96 12 96 24] _32 <- ([#"../index_range.rs" 96 12 96 24] get0 ([#"../index_range.rs" 96 12 96 15] _34) ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 96 22 96 23] [#"../index_range.rs" 96 22 96 23] (6 : usize))));
+    [#"../index_range.rs" 96 20 96 23] _36 <- ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo (6 : usize));
+    [#"../index_range.rs" 96 12 96 24] _32 <- ([#"../index_range.rs" 96 12 96 24] get0 _34 _36);
+    _36 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB18
   }
   BB18 {
-    [#"../index_range.rs" 96 12 96 34] _30 <- ([#"../index_range.rs" 96 12 96 34] is_none0 ([#"../index_range.rs" 96 12 96 24] _32));
+    [#"../index_range.rs" 96 12 96 34] _30 <- ([#"../index_range.rs" 96 12 96 34] is_none0 _32);
     goto BB19
   }
   BB19 {
@@ -1343,8 +1457,10 @@ module IndexRange_TestRangeTo
   BB20 {
     [#"../index_range.rs" 99 17 99 20] _40 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 99 17 99 20] arr <-  ^ _40;
-    [#"../index_range.rs" 99 20 99 25] _39 <- ([#"../index_range.rs" 99 20 99 25] index_mut0 _40 ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 99 23 99 24] [#"../index_range.rs" 99 23 99 24] (3 : usize))));
+    [#"../index_range.rs" 99 21 99 24] _41 <- ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo (3 : usize));
+    [#"../index_range.rs" 99 20 99 25] _39 <- ([#"../index_range.rs" 99 20 99 25] index_mut0 _40 _41);
     _40 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+    _41 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB22
   }
   BB21 {
@@ -1355,18 +1471,21 @@ module IndexRange_TestRangeTo
   BB22 {
     [#"../index_range.rs" 99 12 99 25] s1 <- Borrow.borrow_final ( * _39) (Borrow.get_id _39);
     [#"../index_range.rs" 99 12 99 25] _39 <- { _39 with current = ( ^ s1) ; };
-    [#"../index_range.rs" 100 12 100 19] _44 <- ([#"../index_range.rs" 100 12 100 19] len0 ([#"../index_range.rs" 100 12 100 13]  * s1));
+    [#"../index_range.rs" 100 12 100 19] _44 <- ([#"../index_range.rs" 100 12 100 19] len0 ( * s1));
     goto BB23
   }
   BB23 {
-    switch ([#"../index_range.rs" 100 12 100 24] _44 = ([#"../index_range.rs" 100 23 100 24] [#"../index_range.rs" 100 23 100 24] (3 : usize)))
+    [#"../index_range.rs" 100 12 100 24] _43 <- ([#"../index_range.rs" 100 12 100 24] _44 = (3 : usize));
+    _44 <- any usize;
+    switch (_43)
       | False -> goto BB25
       | True -> goto BB24
       end
   }
   BB24 {
-    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] [#"../index_range.rs" 101 6 101 7] (0 : usize));
-    [#"../index_range.rs" 101 4 101 8] _49 <- ([#"../index_range.rs" 101 4 101 8] _47 < ([#"../index_range.rs" 101 4 101 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] (0 : usize));
+    [#"../index_range.rs" 101 4 101 8] _48 <- ([#"../index_range.rs" 101 4 101 8] Slice.length ( * s1));
+    [#"../index_range.rs" 101 4 101 8] _49 <- ([#"../index_range.rs" 101 4 101 8] _47 < _48);
     assert { [@expl:index in bounds] [#"../index_range.rs" 101 4 101 8] _49 };
     goto BB26
   }
@@ -1378,29 +1497,32 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] [#"../index_range.rs" 101 11 101 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] [#"../index_range.rs" 102 6 102 7] (2 : usize));
-    [#"../index_range.rs" 102 4 102 8] _52 <- ([#"../index_range.rs" 102 4 102 8] _50 < ([#"../index_range.rs" 102 4 102 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] (2 : usize));
+    [#"../index_range.rs" 102 4 102 8] _51 <- ([#"../index_range.rs" 102 4 102 8] Slice.length ( * s1));
+    [#"../index_range.rs" 102 4 102 8] _52 <- ([#"../index_range.rs" 102 4 102 8] _50 < _51);
     assert { [@expl:index in bounds] [#"../index_range.rs" 102 4 102 8] _52 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] [#"../index_range.rs" 102 11 102 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] [#"../index_range.rs" 104 14 104 15] (1 : usize));
-    [#"../index_range.rs" 104 12 104 16] _58 <- ([#"../index_range.rs" 104 12 104 16] _56 < ([#"../index_range.rs" 104 12 104 16] Slice.length ( * s1)));
+    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] (1 : usize));
+    [#"../index_range.rs" 104 12 104 16] _57 <- ([#"../index_range.rs" 104 12 104 16] Slice.length ( * s1));
+    [#"../index_range.rs" 104 12 104 16] _58 <- ([#"../index_range.rs" 104 12 104 16] _56 < _57);
     assert { [@expl:index in bounds] [#"../index_range.rs" 104 12 104 16] _58 };
     goto BB28
   }
   BB28 {
     assume { resolve1 s1 };
+    [#"../index_range.rs" 104 12 104 21] _54 <- ([#"../index_range.rs" 104 12 104 21] Slice.get ( * s1) _56 = (1 : int32));
     assume { resolve1 _39 };
-    switch ([#"../index_range.rs" 104 12 104 21] ([#"../index_range.rs" 104 12 104 16] Slice.get ( * s1) _56) = ([#"../index_range.rs" 104 20 104 21] [#"../index_range.rs" 104 20 104 21] (1 : int32)))
+    switch (_54)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../index_range.rs" 106 12 106 21] _62 <- ([#"../index_range.rs" 106 12 106 21] len1 ([#"../index_range.rs" 106 12 106 15] arr));
+    [#"../index_range.rs" 106 12 106 21] _62 <- ([#"../index_range.rs" 106 12 106 21] len1 arr);
     goto BB31
   }
   BB30 {
@@ -1409,13 +1531,15 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB31 {
-    switch ([#"../index_range.rs" 106 12 106 26] _62 = ([#"../index_range.rs" 106 25 106 26] [#"../index_range.rs" 106 25 106 26] (5 : usize)))
+    [#"../index_range.rs" 106 12 106 26] _61 <- ([#"../index_range.rs" 106 12 106 26] _62 = (5 : usize));
+    _62 <- any usize;
+    switch (_61)
       | False -> goto BB33
       | True -> goto BB32
       end
   }
   BB32 {
-    [#"../index_range.rs" 107 15 107 18] _68 <- ([#"../index_range.rs" 107 15 107 18] index1 ([#"../index_range.rs" 107 12 107 15] arr) ([#"../index_range.rs" 107 16 107 17] [#"../index_range.rs" 107 16 107 17] (0 : usize)));
+    [#"../index_range.rs" 107 15 107 18] _68 <- ([#"../index_range.rs" 107 15 107 18] index1 arr (0 : usize));
     goto BB34
   }
   BB33 {
@@ -1424,13 +1548,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB34 {
-    switch ([#"../index_range.rs" 107 12 107 24] ([#"../index_range.rs" 107 12 107 18] _68) = ([#"../index_range.rs" 107 22 107 24] [#"../index_range.rs" 107 22 107 24] (-1 : int32)))
+    [#"../index_range.rs" 107 12 107 24] _66 <- ([#"../index_range.rs" 107 12 107 24] _68 = (-1 : int32));
+    switch (_66)
       | False -> goto BB36
       | True -> goto BB35
       end
   }
   BB35 {
-    [#"../index_range.rs" 108 15 108 18] _74 <- ([#"../index_range.rs" 108 15 108 18] index1 ([#"../index_range.rs" 108 12 108 15] arr) ([#"../index_range.rs" 108 16 108 17] [#"../index_range.rs" 108 16 108 17] (1 : usize)));
+    [#"../index_range.rs" 108 15 108 18] _74 <- ([#"../index_range.rs" 108 15 108 18] index1 arr (1 : usize));
     goto BB37
   }
   BB36 {
@@ -1439,13 +1564,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB37 {
-    switch ([#"../index_range.rs" 108 12 108 23] ([#"../index_range.rs" 108 12 108 18] _74) = ([#"../index_range.rs" 108 22 108 23] [#"../index_range.rs" 108 22 108 23] (1 : int32)))
+    [#"../index_range.rs" 108 12 108 23] _72 <- ([#"../index_range.rs" 108 12 108 23] _74 = (1 : int32));
+    switch (_72)
       | False -> goto BB39
       | True -> goto BB38
       end
   }
   BB38 {
-    [#"../index_range.rs" 109 15 109 18] _80 <- ([#"../index_range.rs" 109 15 109 18] index1 ([#"../index_range.rs" 109 12 109 15] arr) ([#"../index_range.rs" 109 16 109 17] [#"../index_range.rs" 109 16 109 17] (2 : usize)));
+    [#"../index_range.rs" 109 15 109 18] _80 <- ([#"../index_range.rs" 109 15 109 18] index1 arr (2 : usize));
     goto BB40
   }
   BB39 {
@@ -1454,13 +1580,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB40 {
-    switch ([#"../index_range.rs" 109 12 109 24] ([#"../index_range.rs" 109 12 109 18] _80) = ([#"../index_range.rs" 109 22 109 24] [#"../index_range.rs" 109 22 109 24] (-1 : int32)))
+    [#"../index_range.rs" 109 12 109 24] _78 <- ([#"../index_range.rs" 109 12 109 24] _80 = (-1 : int32));
+    switch (_78)
       | False -> goto BB42
       | True -> goto BB41
       end
   }
   BB41 {
-    [#"../index_range.rs" 110 15 110 18] _86 <- ([#"../index_range.rs" 110 15 110 18] index1 ([#"../index_range.rs" 110 12 110 15] arr) ([#"../index_range.rs" 110 16 110 17] [#"../index_range.rs" 110 16 110 17] (3 : usize)));
+    [#"../index_range.rs" 110 15 110 18] _86 <- ([#"../index_range.rs" 110 15 110 18] index1 arr (3 : usize));
     goto BB43
   }
   BB42 {
@@ -1469,13 +1596,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB43 {
-    switch ([#"../index_range.rs" 110 12 110 23] ([#"../index_range.rs" 110 12 110 18] _86) = ([#"../index_range.rs" 110 22 110 23] [#"../index_range.rs" 110 22 110 23] (3 : int32)))
+    [#"../index_range.rs" 110 12 110 23] _84 <- ([#"../index_range.rs" 110 12 110 23] _86 = (3 : int32));
+    switch (_84)
       | False -> goto BB45
       | True -> goto BB44
       end
   }
   BB44 {
-    [#"../index_range.rs" 111 15 111 18] _92 <- ([#"../index_range.rs" 111 15 111 18] index1 ([#"../index_range.rs" 111 12 111 15] arr) ([#"../index_range.rs" 111 16 111 17] [#"../index_range.rs" 111 16 111 17] (4 : usize)));
+    [#"../index_range.rs" 111 15 111 18] _92 <- ([#"../index_range.rs" 111 15 111 18] index1 arr (4 : usize));
     goto BB46
   }
   BB45 {
@@ -1485,7 +1613,8 @@ module IndexRange_TestRangeTo
   }
   BB46 {
     assume { resolve0 arr };
-    switch ([#"../index_range.rs" 111 12 111 23] ([#"../index_range.rs" 111 12 111 18] _92) = ([#"../index_range.rs" 111 22 111 23] [#"../index_range.rs" 111 22 111 23] (4 : int32)))
+    [#"../index_range.rs" 111 12 111 23] _90 <- ([#"../index_range.rs" 111 12 111 23] _92 = (4 : int32));
+    switch (_90)
       | False -> goto BB48
       | True -> goto BB47
       end
@@ -1789,34 +1918,56 @@ module IndexRange_TestRangeFrom
   var arr : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var s : slice int32;
   var _3 : slice int32;
+  var _5 : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
+  var _7 : bool;
   var _8 : usize;
+  var _10 : bool;
   var _12 : usize;
+  var _13 : usize;
   var _14 : bool;
+  var _15 : bool;
   var _17 : usize;
+  var _18 : usize;
   var _19 : bool;
+  var _22 : bool;
   var _23 : usize;
   var _25 : slice int32;
+  var _27 : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
   var _30 : bool;
   var _32 : Core_Option_Option_Type.t_option (slice int32);
   var _34 : slice int32;
+  var _36 : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
   var _39 : bool;
   var _41 : Core_Option_Option_Type.t_option (slice int32);
   var _43 : slice int32;
+  var _45 : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
   var s1 : borrowed (slice int32);
   var _48 : borrowed (slice int32);
   var _49 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _50 : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
+  var _52 : bool;
   var _53 : usize;
   var _56 : usize;
+  var _57 : usize;
   var _58 : bool;
   var _59 : usize;
+  var _60 : usize;
   var _61 : bool;
+  var _63 : bool;
   var _65 : usize;
+  var _66 : usize;
   var _67 : bool;
+  var _70 : bool;
   var _71 : usize;
+  var _75 : bool;
   var _77 : int32;
+  var _81 : bool;
   var _83 : int32;
+  var _87 : bool;
   var _89 : int32;
+  var _93 : bool;
   var _95 : int32;
+  var _99 : bool;
   var _101 : int32;
   {
     goto BB0
@@ -1826,46 +1977,56 @@ module IndexRange_TestRangeFrom
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 122 16 122 21] _3 <- ([#"../index_range.rs" 122 16 122 21] index0 ([#"../index_range.rs" 122 13 122 16] arr) ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 122 17 122 18] [#"../index_range.rs" 122 17 122 18] (3 : usize))));
+    [#"../index_range.rs" 122 17 122 20] _5 <- ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (3 : usize));
+    [#"../index_range.rs" 122 16 122 21] _3 <- ([#"../index_range.rs" 122 16 122 21] index0 arr _5);
+    _5 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 122 12 122 21] s <- ([#"../index_range.rs" 122 12 122 21] _3);
-    [#"../index_range.rs" 123 12 123 19] _8 <- ([#"../index_range.rs" 123 12 123 19] len0 ([#"../index_range.rs" 123 12 123 13] s));
+    [#"../index_range.rs" 123 12 123 19] _8 <- ([#"../index_range.rs" 123 12 123 19] len0 s);
     goto BB3
   }
   BB3 {
-    switch ([#"../index_range.rs" 123 12 123 24] _8 = ([#"../index_range.rs" 123 23 123 24] [#"../index_range.rs" 123 23 123 24] (2 : usize)))
+    [#"../index_range.rs" 123 12 123 24] _7 <- ([#"../index_range.rs" 123 12 123 24] _8 = (2 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB11
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] [#"../index_range.rs" 123 30 123 31] (0 : usize));
-    [#"../index_range.rs" 123 28 123 32] _14 <- ([#"../index_range.rs" 123 28 123 32] _12 < ([#"../index_range.rs" 123 28 123 32] Slice.length s));
+    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] (0 : usize));
+    [#"../index_range.rs" 123 28 123 32] _13 <- ([#"../index_range.rs" 123 28 123 32] Slice.length s);
+    [#"../index_range.rs" 123 28 123 32] _14 <- ([#"../index_range.rs" 123 28 123 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 28 123 32] _14 };
     goto BB5
   }
   BB5 {
-    switch ([#"../index_range.rs" 123 28 123 37] ([#"../index_range.rs" 123 28 123 32] Slice.get s _12) = ([#"../index_range.rs" 123 36 123 37] [#"../index_range.rs" 123 36 123 37] (3 : int32)))
+    [#"../index_range.rs" 123 28 123 37] _10 <- ([#"../index_range.rs" 123 28 123 37] Slice.get s _12 = (3 : int32));
+    switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] [#"../index_range.rs" 123 43 123 44] (1 : usize));
-    [#"../index_range.rs" 123 41 123 45] _19 <- ([#"../index_range.rs" 123 41 123 45] _17 < ([#"../index_range.rs" 123 41 123 45] Slice.length s));
+    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] (1 : usize));
+    [#"../index_range.rs" 123 41 123 45] _18 <- ([#"../index_range.rs" 123 41 123 45] Slice.length s);
+    [#"../index_range.rs" 123 41 123 45] _19 <- ([#"../index_range.rs" 123 41 123 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 41 123 45] _19 };
     goto BB7
   }
   BB7 {
-    switch ([#"../index_range.rs" 123 41 123 50] ([#"../index_range.rs" 123 41 123 45] Slice.get s _17) = ([#"../index_range.rs" 123 49 123 50] [#"../index_range.rs" 123 49 123 50] (4 : int32)))
+    [#"../index_range.rs" 123 41 123 50] _15 <- ([#"../index_range.rs" 123 41 123 50] Slice.get s _17 = (4 : int32));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 128 15 128 20] _25 <- ([#"../index_range.rs" 128 15 128 20] index0 ([#"../index_range.rs" 128 12 128 15] arr) ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 128 16 128 17] [#"../index_range.rs" 128 16 128 17] (5 : usize))));
+    [#"../index_range.rs" 128 16 128 19] _27 <- ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (5 : usize));
+    [#"../index_range.rs" 128 15 128 20] _25 <- ([#"../index_range.rs" 128 15 128 20] index0 arr _27);
+    _27 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB13
   }
   BB9 {
@@ -1885,17 +2046,19 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 128 12 128 26] _23 <- ([#"../index_range.rs" 128 12 128 26] len0 ([#"../index_range.rs" 128 12 128 20] _25));
+    [#"../index_range.rs" 128 12 128 26] _23 <- ([#"../index_range.rs" 128 12 128 26] len0 _25);
     goto BB14
   }
   BB14 {
-    switch ([#"../index_range.rs" 128 12 128 31] _23 = ([#"../index_range.rs" 128 30 128 31] [#"../index_range.rs" 128 30 128 31] (0 : usize)))
+    [#"../index_range.rs" 128 12 128 31] _22 <- ([#"../index_range.rs" 128 12 128 31] _23 = (0 : usize));
+    _23 <- any usize;
+    switch (_22)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../index_range.rs" 133 12 133 24] _34 <- ([#"../index_range.rs" 133 12 133 24] deref0 ([#"../index_range.rs" 133 12 133 15] arr));
+    [#"../index_range.rs" 133 12 133 24] _34 <- ([#"../index_range.rs" 133 12 133 24] deref0 arr);
     goto BB17
   }
   BB16 {
@@ -1904,11 +2067,13 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 133 12 133 24] _32 <- ([#"../index_range.rs" 133 12 133 24] get0 ([#"../index_range.rs" 133 12 133 15] _34) ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 133 20 133 21] [#"../index_range.rs" 133 20 133 21] (6 : usize))));
+    [#"../index_range.rs" 133 20 133 23] _36 <- ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (6 : usize));
+    [#"../index_range.rs" 133 12 133 24] _32 <- ([#"../index_range.rs" 133 12 133 24] get0 _34 _36);
+    _36 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB18
   }
   BB18 {
-    [#"../index_range.rs" 133 12 133 34] _30 <- ([#"../index_range.rs" 133 12 133 34] is_none0 ([#"../index_range.rs" 133 12 133 24] _32));
+    [#"../index_range.rs" 133 12 133 34] _30 <- ([#"../index_range.rs" 133 12 133 34] is_none0 _32);
     goto BB19
   }
   BB19 {
@@ -1918,7 +2083,7 @@ module IndexRange_TestRangeFrom
       end
   }
   BB20 {
-    [#"../index_range.rs" 135 12 135 25] _43 <- ([#"../index_range.rs" 135 12 135 25] deref0 ([#"../index_range.rs" 135 12 135 15] arr));
+    [#"../index_range.rs" 135 12 135 25] _43 <- ([#"../index_range.rs" 135 12 135 25] deref0 arr);
     goto BB22
   }
   BB21 {
@@ -1927,11 +2092,13 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 135 12 135 25] _41 <- ([#"../index_range.rs" 135 12 135 25] get0 ([#"../index_range.rs" 135 12 135 15] _43) ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 135 20 135 22] [#"../index_range.rs" 135 20 135 22] (10 : usize))));
+    [#"../index_range.rs" 135 20 135 24] _45 <- ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (10 : usize));
+    [#"../index_range.rs" 135 12 135 25] _41 <- ([#"../index_range.rs" 135 12 135 25] get0 _43 _45);
+    _45 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 135 12 135 35] _39 <- ([#"../index_range.rs" 135 12 135 35] is_none0 ([#"../index_range.rs" 135 12 135 25] _41));
+    [#"../index_range.rs" 135 12 135 35] _39 <- ([#"../index_range.rs" 135 12 135 35] is_none0 _41);
     goto BB24
   }
   BB24 {
@@ -1943,8 +2110,10 @@ module IndexRange_TestRangeFrom
   BB25 {
     [#"../index_range.rs" 138 17 138 20] _49 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 138 17 138 20] arr <-  ^ _49;
-    [#"../index_range.rs" 138 20 138 25] _48 <- ([#"../index_range.rs" 138 20 138 25] index_mut0 _49 ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 138 21 138 22] [#"../index_range.rs" 138 21 138 22] (2 : usize))));
+    [#"../index_range.rs" 138 21 138 24] _50 <- ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (2 : usize));
+    [#"../index_range.rs" 138 20 138 25] _48 <- ([#"../index_range.rs" 138 20 138 25] index_mut0 _49 _50);
     _49 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+    _50 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB27
   }
   BB26 {
@@ -1955,18 +2124,21 @@ module IndexRange_TestRangeFrom
   BB27 {
     [#"../index_range.rs" 138 12 138 25] s1 <- Borrow.borrow_final ( * _48) (Borrow.get_id _48);
     [#"../index_range.rs" 138 12 138 25] _48 <- { _48 with current = ( ^ s1) ; };
-    [#"../index_range.rs" 139 12 139 19] _53 <- ([#"../index_range.rs" 139 12 139 19] len0 ([#"../index_range.rs" 139 12 139 13]  * s1));
+    [#"../index_range.rs" 139 12 139 19] _53 <- ([#"../index_range.rs" 139 12 139 19] len0 ( * s1));
     goto BB28
   }
   BB28 {
-    switch ([#"../index_range.rs" 139 12 139 24] _53 = ([#"../index_range.rs" 139 23 139 24] [#"../index_range.rs" 139 23 139 24] (3 : usize)))
+    [#"../index_range.rs" 139 12 139 24] _52 <- ([#"../index_range.rs" 139 12 139 24] _53 = (3 : usize));
+    _53 <- any usize;
+    switch (_52)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] [#"../index_range.rs" 140 6 140 7] (0 : usize));
-    [#"../index_range.rs" 140 4 140 8] _58 <- ([#"../index_range.rs" 140 4 140 8] _56 < ([#"../index_range.rs" 140 4 140 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] (0 : usize));
+    [#"../index_range.rs" 140 4 140 8] _57 <- ([#"../index_range.rs" 140 4 140 8] Slice.length ( * s1));
+    [#"../index_range.rs" 140 4 140 8] _58 <- ([#"../index_range.rs" 140 4 140 8] _56 < _57);
     assert { [@expl:index in bounds] [#"../index_range.rs" 140 4 140 8] _58 };
     goto BB31
   }
@@ -1978,29 +2150,32 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] [#"../index_range.rs" 140 11 140 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] [#"../index_range.rs" 141 6 141 7] (1 : usize));
-    [#"../index_range.rs" 141 4 141 8] _61 <- ([#"../index_range.rs" 141 4 141 8] _59 < ([#"../index_range.rs" 141 4 141 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] (1 : usize));
+    [#"../index_range.rs" 141 4 141 8] _60 <- ([#"../index_range.rs" 141 4 141 8] Slice.length ( * s1));
+    [#"../index_range.rs" 141 4 141 8] _61 <- ([#"../index_range.rs" 141 4 141 8] _59 < _60);
     assert { [@expl:index in bounds] [#"../index_range.rs" 141 4 141 8] _61 };
     goto BB32
   }
   BB32 {
-    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] [#"../index_range.rs" 141 11 141 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] [#"../index_range.rs" 143 14 143 15] (2 : usize));
-    [#"../index_range.rs" 143 12 143 16] _67 <- ([#"../index_range.rs" 143 12 143 16] _65 < ([#"../index_range.rs" 143 12 143 16] Slice.length ( * s1)));
+    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] (2 : usize));
+    [#"../index_range.rs" 143 12 143 16] _66 <- ([#"../index_range.rs" 143 12 143 16] Slice.length ( * s1));
+    [#"../index_range.rs" 143 12 143 16] _67 <- ([#"../index_range.rs" 143 12 143 16] _65 < _66);
     assert { [@expl:index in bounds] [#"../index_range.rs" 143 12 143 16] _67 };
     goto BB33
   }
   BB33 {
     assume { resolve1 s1 };
+    [#"../index_range.rs" 143 12 143 21] _63 <- ([#"../index_range.rs" 143 12 143 21] Slice.get ( * s1) _65 = (4 : int32));
     assume { resolve1 _48 };
-    switch ([#"../index_range.rs" 143 12 143 21] ([#"../index_range.rs" 143 12 143 16] Slice.get ( * s1) _65) = ([#"../index_range.rs" 143 20 143 21] [#"../index_range.rs" 143 20 143 21] (4 : int32)))
+    switch (_63)
       | False -> goto BB35
       | True -> goto BB34
       end
   }
   BB34 {
-    [#"../index_range.rs" 145 12 145 21] _71 <- ([#"../index_range.rs" 145 12 145 21] len1 ([#"../index_range.rs" 145 12 145 15] arr));
+    [#"../index_range.rs" 145 12 145 21] _71 <- ([#"../index_range.rs" 145 12 145 21] len1 arr);
     goto BB36
   }
   BB35 {
@@ -2009,13 +2184,15 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB36 {
-    switch ([#"../index_range.rs" 145 12 145 26] _71 = ([#"../index_range.rs" 145 25 145 26] [#"../index_range.rs" 145 25 145 26] (5 : usize)))
+    [#"../index_range.rs" 145 12 145 26] _70 <- ([#"../index_range.rs" 145 12 145 26] _71 = (5 : usize));
+    _71 <- any usize;
+    switch (_70)
       | False -> goto BB38
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../index_range.rs" 146 15 146 18] _77 <- ([#"../index_range.rs" 146 15 146 18] index1 ([#"../index_range.rs" 146 12 146 15] arr) ([#"../index_range.rs" 146 16 146 17] [#"../index_range.rs" 146 16 146 17] (0 : usize)));
+    [#"../index_range.rs" 146 15 146 18] _77 <- ([#"../index_range.rs" 146 15 146 18] index1 arr (0 : usize));
     goto BB39
   }
   BB38 {
@@ -2024,13 +2201,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB39 {
-    switch ([#"../index_range.rs" 146 12 146 23] ([#"../index_range.rs" 146 12 146 18] _77) = ([#"../index_range.rs" 146 22 146 23] [#"../index_range.rs" 146 22 146 23] (0 : int32)))
+    [#"../index_range.rs" 146 12 146 23] _75 <- ([#"../index_range.rs" 146 12 146 23] _77 = (0 : int32));
+    switch (_75)
       | False -> goto BB41
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../index_range.rs" 147 15 147 18] _83 <- ([#"../index_range.rs" 147 15 147 18] index1 ([#"../index_range.rs" 147 12 147 15] arr) ([#"../index_range.rs" 147 16 147 17] [#"../index_range.rs" 147 16 147 17] (1 : usize)));
+    [#"../index_range.rs" 147 15 147 18] _83 <- ([#"../index_range.rs" 147 15 147 18] index1 arr (1 : usize));
     goto BB42
   }
   BB41 {
@@ -2039,13 +2217,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB42 {
-    switch ([#"../index_range.rs" 147 12 147 23] ([#"../index_range.rs" 147 12 147 18] _83) = ([#"../index_range.rs" 147 22 147 23] [#"../index_range.rs" 147 22 147 23] (1 : int32)))
+    [#"../index_range.rs" 147 12 147 23] _81 <- ([#"../index_range.rs" 147 12 147 23] _83 = (1 : int32));
+    switch (_81)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../index_range.rs" 148 15 148 18] _89 <- ([#"../index_range.rs" 148 15 148 18] index1 ([#"../index_range.rs" 148 12 148 15] arr) ([#"../index_range.rs" 148 16 148 17] [#"../index_range.rs" 148 16 148 17] (2 : usize)));
+    [#"../index_range.rs" 148 15 148 18] _89 <- ([#"../index_range.rs" 148 15 148 18] index1 arr (2 : usize));
     goto BB45
   }
   BB44 {
@@ -2054,13 +2233,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB45 {
-    switch ([#"../index_range.rs" 148 12 148 24] ([#"../index_range.rs" 148 12 148 18] _89) = ([#"../index_range.rs" 148 22 148 24] [#"../index_range.rs" 148 22 148 24] (-1 : int32)))
+    [#"../index_range.rs" 148 12 148 24] _87 <- ([#"../index_range.rs" 148 12 148 24] _89 = (-1 : int32));
+    switch (_87)
       | False -> goto BB47
       | True -> goto BB46
       end
   }
   BB46 {
-    [#"../index_range.rs" 149 15 149 18] _95 <- ([#"../index_range.rs" 149 15 149 18] index1 ([#"../index_range.rs" 149 12 149 15] arr) ([#"../index_range.rs" 149 16 149 17] [#"../index_range.rs" 149 16 149 17] (3 : usize)));
+    [#"../index_range.rs" 149 15 149 18] _95 <- ([#"../index_range.rs" 149 15 149 18] index1 arr (3 : usize));
     goto BB48
   }
   BB47 {
@@ -2069,13 +2249,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB48 {
-    switch ([#"../index_range.rs" 149 12 149 24] ([#"../index_range.rs" 149 12 149 18] _95) = ([#"../index_range.rs" 149 22 149 24] [#"../index_range.rs" 149 22 149 24] (-1 : int32)))
+    [#"../index_range.rs" 149 12 149 24] _93 <- ([#"../index_range.rs" 149 12 149 24] _95 = (-1 : int32));
+    switch (_93)
       | False -> goto BB50
       | True -> goto BB49
       end
   }
   BB49 {
-    [#"../index_range.rs" 150 15 150 18] _101 <- ([#"../index_range.rs" 150 15 150 18] index1 ([#"../index_range.rs" 150 12 150 15] arr) ([#"../index_range.rs" 150 16 150 17] [#"../index_range.rs" 150 16 150 17] (4 : usize)));
+    [#"../index_range.rs" 150 15 150 18] _101 <- ([#"../index_range.rs" 150 15 150 18] index1 arr (4 : usize));
     goto BB51
   }
   BB50 {
@@ -2085,7 +2266,8 @@ module IndexRange_TestRangeFrom
   }
   BB51 {
     assume { resolve0 arr };
-    switch ([#"../index_range.rs" 150 12 150 23] ([#"../index_range.rs" 150 12 150 18] _101) = ([#"../index_range.rs" 150 22 150 23] [#"../index_range.rs" 150 22 150 23] (4 : int32)))
+    [#"../index_range.rs" 150 12 150 23] _99 <- ([#"../index_range.rs" 150 12 150 23] _101 = (4 : int32));
+    switch (_99)
       | False -> goto BB53
       | True -> goto BB52
       end
@@ -2345,30 +2527,52 @@ module IndexRange_TestRangeFull
   var arr : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var s : slice int32;
   var _3 : slice int32;
+  var _5 : Core_Ops_Range_RangeFull_Type.t_rangefull;
+  var _7 : bool;
   var _8 : usize;
+  var _10 : bool;
   var _12 : usize;
+  var _13 : usize;
   var _14 : bool;
+  var _15 : bool;
   var _17 : usize;
+  var _18 : usize;
   var _19 : bool;
+  var _20 : bool;
   var _22 : usize;
+  var _23 : usize;
   var _24 : bool;
+  var _25 : bool;
   var _27 : usize;
+  var _28 : usize;
   var _29 : bool;
+  var _30 : bool;
   var _32 : usize;
+  var _33 : usize;
   var _34 : bool;
   var s1 : borrowed (slice int32);
   var _37 : borrowed (slice int32);
   var _38 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _39 : Core_Ops_Range_RangeFull_Type.t_rangefull;
+  var _41 : bool;
   var _42 : usize;
   var _45 : usize;
+  var _46 : usize;
   var _47 : bool;
   var _48 : usize;
+  var _49 : usize;
   var _50 : bool;
+  var _52 : bool;
   var _53 : usize;
+  var _57 : bool;
   var _59 : int32;
+  var _63 : bool;
   var _65 : int32;
+  var _69 : bool;
   var _71 : int32;
+  var _75 : bool;
   var _77 : int32;
+  var _81 : bool;
   var _83 : int32;
   {
     goto BB0
@@ -2378,76 +2582,90 @@ module IndexRange_TestRangeFull
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 161 16 161 20] _3 <- ([#"../index_range.rs" 161 16 161 20] index0 ([#"../index_range.rs" 161 13 161 16] arr) ([#"../index_range.rs" 161 17 161 19] Core_Ops_Range_RangeFull_Type.C_RangeFull));
+    [#"../index_range.rs" 161 17 161 19] _5 <- ([#"../index_range.rs" 161 17 161 19] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../index_range.rs" 161 16 161 20] _3 <- ([#"../index_range.rs" 161 16 161 20] index0 arr _5);
+    _5 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 161 12 161 20] s <- ([#"../index_range.rs" 161 12 161 20] _3);
-    [#"../index_range.rs" 162 12 162 19] _8 <- ([#"../index_range.rs" 162 12 162 19] len0 ([#"../index_range.rs" 162 12 162 13] s));
+    [#"../index_range.rs" 162 12 162 19] _8 <- ([#"../index_range.rs" 162 12 162 19] len0 s);
     goto BB3
   }
   BB3 {
-    switch ([#"../index_range.rs" 162 12 162 24] _8 = ([#"../index_range.rs" 162 23 162 24] [#"../index_range.rs" 162 23 162 24] (5 : usize)))
+    [#"../index_range.rs" 162 12 162 24] _7 <- ([#"../index_range.rs" 162 12 162 24] _8 = (5 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB20
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] [#"../index_range.rs" 162 30 162 31] (0 : usize));
-    [#"../index_range.rs" 162 28 162 32] _14 <- ([#"../index_range.rs" 162 28 162 32] _12 < ([#"../index_range.rs" 162 28 162 32] Slice.length s));
+    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] (0 : usize));
+    [#"../index_range.rs" 162 28 162 32] _13 <- ([#"../index_range.rs" 162 28 162 32] Slice.length s);
+    [#"../index_range.rs" 162 28 162 32] _14 <- ([#"../index_range.rs" 162 28 162 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 28 162 32] _14 };
     goto BB5
   }
   BB5 {
-    switch ([#"../index_range.rs" 162 28 162 37] ([#"../index_range.rs" 162 28 162 32] Slice.get s _12) = ([#"../index_range.rs" 162 36 162 37] [#"../index_range.rs" 162 36 162 37] (0 : int32)))
+    [#"../index_range.rs" 162 28 162 37] _10 <- ([#"../index_range.rs" 162 28 162 37] Slice.get s _12 = (0 : int32));
+    switch (_10)
       | False -> goto BB19
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] [#"../index_range.rs" 162 43 162 44] (1 : usize));
-    [#"../index_range.rs" 162 41 162 45] _19 <- ([#"../index_range.rs" 162 41 162 45] _17 < ([#"../index_range.rs" 162 41 162 45] Slice.length s));
+    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] (1 : usize));
+    [#"../index_range.rs" 162 41 162 45] _18 <- ([#"../index_range.rs" 162 41 162 45] Slice.length s);
+    [#"../index_range.rs" 162 41 162 45] _19 <- ([#"../index_range.rs" 162 41 162 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 41 162 45] _19 };
     goto BB7
   }
   BB7 {
-    switch ([#"../index_range.rs" 162 41 162 50] ([#"../index_range.rs" 162 41 162 45] Slice.get s _17) = ([#"../index_range.rs" 162 49 162 50] [#"../index_range.rs" 162 49 162 50] (1 : int32)))
+    [#"../index_range.rs" 162 41 162 50] _15 <- ([#"../index_range.rs" 162 41 162 50] Slice.get s _17 = (1 : int32));
+    switch (_15)
       | False -> goto BB18
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] [#"../index_range.rs" 162 56 162 57] (2 : usize));
-    [#"../index_range.rs" 162 54 162 58] _24 <- ([#"../index_range.rs" 162 54 162 58] _22 < ([#"../index_range.rs" 162 54 162 58] Slice.length s));
+    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] (2 : usize));
+    [#"../index_range.rs" 162 54 162 58] _23 <- ([#"../index_range.rs" 162 54 162 58] Slice.length s);
+    [#"../index_range.rs" 162 54 162 58] _24 <- ([#"../index_range.rs" 162 54 162 58] _22 < _23);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 54 162 58] _24 };
     goto BB9
   }
   BB9 {
-    switch ([#"../index_range.rs" 162 54 162 63] ([#"../index_range.rs" 162 54 162 58] Slice.get s _22) = ([#"../index_range.rs" 162 62 162 63] [#"../index_range.rs" 162 62 162 63] (2 : int32)))
+    [#"../index_range.rs" 162 54 162 63] _20 <- ([#"../index_range.rs" 162 54 162 63] Slice.get s _22 = (2 : int32));
+    switch (_20)
       | False -> goto BB17
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] [#"../index_range.rs" 162 69 162 70] (3 : usize));
-    [#"../index_range.rs" 162 67 162 71] _29 <- ([#"../index_range.rs" 162 67 162 71] _27 < ([#"../index_range.rs" 162 67 162 71] Slice.length s));
+    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] (3 : usize));
+    [#"../index_range.rs" 162 67 162 71] _28 <- ([#"../index_range.rs" 162 67 162 71] Slice.length s);
+    [#"../index_range.rs" 162 67 162 71] _29 <- ([#"../index_range.rs" 162 67 162 71] _27 < _28);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 67 162 71] _29 };
     goto BB11
   }
   BB11 {
-    switch ([#"../index_range.rs" 162 67 162 76] ([#"../index_range.rs" 162 67 162 71] Slice.get s _27) = ([#"../index_range.rs" 162 75 162 76] [#"../index_range.rs" 162 75 162 76] (3 : int32)))
+    [#"../index_range.rs" 162 67 162 76] _25 <- ([#"../index_range.rs" 162 67 162 76] Slice.get s _27 = (3 : int32));
+    switch (_25)
       | False -> goto BB16
       | True -> goto BB12
       end
   }
   BB12 {
-    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] [#"../index_range.rs" 162 82 162 83] (4 : usize));
-    [#"../index_range.rs" 162 80 162 84] _34 <- ([#"../index_range.rs" 162 80 162 84] _32 < ([#"../index_range.rs" 162 80 162 84] Slice.length s));
+    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] (4 : usize));
+    [#"../index_range.rs" 162 80 162 84] _33 <- ([#"../index_range.rs" 162 80 162 84] Slice.length s);
+    [#"../index_range.rs" 162 80 162 84] _34 <- ([#"../index_range.rs" 162 80 162 84] _32 < _33);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 80 162 84] _34 };
     goto BB13
   }
   BB13 {
-    switch ([#"../index_range.rs" 162 80 162 89] ([#"../index_range.rs" 162 80 162 84] Slice.get s _32) = ([#"../index_range.rs" 162 88 162 89] [#"../index_range.rs" 162 88 162 89] (4 : int32)))
+    [#"../index_range.rs" 162 80 162 89] _30 <- ([#"../index_range.rs" 162 80 162 89] Slice.get s _32 = (4 : int32));
+    switch (_30)
       | False -> goto BB15
       | True -> goto BB14
       end
@@ -2455,8 +2673,10 @@ module IndexRange_TestRangeFull
   BB14 {
     [#"../index_range.rs" 165 17 165 20] _38 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 165 17 165 20] arr <-  ^ _38;
-    [#"../index_range.rs" 165 20 165 24] _37 <- ([#"../index_range.rs" 165 20 165 24] index_mut0 _38 ([#"../index_range.rs" 165 21 165 23] Core_Ops_Range_RangeFull_Type.C_RangeFull));
+    [#"../index_range.rs" 165 21 165 23] _39 <- ([#"../index_range.rs" 165 21 165 23] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../index_range.rs" 165 20 165 24] _37 <- ([#"../index_range.rs" 165 20 165 24] index_mut0 _38 _39);
     _38 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+    _39 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
     goto BB22
   }
   BB15 {
@@ -2490,18 +2710,21 @@ module IndexRange_TestRangeFull
   BB22 {
     [#"../index_range.rs" 165 12 165 24] s1 <- Borrow.borrow_final ( * _37) (Borrow.get_id _37);
     [#"../index_range.rs" 165 12 165 24] _37 <- { _37 with current = ( ^ s1) ; };
-    [#"../index_range.rs" 166 12 166 19] _42 <- ([#"../index_range.rs" 166 12 166 19] len0 ([#"../index_range.rs" 166 12 166 13]  * s1));
+    [#"../index_range.rs" 166 12 166 19] _42 <- ([#"../index_range.rs" 166 12 166 19] len0 ( * s1));
     goto BB23
   }
   BB23 {
-    switch ([#"../index_range.rs" 166 12 166 24] _42 = ([#"../index_range.rs" 166 23 166 24] [#"../index_range.rs" 166 23 166 24] (5 : usize)))
+    [#"../index_range.rs" 166 12 166 24] _41 <- ([#"../index_range.rs" 166 12 166 24] _42 = (5 : usize));
+    _42 <- any usize;
+    switch (_41)
       | False -> goto BB25
       | True -> goto BB24
       end
   }
   BB24 {
-    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] [#"../index_range.rs" 167 6 167 7] (1 : usize));
-    [#"../index_range.rs" 167 4 167 8] _47 <- ([#"../index_range.rs" 167 4 167 8] _45 < ([#"../index_range.rs" 167 4 167 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] (1 : usize));
+    [#"../index_range.rs" 167 4 167 8] _46 <- ([#"../index_range.rs" 167 4 167 8] Slice.length ( * s1));
+    [#"../index_range.rs" 167 4 167 8] _47 <- ([#"../index_range.rs" 167 4 167 8] _45 < _46);
     assert { [@expl:index in bounds] [#"../index_range.rs" 167 4 167 8] _47 };
     goto BB26
   }
@@ -2513,27 +2736,30 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] [#"../index_range.rs" 167 11 167 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] [#"../index_range.rs" 168 6 168 7] (3 : usize));
-    [#"../index_range.rs" 168 4 168 8] _50 <- ([#"../index_range.rs" 168 4 168 8] _48 < ([#"../index_range.rs" 168 4 168 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] (3 : usize));
+    [#"../index_range.rs" 168 4 168 8] _49 <- ([#"../index_range.rs" 168 4 168 8] Slice.length ( * s1));
+    [#"../index_range.rs" 168 4 168 8] _50 <- ([#"../index_range.rs" 168 4 168 8] _48 < _49);
     assert { [@expl:index in bounds] [#"../index_range.rs" 168 4 168 8] _50 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] [#"../index_range.rs" 168 11 168 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] (-1 : int32)) ; };
     assume { resolve1 s1 };
     assume { resolve1 _37 };
-    [#"../index_range.rs" 170 12 170 21] _53 <- ([#"../index_range.rs" 170 12 170 21] len1 ([#"../index_range.rs" 170 12 170 15] arr));
+    [#"../index_range.rs" 170 12 170 21] _53 <- ([#"../index_range.rs" 170 12 170 21] len1 arr);
     goto BB28
   }
   BB28 {
-    switch ([#"../index_range.rs" 170 12 170 26] _53 = ([#"../index_range.rs" 170 25 170 26] [#"../index_range.rs" 170 25 170 26] (5 : usize)))
+    [#"../index_range.rs" 170 12 170 26] _52 <- ([#"../index_range.rs" 170 12 170 26] _53 = (5 : usize));
+    _53 <- any usize;
+    switch (_52)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../index_range.rs" 171 15 171 18] _59 <- ([#"../index_range.rs" 171 15 171 18] index1 ([#"../index_range.rs" 171 12 171 15] arr) ([#"../index_range.rs" 171 16 171 17] [#"../index_range.rs" 171 16 171 17] (0 : usize)));
+    [#"../index_range.rs" 171 15 171 18] _59 <- ([#"../index_range.rs" 171 15 171 18] index1 arr (0 : usize));
     goto BB31
   }
   BB30 {
@@ -2542,13 +2768,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB31 {
-    switch ([#"../index_range.rs" 171 12 171 23] ([#"../index_range.rs" 171 12 171 18] _59) = ([#"../index_range.rs" 171 22 171 23] [#"../index_range.rs" 171 22 171 23] (0 : int32)))
+    [#"../index_range.rs" 171 12 171 23] _57 <- ([#"../index_range.rs" 171 12 171 23] _59 = (0 : int32));
+    switch (_57)
       | False -> goto BB33
       | True -> goto BB32
       end
   }
   BB32 {
-    [#"../index_range.rs" 172 15 172 18] _65 <- ([#"../index_range.rs" 172 15 172 18] index1 ([#"../index_range.rs" 172 12 172 15] arr) ([#"../index_range.rs" 172 16 172 17] [#"../index_range.rs" 172 16 172 17] (1 : usize)));
+    [#"../index_range.rs" 172 15 172 18] _65 <- ([#"../index_range.rs" 172 15 172 18] index1 arr (1 : usize));
     goto BB34
   }
   BB33 {
@@ -2557,13 +2784,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB34 {
-    switch ([#"../index_range.rs" 172 12 172 24] ([#"../index_range.rs" 172 12 172 18] _65) = ([#"../index_range.rs" 172 22 172 24] [#"../index_range.rs" 172 22 172 24] (-1 : int32)))
+    [#"../index_range.rs" 172 12 172 24] _63 <- ([#"../index_range.rs" 172 12 172 24] _65 = (-1 : int32));
+    switch (_63)
       | False -> goto BB36
       | True -> goto BB35
       end
   }
   BB35 {
-    [#"../index_range.rs" 173 15 173 18] _71 <- ([#"../index_range.rs" 173 15 173 18] index1 ([#"../index_range.rs" 173 12 173 15] arr) ([#"../index_range.rs" 173 16 173 17] [#"../index_range.rs" 173 16 173 17] (2 : usize)));
+    [#"../index_range.rs" 173 15 173 18] _71 <- ([#"../index_range.rs" 173 15 173 18] index1 arr (2 : usize));
     goto BB37
   }
   BB36 {
@@ -2572,13 +2800,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB37 {
-    switch ([#"../index_range.rs" 173 12 173 23] ([#"../index_range.rs" 173 12 173 18] _71) = ([#"../index_range.rs" 173 22 173 23] [#"../index_range.rs" 173 22 173 23] (2 : int32)))
+    [#"../index_range.rs" 173 12 173 23] _69 <- ([#"../index_range.rs" 173 12 173 23] _71 = (2 : int32));
+    switch (_69)
       | False -> goto BB39
       | True -> goto BB38
       end
   }
   BB38 {
-    [#"../index_range.rs" 174 15 174 18] _77 <- ([#"../index_range.rs" 174 15 174 18] index1 ([#"../index_range.rs" 174 12 174 15] arr) ([#"../index_range.rs" 174 16 174 17] [#"../index_range.rs" 174 16 174 17] (3 : usize)));
+    [#"../index_range.rs" 174 15 174 18] _77 <- ([#"../index_range.rs" 174 15 174 18] index1 arr (3 : usize));
     goto BB40
   }
   BB39 {
@@ -2587,13 +2816,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB40 {
-    switch ([#"../index_range.rs" 174 12 174 24] ([#"../index_range.rs" 174 12 174 18] _77) = ([#"../index_range.rs" 174 22 174 24] [#"../index_range.rs" 174 22 174 24] (-1 : int32)))
+    [#"../index_range.rs" 174 12 174 24] _75 <- ([#"../index_range.rs" 174 12 174 24] _77 = (-1 : int32));
+    switch (_75)
       | False -> goto BB42
       | True -> goto BB41
       end
   }
   BB41 {
-    [#"../index_range.rs" 175 15 175 18] _83 <- ([#"../index_range.rs" 175 15 175 18] index1 ([#"../index_range.rs" 175 12 175 15] arr) ([#"../index_range.rs" 175 16 175 17] [#"../index_range.rs" 175 16 175 17] (4 : usize)));
+    [#"../index_range.rs" 175 15 175 18] _83 <- ([#"../index_range.rs" 175 15 175 18] index1 arr (4 : usize));
     goto BB43
   }
   BB42 {
@@ -2603,7 +2833,8 @@ module IndexRange_TestRangeFull
   }
   BB43 {
     assume { resolve0 arr };
-    switch ([#"../index_range.rs" 175 12 175 23] ([#"../index_range.rs" 175 12 175 18] _83) = ([#"../index_range.rs" 175 22 175 23] [#"../index_range.rs" 175 22 175 23] (4 : int32)))
+    [#"../index_range.rs" 175 12 175 23] _81 <- ([#"../index_range.rs" 175 12 175 23] _83 = (4 : int32));
+    switch (_81)
       | False -> goto BB45
       | True -> goto BB44
       end
@@ -2907,29 +3138,48 @@ module IndexRange_TestRangeToInclusive
   var arr : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var s : slice int32;
   var _3 : slice int32;
+  var _5 : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
+  var _7 : bool;
   var _8 : usize;
+  var _10 : bool;
   var _12 : usize;
+  var _13 : usize;
   var _14 : bool;
+  var _15 : bool;
   var _17 : usize;
+  var _18 : usize;
   var _19 : bool;
   var _22 : bool;
   var _24 : Core_Option_Option_Type.t_option (slice int32);
   var _26 : slice int32;
+  var _28 : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
   var s1 : borrowed (slice int32);
   var _31 : borrowed (slice int32);
   var _32 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _33 : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
+  var _35 : bool;
   var _36 : usize;
   var _39 : usize;
+  var _40 : usize;
   var _41 : bool;
   var _42 : usize;
+  var _43 : usize;
   var _44 : bool;
+  var _46 : bool;
   var _48 : usize;
+  var _49 : usize;
   var _50 : bool;
+  var _53 : bool;
   var _54 : usize;
+  var _58 : bool;
   var _60 : int32;
+  var _64 : bool;
   var _66 : int32;
+  var _70 : bool;
   var _72 : int32;
+  var _76 : bool;
   var _78 : int32;
+  var _82 : bool;
   var _84 : int32;
   {
     goto BB0
@@ -2939,46 +3189,54 @@ module IndexRange_TestRangeToInclusive
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 186 16 186 22] _3 <- ([#"../index_range.rs" 186 16 186 22] index0 ([#"../index_range.rs" 186 13 186 16] arr) ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 186 20 186 21] [#"../index_range.rs" 186 20 186 21] (1 : usize))));
+    [#"../index_range.rs" 186 17 186 21] _5 <- ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (1 : usize));
+    [#"../index_range.rs" 186 16 186 22] _3 <- ([#"../index_range.rs" 186 16 186 22] index0 arr _5);
+    _5 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 186 12 186 22] s <- ([#"../index_range.rs" 186 12 186 22] _3);
-    [#"../index_range.rs" 187 12 187 19] _8 <- ([#"../index_range.rs" 187 12 187 19] len0 ([#"../index_range.rs" 187 12 187 13] s));
+    [#"../index_range.rs" 187 12 187 19] _8 <- ([#"../index_range.rs" 187 12 187 19] len0 s);
     goto BB3
   }
   BB3 {
-    switch ([#"../index_range.rs" 187 12 187 24] _8 = ([#"../index_range.rs" 187 23 187 24] [#"../index_range.rs" 187 23 187 24] (2 : usize)))
+    [#"../index_range.rs" 187 12 187 24] _7 <- ([#"../index_range.rs" 187 12 187 24] _8 = (2 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB11
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] [#"../index_range.rs" 187 30 187 31] (0 : usize));
-    [#"../index_range.rs" 187 28 187 32] _14 <- ([#"../index_range.rs" 187 28 187 32] _12 < ([#"../index_range.rs" 187 28 187 32] Slice.length s));
+    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] (0 : usize));
+    [#"../index_range.rs" 187 28 187 32] _13 <- ([#"../index_range.rs" 187 28 187 32] Slice.length s);
+    [#"../index_range.rs" 187 28 187 32] _14 <- ([#"../index_range.rs" 187 28 187 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 28 187 32] _14 };
     goto BB5
   }
   BB5 {
-    switch ([#"../index_range.rs" 187 28 187 37] ([#"../index_range.rs" 187 28 187 32] Slice.get s _12) = ([#"../index_range.rs" 187 36 187 37] [#"../index_range.rs" 187 36 187 37] (0 : int32)))
+    [#"../index_range.rs" 187 28 187 37] _10 <- ([#"../index_range.rs" 187 28 187 37] Slice.get s _12 = (0 : int32));
+    switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] [#"../index_range.rs" 187 43 187 44] (1 : usize));
-    [#"../index_range.rs" 187 41 187 45] _19 <- ([#"../index_range.rs" 187 41 187 45] _17 < ([#"../index_range.rs" 187 41 187 45] Slice.length s));
+    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] (1 : usize));
+    [#"../index_range.rs" 187 41 187 45] _18 <- ([#"../index_range.rs" 187 41 187 45] Slice.length s);
+    [#"../index_range.rs" 187 41 187 45] _19 <- ([#"../index_range.rs" 187 41 187 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 41 187 45] _19 };
     goto BB7
   }
   BB7 {
-    switch ([#"../index_range.rs" 187 41 187 50] ([#"../index_range.rs" 187 41 187 45] Slice.get s _17) = ([#"../index_range.rs" 187 49 187 50] [#"../index_range.rs" 187 49 187 50] (1 : int32)))
+    [#"../index_range.rs" 187 41 187 50] _15 <- ([#"../index_range.rs" 187 41 187 50] Slice.get s _17 = (1 : int32));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 192 12 192 25] _26 <- ([#"../index_range.rs" 192 12 192 25] deref0 ([#"../index_range.rs" 192 12 192 15] arr));
+    [#"../index_range.rs" 192 12 192 25] _26 <- ([#"../index_range.rs" 192 12 192 25] deref0 arr);
     goto BB13
   }
   BB9 {
@@ -2998,11 +3256,13 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 192 12 192 25] _24 <- ([#"../index_range.rs" 192 12 192 25] get0 ([#"../index_range.rs" 192 12 192 15] _26) ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 192 23 192 24] [#"../index_range.rs" 192 23 192 24] (5 : usize))));
+    [#"../index_range.rs" 192 20 192 24] _28 <- ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (5 : usize));
+    [#"../index_range.rs" 192 12 192 25] _24 <- ([#"../index_range.rs" 192 12 192 25] get0 _26 _28);
+    _28 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 192 12 192 35] _22 <- ([#"../index_range.rs" 192 12 192 35] is_none0 ([#"../index_range.rs" 192 12 192 25] _24));
+    [#"../index_range.rs" 192 12 192 35] _22 <- ([#"../index_range.rs" 192 12 192 35] is_none0 _24);
     goto BB15
   }
   BB15 {
@@ -3014,8 +3274,10 @@ module IndexRange_TestRangeToInclusive
   BB16 {
     [#"../index_range.rs" 195 17 195 20] _32 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 195 17 195 20] arr <-  ^ _32;
-    [#"../index_range.rs" 195 20 195 26] _31 <- ([#"../index_range.rs" 195 20 195 26] index_mut0 _32 ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 195 24 195 25] [#"../index_range.rs" 195 24 195 25] (2 : usize))));
+    [#"../index_range.rs" 195 21 195 25] _33 <- ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (2 : usize));
+    [#"../index_range.rs" 195 20 195 26] _31 <- ([#"../index_range.rs" 195 20 195 26] index_mut0 _32 _33);
     _32 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+    _33 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB18
   }
   BB17 {
@@ -3026,18 +3288,21 @@ module IndexRange_TestRangeToInclusive
   BB18 {
     [#"../index_range.rs" 195 12 195 26] s1 <- Borrow.borrow_final ( * _31) (Borrow.get_id _31);
     [#"../index_range.rs" 195 12 195 26] _31 <- { _31 with current = ( ^ s1) ; };
-    [#"../index_range.rs" 196 12 196 19] _36 <- ([#"../index_range.rs" 196 12 196 19] len0 ([#"../index_range.rs" 196 12 196 13]  * s1));
+    [#"../index_range.rs" 196 12 196 19] _36 <- ([#"../index_range.rs" 196 12 196 19] len0 ( * s1));
     goto BB19
   }
   BB19 {
-    switch ([#"../index_range.rs" 196 12 196 24] _36 = ([#"../index_range.rs" 196 23 196 24] [#"../index_range.rs" 196 23 196 24] (3 : usize)))
+    [#"../index_range.rs" 196 12 196 24] _35 <- ([#"../index_range.rs" 196 12 196 24] _36 = (3 : usize));
+    _36 <- any usize;
+    switch (_35)
       | False -> goto BB21
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] [#"../index_range.rs" 197 6 197 7] (0 : usize));
-    [#"../index_range.rs" 197 4 197 8] _41 <- ([#"../index_range.rs" 197 4 197 8] _39 < ([#"../index_range.rs" 197 4 197 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] (0 : usize));
+    [#"../index_range.rs" 197 4 197 8] _40 <- ([#"../index_range.rs" 197 4 197 8] Slice.length ( * s1));
+    [#"../index_range.rs" 197 4 197 8] _41 <- ([#"../index_range.rs" 197 4 197 8] _39 < _40);
     assert { [@expl:index in bounds] [#"../index_range.rs" 197 4 197 8] _41 };
     goto BB22
   }
@@ -3049,29 +3314,32 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] [#"../index_range.rs" 197 11 197 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] [#"../index_range.rs" 198 6 198 7] (2 : usize));
-    [#"../index_range.rs" 198 4 198 8] _44 <- ([#"../index_range.rs" 198 4 198 8] _42 < ([#"../index_range.rs" 198 4 198 8] Slice.length ( * s1)));
+    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] (2 : usize));
+    [#"../index_range.rs" 198 4 198 8] _43 <- ([#"../index_range.rs" 198 4 198 8] Slice.length ( * s1));
+    [#"../index_range.rs" 198 4 198 8] _44 <- ([#"../index_range.rs" 198 4 198 8] _42 < _43);
     assert { [@expl:index in bounds] [#"../index_range.rs" 198 4 198 8] _44 };
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] [#"../index_range.rs" 198 11 198 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] [#"../index_range.rs" 200 14 200 15] (1 : usize));
-    [#"../index_range.rs" 200 12 200 16] _50 <- ([#"../index_range.rs" 200 12 200 16] _48 < ([#"../index_range.rs" 200 12 200 16] Slice.length ( * s1)));
+    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] (1 : usize));
+    [#"../index_range.rs" 200 12 200 16] _49 <- ([#"../index_range.rs" 200 12 200 16] Slice.length ( * s1));
+    [#"../index_range.rs" 200 12 200 16] _50 <- ([#"../index_range.rs" 200 12 200 16] _48 < _49);
     assert { [@expl:index in bounds] [#"../index_range.rs" 200 12 200 16] _50 };
     goto BB24
   }
   BB24 {
     assume { resolve1 s1 };
+    [#"../index_range.rs" 200 12 200 21] _46 <- ([#"../index_range.rs" 200 12 200 21] Slice.get ( * s1) _48 = (1 : int32));
     assume { resolve1 _31 };
-    switch ([#"../index_range.rs" 200 12 200 21] ([#"../index_range.rs" 200 12 200 16] Slice.get ( * s1) _48) = ([#"../index_range.rs" 200 20 200 21] [#"../index_range.rs" 200 20 200 21] (1 : int32)))
+    switch (_46)
       | False -> goto BB26
       | True -> goto BB25
       end
   }
   BB25 {
-    [#"../index_range.rs" 202 12 202 21] _54 <- ([#"../index_range.rs" 202 12 202 21] len1 ([#"../index_range.rs" 202 12 202 15] arr));
+    [#"../index_range.rs" 202 12 202 21] _54 <- ([#"../index_range.rs" 202 12 202 21] len1 arr);
     goto BB27
   }
   BB26 {
@@ -3080,13 +3348,15 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB27 {
-    switch ([#"../index_range.rs" 202 12 202 26] _54 = ([#"../index_range.rs" 202 25 202 26] [#"../index_range.rs" 202 25 202 26] (5 : usize)))
+    [#"../index_range.rs" 202 12 202 26] _53 <- ([#"../index_range.rs" 202 12 202 26] _54 = (5 : usize));
+    _54 <- any usize;
+    switch (_53)
       | False -> goto BB29
       | True -> goto BB28
       end
   }
   BB28 {
-    [#"../index_range.rs" 203 15 203 18] _60 <- ([#"../index_range.rs" 203 15 203 18] index1 ([#"../index_range.rs" 203 12 203 15] arr) ([#"../index_range.rs" 203 16 203 17] [#"../index_range.rs" 203 16 203 17] (0 : usize)));
+    [#"../index_range.rs" 203 15 203 18] _60 <- ([#"../index_range.rs" 203 15 203 18] index1 arr (0 : usize));
     goto BB30
   }
   BB29 {
@@ -3095,13 +3365,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB30 {
-    switch ([#"../index_range.rs" 203 12 203 24] ([#"../index_range.rs" 203 12 203 18] _60) = ([#"../index_range.rs" 203 22 203 24] [#"../index_range.rs" 203 22 203 24] (-1 : int32)))
+    [#"../index_range.rs" 203 12 203 24] _58 <- ([#"../index_range.rs" 203 12 203 24] _60 = (-1 : int32));
+    switch (_58)
       | False -> goto BB32
       | True -> goto BB31
       end
   }
   BB31 {
-    [#"../index_range.rs" 204 15 204 18] _66 <- ([#"../index_range.rs" 204 15 204 18] index1 ([#"../index_range.rs" 204 12 204 15] arr) ([#"../index_range.rs" 204 16 204 17] [#"../index_range.rs" 204 16 204 17] (1 : usize)));
+    [#"../index_range.rs" 204 15 204 18] _66 <- ([#"../index_range.rs" 204 15 204 18] index1 arr (1 : usize));
     goto BB33
   }
   BB32 {
@@ -3110,13 +3381,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB33 {
-    switch ([#"../index_range.rs" 204 12 204 23] ([#"../index_range.rs" 204 12 204 18] _66) = ([#"../index_range.rs" 204 22 204 23] [#"../index_range.rs" 204 22 204 23] (1 : int32)))
+    [#"../index_range.rs" 204 12 204 23] _64 <- ([#"../index_range.rs" 204 12 204 23] _66 = (1 : int32));
+    switch (_64)
       | False -> goto BB35
       | True -> goto BB34
       end
   }
   BB34 {
-    [#"../index_range.rs" 205 15 205 18] _72 <- ([#"../index_range.rs" 205 15 205 18] index1 ([#"../index_range.rs" 205 12 205 15] arr) ([#"../index_range.rs" 205 16 205 17] [#"../index_range.rs" 205 16 205 17] (2 : usize)));
+    [#"../index_range.rs" 205 15 205 18] _72 <- ([#"../index_range.rs" 205 15 205 18] index1 arr (2 : usize));
     goto BB36
   }
   BB35 {
@@ -3125,13 +3397,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB36 {
-    switch ([#"../index_range.rs" 205 12 205 24] ([#"../index_range.rs" 205 12 205 18] _72) = ([#"../index_range.rs" 205 22 205 24] [#"../index_range.rs" 205 22 205 24] (-1 : int32)))
+    [#"../index_range.rs" 205 12 205 24] _70 <- ([#"../index_range.rs" 205 12 205 24] _72 = (-1 : int32));
+    switch (_70)
       | False -> goto BB38
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../index_range.rs" 206 15 206 18] _78 <- ([#"../index_range.rs" 206 15 206 18] index1 ([#"../index_range.rs" 206 12 206 15] arr) ([#"../index_range.rs" 206 16 206 17] [#"../index_range.rs" 206 16 206 17] (3 : usize)));
+    [#"../index_range.rs" 206 15 206 18] _78 <- ([#"../index_range.rs" 206 15 206 18] index1 arr (3 : usize));
     goto BB39
   }
   BB38 {
@@ -3140,13 +3413,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB39 {
-    switch ([#"../index_range.rs" 206 12 206 23] ([#"../index_range.rs" 206 12 206 18] _78) = ([#"../index_range.rs" 206 22 206 23] [#"../index_range.rs" 206 22 206 23] (3 : int32)))
+    [#"../index_range.rs" 206 12 206 23] _76 <- ([#"../index_range.rs" 206 12 206 23] _78 = (3 : int32));
+    switch (_76)
       | False -> goto BB41
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../index_range.rs" 207 15 207 18] _84 <- ([#"../index_range.rs" 207 15 207 18] index1 ([#"../index_range.rs" 207 12 207 15] arr) ([#"../index_range.rs" 207 16 207 17] [#"../index_range.rs" 207 16 207 17] (4 : usize)));
+    [#"../index_range.rs" 207 15 207 18] _84 <- ([#"../index_range.rs" 207 15 207 18] index1 arr (4 : usize));
     goto BB42
   }
   BB41 {
@@ -3156,7 +3430,8 @@ module IndexRange_TestRangeToInclusive
   }
   BB42 {
     assume { resolve0 arr };
-    switch ([#"../index_range.rs" 207 12 207 23] ([#"../index_range.rs" 207 12 207 18] _84) = ([#"../index_range.rs" 207 22 207 23] [#"../index_range.rs" 207 22 207 23] (4 : int32)))
+    [#"../index_range.rs" 207 12 207 23] _82 <- ([#"../index_range.rs" 207 12 207 23] _84 = (4 : int32));
+    switch (_82)
       | False -> goto BB44
       | True -> goto BB43
       end
diff --git a/creusot/tests/should_succeed/index_range/why3session.xml b/creusot/tests/should_succeed/index_range/why3session.xml
index 0007cfb686..108d138d7e 100644
--- a/creusot/tests/should_succeed/index_range/why3session.xml
+++ b/creusot/tests/should_succeed/index_range/why3session.xml
@@ -14,220 +14,220 @@
 </theory>
 <theory name="IndexRange_TestRange" proved="true">
  <goal name="test_range&#39;vc" expl="VC for test_range" proved="true">
- <proof prover="0" timelimit="5"><result status="valid" time="0.641634" steps="2080697"/></proof>
+ <proof prover="0" timelimit="5"><result status="valid" time="0.271640" steps="1012960"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeTo" proved="true">
  <goal name="test_range_to&#39;vc" expl="VC for test_range_to" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="test_range_to&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.018601" steps="64"/></proof>
+  <proof prover="3"><result status="valid" time="0.041386" steps="66"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.1" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.030911" steps="36"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.058163" steps="36"/></proof>
+  <proof prover="3"><result status="valid" time="0.063416" steps="37"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.064435" steps="24"/></proof>
+  <proof prover="3"><result status="valid" time="0.064435" steps="26"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.4" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.023802" steps="136"/></proof>
+  <proof prover="3"><result status="valid" time="0.023802" steps="140"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.025856" steps="82"/></proof>
+  <proof prover="3"><result status="valid" time="0.025856" steps="85"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.6" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.038420" steps="187"/></proof>
+  <proof prover="3"><result status="valid" time="0.038420" steps="211"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.020791" steps="113"/></proof>
+  <proof prover="3"><result status="valid" time="0.020791" steps="130"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041386" steps="232"/></proof>
+  <proof prover="3"><result status="valid" time="0.039089" steps="263"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.009889" steps="111"/></proof>
+  <proof prover="3"><result status="valid" time="0.009889" steps="130"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.063416" steps="112"/></proof>
+  <proof prover="3"><result status="valid" time="0.026291" steps="131"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.054579" steps="66"/></proof>
+  <proof prover="3"><result status="valid" time="0.054579" steps="78"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.033770" steps="125"/></proof>
+  <goal name="test_range_to&#39;vc.12" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.052196" steps="383"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.046611" steps="75"/></proof>
+  <goal name="test_range_to&#39;vc.13" expl="unreachable point" proved="true">
+  <proof prover="1"><result status="valid" time="0.061981" steps="10056"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026291" steps="137"/></proof>
+  <proof prover="3"><result status="valid" time="0.033770" steps="145"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.032972" steps="145"/></proof>
+  <proof prover="3"><result status="valid" time="0.046611" steps="94"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.16" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.023059" steps="320"/></proof>
+  <goal name="test_range_to&#39;vc.16" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.022309" steps="160"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.17" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.017632" steps="86"/></proof>
+  <goal name="test_range_to&#39;vc.17" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.032972" steps="168"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.039089" steps="398"/></proof>
+  <goal name="test_range_to&#39;vc.18" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.028730" steps="357"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.053796" steps="164"/></proof>
+  <goal name="test_range_to&#39;vc.19" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.013824" steps="101"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.022309" steps="165"/></proof>
+  <proof prover="3"><result status="valid" time="0.018601" steps="431"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.017629" steps="188"/></proof>
+  <proof prover="3"><result status="valid" time="0.053796" steps="188"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.22" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.028291" steps="684"/></proof>
+  <goal name="test_range_to&#39;vc.22" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.058163" steps="189"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.023533" steps="257"/></proof>
+  <proof prover="3"><result status="valid" time="0.017629" steps="212"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.24" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.085769" steps="876"/></proof>
+  <goal name="test_range_to&#39;vc.24" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.055844" steps="762"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026927" steps="328"/></proof>
+  <goal name="test_range_to&#39;vc.25" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.011609" steps="135"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.26" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.095159" steps="378"/></proof>
+  <proof prover="3"><result status="valid" time="0.028291" steps="725"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.038629" steps="391"/></proof>
+  <proof prover="3"><result status="valid" time="0.023533" steps="286"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026829" steps="369"/></proof>
+  <goal name="test_range_to&#39;vc.28" expl="index in bounds" proved="true">
+  <proof prover="3"><result status="valid" time="0.085769" steps="918"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.030057" steps="203"/></proof>
+  <proof prover="3"><result status="valid" time="0.026927" steps="358"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.055926" steps="409"/></proof>
+  <goal name="test_range_to&#39;vc.30" expl="index in bounds" proved="true">
+  <proof prover="3"><result status="valid" time="0.095159" steps="408"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029806" steps="410"/></proof>
+  <proof prover="3"><result status="valid" time="0.038629" steps="421"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.32" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029811" steps="206"/></proof>
+  <goal name="test_range_to&#39;vc.32" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.080546" steps="2567"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.080859" steps="419"/></proof>
+  <goal name="test_range_to&#39;vc.33" expl="unreachable point" proved="true">
+  <proof prover="0"><result status="valid" time="0.012073" steps="3985"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.040729" steps="419"/></proof>
+  <proof prover="3"><result status="valid" time="0.026829" steps="402"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.036415" steps="210"/></proof>
+  <goal name="test_range_to&#39;vc.35" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.126453" steps="453"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.018603" steps="427"/></proof>
+  <goal name="test_range_to&#39;vc.36" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.018127" steps="221"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.37" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.073584" steps="425"/></proof>
+  <proof prover="3"><result status="valid" time="0.030057" steps="224"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.053095" steps="215"/></proof>
+  <proof prover="3"><result status="valid" time="0.040842" steps="443"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.039692" steps="434"/></proof>
+  <proof prover="3"><result status="valid" time="0.029806" steps="445"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.40" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.056447" steps="435"/></proof>
+  <goal name="test_range_to&#39;vc.40" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.117944" steps="2065"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.41" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.034534" steps="223"/></proof>
+  <goal name="test_range_to&#39;vc.41" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.018043" steps="231"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.42" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.040842" steps="451"/></proof>
+  <proof prover="3"><result status="valid" time="0.029811" steps="229"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.43" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041801" steps="472"/></proof>
+  <proof prover="3"><result status="valid" time="0.039692" steps="455"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.44" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.052196" steps="1121"/></proof>
+  <goal name="test_range_to&#39;vc.44" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.040729" steps="456"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.45" expl="unreachable point" proved="true">
-  <proof prover="1"><result status="valid" time="0.061981" steps="11137"/></proof>
+  <goal name="test_range_to&#39;vc.45" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.088526" steps="2480"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.46" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.055844" steps="1090"/></proof>
+  <goal name="test_range_to&#39;vc.46" expl="unreachable point" proved="true">
+  <proof prover="0"><result status="valid" time="0.012573" steps="4076"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.47" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.011609" steps="224"/></proof>
+  <goal name="test_range_to&#39;vc.47" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.036415" steps="235"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.48" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.080546" steps="2256"/></proof>
+  <goal name="test_range_to&#39;vc.48" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.018603" steps="464"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.49" expl="unreachable point" proved="true">
-  <proof prover="0"><result status="valid" time="0.012073" steps="4008"/></proof>
+  <goal name="test_range_to&#39;vc.49" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.073584" steps="464"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.50" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.126453" steps="2377"/></proof>
+  <proof prover="3"><result status="valid" time="0.139415" steps="2370"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.51" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.018127" steps="212"/></proof>
+  <proof prover="0"><result status="valid" time="0.012386" steps="4103"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.52" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.117944" steps="1983"/></proof>
+  <goal name="test_range_to&#39;vc.52" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.053095" steps="241"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.53" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.018043" steps="208"/></proof>
+  <goal name="test_range_to&#39;vc.53" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.080859" steps="474"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.54" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.088526" steps="417"/></proof>
+  <goal name="test_range_to&#39;vc.54" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.056447" steps="476"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.55" expl="unreachable point" proved="true">
-  <proof prover="0"><result status="valid" time="0.012573" steps="3944"/></proof>
+  <goal name="test_range_to&#39;vc.55" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.042777" steps="1137"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.56" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.139415" steps="2471"/></proof>
+  <goal name="test_range_to&#39;vc.56" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.017446" steps="251"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.57" expl="unreachable point" proved="true">
-  <proof prover="0"><result status="valid" time="0.012386" steps="3918"/></proof>
+  <goal name="test_range_to&#39;vc.57" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.034534" steps="250"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.58" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.042777" steps="711"/></proof>
+  <goal name="test_range_to&#39;vc.58" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.055926" steps="490"/></proof>
   </goal>
-  <goal name="test_range_to&#39;vc.59" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.017446" steps="117"/></proof>
+  <goal name="test_range_to&#39;vc.59" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.041801" steps="512"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.60" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.073526" steps="345"/></proof>
+  <proof prover="3"><result status="valid" time="0.073526" steps="1184"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.61" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.016324" steps="72"/></proof>
+  <proof prover="3"><result status="valid" time="0.016324" steps="261"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.62" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.028730" steps="458"/></proof>
+  <proof prover="3"><result status="valid" time="0.023059" steps="492"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.63" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.013824" steps="42"/></proof>
+  <proof prover="3"><result status="valid" time="0.017632" steps="43"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeFrom" proved="true">
  <goal name="test_range_from&#39;vc" expl="VC for test_range_from" proved="true">
- <proof prover="0" timelimit="5"><result status="valid" time="0.411818" steps="1685878"/></proof>
+ <proof prover="0" timelimit="5"><result status="valid" time="0.411818" steps="1481789"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeFull" proved="true">
  <goal name="test_range_full&#39;vc" expl="VC for test_range_full" proved="true">
- <proof prover="0"><result status="valid" time="0.039072" steps="155371"/></proof>
+ <proof prover="0"><result status="valid" time="0.039072" steps="181162"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeToInclusive" proved="true">
  <goal name="test_range_to_inclusive&#39;vc" expl="VC for test_range_to_inclusive" proved="true">
- <proof prover="0"><result status="valid" time="0.621854" steps="2760491"/></proof>
+ <proof prover="0"><result status="valid" time="0.621854" steps="2085144"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/index_range/why3shapes.gz b/creusot/tests/should_succeed/index_range/why3shapes.gz
index c0759acd7c5b8a57bc54549b4f3f53ef0bf3edeb..87bd26a6c9eca465bfa0f489339059a70b91b7b3 100644
GIT binary patch
literal 4417
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
HDR=+?Kw7Zc

literal 4318
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
MABD*@o-}Fz08{Q{O8@`>

diff --git a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
index f48b7797ed..bd092d55a1 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
+++ b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
@@ -85,8 +85,10 @@ module InplaceListReversal_Rev
   var prev : InplaceListReversal_List_Type.t_list t;
   var head : InplaceListReversal_List_Type.t_list t;
   var _7 : borrowed (InplaceListReversal_List_Type.t_list t);
+  var _8 : InplaceListReversal_List_Type.t_list t;
   var curr : (t, InplaceListReversal_List_Type.t_list t);
   var next : InplaceListReversal_List_Type.t_list t;
+  var _16 : InplaceListReversal_List_Type.t_list t;
   {
     goto BB0
   }
@@ -101,8 +103,10 @@ module InplaceListReversal_Rev
     [#"../inplace_list_reversal.rs" 27 27 27 28] _7 <- Borrow.borrow_final ( * l) (Borrow.get_id l);
     [#"../inplace_list_reversal.rs" 27 27 27 28] l <- { l with current = ( ^ _7) ; };
     assume { inv1 ( ^ _7) };
-    [#"../inplace_list_reversal.rs" 27 19 27 34] head <- ([#"../inplace_list_reversal.rs" 27 19 27 34] replace0 _7 ([#"../inplace_list_reversal.rs" 27 30 27 33] InplaceListReversal_List_Type.C_Nil));
+    [#"../inplace_list_reversal.rs" 27 30 27 33] _8 <- ([#"../inplace_list_reversal.rs" 27 30 27 33] InplaceListReversal_List_Type.C_Nil);
+    [#"../inplace_list_reversal.rs" 27 19 27 34] head <- ([#"../inplace_list_reversal.rs" 27 19 27 34] replace0 _7 _8);
     _7 <- any borrowed (InplaceListReversal_List_Type.t_list t);
+    _8 <- any InplaceListReversal_List_Type.t_list t;
     goto BB2
   }
   BB2 {
@@ -126,35 +130,37 @@ module InplaceListReversal_Rev
   }
   BB7 {
     [#"../inplace_list_reversal.rs" 29 19 29 27] curr <- ([#"../inplace_list_reversal.rs" 29 19 29 27] InplaceListReversal_List_Type.cons_0 head);
-    [#"../inplace_list_reversal.rs" 29 19 29 27] head <- (let InplaceListReversal_List_Type.C_Cons x0 = head in InplaceListReversal_List_Type.C_Cons (any (t, InplaceListReversal_List_Type.t_list t)));
+    head <- (let InplaceListReversal_List_Type.C_Cons x0 = head in InplaceListReversal_List_Type.C_Cons (any (t, InplaceListReversal_List_Type.t_list t)));
     assert { [@expl:type invariant] inv1 head };
     assume { resolve1 head };
     [#"../inplace_list_reversal.rs" 30 19 30 25] next <- ([#"../inplace_list_reversal.rs" 30 19 30 25] let (_, a) = curr in a);
-    [#"../inplace_list_reversal.rs" 30 19 30 25] curr <- (let (x0, x1) = curr in (x0, any InplaceListReversal_List_Type.t_list t));
+    curr <- (let (x0, x1) = curr in (x0, any InplaceListReversal_List_Type.t_list t));
     goto BB8
   }
   BB8 {
-    [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, ([#"../inplace_list_reversal.rs" 31 17 31 21] prev)));
-    [#"../inplace_list_reversal.rs" 31 17 31 21] prev <- any InplaceListReversal_List_Type.t_list t;
+    [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, ([#"../inplace_list_reversal.rs" 31 8 31 14] prev)));
+    prev <- any InplaceListReversal_List_Type.t_list t;
     goto BB10
   }
   BB10 {
+    [#"../inplace_list_reversal.rs" 32 15 32 25] _16 <- ([#"../inplace_list_reversal.rs" 32 15 32 25] InplaceListReversal_List_Type.C_Cons curr);
+    curr <- any (t, InplaceListReversal_List_Type.t_list t);
     goto BB11
   }
   BB11 {
     goto BB12
   }
   BB12 {
-    [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- ([#"../inplace_list_reversal.rs" 32 15 32 25] InplaceListReversal_List_Type.C_Cons ([#"../inplace_list_reversal.rs" 32 20 32 24] curr));
-    [#"../inplace_list_reversal.rs" 32 20 32 24] curr <- any (t, InplaceListReversal_List_Type.t_list t);
+    [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- ([#"../inplace_list_reversal.rs" 32 8 32 12] _16);
+    _16 <- any InplaceListReversal_List_Type.t_list t;
     goto BB14
   }
   BB14 {
     goto BB15
   }
   BB15 {
-    [#"../inplace_list_reversal.rs" 33 8 33 12] head <- ([#"../inplace_list_reversal.rs" 33 15 33 19] next);
-    [#"../inplace_list_reversal.rs" 33 15 33 19] next <- any InplaceListReversal_List_Type.t_list t;
+    [#"../inplace_list_reversal.rs" 33 8 33 12] head <- ([#"../inplace_list_reversal.rs" 33 8 33 12] next);
+    next <- any InplaceListReversal_List_Type.t_list t;
     goto BB17
   }
   BB17 {
@@ -172,8 +178,8 @@ module InplaceListReversal_Rev
     goto BB4
   }
   BB21 {
-    [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = ([#"../inplace_list_reversal.rs" 35 9 35 13] prev) ; };
-    [#"../inplace_list_reversal.rs" 35 9 35 13] prev <- any InplaceListReversal_List_Type.t_list t;
+    [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = ([#"../inplace_list_reversal.rs" 35 4 35 6] prev) ; };
+    prev <- any InplaceListReversal_List_Type.t_list t;
     assert { [@expl:type invariant] inv1 ( * l) };
     assume { resolve1 ( * l) };
     assert { [@expl:type invariant] inv2 l };
diff --git a/creusot/tests/should_succeed/inplace_list_reversal/why3session.xml b/creusot/tests/should_succeed/inplace_list_reversal/why3session.xml
index 31b0868b8c..a72a1e213a 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal/why3session.xml
+++ b/creusot/tests/should_succeed/inplace_list_reversal/why3session.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
diff --git a/creusot/tests/should_succeed/inplace_list_reversal/why3shapes.gz b/creusot/tests/should_succeed/inplace_list_reversal/why3shapes.gz
index e5dbb9b484f73107b88098cb644c0e9bf1fa6f38..26cbb40d6ba97978b99362947ec44f78aa24f8a6 100644
GIT binary patch
literal 420
zcmV;V0bBkbiwFP!00000|AkVqj@vK{-Tf8b+IkWt*^&y}U>FdRrBlK20$!rDMpHYr
z)8zLnT5>LTLvPa4<D<w&>T^}jKj|Fi@*1YOABV4HQ&wM!%OC28t3=^51cVg|l)mUX
zdZH;@cXU37;UG{&+C4H<Mez_O)YR?1^`|X8Eh6C=Nr%!VWMjM=hnc?rJ)eR^sZrJ`
zWKcFf!5Trf3}RF!N}+^>k_bA>1On$yVIEJ{5W9BU+`em9z(R2Es)9kV-e(q%Hv|=h
z_ppu+(>{iFv4mQ6x2SkV_11U1C&!n2BN7#C(?}JxD|qdblae68_7yI319};!X}pEQ
zr{BNgB<R==bV5u00qq;VYW1sDziPGexGqrq%7517+xHoO^+)@S8sPn=!h)9rJP^|^
zb28|B?#ksM7*2D!WFEkCV(p`6CbMb9rq!};gAJcdH1s1}b{yeaRlHYORNr6EQxd4R
z=_BhlpRCg~gxivn*5eE8%Hued(R5LWMmwR7#_a9Bv2|lKSs-w>eo=d252fCyjoiRS
O6#oEiYj!tP0{{Tyr_Hed

literal 417
zcmV;S0bc$eiwFP!00000|AkV)Zrd;nz56SC>*kY0$+lde2g87n0L4xPj}6#ZZjEMk
zW~a&TPqgGT?O{9V>G4tIBlROo=QldKIX$~+?#JOiEz;~~a{5F4a0V1MLWy#P0>LIt
zLk~2$^Nx;3H?*Fs5X>z@nHLXkLQT!?SAW>j!y*!PLB_MqIL!3)aXdIc&<J@5l?a6m
zFh>bB10RJzDFnGtfKo@9K*_n2o5#c1`ChASY`Usfz(QGlt13&B#@fhYcR{JV@EX?s
zVcPr9&X-WD?&1~CsJ^=O_u%t%Z3Iw>Z5X5y^$I@w<fI@7u>OSHtrGMyPSbdC?cMKp
zKMCskfevV>Z_#}5t5&~i^{ZAZw@Z?WU-`$9Z2dh$V*bCadX40*hQflEBY7ZYz09e^
z%Eqp$IE3<X&0Y+94ZmY<?J^ntD)y_EO_x~k$wWb~?zH0wm&yD+i=sSwxeiF6-iDv6
z>v*zG)8H;kPS}i1ut~ddO1<ACX<Nt*?F-QR98BJ|P?71(UdYOst|(HyQ5)FEjY$3i
L9kywRMgsr<s3z7q

diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg
index 4d4c56e86a..86a7c76238 100644
--- a/creusot/tests/should_succeed/instant.mlcfg
+++ b/creusot/tests/should_succeed/instant.mlcfg
@@ -467,15 +467,15 @@ module Instant_TestInstant
     goto BB1
   }
   BB1 {
-    [#"../instant.rs" 9 19 9 41] zero_dur <- ([#"../instant.rs" 9 19 9 41] from_secs0 ([#"../instant.rs" 9 39 9 40] [#"../instant.rs" 9 39 9 40] (0 : uint64)));
+    [#"../instant.rs" 9 19 9 41] zero_dur <- ([#"../instant.rs" 9 19 9 41] from_secs0 (0 : uint64));
     goto BB2
   }
   BB2 {
-    [#"../instant.rs" 10 12 10 29] _6 <- ([#"../instant.rs" 10 12 10 29] elapsed0 ([#"../instant.rs" 10 12 10 19] instant));
+    [#"../instant.rs" 10 12 10 29] _6 <- ([#"../instant.rs" 10 12 10 29] elapsed0 instant);
     goto BB3
   }
   BB3 {
-    [#"../instant.rs" 10 12 10 41] _4 <- ([#"../instant.rs" 10 12 10 41] ge0 ([#"../instant.rs" 10 12 10 29] _6) ([#"../instant.rs" 10 33 10 41] zero_dur));
+    [#"../instant.rs" 10 12 10 41] _4 <- ([#"../instant.rs" 10 12 10 41] ge0 _6 zero_dur);
     goto BB4
   }
   BB4 {
@@ -485,7 +485,7 @@ module Instant_TestInstant
       end
   }
   BB5 {
-    [#"../instant.rs" 12 12 12 41] _14 <- ([#"../instant.rs" 12 12 12 41] checked_add0 ([#"../instant.rs" 12 12 12 19] instant) ([#"../instant.rs" 12 32 12 40] zero_dur));
+    [#"../instant.rs" 12 12 12 41] _14 <- ([#"../instant.rs" 12 12 12 41] checked_add0 instant zero_dur);
     goto BB7
   }
   BB6 {
@@ -498,7 +498,7 @@ module Instant_TestInstant
     goto BB8
   }
   BB8 {
-    [#"../instant.rs" 12 12 12 61] _11 <- ([#"../instant.rs" 12 12 12 61] eq0 ([#"../instant.rs" 12 12 12 50] _13) ([#"../instant.rs" 12 54 12 61] instant));
+    [#"../instant.rs" 12 12 12 61] _11 <- ([#"../instant.rs" 12 12 12 61] eq0 _13 instant);
     goto BB9
   }
   BB9 {
@@ -508,7 +508,7 @@ module Instant_TestInstant
       end
   }
   BB10 {
-    [#"../instant.rs" 13 12 13 30] _22 <- ([#"../instant.rs" 13 12 13 30] add0 ([#"../instant.rs" 13 12 13 19] instant) ([#"../instant.rs" 13 22 13 30] zero_dur));
+    [#"../instant.rs" 13 12 13 30] _22 <- ([#"../instant.rs" 13 12 13 30] add0 instant zero_dur);
     goto BB12
   }
   BB11 {
@@ -516,7 +516,7 @@ module Instant_TestInstant
     absurd
   }
   BB12 {
-    [#"../instant.rs" 13 12 13 41] _20 <- ([#"../instant.rs" 13 12 13 41] eq0 ([#"../instant.rs" 13 12 13 30] _22) ([#"../instant.rs" 13 34 13 41] instant));
+    [#"../instant.rs" 13 12 13 41] _20 <- ([#"../instant.rs" 13 12 13 41] eq0 _22 instant);
     goto BB13
   }
   BB13 {
@@ -526,7 +526,7 @@ module Instant_TestInstant
       end
   }
   BB14 {
-    [#"../instant.rs" 14 24 14 46] three_seconds <- ([#"../instant.rs" 14 24 14 46] from_secs0 ([#"../instant.rs" 14 44 14 45] [#"../instant.rs" 14 44 14 45] (3 : uint64)));
+    [#"../instant.rs" 14 24 14 46] three_seconds <- ([#"../instant.rs" 14 24 14 46] from_secs0 (3 : uint64));
     goto BB16
   }
   BB15 {
@@ -534,17 +534,17 @@ module Instant_TestInstant
     absurd
   }
   BB16 {
-    [#"../instant.rs" 15 26 15 49] greater_instant <- ([#"../instant.rs" 15 26 15 49] add0 ([#"../instant.rs" 15 26 15 33] instant) ([#"../instant.rs" 15 36 15 49] three_seconds));
+    [#"../instant.rs" 15 26 15 49] greater_instant <- ([#"../instant.rs" 15 26 15 49] add0 instant three_seconds);
     goto BB17
   }
   BB17 {
     assert { [@expl:assertion] [#"../instant.rs" 16 18 16 45] shallow_model0 instant < shallow_model0 greater_instant };
-    [#"../instant.rs" 17 31 17 62] even_greater_instant <- ([#"../instant.rs" 17 31 17 62] add0 ([#"../instant.rs" 17 31 17 46] greater_instant) ([#"../instant.rs" 17 49 17 62] three_seconds));
+    [#"../instant.rs" 17 31 17 62] even_greater_instant <- ([#"../instant.rs" 17 31 17 62] add0 greater_instant three_seconds);
     goto BB18
   }
   BB18 {
     assert { [@expl:assertion] [#"../instant.rs" 18 18 18 50] shallow_model0 instant < shallow_model0 even_greater_instant };
-    [#"../instant.rs" 20 12 20 41] _42 <- ([#"../instant.rs" 20 12 20 41] checked_sub0 ([#"../instant.rs" 20 12 20 19] instant) ([#"../instant.rs" 20 32 20 40] zero_dur));
+    [#"../instant.rs" 20 12 20 41] _42 <- ([#"../instant.rs" 20 12 20 41] checked_sub0 instant zero_dur);
     goto BB19
   }
   BB19 {
@@ -553,7 +553,7 @@ module Instant_TestInstant
     goto BB20
   }
   BB20 {
-    [#"../instant.rs" 20 12 20 61] _39 <- ([#"../instant.rs" 20 12 20 61] eq0 ([#"../instant.rs" 20 12 20 50] _41) ([#"../instant.rs" 20 54 20 61] instant));
+    [#"../instant.rs" 20 12 20 61] _39 <- ([#"../instant.rs" 20 12 20 61] eq0 _41 instant);
     goto BB21
   }
   BB21 {
@@ -563,7 +563,7 @@ module Instant_TestInstant
       end
   }
   BB22 {
-    [#"../instant.rs" 21 12 21 30] _50 <- ([#"../instant.rs" 21 12 21 30] sub0 ([#"../instant.rs" 21 12 21 19] instant) ([#"../instant.rs" 21 22 21 30] zero_dur));
+    [#"../instant.rs" 21 12 21 30] _50 <- ([#"../instant.rs" 21 12 21 30] sub0 instant zero_dur);
     goto BB24
   }
   BB23 {
@@ -571,7 +571,7 @@ module Instant_TestInstant
     absurd
   }
   BB24 {
-    [#"../instant.rs" 21 12 21 41] _48 <- ([#"../instant.rs" 21 12 21 41] eq0 ([#"../instant.rs" 21 12 21 30] _50) ([#"../instant.rs" 21 34 21 41] instant));
+    [#"../instant.rs" 21 12 21 41] _48 <- ([#"../instant.rs" 21 12 21 41] eq0 _50 instant);
     goto BB25
   }
   BB25 {
@@ -581,7 +581,7 @@ module Instant_TestInstant
       end
   }
   BB26 {
-    [#"../instant.rs" 22 25 22 48] lesser_instant <- ([#"../instant.rs" 22 25 22 48] sub0 ([#"../instant.rs" 22 25 22 32] instant) ([#"../instant.rs" 22 35 22 48] three_seconds));
+    [#"../instant.rs" 22 25 22 48] lesser_instant <- ([#"../instant.rs" 22 25 22 48] sub0 instant three_seconds);
     goto BB28
   }
   BB27 {
@@ -590,11 +590,11 @@ module Instant_TestInstant
   }
   BB28 {
     assert { [@expl:assertion] [#"../instant.rs" 23 18 23 44] shallow_model0 instant > shallow_model0 lesser_instant };
-    [#"../instant.rs" 24 12 24 29] _63 <- ([#"../instant.rs" 24 12 24 29] sub1 ([#"../instant.rs" 24 12 24 19] instant) ([#"../instant.rs" 24 22 24 29] instant));
+    [#"../instant.rs" 24 12 24 29] _63 <- ([#"../instant.rs" 24 12 24 29] sub1 instant instant);
     goto BB29
   }
   BB29 {
-    [#"../instant.rs" 24 12 24 41] _61 <- ([#"../instant.rs" 24 12 24 41] eq1 ([#"../instant.rs" 24 12 24 29] _63) ([#"../instant.rs" 24 33 24 41] zero_dur));
+    [#"../instant.rs" 24 12 24 41] _61 <- ([#"../instant.rs" 24 12 24 41] eq1 _63 zero_dur);
     goto BB30
   }
   BB30 {
@@ -604,7 +604,7 @@ module Instant_TestInstant
       end
   }
   BB31 {
-    [#"../instant.rs" 25 12 25 37] _71 <- ([#"../instant.rs" 25 12 25 37] sub1 ([#"../instant.rs" 25 12 25 19] instant) ([#"../instant.rs" 25 22 25 37] greater_instant));
+    [#"../instant.rs" 25 12 25 37] _71 <- ([#"../instant.rs" 25 12 25 37] sub1 instant greater_instant);
     goto BB33
   }
   BB32 {
@@ -612,7 +612,7 @@ module Instant_TestInstant
     absurd
   }
   BB33 {
-    [#"../instant.rs" 25 12 25 49] _69 <- ([#"../instant.rs" 25 12 25 49] eq1 ([#"../instant.rs" 25 12 25 37] _71) ([#"../instant.rs" 25 41 25 49] zero_dur));
+    [#"../instant.rs" 25 12 25 49] _69 <- ([#"../instant.rs" 25 12 25 49] eq1 _71 zero_dur);
     goto BB34
   }
   BB34 {
@@ -622,7 +622,7 @@ module Instant_TestInstant
       end
   }
   BB35 {
-    [#"../instant.rs" 26 12 26 37] _79 <- ([#"../instant.rs" 26 12 26 37] sub1 ([#"../instant.rs" 26 12 26 27] greater_instant) ([#"../instant.rs" 26 30 26 37] instant));
+    [#"../instant.rs" 26 12 26 37] _79 <- ([#"../instant.rs" 26 12 26 37] sub1 greater_instant instant);
     goto BB37
   }
   BB36 {
@@ -630,7 +630,7 @@ module Instant_TestInstant
     absurd
   }
   BB37 {
-    [#"../instant.rs" 26 12 26 48] _77 <- ([#"../instant.rs" 26 12 26 48] gt0 ([#"../instant.rs" 26 12 26 37] _79) ([#"../instant.rs" 26 40 26 48] zero_dur));
+    [#"../instant.rs" 26 12 26 48] _77 <- ([#"../instant.rs" 26 12 26 48] gt0 _79 zero_dur);
     goto BB38
   }
   BB38 {
@@ -640,7 +640,7 @@ module Instant_TestInstant
       end
   }
   BB39 {
-    [#"../instant.rs" 28 12 28 51] _87 <- ([#"../instant.rs" 28 12 28 51] duration_since0 ([#"../instant.rs" 28 12 28 27] greater_instant) ([#"../instant.rs" 28 43 28 50] instant));
+    [#"../instant.rs" 28 12 28 51] _87 <- ([#"../instant.rs" 28 12 28 51] duration_since0 greater_instant instant);
     goto BB41
   }
   BB40 {
@@ -648,7 +648,7 @@ module Instant_TestInstant
     absurd
   }
   BB41 {
-    [#"../instant.rs" 28 12 28 62] _85 <- ([#"../instant.rs" 28 12 28 62] gt0 ([#"../instant.rs" 28 12 28 51] _87) ([#"../instant.rs" 28 54 28 62] zero_dur));
+    [#"../instant.rs" 28 12 28 62] _85 <- ([#"../instant.rs" 28 12 28 62] gt0 _87 zero_dur);
     goto BB42
   }
   BB42 {
@@ -658,7 +658,7 @@ module Instant_TestInstant
       end
   }
   BB43 {
-    [#"../instant.rs" 29 12 29 51] _95 <- ([#"../instant.rs" 29 12 29 51] duration_since0 ([#"../instant.rs" 29 12 29 19] instant) ([#"../instant.rs" 29 35 29 50] greater_instant));
+    [#"../instant.rs" 29 12 29 51] _95 <- ([#"../instant.rs" 29 12 29 51] duration_since0 instant greater_instant);
     goto BB45
   }
   BB44 {
@@ -666,7 +666,7 @@ module Instant_TestInstant
     absurd
   }
   BB45 {
-    [#"../instant.rs" 29 12 29 63] _93 <- ([#"../instant.rs" 29 12 29 63] eq1 ([#"../instant.rs" 29 12 29 51] _95) ([#"../instant.rs" 29 55 29 63] zero_dur));
+    [#"../instant.rs" 29 12 29 63] _93 <- ([#"../instant.rs" 29 12 29 63] eq1 _95 zero_dur);
     goto BB46
   }
   BB46 {
@@ -676,7 +676,7 @@ module Instant_TestInstant
       end
   }
   BB47 {
-    [#"../instant.rs" 30 12 30 59] _103 <- ([#"../instant.rs" 30 12 30 59] checked_duration_since0 ([#"../instant.rs" 30 12 30 27] greater_instant) ([#"../instant.rs" 30 51 30 58] instant));
+    [#"../instant.rs" 30 12 30 59] _103 <- ([#"../instant.rs" 30 12 30 59] checked_duration_since0 greater_instant instant);
     goto BB49
   }
   BB48 {
@@ -684,7 +684,7 @@ module Instant_TestInstant
     absurd
   }
   BB49 {
-    [#"../instant.rs" 30 12 30 69] _101 <- ([#"../instant.rs" 30 12 30 69] is_some0 ([#"../instant.rs" 30 12 30 59] _103));
+    [#"../instant.rs" 30 12 30 69] _101 <- ([#"../instant.rs" 30 12 30 69] is_some0 _103);
     goto BB50
   }
   BB50 {
@@ -694,7 +694,7 @@ module Instant_TestInstant
       end
   }
   BB51 {
-    [#"../instant.rs" 31 12 31 59] _110 <- ([#"../instant.rs" 31 12 31 59] checked_duration_since0 ([#"../instant.rs" 31 12 31 19] instant) ([#"../instant.rs" 31 43 31 58] greater_instant));
+    [#"../instant.rs" 31 12 31 59] _110 <- ([#"../instant.rs" 31 12 31 59] checked_duration_since0 instant greater_instant);
     goto BB53
   }
   BB52 {
@@ -702,7 +702,7 @@ module Instant_TestInstant
     absurd
   }
   BB53 {
-    [#"../instant.rs" 31 12 31 69] _108 <- ([#"../instant.rs" 31 12 31 69] is_none0 ([#"../instant.rs" 31 12 31 59] _110));
+    [#"../instant.rs" 31 12 31 69] _108 <- ([#"../instant.rs" 31 12 31 69] is_none0 _110);
     goto BB54
   }
   BB54 {
@@ -712,7 +712,7 @@ module Instant_TestInstant
       end
   }
   BB55 {
-    [#"../instant.rs" 32 12 32 62] _117 <- ([#"../instant.rs" 32 12 32 62] saturating_duration_since0 ([#"../instant.rs" 32 12 32 27] greater_instant) ([#"../instant.rs" 32 54 32 61] instant));
+    [#"../instant.rs" 32 12 32 62] _117 <- ([#"../instant.rs" 32 12 32 62] saturating_duration_since0 greater_instant instant);
     goto BB57
   }
   BB56 {
@@ -720,7 +720,7 @@ module Instant_TestInstant
     absurd
   }
   BB57 {
-    [#"../instant.rs" 32 12 32 73] _115 <- ([#"../instant.rs" 32 12 32 73] gt0 ([#"../instant.rs" 32 12 32 62] _117) ([#"../instant.rs" 32 65 32 73] zero_dur));
+    [#"../instant.rs" 32 12 32 73] _115 <- ([#"../instant.rs" 32 12 32 73] gt0 _117 zero_dur);
     goto BB58
   }
   BB58 {
@@ -730,7 +730,7 @@ module Instant_TestInstant
       end
   }
   BB59 {
-    [#"../instant.rs" 33 12 33 62] _125 <- ([#"../instant.rs" 33 12 33 62] saturating_duration_since0 ([#"../instant.rs" 33 12 33 19] instant) ([#"../instant.rs" 33 46 33 61] greater_instant));
+    [#"../instant.rs" 33 12 33 62] _125 <- ([#"../instant.rs" 33 12 33 62] saturating_duration_since0 instant greater_instant);
     goto BB61
   }
   BB60 {
@@ -738,7 +738,7 @@ module Instant_TestInstant
     absurd
   }
   BB61 {
-    [#"../instant.rs" 33 12 33 74] _123 <- ([#"../instant.rs" 33 12 33 74] eq1 ([#"../instant.rs" 33 12 33 62] _125) ([#"../instant.rs" 33 66 33 74] zero_dur));
+    [#"../instant.rs" 33 12 33 74] _123 <- ([#"../instant.rs" 33 12 33 74] eq1 _125 zero_dur);
     goto BB62
   }
   BB62 {
diff --git a/creusot/tests/should_succeed/ite_normalize.mlcfg b/creusot/tests/should_succeed/ite_normalize.mlcfg
index a65f6bd7a9..783cbb19b4 100644
--- a/creusot/tests/should_succeed/ite_normalize.mlcfg
+++ b/creusot/tests/should_succeed/ite_normalize.mlcfg
@@ -165,17 +165,17 @@ module IteNormalize_Impl6_Clone
     [#"../ite_normalize.rs" 57 31 57 32] t_1 <- ([#"../ite_normalize.rs" 57 31 57 32] IteNormalize_Expr_Type.ifthenelse_t self);
     [#"../ite_normalize.rs" 57 45 57 46] e_1 <- ([#"../ite_normalize.rs" 57 45 57 46] IteNormalize_Expr_Type.ifthenelse_e self);
     [#"../ite_normalize.rs" 55 9 55 14] _9 <- ([#"../ite_normalize.rs" 55 9 55 14] c_1);
-    [#"../ite_normalize.rs" 55 9 55 14] _7 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 ([#"../ite_normalize.rs" 55 9 55 14] _9));
+    [#"../ite_normalize.rs" 55 9 55 14] _7 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _9);
     goto BB7
   }
   BB7 {
     [#"../ite_normalize.rs" 55 9 55 14] _12 <- ([#"../ite_normalize.rs" 55 9 55 14] t_1);
-    [#"../ite_normalize.rs" 55 9 55 14] _10 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 ([#"../ite_normalize.rs" 55 9 55 14] _12));
+    [#"../ite_normalize.rs" 55 9 55 14] _10 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _12);
     goto BB8
   }
   BB8 {
     [#"../ite_normalize.rs" 55 9 55 14] _15 <- ([#"../ite_normalize.rs" 55 9 55 14] e_1);
-    [#"../ite_normalize.rs" 55 9 55 14] _13 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 ([#"../ite_normalize.rs" 55 9 55 14] _15));
+    [#"../ite_normalize.rs" 55 9 55 14] _13 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _15);
     goto BB9
   }
   BB9 {
@@ -197,7 +197,7 @@ module IteNormalize_Impl6_Clone
   BB13 {
     [#"../ite_normalize.rs" 58 10 58 11] v_1 <- ([#"../ite_normalize.rs" 58 10 58 11] IteNormalize_Expr_Type.var_v self);
     [#"../ite_normalize.rs" 55 9 55 14] _19 <- ([#"../ite_normalize.rs" 55 9 55 14] v_1);
-    [#"../ite_normalize.rs" 55 9 55 14] _17 <- ([#"../ite_normalize.rs" 55 9 55 14] clone1 ([#"../ite_normalize.rs" 55 9 55 14] _19));
+    [#"../ite_normalize.rs" 55 9 55 14] _17 <- ([#"../ite_normalize.rs" 55 9 55 14] clone1 _19);
     goto BB14
   }
   BB14 {
@@ -230,7 +230,7 @@ module IteNormalize_Impl5_Variable
     goto BB0
   }
   BB0 {
-    [#"../ite_normalize.rs" 102 8 102 23] _0 <- ([#"../ite_normalize.rs" 102 8 102 23] IteNormalize_Expr_Type.C_Var ([#"../ite_normalize.rs" 102 20 102 21] v));
+    [#"../ite_normalize.rs" 102 8 102 23] _0 <- ([#"../ite_normalize.rs" 102 8 102 23] IteNormalize_Expr_Type.C_Var v);
     return _0
   }
   
@@ -249,7 +249,7 @@ module IteNormalize_Impl3_From
     goto BB0
   }
   BB0 {
-    [#"../ite_normalize.rs" 81 8 81 25] _0 <- ([#"../ite_normalize.rs" 81 8 81 25] variable0 ([#"../ite_normalize.rs" 81 23 81 24] a));
+    [#"../ite_normalize.rs" 81 8 81 25] _0 <- ([#"../ite_normalize.rs" 81 8 81 25] variable0 a);
     goto BB1
   }
   BB1 {
@@ -268,7 +268,7 @@ module IteNormalize_Impl4_From
     goto BB0
   }
   BB0 {
-    switch ([#"../ite_normalize.rs" 87 11 87 12] b)
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -312,10 +312,10 @@ module IteNormalize_Impl5_Ite
     goto BB4
   }
   BB4 {
-    [#"../ite_normalize.rs" 98 8 98 75] _0 <- ([#"../ite_normalize.rs" 98 8 98 75] IteNormalize_Expr_Type.C_IfThenElse ([#"../ite_normalize.rs" 98 39 98 40] c) ([#"../ite_normalize.rs" 98 55 98 56] t) ([#"../ite_normalize.rs" 98 71 98 72] e));
-    [#"../ite_normalize.rs" 98 39 98 40] c <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 98 55 98 56] t <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 98 71 98 72] e <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 98 8 98 75] _0 <- ([#"../ite_normalize.rs" 98 8 98 75] IteNormalize_Expr_Type.C_IfThenElse c t e);
+    c <- any IteNormalize_Expr_Type.t_expr;
+    t <- any IteNormalize_Expr_Type.t_expr;
+    e <- any IteNormalize_Expr_Type.t_expr;
     goto BB5
   }
   BB5 {
@@ -420,7 +420,7 @@ module IteNormalize_Impl5_Transpose
   }
   BB8 {
     [#"../ite_normalize.rs" 121 27 121 28] _0 <- ([#"../ite_normalize.rs" 121 27 121 28] b);
-    [#"../ite_normalize.rs" 121 27 121 28] b <- any IteNormalize_Expr_Type.t_expr;
+    b <- any IteNormalize_Expr_Type.t_expr;
     goto BB31
   }
   BB9 {
@@ -429,22 +429,22 @@ module IteNormalize_Impl5_Transpose
   }
   BB10 {
     [#"../ite_normalize.rs" 112 31 112 32] c <- ([#"../ite_normalize.rs" 112 31 112 32] IteNormalize_Expr_Type.ifthenelse_c self);
-    [#"../ite_normalize.rs" 112 31 112 32] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
     [#"../ite_normalize.rs" 112 34 112 35] t <- ([#"../ite_normalize.rs" 112 34 112 35] IteNormalize_Expr_Type.ifthenelse_t self);
-    [#"../ite_normalize.rs" 112 34 112 35] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
     [#"../ite_normalize.rs" 112 37 112 38] e <- ([#"../ite_normalize.rs" 112 37 112 38] IteNormalize_Expr_Type.ifthenelse_e self);
-    [#"../ite_normalize.rs" 112 37 112 38] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
     assume { resolve0 t };
-    [#"../ite_normalize.rs" 114 40 114 49] _17 <- ([#"../ite_normalize.rs" 114 40 114 49] clone0 ([#"../ite_normalize.rs" 114 40 114 41] a));
+    [#"../ite_normalize.rs" 114 40 114 49] _17 <- ([#"../ite_normalize.rs" 114 40 114 49] clone0 a);
     goto BB11
   }
   BB11 {
-    [#"../ite_normalize.rs" 114 51 114 60] _19 <- ([#"../ite_normalize.rs" 114 51 114 60] clone0 ([#"../ite_normalize.rs" 114 51 114 52] b));
+    [#"../ite_normalize.rs" 114 51 114 60] _19 <- ([#"../ite_normalize.rs" 114 51 114 60] clone0 b);
     goto BB12
   }
   BB12 {
-    [#"../ite_normalize.rs" 114 28 114 61] _15 <- ([#"../ite_normalize.rs" 114 28 114 61] transpose ([#"../ite_normalize.rs" 114 28 114 29] t) _17 _19);
-    [#"../ite_normalize.rs" 114 28 114 29] t <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 114 28 114 61] _15 <- ([#"../ite_normalize.rs" 114 28 114 61] transpose t _17 _19);
+    t <- any IteNormalize_Expr_Type.t_expr;
     _17 <- any IteNormalize_Expr_Type.t_expr;
     _19 <- any IteNormalize_Expr_Type.t_expr;
     goto BB13
@@ -454,18 +454,18 @@ module IteNormalize_Impl5_Transpose
   }
   BB14 {
     assume { resolve0 e };
-    [#"../ite_normalize.rs" 115 28 115 45] _22 <- ([#"../ite_normalize.rs" 115 28 115 45] transpose ([#"../ite_normalize.rs" 115 28 115 29] e) ([#"../ite_normalize.rs" 115 40 115 41] a) ([#"../ite_normalize.rs" 115 43 115 44] b));
-    [#"../ite_normalize.rs" 115 28 115 29] e <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 115 40 115 41] a <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 115 43 115 44] b <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 115 28 115 45] _22 <- ([#"../ite_normalize.rs" 115 28 115 45] transpose e a b);
+    e <- any IteNormalize_Expr_Type.t_expr;
+    a <- any IteNormalize_Expr_Type.t_expr;
+    b <- any IteNormalize_Expr_Type.t_expr;
     goto BB15
   }
   BB15 {
     goto BB16
   }
   BB16 {
-    [#"../ite_normalize.rs" 112 44 116 13] _0 <- ([#"../ite_normalize.rs" 112 44 116 13] IteNormalize_Expr_Type.C_IfThenElse ([#"../ite_normalize.rs" 113 16 113 17] c) _15 _22);
-    [#"../ite_normalize.rs" 113 16 113 17] c <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 112 44 116 13] _0 <- ([#"../ite_normalize.rs" 112 44 116 13] IteNormalize_Expr_Type.C_IfThenElse c _15 _22);
+    c <- any IteNormalize_Expr_Type.t_expr;
     _15 <- any IteNormalize_Expr_Type.t_expr;
     _22 <- any IteNormalize_Expr_Type.t_expr;
     goto BB17
@@ -498,10 +498,10 @@ module IteNormalize_Impl5_Transpose
     goto BB26
   }
   BB26 {
-    [#"../ite_normalize.rs" 118 16 118 86] _0 <- ([#"../ite_normalize.rs" 118 16 118 86] IteNormalize_Expr_Type.C_IfThenElse ([#"../ite_normalize.rs" 118 47 118 51] self) ([#"../ite_normalize.rs" 118 66 118 67] a) ([#"../ite_normalize.rs" 118 82 118 83] b));
-    [#"../ite_normalize.rs" 118 47 118 51] self <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 118 66 118 67] a <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 118 82 118 83] b <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 118 16 118 86] _0 <- ([#"../ite_normalize.rs" 118 16 118 86] IteNormalize_Expr_Type.C_IfThenElse self a b);
+    self <- any IteNormalize_Expr_Type.t_expr;
+    a <- any IteNormalize_Expr_Type.t_expr;
+    b <- any IteNormalize_Expr_Type.t_expr;
     goto BB27
   }
   BB27 {
@@ -515,7 +515,7 @@ module IteNormalize_Impl5_Transpose
   }
   BB30 {
     [#"../ite_normalize.rs" 120 26 120 27] _0 <- ([#"../ite_normalize.rs" 120 26 120 27] a);
-    [#"../ite_normalize.rs" 120 26 120 27] a <- any IteNormalize_Expr_Type.t_expr;
+    a <- any IteNormalize_Expr_Type.t_expr;
     goto BB31
   }
   BB31 {
@@ -591,29 +591,29 @@ module IteNormalize_Impl5_Normalize
   }
   BB2 {
     [#"../ite_normalize.rs" 153 12 153 13] e1 <- ([#"../ite_normalize.rs" 153 12 153 13] self);
-    [#"../ite_normalize.rs" 153 17 153 26] _0 <- ([#"../ite_normalize.rs" 153 17 153 26] clone0 ([#"../ite_normalize.rs" 153 17 153 18] e1));
+    [#"../ite_normalize.rs" 153 17 153 26] _0 <- ([#"../ite_normalize.rs" 153 17 153 26] clone0 e1);
     goto BB11
   }
   BB3 {
     [#"../ite_normalize.rs" 147 31 147 32] c <- ([#"../ite_normalize.rs" 147 31 147 32] IteNormalize_Expr_Type.ifthenelse_c self);
     [#"../ite_normalize.rs" 147 34 147 35] t <- ([#"../ite_normalize.rs" 147 34 147 35] IteNormalize_Expr_Type.ifthenelse_t self);
     [#"../ite_normalize.rs" 147 37 147 38] e <- ([#"../ite_normalize.rs" 147 37 147 38] IteNormalize_Expr_Type.ifthenelse_e self);
-    [#"../ite_normalize.rs" 148 25 148 38] cp <- ([#"../ite_normalize.rs" 148 25 148 38] normalize ([#"../ite_normalize.rs" 148 25 148 26] c));
+    [#"../ite_normalize.rs" 148 25 148 38] cp <- ([#"../ite_normalize.rs" 148 25 148 38] normalize c);
     goto BB4
   }
   BB4 {
-    [#"../ite_normalize.rs" 149 25 149 38] tp <- ([#"../ite_normalize.rs" 149 25 149 38] normalize ([#"../ite_normalize.rs" 149 25 149 26] t));
+    [#"../ite_normalize.rs" 149 25 149 38] tp <- ([#"../ite_normalize.rs" 149 25 149 38] normalize t);
     goto BB5
   }
   BB5 {
-    [#"../ite_normalize.rs" 150 25 150 38] ep <- ([#"../ite_normalize.rs" 150 25 150 38] normalize ([#"../ite_normalize.rs" 150 25 150 26] e));
+    [#"../ite_normalize.rs" 150 25 150 38] ep <- ([#"../ite_normalize.rs" 150 25 150 38] normalize e);
     goto BB6
   }
   BB6 {
-    [#"../ite_normalize.rs" 151 16 151 36] _0 <- ([#"../ite_normalize.rs" 151 16 151 36] transpose0 ([#"../ite_normalize.rs" 151 16 151 18] cp) ([#"../ite_normalize.rs" 151 29 151 31] tp) ([#"../ite_normalize.rs" 151 33 151 35] ep));
-    [#"../ite_normalize.rs" 151 16 151 18] cp <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 151 29 151 31] tp <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 151 33 151 35] ep <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 151 16 151 36] _0 <- ([#"../ite_normalize.rs" 151 16 151 36] transpose0 cp tp ep);
+    cp <- any IteNormalize_Expr_Type.t_expr;
+    tp <- any IteNormalize_Expr_Type.t_expr;
+    ep <- any IteNormalize_Expr_Type.t_expr;
     goto BB7
   }
   BB7 {
@@ -867,18 +867,18 @@ module IteNormalize_Impl5_SimplifyHelper
   }
   BB6 {
     [#"../ite_normalize.rs" 229 12 229 13] c2 <- ([#"../ite_normalize.rs" 229 12 229 13] self);
-    [#"../ite_normalize.rs" 229 12 229 13] self <- any IteNormalize_Expr_Type.t_expr;
+    self <- any IteNormalize_Expr_Type.t_expr;
     [#"../ite_normalize.rs" 229 17 229 18] _0 <- ([#"../ite_normalize.rs" 229 17 229 18] c2);
-    [#"../ite_normalize.rs" 229 17 229 18] c2 <- any IteNormalize_Expr_Type.t_expr;
+    c2 <- any IteNormalize_Expr_Type.t_expr;
     goto BB51
   }
   BB7 {
     [#"../ite_normalize.rs" 191 31 191 32] c <- ([#"../ite_normalize.rs" 191 31 191 32] IteNormalize_Expr_Type.ifthenelse_c self);
-    [#"../ite_normalize.rs" 191 31 191 32] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
     [#"../ite_normalize.rs" 191 34 191 35] t <- ([#"../ite_normalize.rs" 191 34 191 35] IteNormalize_Expr_Type.ifthenelse_t self);
-    [#"../ite_normalize.rs" 191 34 191 35] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
     [#"../ite_normalize.rs" 191 37 191 38] e <- ([#"../ite_normalize.rs" 191 37 191 38] IteNormalize_Expr_Type.ifthenelse_e self);
-    [#"../ite_normalize.rs" 191 37 191 38] self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
+    self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
     switch (c)
       | IteNormalize_Expr_Type.C_Var _ -> goto BB9
       | _ -> goto BB8
@@ -888,11 +888,11 @@ module IteNormalize_Impl5_SimplifyHelper
     assume { resolve0 e };
     assume { resolve0 t };
     [#"../ite_normalize.rs" 215 20 215 21] c1 <- ([#"../ite_normalize.rs" 215 20 215 21] c);
-    [#"../ite_normalize.rs" 215 20 215 21] c <- any IteNormalize_Expr_Type.t_expr;
+    c <- any IteNormalize_Expr_Type.t_expr;
     assume { resolve0 c };
-    [#"../ite_normalize.rs" 215 25 215 49] _0 <- ([#"../ite_normalize.rs" 215 25 215 49] simplify_helper ([#"../ite_normalize.rs" 215 25 215 26] c1) ([#"../ite_normalize.rs" 215 43 215 48] state));
-    [#"../ite_normalize.rs" 215 25 215 26] c1 <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 215 43 215 48] state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
+    [#"../ite_normalize.rs" 215 25 215 49] _0 <- ([#"../ite_normalize.rs" 215 25 215 49] simplify_helper c1 state);
+    c1 <- any IteNormalize_Expr_Type.t_expr;
+    state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB36
   }
   BB9 {
@@ -901,7 +901,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB10 {
     [#"../ite_normalize.rs" 193 32 193 33] v <- ([#"../ite_normalize.rs" 193 32 193 33] IteNormalize_Expr_Type.var_v c);
     [#"../ite_normalize.rs" 194 51 194 53] _16 <- ([#"../ite_normalize.rs" 194 51 194 53] v);
-    [#"../ite_normalize.rs" 194 41 194 54] _13 <- ([#"../ite_normalize.rs" 194 41 194 54] get0 ([#"../ite_normalize.rs" 194 41 194 46] state) ([#"../ite_normalize.rs" 194 51 194 53] _16));
+    [#"../ite_normalize.rs" 194 41 194 54] _13 <- ([#"../ite_normalize.rs" 194 41 194 54] get0 state _16);
     goto BB11
   }
   BB11 {
@@ -916,7 +916,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB13 {
     assume { resolve0 c };
     [#"../ite_normalize.rs" 194 36 194 37] b <- ([#"../ite_normalize.rs" 194 36 194 37] Core_Option_Option_Type.some_0 _13);
-    switch ([#"../ite_normalize.rs" 195 31 195 33] b)
+    switch (b)
       | False -> goto BB16
       | True -> goto BB14
       end
@@ -924,9 +924,9 @@ module IteNormalize_Impl5_SimplifyHelper
   BB14 {
     assume { resolve0 e };
     assume { resolve0 t };
-    [#"../ite_normalize.rs" 196 32 196 56] _0 <- ([#"../ite_normalize.rs" 196 32 196 56] simplify_helper ([#"../ite_normalize.rs" 196 32 196 33] t) ([#"../ite_normalize.rs" 196 50 196 55] state));
-    [#"../ite_normalize.rs" 196 32 196 33] t <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 196 50 196 55] state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
+    [#"../ite_normalize.rs" 196 32 196 56] _0 <- ([#"../ite_normalize.rs" 196 32 196 56] simplify_helper t state);
+    t <- any IteNormalize_Expr_Type.t_expr;
+    state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB15
   }
   BB15 {
@@ -935,9 +935,9 @@ module IteNormalize_Impl5_SimplifyHelper
   BB16 {
     assume { resolve0 t };
     assume { resolve0 e };
-    [#"../ite_normalize.rs" 198 32 198 56] _0 <- ([#"../ite_normalize.rs" 198 32 198 56] simplify_helper ([#"../ite_normalize.rs" 198 32 198 33] e) ([#"../ite_normalize.rs" 198 50 198 55] state));
-    [#"../ite_normalize.rs" 198 32 198 33] e <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 198 50 198 55] state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
+    [#"../ite_normalize.rs" 198 32 198 56] _0 <- ([#"../ite_normalize.rs" 198 32 198 56] simplify_helper e state);
+    e <- any IteNormalize_Expr_Type.t_expr;
+    state <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB17
   }
   BB17 {
@@ -947,39 +947,39 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB35
   }
   BB19 {
-    [#"../ite_normalize.rs" 202 46 202 59] state_t <- ([#"../ite_normalize.rs" 202 46 202 59] clone0 ([#"../ite_normalize.rs" 202 46 202 51] state));
+    [#"../ite_normalize.rs" 202 46 202 59] state_t <- ([#"../ite_normalize.rs" 202 46 202 59] clone0 state);
     goto BB20
   }
   BB20 {
     [#"../ite_normalize.rs" 203 28 203 35] _27 <- Borrow.borrow_mut state_t;
     [#"../ite_normalize.rs" 203 28 203 35] state_t <-  ^ _27;
-    [#"../ite_normalize.rs" 203 28 203 51] _26 <- ([#"../ite_normalize.rs" 203 28 203 51] insert0 _27 ([#"../ite_normalize.rs" 203 43 203 44] v) ([#"../ite_normalize.rs" 203 46 203 50] [#"../ite_normalize.rs" 203 46 203 50] true));
+    [#"../ite_normalize.rs" 203 28 203 51] _26 <- ([#"../ite_normalize.rs" 203 28 203 51] insert0 _27 v true);
     _27 <- any borrowed (IteNormalize_BTreeMap_Type.t_btreemap usize bool);
     goto BB21
   }
   BB21 {
     assume { resolve0 t };
-    [#"../ite_normalize.rs" 204 37 204 63] tp <- ([#"../ite_normalize.rs" 204 37 204 63] simplify_helper ([#"../ite_normalize.rs" 204 37 204 38] t) ([#"../ite_normalize.rs" 204 55 204 62] state_t));
-    [#"../ite_normalize.rs" 204 37 204 38] t <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 204 55 204 62] state_t <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
+    [#"../ite_normalize.rs" 204 37 204 63] tp <- ([#"../ite_normalize.rs" 204 37 204 63] simplify_helper t state_t);
+    t <- any IteNormalize_Expr_Type.t_expr;
+    state_t <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB22
   }
   BB22 {
-    [#"../ite_normalize.rs" 207 46 207 59] state_e <- ([#"../ite_normalize.rs" 207 46 207 59] clone0 ([#"../ite_normalize.rs" 207 46 207 51] state));
+    [#"../ite_normalize.rs" 207 46 207 59] state_e <- ([#"../ite_normalize.rs" 207 46 207 59] clone0 state);
     goto BB23
   }
   BB23 {
     [#"../ite_normalize.rs" 208 28 208 35] _35 <- Borrow.borrow_mut state_e;
     [#"../ite_normalize.rs" 208 28 208 35] state_e <-  ^ _35;
-    [#"../ite_normalize.rs" 208 28 208 52] _34 <- ([#"../ite_normalize.rs" 208 28 208 52] insert0 _35 ([#"../ite_normalize.rs" 208 43 208 44] v) ([#"../ite_normalize.rs" 208 46 208 51] [#"../ite_normalize.rs" 208 46 208 51] false));
+    [#"../ite_normalize.rs" 208 28 208 52] _34 <- ([#"../ite_normalize.rs" 208 28 208 52] insert0 _35 v false);
     _35 <- any borrowed (IteNormalize_BTreeMap_Type.t_btreemap usize bool);
     goto BB24
   }
   BB24 {
     assume { resolve0 e };
-    [#"../ite_normalize.rs" 209 37 209 63] ep <- ([#"../ite_normalize.rs" 209 37 209 63] simplify_helper ([#"../ite_normalize.rs" 209 37 209 38] e) ([#"../ite_normalize.rs" 209 55 209 62] state_e));
-    [#"../ite_normalize.rs" 209 37 209 38] e <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 209 55 209 62] state_e <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
+    [#"../ite_normalize.rs" 209 37 209 63] ep <- ([#"../ite_normalize.rs" 209 37 209 63] simplify_helper e state_e);
+    e <- any IteNormalize_Expr_Type.t_expr;
+    state_e <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB25
   }
   BB25 {
@@ -989,10 +989,10 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB27
   }
   BB27 {
-    [#"../ite_normalize.rs" 212 28 212 84] _0 <- ([#"../ite_normalize.rs" 212 28 212 84] IteNormalize_Expr_Type.C_IfThenElse ([#"../ite_normalize.rs" 212 47 212 48] c) ([#"../ite_normalize.rs" 212 62 212 64] tp) ([#"../ite_normalize.rs" 212 79 212 81] ep));
-    [#"../ite_normalize.rs" 212 47 212 48] c <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 212 62 212 64] tp <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 212 79 212 81] ep <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 212 28 212 84] _0 <- ([#"../ite_normalize.rs" 212 28 212 84] IteNormalize_Expr_Type.C_IfThenElse c tp ep);
+    c <- any IteNormalize_Expr_Type.t_expr;
+    tp <- any IteNormalize_Expr_Type.t_expr;
+    ep <- any IteNormalize_Expr_Type.t_expr;
     goto BB28
   }
   BB28 {
@@ -1040,7 +1040,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB42 {
     [#"../ite_normalize.rs" 218 24 218 25] v1 <- ([#"../ite_normalize.rs" 218 24 218 25] IteNormalize_Expr_Type.var_v self);
     [#"../ite_normalize.rs" 219 43 219 45] _52 <- ([#"../ite_normalize.rs" 219 43 219 45] v1);
-    [#"../ite_normalize.rs" 219 33 219 46] _49 <- ([#"../ite_normalize.rs" 219 33 219 46] get0 ([#"../ite_normalize.rs" 219 33 219 38] state) ([#"../ite_normalize.rs" 219 43 219 45] _52));
+    [#"../ite_normalize.rs" 219 33 219 46] _49 <- ([#"../ite_normalize.rs" 219 33 219 46] get0 state _52);
     goto BB43
   }
   BB43 {
@@ -1054,7 +1054,7 @@ module IteNormalize_Impl5_SimplifyHelper
   }
   BB45 {
     [#"../ite_normalize.rs" 219 28 219 29] b1 <- ([#"../ite_normalize.rs" 219 28 219 29] Core_Option_Option_Type.some_0 _49);
-    switch ([#"../ite_normalize.rs" 220 23 220 25] b1)
+    switch (b1)
       | False -> goto BB47
       | True -> goto BB46
       end
@@ -1071,7 +1071,7 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB50
   }
   BB49 {
-    [#"../ite_normalize.rs" 226 20 226 35] _0 <- ([#"../ite_normalize.rs" 226 20 226 35] IteNormalize_Expr_Type.C_Var ([#"../ite_normalize.rs" 226 32 226 33] v1));
+    [#"../ite_normalize.rs" 226 20 226 35] _0 <- ([#"../ite_normalize.rs" 226 20 226 35] IteNormalize_Expr_Type.C_Var v1);
     goto BB50
   }
   BB50 {
@@ -1165,8 +1165,8 @@ module IteNormalize_Impl5_Simplify
     goto BB2
   }
   BB2 {
-    [#"../ite_normalize.rs" 182 8 182 45] _0 <- ([#"../ite_normalize.rs" 182 8 182 45] simplify_helper0 ([#"../ite_normalize.rs" 182 8 182 12] self) _5);
-    [#"../ite_normalize.rs" 182 8 182 12] self <- any IteNormalize_Expr_Type.t_expr;
+    [#"../ite_normalize.rs" 182 8 182 45] _0 <- ([#"../ite_normalize.rs" 182 8 182 45] simplify_helper0 self _5);
+    self <- any IteNormalize_Expr_Type.t_expr;
     _5 <- any IteNormalize_BTreeMap_Type.t_btreemap usize bool;
     goto BB3
   }
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 490a8aa47f..5dcec0a0f5 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -108,12 +108,14 @@ module C01Range_Impl0_Next
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option isize;
   var self : borrowed (C01Range_Range_Type.t_range) = self;
+  var _3 : bool;
   var r : isize;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../01_range.rs" 58 11 58 33] ([#"../01_range.rs" 58 11 58 21] C01Range_Range_Type.range_start ( * self)) >= ([#"../01_range.rs" 58 25 58 33] C01Range_Range_Type.range_end ( * self)))
+    [#"../01_range.rs" 58 11 58 33] _3 <- ([#"../01_range.rs" 58 11 58 33] C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self));
+    switch (_3)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -125,9 +127,9 @@ module C01Range_Impl0_Next
   }
   BB2 {
     [#"../01_range.rs" 61 20 61 30] r <- ([#"../01_range.rs" 61 20 61 30] C01Range_Range_Type.range_start ( * self));
-    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + ([#"../01_range.rs" 62 26 62 27] [#"../01_range.rs" 62 26 62 27] (1 : isize))) x1) ; };
+    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + (1 : isize)) x1) ; };
     assume { resolve0 self };
-    [#"../01_range.rs" 63 12 63 19] _0 <- ([#"../01_range.rs" 63 12 63 19] Core_Option_Option_Type.C_Some ([#"../01_range.rs" 63 17 63 18] r));
+    [#"../01_range.rs" 63 12 63 19] _0 <- ([#"../01_range.rs" 63 12 63 19] Core_Option_Option_Type.C_Some r);
     goto BB3
   }
   BB3 {
@@ -148,7 +150,7 @@ module C01Range_Impl1_IntoIter
   }
   BB0 {
     [#"../01_range.rs" 71 8 71 12] _0 <- ([#"../01_range.rs" 71 8 71 12] self);
-    [#"../01_range.rs" 71 8 71 12] self <- any C01Range_Range_Type.t_range;
+    self <- any C01Range_Range_Type.t_range;
     return _0
   }
   
@@ -233,6 +235,7 @@ module C01Range_SumRange
   var n : isize = n;
   var i : isize;
   var it : C01Range_Range_Type.t_range;
+  var _6 : C01Range_Range_Type.t_range;
   var iter_old : Snapshot.snap_ty (C01Range_Range_Type.t_range);
   var produced : Snapshot.snap_ty (Seq.seq isize);
   var _17 : Core_Option_Option_Type.t_option isize;
@@ -243,8 +246,10 @@ module C01Range_SumRange
     goto BB0
   }
   BB0 {
-    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] [#"../01_range.rs" 78 16 78 17] (0 : isize));
-    [#"../01_range.rs" 79 17 79 55] it <- ([#"../01_range.rs" 79 17 79 55] into_iter0 ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range ([#"../01_range.rs" 79 32 79 33] [#"../01_range.rs" 79 32 79 33] (0 : isize)) ([#"../01_range.rs" 79 40 79 41] n)));
+    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] (0 : isize));
+    [#"../01_range.rs" 79 17 79 43] _6 <- ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range (0 : isize) n);
+    [#"../01_range.rs" 79 17 79 55] it <- ([#"../01_range.rs" 79 17 79 55] into_iter0 _6);
+    _6 <- any C01Range_Range_Type.t_range;
     goto BB1
   }
   BB1 {
@@ -295,8 +300,8 @@ module C01Range_SumRange
   }
   BB11 {
     [#"../01_range.rs" 88 16 88 75] produced <- ([#"../01_range.rs" 88 16 88 75] _21);
-    [#"../01_range.rs" 88 16 88 75] _21 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + ([#"../01_range.rs" 89 21 89 22] [#"../01_range.rs" 89 21 89 22] (1 : isize)));
+    _21 <- any Snapshot.snap_ty (Seq.seq isize);
+    [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + (1 : isize));
     goto BB4
   }
   
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3session.xml b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
index cb3bf3edaf..906c627a5a 100644
--- a/creusot/tests/should_succeed/iterators/01_range/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
@@ -17,7 +17,7 @@
 </theory>
 <theory name="C01Range_Impl0_Next" proved="true">
  <goal name="next&#39;vc" expl="VC for next" proved="true">
- <proof prover="0"><result status="valid" time="0.065018" steps="267"/></proof>
+ <proof prover="0"><result status="valid" time="0.065018" steps="265"/></proof>
  </goal>
 </theory>
 <theory name="C01Range_Impl1_IntoIter" proved="true">
@@ -27,7 +27,7 @@
 </theory>
 <theory name="C01Range_SumRange" proved="true">
  <goal name="sum_range&#39;vc" expl="VC for sum_range" proved="true">
- <proof prover="0"><result status="valid" time="0.130000" steps="1740"/></proof>
+ <proof prover="0"><result status="valid" time="0.130000" steps="1624"/></proof>
  </goal>
 </theory>
 <theory name="C01Range_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz b/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz
index 404b2b0604fa4c6013467eb24cd9d039b1ab3acb..cb2d68289d0b56f8b359c7d0fa9c8274bb1ed344 100644
GIT binary patch
literal 962
zcmV;z13mm7iwFP!00000|D{z+Z{s!)zUx=$wrzp}9KKoXE?@)^WMI)lx8Sh`DN<RZ
zj+9DHw*B`VQnD@Og%<U}8qV`0=Ns~et8)D29^zO&#bMm{-Or^guYN4t!_bGvCXU1s
z7w;dAe_K)&_NHw6p*-1kLu?Og*XwHwmRY`CXlYVxmTu@nUuHWFt{aOR*Yx)fhj@%3
zCA``F(s%I^?5<Eb?z=nm=sQc@@7d{Ve;=)d?aht*WZ|U1szV(6!&4+yZ_uKh?}wrP
z9>a(GKhWz}*WE>{taR<Za|cYd50>1btJ`-+$v@z~Rqpz-azhH)jVK%wmIiLmd2CXo
zGW@yMt*hK&j5D^hqXjbJej6U6Whs*FXV0W^pFh1__=P2QA(yH)cnJG$=ljPljPGM#
zL*FKR<hfThAv#VdO>#2-8)bEFe;5Bc7OC)De`&+8ez!ly;a`$$`;ue}jhKlns^a)3
z0(&A>Rz)HV1*^8x7g%-T+{Yyes97>15hOvI42Rg=9lxQyi-V<VLG@V&a5h>%BIeql
zb4g>VuC^<}QN8RMLTaGeyx!7m%z2chvdWTlUHopT$XW4g8Nm;8KP6$pYAK%8$K_gV
z(tgiYG*z2ZIJm5V90C`o6w(k>W!G~i#CLW%OYBQ(8>UIpd@5oB$S?<`%M`e$FUujP
zd0*6xIMh3ICe=LQxXsKOipOcH?dt9T_1fiu+Dl@Vu8-_D-ybHQAn2@~Wb9Zz*Ay!)
zaFkcX0QLqk(6Ax~h<Atq0#l!e!K=->hJK@jepZ3LSApVepDIkFMiWt{p_ujxnK?kF
z6|vKCnA0tReVPtMH_7Gm8HZ{vkHh$QzssXO4;f1j$0Q<xlbC1oG=*$6rhFdL)ij@#
zSU1P;s>qsMe!kYP27j&be9?D_{pIJbi_HX1Z2wypwazjjgM@4a9BD7`iP76vwbk-r
z<fxNNg?thCs>j^ci9l@L5J`@Ct>(3^(yu65rM!=X1fr#;LIMv=MiZU(qVb-WP?N$t
zXd1x{F+6JGD72C~158A!Txe;@YFbDWX^=jEAS7xHn(IJ?X(2SC5j2#d=7kj65z|EF
zTOqmdiW=Im#x+Elh{;P;%ffi&f$HcPSGp0QB`p;#Q_e$RUWO8A4NwEAO|1(SqKh<&
zrfHlD(ooMl)&QxQq9Mc*bPcKoS%av7*T4#@IM<Qlo5#3R_?3<+O^ugPp+@HrvkGaQ
kAV#!6qi;FUZO{UdL?bjKo^X>wC|QO41L2-4Wl#wK0BqITF#rGn

literal 935
zcmV;Y16ceYiwFP!00000|D9D!Z{s!)zUx=$wrzp}9KKoX7BGwm60q1q3-DNjqNuD<
zTS_G-Y5#qPl<Y`}6SVcg9M1D2XFlqOn|%E49>SPEg<;(H-OstqZ+^_&!_YU6K8(Z?
z7mg37zbz>;yUp8v$j`Rj5Zc4q_4d|+WtLY9EscuJ(hYs++ia)7bz`=5zCS)3!YMQ{
z;db|}@4`#4yFul+@9xo~?<{q{C#T=~W3U#g{nmZ4a8|I58^YKho&vFIgBIoLei-`a
z(0n@nfnLA5?mk#)g=_bnJ7B7PW62%5x_x(&{1g6L>26<kZipef5rtF4;^FR+$3{gg
z!(Myc&8Xs87MO_p<;(l2-&jJ|M18T@qG?z6k6kl<jBO3ALKOP7Q&D~Ue<;rV>%w2B
zES_&FfJ<?)VN}1{pTh7jr=)s2B@2z1Cs7pH=}*M<M64{b*l~*et)>-daUPn_%PvyA
z*u-IQ5!z%pgzo<I9qnBhER~B{opnGiMhh66YQt1gTdIm`H8E5z+k%ih6r1ZkOU9H(
zS}KYp3D<>ZOL@wQtEC1P>VAsCgw;}3xzEczG7Qgqv7)Ki%;Ai<s9_|A;O62KLp(uM
za=m0id>5CCM8C$i#l$Ghx56iY6mw8mroc0OU9xmKA-EA)xx<??#Z1v>l+)B03%aOQ
z<Og|;{iuCO%mDeH{N@KhryB&7)RT-IOZOUMg$0K4YA}GlGZ<)C4F>QJ1_L;zJ`V;f
zHtQPi&EBig1Nf){STh%xt_<RsOq7^TO48hzv@vJuV{g)UTJ4eRk?M18<zF~FJ|1_8
z-7~RR<o6^}3uiI$@ytB7q9&iIxnl4|iFH#9FS4ZBrEkvqspr?4%@@6v*i(M#wAf7G
zMD^dYsCAYJ8AN0&;5h2SDyyrj+G6=N<EUFc8TdJQ9eCAa?j_$$7cS<#ocHHfMi=py
zWvx<m9SCWNmYNC)ykRn!;B+l~UGp4DlGP5p7u*oTgC>qbE2%TUM8GGhX=%<%no$Ea
z32mU>`9=m6G-px=uYD^qisz!_nH1U)<AbVOA-Sj(HPkbVAj$+xo~u%3nwo%Ms8K`{
z#*N_k^NM?i`Autbpd~;Fq%@_@SQA{JL3r<-YowtytFZ=1%@l2#kb^Ekl^{zHCGZkh
zMiu88fr4XPDqN*w3ai!#8#OwGm{myY1Tmro8tRr4-8Nd(vI$0LMry)M454Hd@(+l?
J+KdGW002wF(5(Of

diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index ecdd711011..482156eabf 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -485,7 +485,7 @@ module C02IterMut_Impl2_IntoIter
   }
   BB0 {
     [#"../02_iter_mut.rs" 71 8 71 12] _0 <- ([#"../02_iter_mut.rs" 71 8 71 12] self);
-    [#"../02_iter_mut.rs" 71 8 71 12] self <- any C02IterMut_IterMut_Type.t_itermut t;
+    self <- any C02IterMut_IterMut_Type.t_itermut t;
     return _0
   }
   
@@ -690,6 +690,7 @@ module C02IterMut_IterMut
   var _6 : borrowed (slice t);
   var _7 : borrowed (slice t);
   var _8 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
+  var _9 : Core_Ops_Range_RangeFull_Type.t_rangefull;
   {
     goto BB0
   }
@@ -697,8 +698,10 @@ module C02IterMut_IterMut
     [#"../02_iter_mut.rs" 79 26 79 27] _8 <- Borrow.borrow_final ( * v) (Borrow.get_id v);
     [#"../02_iter_mut.rs" 79 26 79 27] v <- { v with current = ( ^ _8) ; };
     assume { inv0 ( ^ _8) };
-    [#"../02_iter_mut.rs" 79 27 79 31] _7 <- ([#"../02_iter_mut.rs" 79 27 79 31] index_mut0 _8 ([#"../02_iter_mut.rs" 79 28 79 30] Core_Ops_Range_RangeFull_Type.C_RangeFull));
+    [#"../02_iter_mut.rs" 79 28 79 30] _9 <- ([#"../02_iter_mut.rs" 79 28 79 30] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../02_iter_mut.rs" 79 27 79 31] _7 <- ([#"../02_iter_mut.rs" 79 27 79 31] index_mut0 _8 _9);
     _8 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
+    _9 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
     goto BB1
   }
   BB1 {
@@ -1036,14 +1039,14 @@ module C02IterMut_AllZero
   }
   BB11 {
     [#"../02_iter_mut.rs" 93 17 93 18] x <- ([#"../02_iter_mut.rs" 93 17 93 18] Core_Option_Option_Type.some_0 _15);
-    [#"../02_iter_mut.rs" 93 17 93 18] _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any borrowed usize));
+    _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any borrowed usize));
     [#"../02_iter_mut.rs" 94 27 94 75] _19 <- ([#"../02_iter_mut.rs" 94 27 94 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x)));
     goto BB12
   }
   BB12 {
     [#"../02_iter_mut.rs" 94 16 94 75] produced <- ([#"../02_iter_mut.rs" 94 16 94 75] _19);
-    [#"../02_iter_mut.rs" 94 16 94 75] _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
-    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] [#"../02_iter_mut.rs" 95 21 95 22] (0 : usize)) ; };
+    _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
+    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] (0 : usize)) ; };
     assume { resolve0 x };
     goto BB5
   }
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz b/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz
index e10052c84d5b7809fd806cf7d6b5c752069247e1..745faae412f4a8bcdc4ddb8d6d6608d3a05c8c8a 100644
GIT binary patch
literal 3587
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
J>Z1xY004$w0lokL

literal 3582
zcmV<a4FU2WiwFP!00000|J_<yZyU)Ge%G(yTM{h-^nC>D0D=&q1#I$=0P`rKyQjw{
zLX%pGmYw|iR9|zDGnBNpcd;>SbJ)jM)pb`7|9HK6`d}Z!)9N`Ko;Lg4Ushsu{imzr
z&vvtWW(~S4kF>${ku;<};)dQ`*&pB8ZP>j(ez1VG-R?iHKknPG#SOE^{d%)I+K=`N
zy0P!h=QnM`ZW5`px%*6(-Cf-t?d|&h7!H5`bZi=)*4x9z?vAM8i4XV$K6*BQ>c>yV
z^;7s6HFB0W7?1p1+xOu(UEU}FY{QrJcK?3kvAvE%_x48^pF_Wa(|gpYy9oC%1E;5O
z4{<2M=}U0>E*+9gC-1Y!B^>qfux~&4@PrzSZTR?j{0}_bXHj7M(@0(zRM_0Ey8U5Q
zH?0q$+g|kw?$z5XcTnvMnmJb~k1FM51;1n*Vr(2`gUBSSa%DM@%)=-u;vFbrIGz66
z#2QrLeIhrU(Mb};td=ltFgevz8jPBPsToyaTy%xWUB$-<|J<lBh?kw3RT@nAY!;tZ
zeAeUBB_qdt!OAhOd->REEc|iSjYr_Cw?50++9JldBn`MS;OYuL;$%wGZa_DYv(0W7
z4nXLKy6%S`Y$o%Xeg4d9j|aPZnicRV$p(wE2uSu+mp6FWkTfA)cciKrF>g<E>^%Hx
z?EIg_Ks*xzNs0)sl015=<k755=78U5VJN8-y-lSk$@KgB+2j7{==ZyJbA<dq4H7+)
zpQIcK6DdB@8en3i$?8ghE02geg6jzAb_63bz+_A&TrtgHlW%15jnz^_rc}0&Z2<UU
zDH7))Z)HCD+1!23mH4z2A*19Y8j|=BLv_TPo;wzEVXdUZP)U`{2JxX$H~HzhQKhz0
zbzO9ZrN}>TP<Y9ZVLX-$BY#9O7ok)>{1~TZiBx;U3qBqJ$Q1P<4_?TiXvm=H>~bz`
zqnx%=BzOwjE+>FBy#?bL=>o>;?54#q4?8}D!v@T}joikMxWMBK5TA$b_Dd>dU<^{+
z{&3iT4(%U4{(H3GAwqVWo!#cGkw_+((qWv=g;acaJcPlaZqJMjRwuZl-N2W#xp=yB
z3x(n3P1j}9Ul&|HgL<^Q;<{h)E^3aQ=yEiBeKuS7g1G**{}`IZ1E)fD_Gs6arXMa(
zUys0ng@5dK!LCuRX6r*%7QQ<E=P|5$pS`k&@U-7P2UMm3e2ogmmG%3NkK1qzE$VG+
zT@Pu$;Blxd2KBVry@wt99ZUmPY1i#3PUUfVcdX|g>e?()ILB?N<n+xLGP}VkU>qIb
zNb*Kn!2sgEKRJZl(pSXjTpnVXjdg=nUwW#Wc{`4*F4=L4?Q`l{+;m+wU9e-Af5DE+
zifG3KpV@Igdwn)r_g=K)$omC5zBK)CdHQ+;UQ`-2a8vrTl4#SSq#wBysv=4XRZ-^<
zsAA(V36(IA5O{7b-sMH?JY>Q`kE_$)HiVqQ+*RA5eV4flUygmMLqn>=!=(Yal&R?p
znK~Y+$u$N&n=9r@Pct=}w27=_RaW}S(aKm7LwPFh^T*x&=>pLo6nF$iVYr-245#I(
zonAO1wAdGq80X=Lq|^habN9Urr$?ltBeI5;vV#s~2Oo4H23^QyMk&<$6GqSZp|LN>
zt$DpI7+4~7sd%NSI=EQ5OphIXna*L%7|7{DoJxrj?{KpH>`}D379E8{LW&KMtN@Zm
zhG?m4MASF+A=(O|5Kf9Wq`;E~$;3rdJSvW<vd_f;3+q6gsCPt&*46t|2~;Vfs{tOX
z9HCF(0ky!33@;KqRuC)(KbJkcD6TEze`T$RR|Wm0!9@j<B?W@yion)k`}7%tN|fB$
zMG^qafZkXDTtD0Gr<qNK?n7ej!ny<=qiqhKG0;_IC$+BK{?o2~n%@{3jDOnQ`*8PZ
zyB(q~N%EnmGAC8$D2o?mIi~BNUgo%$d99(+6%e|swm96<#fTEC;Nqcbh$?c3p_4A-
zEqAcz{Y|~lV?#K6XmTkK%}x%T%5msRmgq6)=`Y2$I1f_LbBwSi`<8ffw?kjw?Xd6C
z?XX|a?WnnKN9Jy4)DY9uYqR8-^**#bsB}+My6-x|>Iek25e%;YW9Wp-r}R|4POgC+
z;?7B?DWR`sQ>;rm#k$;ouH*IFbKi@J+JL2@=V^=e5a)Aa^_-SJmx6sQmaZ6a-ZYzA
z%eIrCvF5K>#v<&gb0kuyRRSzahZ`QiW%t|G?!xEMs?9M@7TM;>B-=AMSh(HqABV;S
zp5o@ApwD+TJ)QiuN1l?5R%SQwX*X3y)Af<7;-nAL3b;pvFEd=?SF?mq_q{|B(jNBd
zij3fSuIqg}skiKF$Z}^?#sefO4~wBiFV7@BP5QEob=H=};ZYk^0Eeaw^V;;|WC-xl
zcaOE;0E53|$j=LQ{5(<M`D8E9>D6j<qNuydOYT+Ucj!o;;L93KnavBxn8i^Oo3Bfz
zLn!sW??$(cr@EiC!9OghbB<gh_5xt6?@kxMSTY^@g6ZTJC@)iB(<9qI$Dw)XM3=o%
z7&oK5d3J>SK5Y$EU5pejAdMqSv}c`EJSk2<Q8})D!6~rDP5phx7dqqL<TMOD!uoJ{
zwx>747k!_cU@iwD@^V}t$(*~ZPrE~~{)2VfuzK9XhIFqs>jJTyrYZ*$s+L-?Y7<l~
zUa@DaMSxLHLD>DVIR5R@ks8JuCNo=1P6Pr|g&QXCZcgRg5Zx~urD4i%PJ2_zN1X~w
zJuDM*Cecux>Qbsxu^KsJ`H4m2YZy(XD||Lg!AJA}Rz=ycROXDn(~(`nEKDVtrtR9M
zk@UWY>0wblupWsYHuT{Fmh?~fr&t6<7<kH}pd>ShqYCvH0%F!rqo55ZE#bQR+|YEh
z1w%O!!uPu}+t0~{idvOZF}-S|Z0@QJMh9{{R?lf&zG?%o(kD{Zw-WL3-9&F`Flm57
z&z_|Z$m1Jsn%jwa+oGi5C4cg1{)DL_YK|}279|r}=eCuL;RW)5P6~N)LcZ3$oLnS7
zrbW~ld6GI_ST$5prC$QCT>m#5_Whd{GF*9lt6!&x`Id=a{&fl|zfK|PhY+dosIPfQ
z|C%S?oXmDRdX{n2==okprxtYj-d3Nzcbx2)zGggcbo5F06eFU(*gWZR@03cT$!zH~
zp;4ILVUyWAY%;zQXSvz#@33kAzVZIeSbP!duD+@ywfzBeO7^x+Ka`sEN~HEm<bHm*
z`aZ6gN)c_kG<J71_h<KuGk24Bq$Ia)lQEVT_VoIztvb@*fABhTLhl=a-o-yxSDJW5
zgm8)q8hi*+;h-@V5^{+WUaypqMi_3Gp@tZ2(3O%%Vn>K#tzw!Y!L1Fn<AG=@gdi)5
z43&n`$u3V7r6IJP(hhN@I>(^a@m3Q;Jqz86azlk7$`EM?Ja9vpA+VjCLcwOs9D<Y&
zd%Ga4wp1|UF=>P9BuY^1RZ!X~ZV@9=ITSSG9t-3h91nUcrWlH6A$lH)U_+3>+F)g{
zG*}qS4Q2*Yg8>~IjEuetDzw^Sj<7>MxK0s?wCmbH35T5DCTZcXp`f`It?sZzK!&r9
zF`xlrK?Itb7H55suc6?S*Suqj6GRlkL2@EI@2rz8?>fs@0&GMWCJlrCLB7l|Y8WvL
z8wSL+q3ViC?t&)PYbBT^8h2n|tz%p=+Od|cI5(Ub4hkZMW5bbQ+A#G3Y!|4~R=12|
zOoIgOz%o0boyLkP=T=-Bt_+uki#LNi8c!;?lVDbkw+OY~dD=SN(m=3?mL}jY`sE}9
zL0mw|ECNCpIS0ZZZ6}-nyY7686A5Aj{wgXOv-rxKpn!=`;E6(a3I&HiMuc@FQDH{V
zucFemToB%}0Imb3&M+l#B;GkLTFFszOhEohiCONMX5I#FI}~_m6}24&-@=}GLi9>9
zBdL+ZNNglBLK^|9^u$T2EqFN+$buwD+@S(x#Bm>1iWx;CT}6z-Mj<1$kr4i*k-|uR
z1@=Ux^DXz1bBGQcj2}R`c0std>sA<8$H2Q5MsuT?(bQ;SG&UNQb0}?;GD;c+boiBM
zTfrp9q0`{LkhZmDB2dl{1XnF+^a+f>1+~%2=(j+72(y;rE;!dp%CsjC5nARuPd$<?
z$<VC)19wN@?+E`AQh{QpHBj-b>@1=@fD}Xw8XW>J7b}b)z#tF~f)Ils#-MLT8{(aG
zHfjK@j%bjXB;Z4B7qoQBqD&j2*mt7uJ!lPemOut|k_Fp22M%VD@T!$o7WzOV#Z&w}
zd4VFGX%vLV4m+=P&>E7N*Az0g?=(*;kKsPX`xx+J#E&6A#{3xczdcLALLmV>`3^!2
zZ*7ZI%LoA%a)GvB;54!n{{blylMav~_}667(cq}_9i$B&5Pa)s=OO3^>A*R)&nyC2
zBC-O1TXsQ@1X#3MK*6TLtu1w!D2QW%3)yOjLck9MOAOHxQ{V||F$|Rzj_05;wF7;q
z2QX9}7)k>S^$h_07H5%4E8N0q0(^FwIp#QPk?lIke5+MC3;DgAhwH8bOKLrXn%1fo
za=2y?o?73A7AoIz9-zZ$wx!?C*>H!nZ-uAAS}m=QZqnKg$EuJa>ELWYkMZIcznu<*
zBF;f&BcL$>x#>;_4~E82fO6P|73Q(X1$t0yVyHbJ*JG$ZFpr-gVkkj!z7H+b7F|aI
z)ajBSnsOP1O4S90;NS&GzKrB3<<Rta?mLMAFL=*lt;z^jQ2B|1q+Uk)A2P;~rU*0u
E06OI3QUCw|

diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index ef7847c07c..1ba4247c45 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -268,10 +268,10 @@ module C03StdIterators_SliceIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] [#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
+    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
     assert { [@expl:type invariant] inv0 slice };
     assume { resolve0 slice };
-    [#"../03_std_iterators.rs" 9 13 9 25] _7 <- ([#"../03_std_iterators.rs" 9 13 9 25] iter0 ([#"../03_std_iterators.rs" 9 13 9 18] slice));
+    [#"../03_std_iterators.rs" 9 13 9 25] _7 <- ([#"../03_std_iterators.rs" 9 13 9 25] iter0 slice);
     goto BB1
   }
   BB1 {
@@ -341,12 +341,12 @@ module C03StdIterators_SliceIter
   }
   BB12 {
     [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] _22);
-    [#"../03_std_iterators.rs" 8 4 8 38] _22 <- any Snapshot.snap_ty (Seq.seq t);
+    _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + ([#"../03_std_iterators.rs" 10 13 10 14] [#"../03_std_iterators.rs" 10 13 10 14] (1 : usize)));
+    [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + (1 : usize));
     goto BB5
   }
   
@@ -645,10 +645,10 @@ module C03StdIterators_VecIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] [#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
+    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
     assert { [@expl:type invariant] inv0 vec };
     assume { resolve0 vec };
-    [#"../03_std_iterators.rs" 19 4 19 38] iter <- ([#"../03_std_iterators.rs" 19 4 19 38] into_iter0 ([#"../03_std_iterators.rs" 20 13 20 16] vec));
+    [#"../03_std_iterators.rs" 19 4 19 38] iter <- ([#"../03_std_iterators.rs" 19 4 19 38] into_iter0 vec);
     goto BB1
   }
   BB1 {
@@ -713,12 +713,12 @@ module C03StdIterators_VecIter
   }
   BB11 {
     [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] _21);
-    [#"../03_std_iterators.rs" 19 4 19 38] _21 <- any Snapshot.snap_ty (Seq.seq t);
+    _21 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + ([#"../03_std_iterators.rs" 21 13 21 14] [#"../03_std_iterators.rs" 21 13 21 14] (1 : usize)));
+    [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + (1 : usize));
     goto BB4
   }
   
@@ -1082,16 +1082,16 @@ module C03StdIterators_AllZero
   }
   BB12 {
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize));
+    _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize));
     [#"../03_std_iterators.rs" 29 4 29 87] _22 <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
     [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] _22);
-    [#"../03_std_iterators.rs" 29 4 29 87] _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
+    _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any borrowed usize;
-    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] [#"../03_std_iterators.rs" 31 13 31 14] (0 : usize)) ; };
+    __creusot_proc_iter_elem <- any borrowed usize;
+    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] (0 : usize)) ; };
     assume { resolve2 x };
     goto BB6
   }
@@ -1380,12 +1380,12 @@ module C03StdIterators_SkipTake
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 36 14 36 26] _6 <- ([#"../03_std_iterators.rs" 36 14 36 26] take0 ([#"../03_std_iterators.rs" 36 14 36 18] iter) ([#"../03_std_iterators.rs" 36 24 36 25] n));
-    [#"../03_std_iterators.rs" 36 14 36 18] iter <- any i;
+    [#"../03_std_iterators.rs" 36 14 36 26] _6 <- ([#"../03_std_iterators.rs" 36 14 36 26] take0 iter n);
+    iter <- any i;
     goto BB1
   }
   BB1 {
-    [#"../03_std_iterators.rs" 36 14 36 34] _5 <- ([#"../03_std_iterators.rs" 36 14 36 34] skip0 _6 ([#"../03_std_iterators.rs" 36 32 36 33] n));
+    [#"../03_std_iterators.rs" 36 14 36 34] _5 <- ([#"../03_std_iterators.rs" 36 14 36 34] skip0 _6 n);
     _6 <- any Core_Iter_Adapters_Take_Take_Type.t_take i;
     goto BB2
   }
@@ -1420,26 +1420,6 @@ module C03StdIterators_SkipTake
   }
   
 end
-module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
-  use seq.Seq
-  use prelude.Snapshot
-  type t_mapinv 'i 'b 'f =
-    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
-    
-  let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv a _ _ -> a
-      end
-  let function mapinv_func (self : t_mapinv 'i 'b 'f) : 'f = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv _ a _ -> a
-      end
-  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv _ _ a -> a
-      end
-end
 module C03StdIterators_Counter_Closure0_Type
   use prelude.UInt32
   use seq.Seq
@@ -1497,7 +1477,7 @@ module C03StdIterators_Counter_Closure0
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24]  * field_00 ( * _1) + ([#"../03_std_iterators.rs" 50 23 50 24] [#"../03_std_iterators.rs" 50 23 50 24] (1 : usize))) ; })) ; };
+    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24]  * field_00 ( * _1) + (1 : usize)) ; })) ; };
     assume { resolve0 _1 };
     [#"../03_std_iterators.rs" 51 16 51 18] res1 <- ([#"../03_std_iterators.rs" 51 16 51 18] x);
     [#"../03_std_iterators.rs" 47 12 47 67] res <- ([#"../03_std_iterators.rs" 47 12 47 67] res1);
@@ -1506,6 +1486,26 @@ module C03StdIterators_Counter_Closure0
   }
   
 end
+module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
+  use seq.Seq
+  use prelude.Snapshot
+  type t_mapinv 'i 'b 'f =
+    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
+    
+  let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv a _ _ -> a
+      end
+  let function mapinv_func (self : t_mapinv 'i 'b 'f) : 'f = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv _ a _ -> a
+      end
+  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
+   = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv _ _ a -> a
+      end
+end
 module C03StdIterators_Counter
   use prelude.UInt32
   use seq.Seq
@@ -1966,25 +1966,28 @@ module C03StdIterators_Counter
   var _4 : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0;
   var _5 : Core_Slice_Iter_Iter_Type.t_iter uint32;
   var _7 : slice uint32;
+  var _9 : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0;
   var _10 : borrowed usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] [#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
-    [#"../03_std_iterators.rs" 44 22 45 15] _7 <- ([#"../03_std_iterators.rs" 44 22 45 15] deref0 ([#"../03_std_iterators.rs" 44 22 44 23] v));
+    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
+    [#"../03_std_iterators.rs" 44 22 45 15] _7 <- ([#"../03_std_iterators.rs" 44 22 45 15] deref0 v);
     goto BB1
   }
   BB1 {
-    [#"../03_std_iterators.rs" 44 22 45 15] _5 <- ([#"../03_std_iterators.rs" 44 22 45 15] iter0 ([#"../03_std_iterators.rs" 44 22 44 23] _7));
+    [#"../03_std_iterators.rs" 44 22 45 15] _5 <- ([#"../03_std_iterators.rs" 44 22 45 15] iter0 _7);
     goto BB2
   }
   BB2 {
     [#"../03_std_iterators.rs" 48 12 48 91] _10 <- Borrow.borrow_mut cnt;
     [#"../03_std_iterators.rs" 48 12 48 91] cnt <-  ^ _10;
-    [#"../03_std_iterators.rs" 44 22 53 9] _4 <- ([#"../03_std_iterators.rs" 44 22 53 9] map_inv0 _5 ([#"../03_std_iterators.rs" 48 12 48 91] C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10));
-    _5 <- any Core_Slice_Iter_Iter_Type.t_iter uint32;
+    [#"../03_std_iterators.rs" 48 12 48 91] _9 <- ([#"../03_std_iterators.rs" 48 12 48 91] C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10);
     _10 <- any borrowed usize;
+    [#"../03_std_iterators.rs" 44 22 53 9] _4 <- ([#"../03_std_iterators.rs" 44 22 53 9] map_inv0 _5 _9);
+    _5 <- any Core_Slice_Iter_Iter_Type.t_iter uint32;
+    _9 <- any C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0;
     goto BB3
   }
   BB3 {
@@ -2167,6 +2170,7 @@ module C03StdIterators_SumRange
   var n : isize = n;
   var i : isize;
   var iter : Core_Ops_Range_Range_Type.t_range isize;
+  var _7 : Core_Ops_Range_Range_Type.t_range isize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range isize);
   var produced : Snapshot.snap_ty (Seq.seq isize);
   var _17 : Core_Option_Option_Type.t_option isize;
@@ -2178,8 +2182,10 @@ module C03StdIterators_SumRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] [#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
-    [#"../03_std_iterators.rs" 65 4 65 48] iter <- ([#"../03_std_iterators.rs" 65 4 65 48] into_iter0 ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 66 13 66 14] [#"../03_std_iterators.rs" 66 13 66 14] (0 : isize)) ([#"../03_std_iterators.rs" 66 16 66 17] n)));
+    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
+    [#"../03_std_iterators.rs" 66 13 66 17] _7 <- ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range (0 : isize) n);
+    [#"../03_std_iterators.rs" 65 4 65 48] iter <- ([#"../03_std_iterators.rs" 65 4 65 48] into_iter0 _7);
+    _7 <- any Core_Ops_Range_Range_Type.t_range isize;
     goto BB1
   }
   BB1 {
@@ -2233,8 +2239,8 @@ module C03StdIterators_SumRange
   }
   BB11 {
     [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] _22);
-    [#"../03_std_iterators.rs" 65 4 65 48] _22 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + ([#"../03_std_iterators.rs" 67 13 67 14] [#"../03_std_iterators.rs" 67 13 67 14] (1 : isize)));
+    _22 <- any Snapshot.snap_ty (Seq.seq isize);
+    [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + (1 : isize));
     goto BB4
   }
   
@@ -2508,6 +2514,7 @@ module C03StdIterators_EnumerateRange
   var _0 : ();
   var iter : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize);
   var _2 : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize);
+  var _3 : Core_Ops_Range_Range_Type.t_range usize;
   var iter_old : Snapshot.snap_ty (Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize));
   var produced : Snapshot.snap_ty (Seq.seq (usize, usize));
   var _12 : Core_Option_Option_Type.t_option (usize, usize);
@@ -2522,7 +2529,9 @@ module C03StdIterators_EnumerateRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 74 19 74 38] _2 <- ([#"../03_std_iterators.rs" 74 19 74 38] enumerate0 ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 74 20 74 21] [#"../03_std_iterators.rs" 74 20 74 21] (0 : usize)) ([#"../03_std_iterators.rs" 74 23 74 25] [#"../03_std_iterators.rs" 74 23 74 25] (10 : usize))));
+    [#"../03_std_iterators.rs" 74 19 74 26] _3 <- ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range (0 : usize) (10 : usize));
+    [#"../03_std_iterators.rs" 74 19 74 38] _2 <- ([#"../03_std_iterators.rs" 74 19 74 38] enumerate0 _3);
+    _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB1
   }
   BB1 {
@@ -2588,11 +2597,11 @@ module C03StdIterators_EnumerateRange
   }
   BB12 {
     [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] _17);
-    [#"../03_std_iterators.rs" 73 4 73 96] _17 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
+    _17 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
     [#"../03_std_iterators.rs" 74 9 74 11] ix <- ([#"../03_std_iterators.rs" 74 9 74 11] let (a, _) = __creusot_proc_iter_elem in a);
     [#"../03_std_iterators.rs" 74 13 74 14] x <- ([#"../03_std_iterators.rs" 74 13 74 14] let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve1 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 75 16 75 23] _21 <- ([#"../03_std_iterators.rs" 75 16 75 23] (([#"../03_std_iterators.rs" 75 17 75 19] ix), ([#"../03_std_iterators.rs" 75 21 75 22] x)));
+    [#"../03_std_iterators.rs" 75 16 75 23] _21 <- ([#"../03_std_iterators.rs" 75 16 75 23] (ix, x));
     assume { resolve1 _21 };
     goto BB5
   }
@@ -2992,7 +3001,11 @@ module C03StdIterators_MyReverse
   var old_v : Snapshot.snap_ty (borrowed (slice t));
   var iter : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize);
   var _8 : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize);
+  var _9 : Core_Ops_Range_Range_Type.t_range usize;
+  var _10 : usize;
   var _12 : bool;
+  var _13 : Core_Ops_Range_Range_Type.t_range usize;
+  var _14 : usize;
   var _16 : bool;
   var iter_old : Snapshot.snap_ty (Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize));
   var produced : Snapshot.snap_ty (Seq.seq (usize, usize));
@@ -3005,11 +3018,13 @@ module C03StdIterators_MyReverse
   var j : usize;
   var _37 : ();
   var _38 : borrowed (slice t);
+  var _40 : usize;
+  var _41 : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 95 12 95 23] n <- ([#"../03_std_iterators.rs" 95 12 95 23] len0 ([#"../03_std_iterators.rs" 95 12 95 17]  * slice));
+    [#"../03_std_iterators.rs" 95 12 95 23] n <- ([#"../03_std_iterators.rs" 95 12 95 23] len0 ( * slice));
     goto BB1
   }
   BB1 {
@@ -3019,17 +3034,25 @@ module C03StdIterators_MyReverse
   BB2 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] ([#"../03_std_iterators.rs" 101 26 101 27] [#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)) = ([#"../03_std_iterators.rs" 101 22 101 27] [#"../03_std_iterators.rs" 101 22 101 27] (0 : usize)));
+    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 22 101 27] not _12 };
     goto BB3
   }
   BB3 {
-    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] ([#"../03_std_iterators.rs" 101 40 101 41] [#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)) = ([#"../03_std_iterators.rs" 101 36 101 41] [#"../03_std_iterators.rs" 101 36 101 41] (0 : usize)));
+    [#"../03_std_iterators.rs" 101 22 101 27] _10 <- ([#"../03_std_iterators.rs" 101 22 101 27] n / (2 : usize));
+    [#"../03_std_iterators.rs" 101 18 101 28] _9 <- ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) _10);
+    _10 <- any usize;
+    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 36 101 41] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../03_std_iterators.rs" 101 18 101 42] _8 <- ([#"../03_std_iterators.rs" 101 18 101 42] zip0 ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 19 101 20] [#"../03_std_iterators.rs" 101 19 101 20] (0 : usize)) ([#"../03_std_iterators.rs" 101 22 101 27] ([#"../03_std_iterators.rs" 101 22 101 23] n) / ([#"../03_std_iterators.rs" 101 26 101 27] [#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)))) ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 33 101 34] [#"../03_std_iterators.rs" 101 33 101 34] (0 : usize)) ([#"../03_std_iterators.rs" 101 36 101 41] ([#"../03_std_iterators.rs" 101 36 101 37] n) / ([#"../03_std_iterators.rs" 101 40 101 41] [#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)))));
+    [#"../03_std_iterators.rs" 101 36 101 41] _14 <- ([#"../03_std_iterators.rs" 101 36 101 41] n / (2 : usize));
+    [#"../03_std_iterators.rs" 101 33 101 41] _13 <- ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range (0 : usize) _14);
+    _14 <- any usize;
+    [#"../03_std_iterators.rs" 101 18 101 42] _8 <- ([#"../03_std_iterators.rs" 101 18 101 42] zip0 _9 _13);
+    _9 <- any Core_Ops_Range_Range_Type.t_range usize;
+    _13 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB5
   }
   BB5 {
@@ -3095,15 +3118,19 @@ module C03StdIterators_MyReverse
   }
   BB16 {
     [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] _33);
-    [#"../03_std_iterators.rs" 97 4 97 36] _33 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
+    _33 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
     [#"../03_std_iterators.rs" 101 9 101 10] i <- ([#"../03_std_iterators.rs" 101 9 101 10] let (a, _) = __creusot_proc_iter_elem in a);
     [#"../03_std_iterators.rs" 101 12 101 13] j <- ([#"../03_std_iterators.rs" 101 12 101 13] let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve2 __creusot_proc_iter_elem };
     [#"../03_std_iterators.rs" 102 8 102 13] _38 <- Borrow.borrow_mut ( * slice);
     [#"../03_std_iterators.rs" 102 8 102 13] slice <- { slice with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
-    [#"../03_std_iterators.rs" 102 8 102 32] _37 <- ([#"../03_std_iterators.rs" 102 8 102 32] swap0 _38 ([#"../03_std_iterators.rs" 102 19 102 20] i) ([#"../03_std_iterators.rs" 102 22 102 31] ([#"../03_std_iterators.rs" 102 22 102 27] ([#"../03_std_iterators.rs" 102 22 102 23] n) - ([#"../03_std_iterators.rs" 102 26 102 27] j)) - ([#"../03_std_iterators.rs" 102 30 102 31] [#"../03_std_iterators.rs" 102 30 102 31] (1 : usize))));
+    [#"../03_std_iterators.rs" 102 22 102 27] _41 <- ([#"../03_std_iterators.rs" 102 22 102 27] n - j);
+    [#"../03_std_iterators.rs" 102 22 102 31] _40 <- ([#"../03_std_iterators.rs" 102 22 102 31] _41 - (1 : usize));
+    _41 <- any usize;
+    [#"../03_std_iterators.rs" 102 8 102 32] _37 <- ([#"../03_std_iterators.rs" 102 8 102 32] swap0 _38 i _40);
     _38 <- any borrowed (slice t);
+    _40 <- any usize;
     goto BB17
   }
   BB17 {
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml b/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
index fac3b7cce0..d5bf13f43f 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
@@ -43,43 +43,43 @@
   <proof prover="1"><result status="valid" time="0.010000" steps="12"/></proof>
   </goal>
   <goal name="counter&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.010000" steps="88"/></proof>
+  <proof prover="1"><result status="valid" time="0.010000" steps="91"/></proof>
   </goal>
   <goal name="counter&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.059895" steps="213290"/></proof>
+  <proof prover="5"><result status="valid" time="0.059895" steps="213346"/></proof>
   </goal>
   <goal name="counter&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.020000" steps="387"/></proof>
+  <proof prover="1"><result status="valid" time="0.020000" steps="388"/></proof>
   </goal>
   <goal name="counter&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.056748" steps="113393"/></proof>
+  <proof prover="5"><result status="valid" time="0.056748" steps="113426"/></proof>
   </goal>
   <goal name="counter&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.024487" steps="26"/></proof>
+  <proof prover="1"><result status="valid" time="0.024487" steps="28"/></proof>
   </goal>
   <goal name="counter&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.028332" steps="22"/></proof>
+  <proof prover="1"><result status="valid" time="0.028332" steps="24"/></proof>
   </goal>
   <goal name="counter&#39;vc.8" expl="assertion" proved="true">
-  <proof prover="1"><result status="valid" time="0.212152" steps="614"/></proof>
+  <proof prover="1"><result status="valid" time="0.212152" steps="615"/></proof>
   </goal>
   <goal name="counter&#39;vc.9" expl="assertion" proved="true">
-  <proof prover="5"><result status="valid" time="0.050000" steps="288468"/></proof>
+  <proof prover="5"><result status="valid" time="0.050000" steps="288501"/></proof>
   </goal>
   <goal name="counter&#39;vc.10" expl="assertion" proved="true">
-  <proof prover="5"><result status="valid" time="0.118193" steps="404309"/></proof>
+  <proof prover="5"><result status="valid" time="0.118193" steps="404342"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="C03StdIterators_SumRange" proved="true">
  <goal name="sum_range&#39;vc" expl="VC for sum_range" proved="true">
- <proof prover="1"><result status="valid" time="0.111099" steps="1728"/></proof>
+ <proof prover="1"><result status="valid" time="0.111099" steps="2010"/></proof>
  </goal>
 </theory>
 <theory name="C03StdIterators_EnumerateRange" proved="true">
  <goal name="enumerate_range&#39;vc" expl="VC for enumerate_range" proved="true">
- <proof prover="1" timelimit="5"><result status="valid" time="1.198946" steps="9589"/></proof>
+ <proof prover="1" timelimit="5"><result status="valid" time="1.198946" steps="13438"/></proof>
  </goal>
 </theory>
 <theory name="C03StdIterators_MyReverse" proved="true">
@@ -95,100 +95,100 @@
   <proof prover="4"><result status="valid" time="0.046112" steps="16888"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.3" expl="division by zero" proved="true">
-  <proof prover="4"><result status="valid" time="0.141963" steps="16576"/></proof>
+  <proof prover="4"><result status="valid" time="0.038767" steps="16564"/></proof>
   </goal>
-  <goal name="my_reverse&#39;vc.4" expl="division by zero" proved="true">
-  <proof prover="4"><result status="valid" time="0.038767" steps="16583"/></proof>
+  <goal name="my_reverse&#39;vc.4" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.064487" steps="19428"/></proof>
   </goal>
-  <goal name="my_reverse&#39;vc.5" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.064487" steps="19452"/></proof>
+  <goal name="my_reverse&#39;vc.5" expl="division by zero" proved="true">
+  <proof prover="4"><result status="valid" time="0.141963" steps="17934"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.6" expl="division by zero" proved="true">
-  <proof prover="4"><result status="valid" time="0.041819" steps="17818"/></proof>
+  <proof prover="4"><result status="valid" time="0.041819" steps="17941"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.7" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.166155" steps="18550"/></proof>
+  <proof prover="4"><result status="valid" time="0.166155" steps="19125"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.043056" steps="17831"/></proof>
+  <proof prover="4"><result status="valid" time="0.043056" steps="17969"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.056799" steps="19116"/></proof>
+  <proof prover="4"><result status="valid" time="0.054220" steps="19154"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.054220" steps="19128"/></proof>
+  <proof prover="4"><result status="valid" time="0.056799" steps="19162"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.042483" steps="17977"/></proof>
+  <proof prover="4"><result status="valid" time="0.042483" steps="17994"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.042858" steps="17980"/></proof>
+  <proof prover="4"><result status="valid" time="0.042858" steps="17997"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.043813" steps="18459"/></proof>
+  <proof prover="4"><result status="valid" time="0.043813" steps="18476"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.14" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.057108" steps="19878"/></proof>
+  <proof prover="4"><result status="valid" time="0.057108" steps="19917"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.15" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.056545" steps="19745"/></proof>
+  <proof prover="4"><result status="valid" time="0.056545" steps="19784"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.16" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.328679" steps="25973"/></proof>
+  <proof prover="4"><result status="valid" time="0.328679" steps="26017"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.088827" steps="26328"/></proof>
+  <proof prover="4"><result status="valid" time="0.224844" steps="26372"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.086609" steps="26772"/></proof>
+  <proof prover="4"><result status="valid" time="0.229118" steps="26816"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.178925" steps="24121"/></proof>
+  <proof prover="4"><result status="valid" time="0.178925" steps="24160"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.20" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.068268" steps="25397"/></proof>
+  <proof prover="4"><result status="valid" time="0.185875" steps="25436"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="1.321324" steps="9948"/></proof>
+  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="0.716177" steps="11893"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.22" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.958570" steps="86750"/></proof>
+  <proof prover="4"><result status="valid" time="0.728269" steps="85058"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.23" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="1.060947" steps="87600"/></proof>
+  <proof prover="4"><result status="valid" time="0.717637" steps="85861"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="5" timelimit="5"><result status="valid" time="0.157133" steps="262621"/></proof>
+  <proof prover="5" timelimit="5"><result status="valid" time="0.157133" steps="262690"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.276484" steps="32796"/></proof>
+  <proof prover="4"><result status="valid" time="0.276484" steps="32840"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.26" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.255111" steps="28453"/></proof>
+  <proof prover="4"><result status="valid" time="0.255111" steps="28492"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.212105" steps="28426"/></proof>
+  <proof prover="4"><result status="valid" time="0.212105" steps="28465"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.415345" steps="34747"/></proof>
+  <proof prover="4"><result status="valid" time="0.415345" steps="34791"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.275779" steps="33473"/></proof>
+  <proof prover="4"><result status="valid" time="0.275779" steps="33517"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.30" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="my_reverse&#39;vc.30.0" expl="loop invariant preservation" proved="true">
-   <proof prover="2"><result status="valid" time="0.753020" steps="91863"/></proof>
+   <proof prover="2"><result status="valid" time="0.514909" steps="92108"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="my_reverse&#39;vc.31" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="1.296025" steps="386256"/></proof>
+  <proof prover="2"><result status="valid" time="1.296025" steps="385395"/></proof>
   </goal>
   <goal name="my_reverse&#39;vc.32" expl="loop invariant preservation" proved="true">
   <transf name="inline_goal" proved="true" >
    <goal name="my_reverse&#39;vc.32.0" expl="loop invariant preservation" proved="true">
-   <proof prover="2" timelimit="5"><result status="valid" time="1.187945" steps="319172"/></proof>
+   <proof prover="2" timelimit="5"><result status="valid" time="1.187945" steps="318321"/></proof>
    </goal>
   </transf>
   </goal>
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators/why3shapes.gz b/creusot/tests/should_succeed/iterators/03_std_iterators/why3shapes.gz
index cd34f025c6b955a24c07fc02c4a488c824dd075b..5f8ccc8da40e2d0a9239ce394fa3ddc309beee1d 100644
GIT binary patch
literal 6586
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

literal 6551
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
Jj|5w8005V0rnmqA

diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index c8924be797..4bb5388414 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -409,6 +409,7 @@ module C04Skip_Impl0_Next
   var skipped : Snapshot.snap_ty (Seq.seq item0);
   var r : Core_Option_Option_Type.t_option item0;
   var _18 : borrowed i;
+  var _20 : bool;
   var x : item0;
   var _25 : Snapshot.snap_ty (Seq.seq item0);
   {
@@ -456,7 +457,8 @@ module C04Skip_Impl0_Next
     goto BB6
   }
   BB6 {
-    switch ([#"../04_skip.rs" 74 15 74 21] ([#"../04_skip.rs" 74 15 74 16] n) = ([#"../04_skip.rs" 74 20 74 21] [#"../04_skip.rs" 74 20 74 21] (0 : usize)))
+    [#"../04_skip.rs" 74 15 74 21] _20 <- ([#"../04_skip.rs" 74 15 74 21] n = (0 : usize));
+    switch (_20)
       | False -> goto BB8
       | True -> goto BB7
       end
@@ -465,7 +467,7 @@ module C04Skip_Impl0_Next
     assert { [@expl:type invariant] inv2 self };
     assume { resolve5 self };
     [#"../04_skip.rs" 75 23 75 24] _0 <- ([#"../04_skip.rs" 75 23 75 24] r);
-    [#"../04_skip.rs" 75 23 75 24] r <- any Core_Option_Option_Type.t_option item0;
+    r <- any Core_Option_Option_Type.t_option item0;
     goto BB15
   }
   BB8 {
@@ -478,7 +480,7 @@ module C04Skip_Impl0_Next
     assert { [@expl:type invariant] inv2 self };
     assume { resolve5 self };
     [#"../04_skip.rs" 81 23 81 24] _0 <- ([#"../04_skip.rs" 81 23 81 24] r);
-    [#"../04_skip.rs" 81 23 81 24] r <- any Core_Option_Option_Type.t_option item0;
+    r <- any Core_Option_Option_Type.t_option item0;
     goto BB15
   }
   BB10 {
@@ -486,7 +488,7 @@ module C04Skip_Impl0_Next
   }
   BB11 {
     [#"../04_skip.rs" 77 24 77 25] x <- ([#"../04_skip.rs" 77 24 77 25] Core_Option_Option_Type.some_0 r);
-    [#"../04_skip.rs" 77 24 77 25] r <- (let Core_Option_Option_Type.C_Some x0 = r in Core_Option_Option_Type.C_Some (any item0));
+    r <- (let Core_Option_Option_Type.C_Some x0 = r in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv4 x };
     assume { resolve3 x };
     assert { [@expl:type invariant] inv5 r };
@@ -496,10 +498,10 @@ module C04Skip_Impl0_Next
   }
   BB12 {
     [#"../04_skip.rs" 78 16 78 73] skipped <- ([#"../04_skip.rs" 78 16 78 73] _25);
-    [#"../04_skip.rs" 78 16 78 73] _25 <- any Snapshot.snap_ty (Seq.seq item0);
+    _25 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 skipped };
     assume { resolve2 skipped };
-    [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - ([#"../04_skip.rs" 79 21 79 22] [#"../04_skip.rs" 79 21 79 22] (1 : usize)));
+    [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - (1 : usize));
     goto BB13
   }
   BB13 {
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
index eaa7b39560..f888ad166e 100644
--- a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
@@ -22,7 +22,7 @@
 </theory>
 <theory name="C04Skip_Impl0_Next" proved="true">
  <goal name="next&#39;vc" expl="VC for next" proved="true">
- <proof prover="0"><result status="valid" time="0.272542" steps="92219"/></proof>
+ <proof prover="0"><result status="valid" time="0.587002" steps="90879"/></proof>
  </goal>
 </theory>
 <theory name="C04Skip_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz b/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz
index 5c2739aad51a0a5b9e9576fc906c8c71346af645..5ef67863964e8785fa29c1c101da0a6cc3cf9c3c 100644
GIT binary patch
delta 1073
zcmV-11kU@d2)hW78GrC87Mp_+#GrshFD-biK~Yp9tRrP*CE5P_4n@k6ouEL0`oNI$
z;`hxANBQMudwOy&;k11V!>R4N-?nml^Xq2(;o9zvTC&euu(02_m!Yp;eK>)o?)KI)
zE37P&W%>(N<TKA_md~_YdGqAB3Wu@y#RbZR=a=zstFphEk$(_dtPF|O*-)2BtM?mw
zzis+qJKG$F&>YvXA%dq7MGh`9Sf0-;pJ_hB8Y@eVt8fwi1$db;os+YqQC)#YBtR_S
z9V`<7w#yl(yDWiOLb62fRzU!g|5~P}sPHit<KVheMx&Sd7O}o*t1O+jGV)4W5$lt-
zNPph4g&Mu0R)0ilI)N*bZQexTEFoE<v!E!~#K`Qv3OiA|xCvNJcTOROWvjmBOXmOr
zPh>#t?w#+SUyfl6HEN{0Km6WzVX30KiPBTsJ)%wDSt#6J$?lK-Iamx)-s7*yf_Ha^
zBFnKvLpb%vw;(JlcDbR7chtDOJD$S7+qpl7*I+qT{C^JDHoHV23K;d|VV5_hyK}E?
zH%k5m*GV)v5zF+$F41IqO%r=pT+<{-6Qv7HPLbwhmuSwx*d(4VFI?3RL;oJ?FVEkj
z;rI4s(psim({}D?8MwB_^&zXRjrUBfq8X1YqJ+B>Y7gxghRI-(Po8n5JRZ*x(<Ta2
zvSK(l_J0SYpTcxg48Nq7p=BL@9*+HE>oGC-cCkmk;_8l}dmNuo--Q7cJNNYtEjZh+
zp3xdywgi24xq=?S++K&x@US}9K+o|W&S;Sm$uFHvwPeI~*jQ6{FJ?GzRMb*!X_1P9
zZ#K5j=}?Epy&gw`<)HE#;-YdgRTm|T$~l`U(SK9oQEI7}OF)Ht4C7(arfQ+&=4{G8
zX#z`Q^U%3c_*l>z<V6!e0)!;U`6hxKp2E<^+vZC_dYZ2#OLZ~WIS=@1^*kYU42reE
zbVZx}E<VlsJbl@RKAFd27k-ZCsYaHm2Fp~V%P3*XB;gkmNW@tu<7_HFm9Bd#e)_Ch
z3x8BJ$wWl1zszTq&&53W%l|FXKK?dSZylz80xlV)kt)j1g!}o9{K>+xdNEBuoigho
zqp(eu5tAU|x1{`UQHsx_?04(0I*sTy6(v*%&jt0)Y0}gU#SSJA;@%6jl|~qDn4ty?
z*)#$ltg1PevVx}JA@~|YXb7V6%!@660e^xH+7w2iL+w@YO^s^ZRCoieDJbuR&;fkS
z)CUL9mD55Y5ZQ3$rF1+Lstzi!ihz<^Dh%a@A|h%i7)lIi1BC%)KpGGRxB+H>ZVI7%
zQ&r$9$)swOtd$nE4|SnA*Pd({H4F?RhH66#LzSU&!-$uhRg3{cmRg2JH4Ov?1S&Yv
r^ph96_Nog7oC;qF7KD%uk)Aunm}J7&p^%dozxMhEr<RePX9@rSefbX(

delta 1059
zcmV+;1l;?(2(1W^8Gj64VzD_GMhqG#dMUtT4T_=?V;w2Aon-s(I}|BP_NE02)CY;2
z$H#9T9Qmia<>}eK#?$gW9#8we`(>$?cRw%AfBJp*j*e~05*%z6{`J^5Zy}z*p})U(
z+)1al*)qSu$+8z^&&wXSGjEX{XK;iit`5*XzPz6Qa=Q5Ik$(wu)y$ANQw+^EYt3fi
z*2}g(E=QZ)F}8;}HYD<xSQKzs$cnP(WshYKbFMr)&fpULEApyvx+G^xqrM?eOn^C{
zGk6IA_^M<aS49G&gcXTd%|HOM|6FDURQNF$=cDgVg^ii&Tc!HurFJ+jRf;PwWvWkJ
zQuyPNPod#WXn$1-&17=hY+DvdI7(QNm?EgQ^T62XK7$=XyE+MYNq0#h!SY$(im7ve
zi05EHuhu^FFRzDqjtyy)U+;eFyEs+R-zDj3-#w8{-#MuKAKC8r{v|qs*sj<6bz1}<
z{((eJP>GK5)F0lXbi7)XhN?bD^Y0d<<rqkr-&_CS-+%VqS&1+7yr=|o+&r#w6x__C
zpw^VPQ80>vq*D|ED2l-@M=^r&K|CB@`MN(I`;XXsdHI$MzwKWKt>fCa`_3O62fuIV
z`B>D>rE_3#Co@5q4@n~YiL|@@IUWatK|Xk<CyKPaAm&99=8Pmbf9`h_eun7=j4<Vo
zlVuaX?|%;c(>_pQ=xS24e5I#9#O~?*O!_V!NwM-@AIL)BW_C;F<ccMji^~o5MCSe$
zw$P*M+!DRuJzm&SNUU6Bp3BU9M}0Fi?_@^fL?<m8hgB{PUCGoZr(F|U|8_VtDhH}x
zi5IHDR9}@WDaUN)L=TB4sY5xI0HuG5=iQ*q)qf(%-NjUV(gY4MVULxfyFlKcu9^Tc
zAqs+BPGS_pb3E?TY2%@w0+wUhR9ynQ<bf`w83&+Api~=5SF+ix(#>0!;fkO2iNb&E
zlW`_?@%#BQ(%3Z8U>a#S%@ID05pgwsWEylT4W{j<(s{?F@1E0hflekROj)`^mAx+e
zYJZ&i+y4z|lYWb#^LE2Ofa{3zJeAwegq!h<^1Y&&dNoQvok8;vq^XIf0hB4yhh+QT
zP^!;SHmmt39TU4njSQs>LSpdVu(oND`kO&a>mc<~S!spk7A;t|XeC`|-3Xyn4Q(r8
z3=KgTh_Vhm$R&UUMh?bSR+B>$bPR1nYJbz#bOJUAI(R8fgwSyPgF~f_LLZH6Q3j|b
zKuc$}v6f9!DJhmHEeeao2rYs|X2DpfENBbLg0vtka0|Goqz-LegRd1=y49-DMm8Zf
zl@Y=Ow&Z9zSk5dOi<L!fQ7t$NO7NO<;1s1%vDIx0kplxkVTQqr-+DEb20@H#$sD7U
ds%0t&uQ^v-h9*{O@DjIPe*<Yq+jV3L001CO0#^V4

diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index f03f4055a9..8a3985d28c 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -1281,6 +1281,7 @@ module C05Map_Impl0_Next
   var _9 : Snapshot.snap_ty ();
   var _11 : b;
   var _12 : borrowed f;
+  var _13 : item0;
   {
     goto BB0
   }
@@ -1319,7 +1320,7 @@ module C05Map_Impl0_Next
   }
   BB5 {
     [#"../05_map.rs" 62 17 62 18] v <- ([#"../05_map.rs" 62 17 62 18] Core_Option_Option_Type.some_0 _3);
-    [#"../05_map.rs" 62 17 62 18] _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
+    _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
     assert { [@expl:assertion] [#"../05_map.rs" 63 16 63 62] precondition0 (C05Map_Map_Type.map_func ( * self)) (v) };
@@ -1334,9 +1335,11 @@ module C05Map_Impl0_Next
     [#"../05_map.rs" 65 21 65 32] _12 <- Borrow.borrow_final (C05Map_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../05_map.rs" 65 21 65 32] self <- { self with current = (let C05Map_Map_Type.C_Map x0 x1 =  * self in C05Map_Map_Type.C_Map x0 ( ^ _12)) ; };
     assume { inv2 ( ^ _12) };
-    [#"../05_map.rs" 65 21 65 35] _11 <- ([#"../05_map.rs" 65 21 65 35] call_mut0 _12 ([#"../05_map.rs" 65 21 65 35] (([#"../05_map.rs" 65 33 65 34] v))));
+    [#"../05_map.rs" 65 21 65 35] _13 <- ([#"../05_map.rs" 65 21 65 35] (v));
+    v <- any item0;
+    [#"../05_map.rs" 65 21 65 35] _11 <- ([#"../05_map.rs" 65 21 65 35] call_mut0 _12 _13);
     _12 <- any borrowed f;
-    [#"../05_map.rs" 65 33 65 34] v <- any item0;
+    _13 <- any item0;
     goto BB8
   }
   BB8 {
@@ -1580,9 +1583,9 @@ module C05Map_Map
     goto BB3
   }
   BB3 {
-    [#"../05_map.rs" 145 4 145 22] _0 <- ([#"../05_map.rs" 145 4 145 22] C05Map_Map_Type.C_Map ([#"../05_map.rs" 145 10 145 14] iter) ([#"../05_map.rs" 145 16 145 20] func));
-    [#"../05_map.rs" 145 10 145 14] iter <- any i;
-    [#"../05_map.rs" 145 16 145 20] func <- any f;
+    [#"../05_map.rs" 145 4 145 22] _0 <- ([#"../05_map.rs" 145 4 145 22] C05Map_Map_Type.C_Map iter func);
+    iter <- any i;
+    func <- any f;
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3session.xml b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
index cb6a4b742d..f26ba3068b 100644
--- a/creusot/tests/should_succeed/iterators/05_map/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="3" name="CVC5" version="1.0.5" timelimit="5" steplimit="0" memlimit="1000"/>
@@ -190,22 +190,22 @@
   <proof prover="5"><result status="valid" time="0.039048" steps="169"/></proof>
   </goal>
   <goal name="next&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.019493" steps="48"/></proof>
+  <proof prover="5"><result status="valid" time="0.019493" steps="49"/></proof>
   </goal>
   <goal name="next&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.022767" steps="56"/></proof>
+  <proof prover="5"><result status="valid" time="0.022767" steps="57"/></proof>
   </goal>
   <goal name="next&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.021483" steps="57"/></proof>
+  <proof prover="5"><result status="valid" time="0.021483" steps="59"/></proof>
   </goal>
   <goal name="next&#39;vc.8" expl="type invariant" proved="true">
-  <proof prover="3" timelimit="1"><result status="valid" time="0.088091" steps="13296"/></proof>
+  <proof prover="3" timelimit="1"><result status="valid" time="0.088091" steps="13319"/></proof>
   </goal>
   <goal name="next&#39;vc.9" expl="unreachable point" proved="true">
   <proof prover="5"><result status="valid" time="0.028356" steps="28"/></proof>
   </goal>
   <goal name="next&#39;vc.10" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.076373" steps="409344"/></proof>
+  <proof prover="0"><result status="valid" time="0.076373" steps="409375"/></proof>
   </goal>
   <goal name="next&#39;vc.11" expl="postcondition" proved="true">
   <proof prover="5"><result status="valid" time="0.023519" steps="10"/></proof>
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz b/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz
index 7ee97d5a13b06dd9e356d4349a34616bb9ae4ec4..6f2caa4f438639206176a1bc5a38bbda412c4206 100644
GIT binary patch
literal 6154
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

literal 6125
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

diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 0a3bb325c0..5938683ba3 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -1577,6 +1577,7 @@ module C06MapPrecond_Impl0_Next
   var produced : Snapshot.snap_ty (Seq.seq item0);
   var r : b;
   var _12 : borrowed f;
+  var _13 : (item0, Snapshot.snap_ty (Seq.seq item0));
   var _17 : Snapshot.snap_ty ();
   var _20 : Snapshot.snap_ty (Seq.seq item0);
   {
@@ -1615,7 +1616,7 @@ module C06MapPrecond_Impl0_Next
   }
   BB5 {
     [#"../06_map_precond.rs" 65 17 65 18] v <- ([#"../06_map_precond.rs" 65 17 65 18] Core_Option_Option_Type.some_0 _3);
-    [#"../06_map_precond.rs" 65 17 65 18] _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
+    _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
     assert { [@expl:assertion] [#"../06_map_precond.rs" 66 16 66 76] precondition0 (C06MapPrecond_Map_Type.map_func ( * self)) (v, C06MapPrecond_Map_Type.map_produced ( * self)) };
@@ -1629,9 +1630,11 @@ module C06MapPrecond_Impl0_Next
     [#"../06_map_precond.rs" 68 24 68 35] _12 <- Borrow.borrow_final (C06MapPrecond_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../06_map_precond.rs" 68 24 68 35] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 ( ^ _12) x2) ; };
     assume { inv2 ( ^ _12) };
-    [#"../06_map_precond.rs" 68 24 68 53] r <- ([#"../06_map_precond.rs" 68 24 68 53] call_mut0 _12 ([#"../06_map_precond.rs" 68 24 68 53] (([#"../06_map_precond.rs" 68 36 68 37] v), ([#"../06_map_precond.rs" 68 39 68 52] C06MapPrecond_Map_Type.map_produced ( * self)))));
+    [#"../06_map_precond.rs" 68 24 68 53] _13 <- ([#"../06_map_precond.rs" 68 24 68 53] (v, C06MapPrecond_Map_Type.map_produced ( * self)));
+    v <- any item0;
+    [#"../06_map_precond.rs" 68 24 68 53] r <- ([#"../06_map_precond.rs" 68 24 68 53] call_mut0 _12 _13);
     _12 <- any borrowed f;
-    [#"../06_map_precond.rs" 68 36 68 37] v <- any item0;
+    _13 <- any (item0, Snapshot.snap_ty (Seq.seq item0));
     goto BB8
   }
   BB8 {
@@ -1640,7 +1643,7 @@ module C06MapPrecond_Impl0_Next
   BB9 {
     assert { [@expl:type invariant] inv3 produced };
     assume { resolve1 produced };
-    [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 69 32 69 40] produced)) ; };
+    [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 69 16 69 40] produced)) ; };
     assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
@@ -1650,8 +1653,8 @@ module C06MapPrecond_Impl0_Next
   }
   BB10 {
     assume { resolve3 _17 };
-    [#"../06_map_precond.rs" 71 16 71 23] _0 <- ([#"../06_map_precond.rs" 71 16 71 23] Core_Option_Option_Type.C_Some ([#"../06_map_precond.rs" 71 21 71 22] r));
-    [#"../06_map_precond.rs" 71 21 71 22] r <- any b;
+    [#"../06_map_precond.rs" 71 16 71 23] _0 <- ([#"../06_map_precond.rs" 71 16 71 23] Core_Option_Option_Type.C_Some r);
+    r <- any b;
     goto BB11
   }
   BB11 {
@@ -1665,7 +1668,7 @@ module C06MapPrecond_Impl0_Next
   }
   BB14 {
     [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 74 16 74 56] _20)) ; };
-    [#"../06_map_precond.rs" 74 16 74 56] _20 <- any Snapshot.snap_ty (Seq.seq item0);
+    _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
@@ -1925,9 +1928,9 @@ module C06MapPrecond_Map
     goto BB4
   }
   BB4 {
-    [#"../06_map_precond.rs" 174 4 174 56] _0 <- ([#"../06_map_precond.rs" 174 4 174 56] C06MapPrecond_Map_Type.C_Map ([#"../06_map_precond.rs" 174 10 174 14] iter) ([#"../06_map_precond.rs" 174 16 174 20] func) _9);
-    [#"../06_map_precond.rs" 174 10 174 14] iter <- any i;
-    [#"../06_map_precond.rs" 174 16 174 20] func <- any f;
+    [#"../06_map_precond.rs" 174 4 174 56] _0 <- ([#"../06_map_precond.rs" 174 4 174 56] C06MapPrecond_Map_Type.C_Map iter func _9);
+    iter <- any i;
+    func <- any f;
     _9 <- any Snapshot.snap_ty (Seq.seq item0);
     goto BB5
   }
@@ -2053,7 +2056,7 @@ module C06MapPrecond_Identity_Closure0
   }
   BB0 {
     [#"../06_map_precond.rs" 178 21 178 22] _0 <- ([#"../06_map_precond.rs" 178 21 178 22] x);
-    [#"../06_map_precond.rs" 178 21 178 22] x <- any item0;
+    x <- any item0;
     assert { [@expl:type invariant] inv0 _3 };
     assume { resolve0 _3 };
     assume { resolve1 _1 };
@@ -2247,12 +2250,15 @@ module C06MapPrecond_Identity
   var _0 : ();
   var iter : i = iter;
   var _2 : C06MapPrecond_Map_Type.t_map i item0 (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) item0;
+  var _4 : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i;
   {
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 178 4 178 23] _2 <- ([#"../06_map_precond.rs" 178 4 178 23] map0 ([#"../06_map_precond.rs" 178 8 178 12] iter) ([#"../06_map_precond.rs" 178 14 178 22] C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0));
-    [#"../06_map_precond.rs" 178 8 178 12] iter <- any i;
+    [#"../06_map_precond.rs" 178 14 178 22] _4 <- ([#"../06_map_precond.rs" 178 14 178 22] C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0);
+    [#"../06_map_precond.rs" 178 4 178 23] _2 <- ([#"../06_map_precond.rs" 178 4 178 23] map0 iter _4);
+    iter <- any i;
+    _4 <- any C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i;
     goto BB1
   }
   BB1 {
@@ -2313,7 +2319,7 @@ module C06MapPrecond_Increment_Closure2
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] ([#"../06_map_precond.rs" 190 20 190 21] x) + ([#"../06_map_precond.rs" 190 24 190 25] [#"../06_map_precond.rs" 190 24 190 25] (1 : uint32)));
+    [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] x + (1 : uint32));
     [#"../06_map_precond.rs" 188 8 188 29] res <- ([#"../06_map_precond.rs" 188 8 188 29] res1);
     [#"../06_map_precond.rs" 189 8 189 35] _0 <- ([#"../06_map_precond.rs" 189 8 189 35] res);
     return _0
@@ -2564,6 +2570,7 @@ module C06MapPrecond_Increment
   var _0 : ();
   var iter : u = iter;
   var i : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32;
+  var _6 : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u;
   {
     goto BB0
   }
@@ -2571,8 +2578,10 @@ module C06MapPrecond_Increment
     goto BB1
   }
   BB1 {
-    [#"../06_map_precond.rs" 186 12 191 5] i <- ([#"../06_map_precond.rs" 186 12 191 5] map0 ([#"../06_map_precond.rs" 187 8 187 12] iter) ([#"../06_map_precond.rs" 189 8 189 35] C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2));
-    [#"../06_map_precond.rs" 187 8 187 12] iter <- any u;
+    [#"../06_map_precond.rs" 189 8 189 35] _6 <- ([#"../06_map_precond.rs" 189 8 189 35] C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2);
+    [#"../06_map_precond.rs" 186 12 191 5] i <- ([#"../06_map_precond.rs" 186 12 191 5] map0 iter _6);
+    iter <- any u;
+    _6 <- any C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u;
     goto BB2
   }
   BB2 {
@@ -2651,7 +2660,7 @@ module C06MapPrecond_Counter_Closure2
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20]  * field_00 ( * _1) + ([#"../06_map_precond.rs" 208 19 208 20] [#"../06_map_precond.rs" 208 19 208 20] (1 : usize))) ; })) ; };
+    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20]  * field_00 ( * _1) + (1 : usize)) ; })) ; };
     assume { resolve0 _1 };
     [#"../06_map_precond.rs" 209 12 209 13] res1 <- ([#"../06_map_precond.rs" 209 12 209 13] x);
     [#"../06_map_precond.rs" 205 8 205 63] res <- ([#"../06_map_precond.rs" 205 8 205 63] res1);
@@ -2864,6 +2873,7 @@ module C06MapPrecond_Counter
   var iter : i = iter;
   var cnt : usize;
   var _5 : C06MapPrecond_Map_Type.t_map i uint32 (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) uint32;
+  var _7 : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i;
   var _8 : borrowed usize;
   {
     goto BB0
@@ -2872,12 +2882,14 @@ module C06MapPrecond_Counter
     goto BB1
   }
   BB1 {
-    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] [#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
+    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
     [#"../06_map_precond.rs" 206 8 206 41] _8 <- Borrow.borrow_mut cnt;
     [#"../06_map_precond.rs" 206 8 206 41] cnt <-  ^ _8;
-    [#"../06_map_precond.rs" 203 4 211 5] _5 <- ([#"../06_map_precond.rs" 203 4 211 5] map0 ([#"../06_map_precond.rs" 204 8 204 12] iter) ([#"../06_map_precond.rs" 206 8 206 41] C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8));
-    [#"../06_map_precond.rs" 204 8 204 12] iter <- any i;
+    [#"../06_map_precond.rs" 206 8 206 41] _7 <- ([#"../06_map_precond.rs" 206 8 206 41] C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8);
     _8 <- any borrowed usize;
+    [#"../06_map_precond.rs" 203 4 211 5] _5 <- ([#"../06_map_precond.rs" 203 4 211 5] map0 iter _7);
+    iter <- any i;
+    _7 <- any C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i;
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
index 5aefe21b75..e5a124ca68 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
@@ -291,28 +291,28 @@
   <proof prover="0"><result status="valid" time="0.025172" steps="199"/></proof>
   </goal>
   <goal name="next&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.015449" steps="72"/></proof>
+  <proof prover="0"><result status="valid" time="0.015449" steps="75"/></proof>
   </goal>
   <goal name="next&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.013939" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.013939" steps="71"/></proof>
   </goal>
   <goal name="next&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.015299" steps="71"/></proof>
+  <proof prover="0"><result status="valid" time="0.015299" steps="73"/></proof>
   </goal>
   <goal name="next&#39;vc.9" expl="type invariant" proved="true">
-  <proof prover="4" timelimit="5"><result status="valid" time="0.079981" steps="14653"/></proof>
+  <proof prover="4" timelimit="5"><result status="valid" time="0.079981" steps="14687"/></proof>
   </goal>
   <goal name="next&#39;vc.10" expl="type invariant" proved="true">
-  <proof prover="0" timelimit="5"><result status="valid" time="0.011114" steps="91"/></proof>
+  <proof prover="0" timelimit="5"><result status="valid" time="0.011114" steps="93"/></proof>
   </goal>
   <goal name="next&#39;vc.11" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.013144" steps="602"/></proof>
+  <proof prover="0"><result status="valid" time="0.013144" steps="605"/></proof>
   </goal>
   <goal name="next&#39;vc.12" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.012501" steps="31"/></proof>
   </goal>
   <goal name="next&#39;vc.13" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.073346" steps="27414"/></proof>
+  <proof prover="4"><result status="valid" time="0.257169" steps="39446"/></proof>
   </goal>
   <goal name="next&#39;vc.14" expl="postcondition" proved="true">
   <proof prover="0"><result status="valid" time="0.015445" steps="10"/></proof>
@@ -374,7 +374,7 @@
 </theory>
 <theory name="C06MapPrecond_Counter" proved="true">
  <goal name="counter&#39;vc" expl="VC for counter" proved="true">
- <proof prover="0"><result status="valid" time="0.054988" steps="810"/></proof>
+ <proof prover="0"><result status="valid" time="0.054988" steps="689"/></proof>
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz b/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz
index 9af660d528c39f744da34d83c46b45a9b4696215..0b686a41cb0700ad944efaa868a0e4d32847c2c8 100644
GIT binary patch
delta 8717
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

delta 8695
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
Vo0?F@P~SDi{{zB&gD?fA0035I^K}3K

diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index 97a236a7b1..f94abb9a95 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -184,6 +184,7 @@ module C07Fuse_Impl0_Next
   var iter : borrowed i;
   var _6 : Core_Option_Option_Type.t_option item0;
   var _7 : borrowed i;
+  var _9 : Core_Option_Option_Type.t_option i;
   var x : Core_Option_Option_Type.t_option item0;
   {
     goto BB0
@@ -244,18 +245,20 @@ module C07Fuse_Impl0_Next
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
     [#"../07_fuse.rs" 47 16 47 17] x <- ([#"../07_fuse.rs" 47 16 47 17] _6);
-    [#"../07_fuse.rs" 47 16 47 17] _6 <- any Core_Option_Option_Type.t_option item0;
+    _6 <- any Core_Option_Option_Type.t_option item0;
     [#"../07_fuse.rs" 47 21 47 22] _0 <- ([#"../07_fuse.rs" 47 21 47 22] x);
-    [#"../07_fuse.rs" 47 21 47 22] x <- any Core_Option_Option_Type.t_option item0;
+    x <- any Core_Option_Option_Type.t_option item0;
     goto BB12
   }
   BB8 {
     assert { [@expl:type invariant] inv5 _6 };
     assume { resolve3 _6 };
+    [#"../07_fuse.rs" 44 32 44 36] _9 <- ([#"../07_fuse.rs" 44 32 44 36] Core_Option_Option_Type.C_None);
     goto BB9
   }
   BB9 {
-    [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 =  * self in C07Fuse_Fuse_Type.C_Fuse ([#"../07_fuse.rs" 44 32 44 36] Core_Option_Option_Type.C_None)) ; };
+    [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 =  * self in C07Fuse_Fuse_Type.C_Fuse ([#"../07_fuse.rs" 44 20 44 29] _9)) ; };
+    _9 <- any Core_Option_Option_Type.t_option i;
     assert { [@expl:type invariant] inv0 (C07Fuse_Fuse_Type.fuse_iter ( * self)) };
     assume { resolve4 (C07Fuse_Fuse_Type.fuse_iter ( * self)) };
     assert { [@expl:type invariant] inv2 self };
diff --git a/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml b/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
index cc9b9853c2..93580f029d 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
@@ -8,7 +8,7 @@
 <path name=".."/><path name="07_fuse.mlcfg"/>
 <theory name="C07Fuse_Impl0_Next" proved="true">
  <goal name="next&#39;vc" expl="VC for next" proved="true">
- <proof prover="0"><result status="valid" time="0.087006" steps="2022"/></proof>
+ <proof prover="0"><result status="valid" time="0.087006" steps="2024"/></proof>
  </goal>
 </theory>
 <theory name="C07Fuse_Impl0_ProducesRefl_Impl" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/07_fuse/why3shapes.gz b/creusot/tests/should_succeed/iterators/07_fuse/why3shapes.gz
index 57e6d7442fef4321f44e307f9bdf5d1e7a35b4a3..46ebe3e424299a87e11c184e1c7df641a07b97f3 100644
GIT binary patch
literal 1437
zcmV;O1!DRiiwFP!00000|Fu_1Z(BDIzUx=$*4DmoxW5892!aI~DB42-9&7M%Nrc*x
zD=A6)?>pop-y#c1+n_o~<Z#xHGsDsMckA;9_ZrXZPw{l#9}hpS<@)Z2)#VSjKYWsw
z?CMfjXiIMCZslH2$MDg|Gg#*C?=82|s>giH>aVo2?nT}6x@V6wX)y@S)S)i1FrZz0
zdA<B)b(Po66K1=%q!vbB!NTY)v5>tTBH){?^T(Ih=Xi+$Png?2{d_#c(H3!cnR?zI
z-XqWPU_rRw2EJd9FVUik$L%&%vF&#2-XW=OH|`YA$LCKGV}Q-zR9;jn-&#hIb@%Zc
zE!wF(1j+1*{0_fee>|OzpJVv$<@a_>JD2tc_iUka`+(mMGePLGAhHbJJdB2!rFt_U
zKy`~a`)wI7w(vsr!_51vX@Io*Tx9DBv6O8Ffb*hKsiksL^FkIEw595ySyXe(QBYiC
z4(K~lC(K#KyzmW}H)X7liv_trr*IFzP{_bgcqnXWp66AearZu6p2}$^-DS$%z}l1-
z=qbB`K6_D48~Cb#uO6C*>2ro(6=95!j3x<c{t!?5Y_?ek<(qxt&M5v=l5W)2bmi2@
zxmVQUeZNhIa@u@i#V58%2v$Uu1=&0TdCMc#JOYWyC>JUoe!(OkGlP?w8F_Il^@(M=
zrU+}fmS&OF(;Qh|zC%T~BSY!0MaHycszt`smm*u)?K&M#>qGqWGB%8PzgYAenj0F+
zo#}Bn9)4+UWKbI!&5dlRhI#+ugWybEZfOexsx~xL<<-=!^o$WZ6sep*9&0xvKQ$n*
z_tmhPz|$$F=eZ%sk<jeY*CQAz{!J&I6G|+LNM!Y|AtWbE)jX1RvH0oRy1#MWyWY38
zUk$0!M9UUjmYdW2O7E}u{R+FYOSpX6U*c&bza_bxBlq`iuwDXc9ex&SH?rhwX{Fz~
z*$q3D<%Yf0>+yW?$3xg(@X5Ui)9B6w#x+;*2z|j9u2EpPPcrRmF#_Ez51<{8<pH+-
zH+BFPCT?(a10<FEZC+kZ?r>ftwj6!WZ)(kLe&sDbzgKRe;AXBy3<?%BS@epjPJWtP
zo0e=EXUH^9e6bPmu_1`M=XKBO{@WS>pBe$3h8&oN98!jyd90<t3j`Q(tKnAU(5f6-
znZsD;vqH~<P*X5hUG%cu)wR`r)CwN3;<0-2Q-lv%c@*lnRv9R1SE$<+s(A(#NzjFF
zKAWlOs-{M_KR@Ma3L{E%LWxZ%@rBc(`n(8lB<`wLq9!4Zp5^4J%*9JRh_$rZc8@oy
zyLlFtv35>SnWfpPkjT1Mb>9$L8u%tnyZl)##@;s*SRO#;1DL`~nZ~a{HN#Z?cUtsq
zExXP9C88PcR(xbO%un}9r+Z~J*SIZ%rf7-wmbP0Y6JI7=Da<y=RKP?94D<Rw3TB*F
znsq)T5xt0#1m_h*@GK<)(mS5~8i?tPHp)mN3^&YB1BR@$mO2IoEE3_JOP*6n2$jtD
zl)A{*pbSU@!T>kG44@dSVj?^^fJiALz<}fQFM#w?_Q888){Gj)vJ@o-Is-aOQ62Gr
z01vWHfd=Sk2ta}l+*8j}CyNwZONmI8O2iY@B}s#0Qj(Z>;xdu04{1$1!-%2EP-!U2
zazimXYUux|s?!-D-zyR*VP0vWdq;dqR0tIj0aQixKT;(rSAysuRHDvxo#u#S@3K<X
zcO6@EZa6cX8V-gN!_Y}>m@-TnCJf^%ADQ+<cASQ;2Pq+e7O1aFDiVnOns<h4!<FIE
za8aeW3^bxiu9btNP*5{LqGBE!X|H9L669J6Q;KMmaQLr;ILE*T2#I!*cMt?kMGD^7
rN<J{zsn7?aK?><5rwWwziDCAMB88bLjNnEvBk1aH4|&#CA`k!onr**b

literal 1433
zcmV;K1!npmiwFP!00000|Fu_3j~h1(zWZ1B)^>9dMZKm#4u-LY76{ry0Uf*0%t(pR
zU3+UgN&D|hX{330-K1?$A8d)@^AkzY-`}mzAN)%=uRn#;d4D|oxK``CA6A#&{r>Pt
zIkqcH>7Xu!<GYoAIUW0tT{we7|K^PoPC5OMj<NhIr^;TIy(oKpm`Te)aHfuQ$%O&q
z!}H7KPiKm}sh*%~>XJJceFX=jv&=#Ac8EZ1w!S+)zdVIY=;;Lg_VK6VA&j<|zf08f
z{_vi7jt2+Q|2pvfa(oVsR6K0Av50NATmP0wWxMgGa6UeL3KRp|3{Is*p^B|TAlBW-
zb8uv*@Gv6tEAm_V_U-X>I(`oQchA3-<LYhPAN-Sp#_xOjzMlz0Gnzxk&1Q(3n<|;S
zb%@zQVz{6AoMZ<eo6lLcoG{06Gr*b_g~}aQo01JG>Ep(6eP1o=InpF3uaO4wmZ%fb
zC<y7yHy~Y=VJ2q_YJo}S9-!cmpx|(y*~q*|t4tIAeYia4(?q&Ul)HhoDu*nESAZuk
z@@a)zXSnr!^)P-;fa@$w5wg)FBh4SeX`jqi>!7=8pZPP1Kju^$wN+gyAyUR=wRFQb
zk|3Q{pD_D`ixkMW3)+FI9)Y^$5mt{tQ3}e1iu<1_wWn;ZnUNN^5}rBKB}Gt|!#Il!
zr^qlzhJO<oemyeO4#&vw%aI{PCRkCia@%!0p4Nx($7O69^PaKjIXpErOx@{WI39j^
zX=YHG8Bfh@sEv6K6NBJPU21C!1G+RdUF7xDvCNE-x)dv%z#d9RWA7>~)c;CYRp9Xy
z;?vv^q)2#j>FW^;_5Z3H&j~q}MI@^DR}oSZrg|Ppy=MBfb=}@LZ++X<b+;N4r;6q+
z_#`){w}swb@pmig&_2@gaeoP?k^GwEQ^ve`;|J?GpxWhUp*AB+x|Z4q#=iX8PGPxW
zZ}oCKU%KO=-(Tq2y$RFk&IHCaSN4c}p;xX_V7N~<?MrC_-z*QH9<b#BRrxDB01Fd0
zIGO>H!u>igFDHLEFA`ggzNdG!<hHo-mY(1%H%V|aS0e`n3!2J$<y0r{CfBAVP9qJQ
zW{NL10x>oOS@xprvFyLC5s0Y~@M+M2Y0zPL(3!`Y3p_(W5!V{7MGm#fp_Vy}bv`Tf
zGz?V*bJbZd?yjz_^rKqvKow8blO85|-trSsMz+GhS-nD2uTal3C`*FLeDnECPggZH
zy8ZbvRZ~Br#3z(+LP;!~mc{2qcq4IFypkmeY5dG5k9js;>LIL^Gp>2KN!`t}Fpsu#
zf=(>eR)Iv7eSJVHLQ4bRq-mEvtHtR1Y934D$b1~rbScv?HmF8Q<$tHe+}5(&%wHm&
z@UF$jW&{0nuY9^!EV(9J9y?`CwAZxVBALW8;c{UXH)_j~1u)9%|0tMnUbUu;o#{Jf
zq}ELcTJvZ`hYhv@q3hScY-5epR#|C<MawN%wlYSU&?8`AvhzN6f-A<j!mj1q2eAfi
zL0OO%gax!fVz3I4iQWSQ&XECv;Ek8STBX{)>y%t0w}?rKGYgFclccx_^shkls*OGG
zq2YZGtnYf!@lM1>WhuCpl7VX-S;uq}74JPN#X=NOsK}bOk89poWR`2omE|NWET`zW
z<^QLu#w38cR<oWn?6i@l^{k7LOQ{1PK&rU;N2(MTS~Am19l7^SV+0}D`lJ-wropuk
zR-hH!3b2A%BqxnUZBbd27R9OyXga1E!TY8Kr67Wlq_2rOFbM5hG*%cZv=zz<S)_#O
zc_5R*Xb(}7ph3xk#*P|kYgCew>{=>D#tcb#`j5iAPq_ts<c$&y^peLc1+Q$yu1D4A
nzU`R-B~_;c*Pu-ok+M%_DauS~rLYpM<g32``_yu^CJ+Ds<fO{1

diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index ab943e1f82..3c9f7a6ccd 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -313,8 +313,8 @@ module C08CollectExtend_Extend
   BB2 {
     assert { [@expl:type invariant] inv0 old_vec };
     assume { resolve0 old_vec };
-    [#"../08_collect_extend.rs" 27 4 27 35] iter1 <- ([#"../08_collect_extend.rs" 27 4 27 35] into_iter0 ([#"../08_collect_extend.rs" 29 13 29 17] iter));
-    [#"../08_collect_extend.rs" 29 13 29 17] iter <- any i;
+    [#"../08_collect_extend.rs" 27 4 27 35] iter1 <- ([#"../08_collect_extend.rs" 27 4 27 35] into_iter0 iter);
+    iter <- any i;
     goto BB3
   }
   BB3 {
@@ -389,7 +389,7 @@ module C08CollectExtend_Extend
   }
   BB14 {
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t));
+    _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t));
     assert { [@expl:type invariant] inv5 _17 };
     assume { resolve4 _17 };
     [#"../08_collect_extend.rs" 27 4 27 35] _22 <- ([#"../08_collect_extend.rs" 27 4 27 35] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
@@ -397,17 +397,17 @@ module C08CollectExtend_Extend
   }
   BB15 {
     [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] _22);
-    [#"../08_collect_extend.rs" 27 4 27 35] _22 <- any Snapshot.snap_ty (Seq.seq t);
+    _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve2 produced };
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any t;
+    __creusot_proc_iter_elem <- any t;
     [#"../08_collect_extend.rs" 30 8 30 11] _26 <- Borrow.borrow_mut ( * vec);
     [#"../08_collect_extend.rs" 30 8 30 11] vec <- { vec with current = ( ^ _26) ; };
     assume { inv6 ( ^ _26) };
-    [#"../08_collect_extend.rs" 30 8 30 19] _25 <- ([#"../08_collect_extend.rs" 30 8 30 19] push0 _26 ([#"../08_collect_extend.rs" 30 17 30 18] x));
+    [#"../08_collect_extend.rs" 30 8 30 19] _25 <- ([#"../08_collect_extend.rs" 30 8 30 19] push0 _26 x);
     _26 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
-    [#"../08_collect_extend.rs" 30 17 30 18] x <- any t;
+    x <- any t;
     goto BB16
   }
   BB16 {
@@ -681,8 +681,8 @@ module C08CollectExtend_Collect
     goto BB2
   }
   BB2 {
-    [#"../08_collect_extend.rs" 45 4 45 40] iter1 <- ([#"../08_collect_extend.rs" 45 4 45 40] into_iter0 ([#"../08_collect_extend.rs" 46 13 46 17] iter));
-    [#"../08_collect_extend.rs" 46 13 46 17] iter <- any i;
+    [#"../08_collect_extend.rs" 45 4 45 40] iter1 <- ([#"../08_collect_extend.rs" 45 4 45 40] into_iter0 iter);
+    iter <- any i;
     goto BB3
   }
   BB3 {
@@ -756,7 +756,7 @@ module C08CollectExtend_Collect
   }
   BB15 {
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0));
+    _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv4 _15 };
     assume { resolve3 _15 };
     [#"../08_collect_extend.rs" 45 4 45 40] _20 <- ([#"../08_collect_extend.rs" 45 4 45 40] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
@@ -764,17 +764,17 @@ module C08CollectExtend_Collect
   }
   BB16 {
     [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] _20);
-    [#"../08_collect_extend.rs" 45 4 45 40] _20 <- any Snapshot.snap_ty (Seq.seq item0);
+    _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve1 produced };
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- any item0;
+    __creusot_proc_iter_elem <- any item0;
     [#"../08_collect_extend.rs" 47 8 47 11] _24 <- Borrow.borrow_mut res;
     [#"../08_collect_extend.rs" 47 8 47 11] res <-  ^ _24;
     assume { inv5 ( ^ _24) };
-    [#"../08_collect_extend.rs" 47 8 47 19] _23 <- ([#"../08_collect_extend.rs" 47 8 47 19] push0 _24 ([#"../08_collect_extend.rs" 47 17 47 18] x));
+    [#"../08_collect_extend.rs" 47 8 47 19] _23 <- ([#"../08_collect_extend.rs" 47 8 47 19] push0 _24 x);
     _24 <- any borrowed (Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global));
-    [#"../08_collect_extend.rs" 47 17 47 18] x <- any item0;
+    x <- any item0;
     goto BB17
   }
   BB17 {
@@ -794,7 +794,7 @@ module C08CollectExtend_Collect
   }
   BB22 {
     [#"../08_collect_extend.rs" 49 4 49 7] _0 <- ([#"../08_collect_extend.rs" 49 4 49 7] res);
-    [#"../08_collect_extend.rs" 49 4 49 7] res <- any Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global);
+    res <- any Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global);
     goto BB23
   }
   BB23 {
@@ -1094,8 +1094,8 @@ module C08CollectExtend_ExtendIndex
     [#"../08_collect_extend.rs" 55 11 55 18] v1 <-  ^ _9;
     [#"../08_collect_extend.rs" 55 11 55 18] _8 <- Borrow.borrow_final ( * _9) (Borrow.get_id _9);
     [#"../08_collect_extend.rs" 55 11 55 18] _9 <- { _9 with current = ( ^ _8) ; };
-    [#"../08_collect_extend.rs" 55 20 55 34] _10 <- ([#"../08_collect_extend.rs" 55 20 55 34] into_iter0 ([#"../08_collect_extend.rs" 55 20 55 22] v2));
-    [#"../08_collect_extend.rs" 55 20 55 22] v2 <- any Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
+    [#"../08_collect_extend.rs" 55 20 55 34] _10 <- ([#"../08_collect_extend.rs" 55 20 55 34] into_iter0 v2);
+    v2 <- any Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
     goto BB3
   }
   BB3 {
@@ -1246,8 +1246,8 @@ module C08CollectExtend_CollectExample
     goto BB1
   }
   BB1 {
-    [#"../08_collect_extend.rs" 62 22 62 35] v <- ([#"../08_collect_extend.rs" 62 22 62 35] collect0 ([#"../08_collect_extend.rs" 62 30 62 34] iter));
-    [#"../08_collect_extend.rs" 62 30 62 34] iter <- any i;
+    [#"../08_collect_extend.rs" 62 22 62 35] v <- ([#"../08_collect_extend.rs" 62 22 62 35] collect0 iter);
+    iter <- any i;
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
index 8e8ff67e93..7b0cbf1e57 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
+++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
@@ -175,7 +175,7 @@ module C11Repeat_Impl0_Next
     goto BB0
   }
   BB0 {
-    [#"../11_repeat.rs" 47 13 47 33] _3 <- ([#"../11_repeat.rs" 47 13 47 33] clone0 ([#"../11_repeat.rs" 47 13 47 25] C11Repeat_Repeat_Type.repeat_element ( * self)));
+    [#"../11_repeat.rs" 47 13 47 33] _3 <- ([#"../11_repeat.rs" 47 13 47 33] clone0 (C11Repeat_Repeat_Type.repeat_element ( * self)));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
index 73525e13ad..0d5bc25a57 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
@@ -526,6 +526,7 @@ module C12Zip_Impl0_Next
   var _10 : Core_Option_Option_Type.t_option item1;
   var _11 : borrowed b;
   var y1 : item1;
+  var _15 : (item0, item1);
   {
     goto BB0
   }
@@ -548,11 +549,11 @@ module C12Zip_Impl0_Next
   }
   BB3 {
     [#"../12_zip.rs" 57 17 57 18] x1 <- ([#"../12_zip.rs" 57 17 57 18] Core_Option_Option_Type.some_0 _4);
-    [#"../12_zip.rs" 57 17 57 18] _4 <- (let Core_Option_Option_Type.C_Some x0 = _4 in Core_Option_Option_Type.C_Some (any item0));
+    _4 <- (let Core_Option_Option_Type.C_Some x0 = _4 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve0 _4 };
     [#"../12_zip.rs" 57 23 57 24] x <- ([#"../12_zip.rs" 57 23 57 24] x1);
-    [#"../12_zip.rs" 57 23 57 24] x1 <- any item0;
+    x1 <- any item0;
     goto BB6
   }
   BB4 {
@@ -591,11 +592,11 @@ module C12Zip_Impl0_Next
   }
   BB10 {
     [#"../12_zip.rs" 61 17 61 18] y1 <- ([#"../12_zip.rs" 61 17 61 18] Core_Option_Option_Type.some_0 _10);
-    [#"../12_zip.rs" 61 17 61 18] _10 <- (let Core_Option_Option_Type.C_Some x0 = _10 in Core_Option_Option_Type.C_Some (any item1));
+    _10 <- (let Core_Option_Option_Type.C_Some x0 = _10 in Core_Option_Option_Type.C_Some (any item1));
     assert { [@expl:type invariant] inv4 _10 };
     assume { resolve2 _10 };
     [#"../12_zip.rs" 61 23 61 24] y <- ([#"../12_zip.rs" 61 23 61 24] y1);
-    [#"../12_zip.rs" 61 23 61 24] y1 <- any item1;
+    y1 <- any item1;
     goto BB12
   }
   BB11 {
@@ -610,15 +611,17 @@ module C12Zip_Impl0_Next
     goto BB13
   }
   BB13 {
+    [#"../12_zip.rs" 63 13 63 19] _15 <- ([#"../12_zip.rs" 63 13 63 19] (x, y));
+    x <- any item0;
+    y <- any item1;
     goto BB14
   }
   BB14 {
     goto BB15
   }
   BB15 {
-    [#"../12_zip.rs" 63 8 63 20] _0 <- ([#"../12_zip.rs" 63 8 63 20] Core_Option_Option_Type.C_Some ([#"../12_zip.rs" 63 13 63 19] (([#"../12_zip.rs" 63 14 63 15] x), ([#"../12_zip.rs" 63 17 63 18] y))));
-    [#"../12_zip.rs" 63 14 63 15] x <- any item0;
-    [#"../12_zip.rs" 63 17 63 18] y <- any item1;
+    [#"../12_zip.rs" 63 8 63 20] _0 <- ([#"../12_zip.rs" 63 8 63 20] Core_Option_Option_Type.C_Some _15);
+    _15 <- any (item0, item1);
     goto BB16
   }
   BB16 {
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
index 982695965e..dba1ecb9da 100644
--- a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="1" name="CVC5" version="1.0.5" timelimit="5" steplimit="0" memlimit="1000"/>
 <prover id="2" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
@@ -72,7 +72,7 @@
 </theory>
 <theory name="C12Zip_Impl0_Next" proved="true">
  <goal name="next&#39;vc" expl="VC for next" proved="true">
- <proof prover="1"><result status="valid" time="0.083699" steps="39913"/></proof>
+ <proof prover="1"><result status="valid" time="0.083699" steps="39993"/></proof>
  </goal>
 </theory>
 <theory name="C12Zip_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz b/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz
index b5093cc4383a67ddcc7a950f285a052530eee3ef..467ac4ca1f20581ca9049433a801ccf9442d55f2 100644
GIT binary patch
literal 2177
zcmV-{2!8h;iwFP!00000|Fu|6a~n4jz3W%-wj28bG`_c@14~5~blDuTHHST{3K(D<
zR%DVZF?M!;eHxg-42B#^ievd;Vj4hqzt@d!K!5+Rdj7>7<MZlEe0ts;_WxMP)rTK$
zPXBeg{TJSl?J#5wEkkIa3~9r*H}3d!2*0)Q85-_Ber!ae8hzjI?|*5dhHp81i{YE!
zSG#4uu~LV+<jjC^@$>QYzs3yvO*Km!N|Jqw19X?)4}SLpKw*(Uk<cO`_q7@*3To9^
zFU;+U!5u1!B2lQp^|kBxsmkJ>j3n9KG<U1+@U$w+9-d<NIA{<P`+Q=bP3*(V?2F+S
z2KL3kJ`C)OzsSCLoqb+~ffWf92`!TE!#=Orr<wgR5=eAL?v9WL%pK{CyLFFo|LKJJ
zPsb6|Vkjf$llW6S;i#e7{p+{mV}vX?(j>?ubQ}r%F@2Bw*6zpK7Cq3l>+b)%<AcM0
z$1?O4%~|BrY#I8|dpf#5_rC%#n}Bh`w*`W48*1hdXp;08(lCQC)6N3IEP(LYdOvP2
zQTXgbKW?-0#JT)S-GGY>zcl-p1?>R%<Htlo!jvQZkZaXIL7JmyM2xap0B59(vPyt{
zCgTaF+u^U<T~7Awm2X^8Q8*dijo-bE-BR4A<yVPwm5!0VH!NDe#oYP~Oao*QO_I;x
zpdcj&iqGg7QUu6${RXDjZwcA@EY9omocKmMlJ{46pcN0eFbU2GpqYRLNIe1cPZBWa
zvPO<G=a4rGm<yb1U|$G2%)rtlD6k=;gli~adkw(_JUT5axQ0-oWV5;GfTt(7e_kjg
zsUls)=@)`}J)EfOB96-uJS&5jka59Tv{15HjuX5XCw4tfe1?K0K^`H4Jfq;(;>2fh
zS_tPf$);rm5i4<mWklHMhTtqA8se3k;MhE8g(k;=^do&yTE^x%D=KH*^)gVnVDNtk
zO=`<a{`=;oGT}?S&N7P4VgX4|P7llev&)QP+oc0>#y?C83ja{}r&ltHznD?tdPd0^
z3XueP#Br2S$ZHuTXIK^zZ<-X-vVuqyM7%~sQj_xaC5ZGrcB$n}S+|IK%(_>a+{?N5
zQd_GsZ~^t(^N{rYsvtcco=@#zA9g2vhRq%hI^U~JU!jM$!;l-aWD6<vhZb`rJ20uq
z)i3X>RrfTE*Jd)kIn4Ct(9@ekr8h@ElnvjGPZcpeRpxI7m7Lf84Ss&{H~He9C1w!l
z;ak=35K}f+N>QVknW0b~1LN}os<$hf-b|ENj|4G)QOL}+>Paa~_k-kvDGxV2ipIB`
zoV{0cQBf<;nr9DzR1A8zffjRgdba@d?-rR((4A`!pD}w+F{F~>?jHVm*vBfHJ|yY$
zZvP3_9QNt>{ik2|^Wk%BQmeSTbGPZt_FLEPDLx+_zeIe+m)?~IgOoI^<QRit%iR?X
ztYK>1CqfzwQhY-82Or=0WlJ~s^EJ<n4)9Xy(%=^78qPLlFRQVmkLDaZAa;~a*m=U9
z*Y((oGM2^J0yuwodOCcK;cuUR#fAUg9UD&iZQX9~9+3;T3;6$Lm~E03k~TBbFuh5K
zJ}uCw`Iq>#J3Z_|swWS5SDS#O9i>{O&6~U%&rtGb;#n4+WuBMCZzeXIGVZ?Sc;GY!
z83hk1KAVxvVGh}$o1%@@ykV}XbKYpm8CCNpQ_iT7x1x+>akfA%dCQXx6y7lBkO5#d
zZ|N#=n^(!g8@8BB-hj2V=MAU(I-WLfe!9EsrW_oHB^i^qLv3#qZB!;h;W&p2B_f9l
zzZ)qxRf0-0B$>=vA;*-FdPcnzd0H0grI@Hsb7LaQa%Ykmu@sHuC6OhcC$c0<iHy=I
zAc~dy@jm{38VfI(3NM`sZ&mQBdRLXZ>W@?NzfF}tO;vTb5^jfnQfi$#+glg-W%;&l
zI=Oh)f}y|{D?|F~;oFq9MoL?ooB7Myw&~x^th`>FlvG{ogJLk}r(;qYy}ti*S}0jo
zvt8GJw}V9ZP3Jv{QFKI*NV!*-_ev4)-n7a@5GzWovDzvtt+3oO3zk}PLk&3Uff3#X
zOm9Y+V|c<jBPw>JgOy-batp*#W2v@OSt>0RmU2s(rKkm8+JPBCJ?e3-@~-O?b1I@c
zCP3#!SV>d@mKn>mWy&&XnXr;rVP4VP8DWUhT5%H{5m-aCArxeEO1PG)Z`Vwe1O|pv
z?S=83R-si|8OK$tTST6L({IttkqPOMgb++C4b_qu5{Qu@q{|#jnuR{sER+@U70ry3
zwv9~ij+o9c9~6^XI&V;<y=t>&aiJN*r!1gyVFAY&dayuWv899V(3qiwur_p_$!PF;
z%{_xCRLqGXE|_PSS<Et&BXz_Aa;3k;x*)-kpnTMk0}-IT(G)29qw%(()rwOqE~4|@
ztb5K(E4pC1(DDwTjcxRTDLhi0lD&2EUe?h9-afhxqz4+g7p;k1ClsDg4MfpooxhuP
zCu87}6Ac2(NA#iN5v0IZhV~L9Wb5x1_o(pjao)8|v;v&)ScDYSp(WlZU|qJ(-pe{L
z<up}<@rXqr2!%z}nZSdTn0(-~b^cz~xrouU3`?eJ32;S(P?!sy3qb|i_1Kl=((;Ql
z{=Iy_BFKrC9dw!o;~bE5@M9OEimmfJ`*2aazT3IO=0U)CCGnm|u>pC9M_vjBspeyS
zOV-W1Vdt#X3OSdZ)+}%noF<G49u){<!b(%CiB-lb?4!ymX_c^wTg9vbtEg4PN@JzA
z65Fh_Qru9ki8k26oRF;ZSgRpK0TLS+i%iOdNMm2tRx7Ke)xv6SHM1ISj3-=h(Y6vi
z!HU#jG>{Cz1CPRonD!d7yqCB@S}#3i(o1QK7g2HNB=$NYBGGv-UEcc#D!p&$^&J2J
D_8d8H

literal 2176
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
CH)D1H

diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index c328782b34..784e7b7fb8 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -394,6 +394,7 @@ module C15Enumerate_Impl0_Next
   var _4 : borrowed i;
   var x : item0;
   var n : usize;
+  var _8 : (usize, item0);
   {
     goto BB0
   }
@@ -416,13 +417,15 @@ module C15Enumerate_Impl0_Next
   }
   BB3 {
     [#"../15_enumerate.rs" 56 17 56 18] x <- ([#"../15_enumerate.rs" 56 17 56 18] Core_Option_Option_Type.some_0 _3);
-    [#"../15_enumerate.rs" 56 17 56 18] _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
+    _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
     [#"../15_enumerate.rs" 57 24 57 34] n <- ([#"../15_enumerate.rs" 57 24 57 34] C15Enumerate_Enumerate_Type.enumerate_count ( * self));
-    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + ([#"../15_enumerate.rs" 58 30 58 31] [#"../15_enumerate.rs" 58 30 58 31] (1 : usize)))) ; };
+    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + (1 : usize))) ; };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
+    [#"../15_enumerate.rs" 59 21 59 27] _8 <- ([#"../15_enumerate.rs" 59 21 59 27] (n, x));
+    x <- any item0;
     goto BB6
   }
   BB4 {
@@ -442,8 +445,8 @@ module C15Enumerate_Impl0_Next
     goto BB9
   }
   BB6 {
-    [#"../15_enumerate.rs" 59 16 59 28] _0 <- ([#"../15_enumerate.rs" 59 16 59 28] Core_Option_Option_Type.C_Some ([#"../15_enumerate.rs" 59 21 59 27] (([#"../15_enumerate.rs" 59 22 59 23] n), ([#"../15_enumerate.rs" 59 25 59 26] x))));
-    [#"../15_enumerate.rs" 59 25 59 26] x <- any item0;
+    [#"../15_enumerate.rs" 59 16 59 28] _0 <- ([#"../15_enumerate.rs" 59 16 59 28] Core_Option_Option_Type.C_Some _8);
+    _8 <- any (usize, item0);
     goto BB7
   }
   BB7 {
@@ -556,8 +559,8 @@ module C15Enumerate_Enumerate
     goto BB1
   }
   BB1 {
-    [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate ([#"../15_enumerate.rs" 82 16 82 20] iter) ([#"../15_enumerate.rs" 82 29 82 30] [#"../15_enumerate.rs" 82 29 82 30] (0 : usize)));
-    [#"../15_enumerate.rs" 82 16 82 20] iter <- any i;
+    [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate iter (0 : usize));
+    iter <- any i;
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml b/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
index 56fc594e56..d4685790e2 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
@@ -41,7 +41,7 @@
   <proof prover="3"><result status="valid" time="0.016682" steps="31"/></proof>
   </goal>
   <goal name="next&#39;vc.7" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.558531" steps="246406"/></proof>
+  <proof prover="0"><result status="valid" time="0.061827" steps="243417"/></proof>
   </goal>
   <goal name="next&#39;vc.8" expl="postcondition" proved="true">
   <proof prover="3"><result status="valid" time="0.017161" steps="12"/></proof>
@@ -58,10 +58,10 @@
  <goal name="next_refn" proved="true">
  <proof prover="3"><result status="valid" time="0.010000" steps="2"/></proof>
  </goal>
- <goal name="produces_refl_refn" proved="true">
+ <goal name="produces_trans_refn" proved="true">
  <proof prover="3"><result status="valid" time="0.010000" steps="2"/></proof>
  </goal>
- <goal name="produces_trans_refn" proved="true">
+ <goal name="produces_refl_refn" proved="true">
  <proof prover="3"><result status="valid" time="0.010000" steps="2"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate/why3shapes.gz b/creusot/tests/should_succeed/iterators/15_enumerate/why3shapes.gz
index c05292fe520933998d70ca05e0ba995af13dc925..a581ba10285f4be23ed20ae8035c0514f51e27a6 100644
GIT binary patch
literal 1874
zcmV-Y2d(%YiwFP!00000|E*U`ZyPxhzUx=$HapIRMHXL+^+7N!P{3j@yXa#Cb~if_
z##VbJIr04aEwV|8ZOfS?8^dVvRbR2bDi(`>yICGT`=@YRehG);ZruNUsg^gtFHZmU
zyZsl@uyt<o21*kezFzpJ!`MG};RucJA3ikLs77z5mD4XYD)(jXWA2MhB`qhx3XZVk
zOo8#?@#*wuW3s$iFYZqMZhOCfehdeH3Qg14Rh;vOo!_5WW79_Ix58l!@C*ceGtC28
z(%dbF@vtn*wudl0WJ~d4zqr`Xziq!b^PqBH=04{B|7X95_7_jsD^viRaRDro0c_4j
z+BaYWssUXH(W?m<)GCk2GJ<79tZEoJ0nElk!j*5yJstf1_;$<nj#V>lSY61MjaZ*u
zf)|%Wn&L|Tv6;53{7s{>lhlPJ{fbVq+cp4o9Bd{%0A+;b5t|20?IU1Cyn>CGY^I4Q
z&H*P1?AZ`%<FtM5kKtih_*;MDx9CIRWxG4k@6CC3*T?DI{&P6&PFw1I3h5`#cQDDv
zcFnDS@h@pAPJnO6!(sdy`rjV^n63I4kzc?MyS;yyKr(RJAxjHV6Jz7)5V~>S?@p93
z7I(fIAD<q=DfAFw?zaCL_u<0AWYuxE|3quXJ%z=j?r!_<@i8=hD-tlI#w~p_!s7Jj
zQ&^tEV&M<rI6iy{tVm3}!C5H6`4=AhFTx+Gw`DcxG>=ms%D{Nm4l@-AcVBs<8=v>5
zOmW3F%;}c?MMcDIOUwJC|KOi@6w~+{ecuBk=h1BV6b{Rg((v#wevSB*;0WIflwHl=
zbv5m9tQ`%-(@>Gh7sKLte+a(&?AwR1d>TpX;_fa|$FhG`g)NxGSCvmzHIu7Ca2CA4
zBnSNGnSzJ=t)YJsyp2EpWor2SD=oaz!dHJ~Yy;MhS8ZLr;`cl0ou{obzWP?A%&34f
z7n7w`7?xHud`+BD5MN@rIxLf%A9;qN#*dyr4)YV3v8GeL`mSU_IsZzsxJpl*AXr&8
z+aN26tJ)$bHF<5eoGqTl<LQ!j(iISg^YyH19^$=pMNJ&7GLfc>Bdtp+2x1dsGurk#
z#A!pTeE0K<M;ng$a^zSA_XJP{cO$S7bdTQBx8YL*8*c9_1wv#6u|f0V-Jlk%5qx4l
z^0e#edp{58xZv9nO)?$azjj!%?v{3TRp7q1+!V`Ak}!ouuJ7+Jp_~|^X_;f0`epV!
zM@)$Of+l9s91rl@XpW;7FN%2mr*)GT3m8koNyGcuFfNJbVPcbFf!GB3mKR7)qqSfX
z)p415dl%EXE}iU~IQ{x2kI3s4MaWbQQmJvK6Gf?!bGoF)C8DM(nwH$s_uaTa+sG0Z
z7*id6*PD4<$a!2el9Jkb_0D~jX8(C56!1+VOxD~sXs)ha*Or#o0hUrTj*zG>9z?ZX
zR}qBCZp0EnDAwl)N^_;i+=rLbw@XWrOUv22MqKJdoE6A2)`=?Cb$Q3Oygzb(Ugtxs
z^DokR60G22p+B#{St$=$MgUfohp;ZGEinLMezozAt&13)+JE?mu>W-W9E12YZsVbU
z^e=2Pd;g?ry*$I9yvwK%U9aY8QcXLH=Yy=P)2b?!EP1IgfA)Fa{H%0`OX<!prMtND
zaKXw|bUw0w&Q<cq#^l@orZJhM_!O+S_a<FLYwBzPboVuvWRc%Wk@?LJ0`d2N*7==O
zUJmp|OJr`-OS=vLn_gg(W5njYiP|^mjX_4tURyA&%lF6h5*B4gJguHa${qGf*{^|I
z$G^FCQ*_(SwZV14&e2FLEm|YJ7=kh&K(oH{hN2t?Gl&ibZuC++<)lL=9CzT@LV{$b
z<%R|NVi&AvTdTaWC>0x+U4n8T9iRi@fMmb{bJm%KU<P_)^k7uah3UN4TrdbCU<V!R
zmx?)Q9hZ)y<D`!}4vsSi)`4-L7t(0!d(L{vm~Fd31}nSJD#MM^(%PjEPH-o{3FbIK
z8OOEb>RXtI1cIF!LaT%61vd~38LtUY*_JT16VeHlzW8I{eXq%4FoO<*_C}cwO*eGP
zAcPjZN#NEA^Ybb=205^<=QemQ5J^ePK?jRoc|HtL1)@XYkUIp2>}Rxy-nX6go$Ue!
zu8H#2XsI-C*@BX|MC;HvBwfm(`~?~<mpBAq;1z4FMbf2MfPqPct(Q95CApK}B>R<m
z2UH#162dbIiC&=WwCG!|LfiE=*mfz=NfDj((<(ZNp_7`mY!IUBL-0LCFzY=N!9d$D
zC7DL2PJS0!+YYLgTK0;2)*CGXooA$&wjBiEn9$4*0Mbb|CK%)(2iZ$u2Rf^qb~t#=
z7{jG9PElG=PD!WGDd7}%3Kjx5xoT)7YK;aImwM2x2!rBWNyV31IW3*Ws8kE5=?hLX
zr|g1BHULlpLDP!XD~dJ61ND2#Ha%jJ)z@XazE_G{9$F#*xz}LG0MSuGBGlF-S#w?X
Me<sR7GL97h05+tk761SM

literal 1860
zcmV-K2fO$miwFP!00000|E*U`bK5u)zUx=$HapG*4K!X;>x0T=6;!n~m)+tqDv$&d
z)!3p}k`v9pp9Tp~pe=inOmv{|>aWpXHyVw9-7Jrv{ZlwDzl6ha*YAH@s^!hEi_`!8
zZvRD8Y@M3Cg4~3PuNVI5(6`S`I6@`-hYuB2s?wWr<@gVkN`0C7nEGN<NXt>MfFmq9
zQ($~}d^-JEnIv!4i@TG*+urY=AH%_)LRD3E73ch6=l3U8*<qvfU*NC`cme{x8Rvm4
zsqU6te^};a+e7FclBIaDUtH|x@7pgX9#rbf)W_8SXZDL|fA)mELItoH7r+u3z~*cW
z`v$B)RiHB=dNl%rTBQ-0M=+0wRS6?UfZ3QBaOG=qPY1t0zTR@VV^xhCRu}SRCDxNm
z@Zyq4Q(WmkR^xV+zo}GmlDe>@U(iW*+X|qJgUzT1Adj##V$*;reFQ9v7qAhN%`_3k
zDd0qgoeZHij@#${7#_NXzx6kMi#}vtw!0Jk-%PW+Hcs#MpTl8y+EVXR82;jX1EYLw
zm)!cZKMzxJ0({*c4*l2A{_^<8Y}Lnzd<Ng`_Wof6Nx;Jn*|1<}Vr)DeLeuZt-H8&$
z;?6hy<I_Vpg%%>r-S+o>A1*A6RvmZyPqe1rQ&^1Z?zaE!A4BE0VgQDraZBHXusHqs
z6qZw1Ec_uH`-d-qWr>kDn1mvnKl9i>3xA~EmX)C6JdS<H1O22OW-12Uec_F!f8L)G
z#Rc0ir(627iiq2qmbXX$!9VXPrtug0z6D0kquKB&9F{$$;qIaT8u1Ik9=;VQxthP}
zYT996IvTR4p&*qny2bPU5Pb95*AHR&)RWf5-Cd-PCI754TQG{R3ZJY>CRdr@BzS=t
z9Pqzq3LZ{WpI;#I0+HH(V^{^&_gC#&z2Nd2shp>%JidA_DrRQGWcMIchFoq{-PeI1
z3fN1$76)UL^F2>c)cD@h#$kTi64rR4SKpKvD8FAx3|HwXlL5=iW*cNVNfle<q$aIR
zmb1lEe>`1s%#iNmaJq_B$wRz@uBeHlMb^=DNet@-6$G(~aTslT8P2q!Rl4W-#iJF+
zbP;ka0(k@|0=eS0;<7*!BB8~`Eq&jNV8JTEN2((!yOzH9^XQEW-Va}rY2f~)cLq~#
zX>V5r?n^UGHq#6eCR4`s{rx3w2Rdk4rog3so}K2f;^ID|iCO5z)A~Ae<LJd@0;9|9
z<gyILhT%cO+i5N?iNQazNscErLB8fCmN&O?EtrAoxXir1WNBS99OIif{ql;A$m<n_
z!{}!!874Xra`Bt;0W~h+GnU7+<d(i~#s%t1vSf*{af`yPH}kll1!Y`RXd76s-nfW{
z+5cP#1z}$i6s@_fP+eWUE-jtP{9G}{5fYsa9pZXjL=X;kBhL|pu%03)%@GD$XIMrN
zlncszIG^4xBSk7BXKxsBsR?mb49i#(s#wD%Z8pC(Qh#34L#*j9(s~pu;9^lfueMn(
z1zAD>R+NIU&Z$jA!$HiiHr`A$03GCi`-iaqbow0Q`qXb@9(eR;wwb+khRQrYxga}-
ziq7?Fo+j0}vv_34x-zY*T(zq8RLW0bkTyRn)8SI4^Glg7t~^q(a236bl7FU(_+w?#
z?SE65L{fbAmD_ujL83Kf0s*@Fs!RSz@1n^3<~xD-TR`jdCd#h_dXEicZiiQO82~o<
ze-<ax;5ywAIqc>SS3A7aMyHC+TN9;Uhqnk3Fng83xGt+&rHEr`03eU#`|pLap98s$
zzr~_9(u*!A0|GQ_8*eDeu```$pyNg_wNp+ybi#25jx8ieW@>I&pf5JTin_MS8;er0
zj@czB2hssL5DrKN9582{S#+HQ-C4yr>x9A1`_@wu=eEU$8P1oAIcXi2j-%tGk2?;I
zGY8gzaiAB{XzN?fTFIELn@$ERn@}smjndNEr4UYVC%_5jI6)c5wd3kNOhf{~Ms=aq
z!L))K2!@Q;1gLCHnA!>Hgc`p1ec)}YTVud<I&|6_Wg0Y1*C>M!YV>9Rw@#QJSHUsJ
zjx{Z}!E=E~N@@-|SoF&Cu8S%V9SVosAvk0|qD8d6Zme%?6EJX1l-EW}rGd*Dl*A=k
zhsGi4QV!)$&}g~DE&v0sSZytmF2w?LOe(Cs)X^@<odhS@&(zzYYUq{_o>54&0%fB`
zTXPlarnSM=ONma3=&T=B5iBsFeI1k*#u6;ots+ZnsT$>_T}m>IPM!R=05H}_*?IIp
z55>^5UZ{q=gTZUjNi(3C?*OEeY)ml7L3Xm0!gi+doX%M1HDe5y$~Z-7K{+LzLZ^gN
z+$mTH;N+^VmZ&uvP+aOx*CKR^b0rmDYUQ+a8lzGzoTe{0&787}rfrqtmWSH2mWmM#
yhBhG@N-C0dwHajfb=kNAfRYcITGU=qoGKou-%_S(5eHdwUG^_tZq=oF6#xK%Ethrx

diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg
index 7686a575d8..8567343ed5 100644
--- a/creusot/tests/should_succeed/iterators/16_take.mlcfg
+++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg
@@ -296,18 +296,20 @@ module C16Take_Impl0_Next
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option item0;
   var self : borrowed (C16Take_Take_Type.t_take i) = self;
+  var _3 : bool;
   var _5 : borrowed i;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../16_take.rs" 54 11 54 22] ([#"../16_take.rs" 54 11 54 17] C16Take_Take_Type.take_n ( * self)) <> ([#"../16_take.rs" 54 21 54 22] [#"../16_take.rs" 54 21 54 22] (0 : usize)))
+    [#"../16_take.rs" 54 11 54 22] _3 <- ([#"../16_take.rs" 54 11 54 22] C16Take_Take_Type.take_n ( * self) <> (0 : usize));
+    switch (_3)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - ([#"../16_take.rs" 55 22 55 23] [#"../16_take.rs" 55 22 55 23] (1 : usize)))) ; };
+    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - (1 : usize))) ; };
     [#"../16_take.rs" 56 12 56 21] _5 <- Borrow.borrow_final (C16Take_Take_Type.take_iter ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../16_take.rs" 56 12 56 21] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take ( ^ _5) x1) ; };
     assume { inv1 ( ^ _5) };
diff --git a/creusot/tests/should_succeed/iterators/16_take/why3session.xml b/creusot/tests/should_succeed/iterators/16_take/why3session.xml
index 0f29b2ddb3..0818cbc038 100644
--- a/creusot/tests/should_succeed/iterators/16_take/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/16_take/why3session.xml
@@ -17,7 +17,7 @@
 </theory>
 <theory name="C16Take_Impl0_Next" proved="true">
  <goal name="next&#39;vc" expl="VC for next" proved="true">
- <proof prover="0"><result status="valid" time="0.080000" steps="833"/></proof>
+ <proof prover="0"><result status="valid" time="0.080000" steps="854"/></proof>
  </goal>
 </theory>
 <theory name="C16Take_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/16_take/why3shapes.gz b/creusot/tests/should_succeed/iterators/16_take/why3shapes.gz
index da6067f4e125ec1962fcc5960e37327073f0e4a8..7b1a76b21044e4d8074e0d8a4b4f4c9430f0691e 100644
GIT binary patch
literal 965
zcmV;$13LU4iwFP!00000|D{z;kJ~m7z57@AmUM#v9DXyv9t>jz3MhJMz+((bq7osy
z(pL6v+kf97MXe;Sfug7nmS#Bf=5Zc1{CKxN|M1V@ynhYjxf}W~d%3^+Wq0|*cl|4M
zq{y$}pxF86acExZa0W;Hr%#SK;bb{2PfzMZwt2Q$wrRP_=2PMd4zc*Afb!w#`SQ0@
zIbY38h|{Y;;!F-S<+N&wojdN^VcgF#r!lmTYix+*X=L&5q>~M6u53zN!A1HT@-lOp
zn<AGssw?uy1c(Ey!SV)x9dgI%A$wr<knAys6$rqTzxJ7g3h#Sy8GV1wZ1|!ti~7#0
z)6HgB<j9>|q$sE4S$dIeo^7^nj+hd!+P5j7bGLNP*Gsp|qB<bgtOh+CeLXxqKZZ+a
z;x_&9^xM#fW&i#zde2?|9b<+bo8!Mtala2w!68I>^!ND4nFl|H^YHi@-kP0Y3;%cy
z$K$d{d0vb!G2c;f$W0S#R(K}fu>xd8*Q}^SR&-%S#ls|Ya>oLc`)U}+;m^=~c>0Nf
zU;WRJRvl%&?Rx*{!1%7g|A)NnT-?1$=@>>3^FBsUg4jR8*j-Lt<G+Xaz_>aVip+?=
zVD_oIgfRg;q#c?Y1RO{QdM*#CJft!&U4N1M1OCT=&ntTZ?~^b!Y`KE}I=&#PNEJnw
z%&Ga&!D}*c!I$!?2)ce<Ll-E*wR*{Bc)IQ##}`w~U%A;T#>6ef(7PzcqckaQQVhWk
z)91tT3`y&;6w|k*W5O|&d&gMp9b?719gL-P4C6&PNyqpN=@^@(!{xPfh?fx9E$OIn
zj9y7sTy+%#K5uMPEba4D4KICje!sfW;Fh*DwV&!MZK<kBA{$?>SVY$bxAgNg>%(7{
zx4}i0!3E3Ypv&Z7n~}@&wBh9~XOX{eo`*4BN@?YkuF2hI?(kb<hp$dc{Ji<wS(yig
zDE}LZx{XpC)^`?cuFr^yLt8i%hw3eFvA!(Qb-Z@S7&3PvA8?UvnQfKrZGr!VRK(wI
z=cP6(v`n=@ac_hc#Ar^v_F6RD>%FwXa?32WV9BnMgcF8Kz?8v(P=V&Uu0j)d(8`28
zfCYjH#%ilDfeM@&LMjeiS0E}crDQd!TP}@KUhFBcU@T}0%7U~YEN~0V0^O0y)I`=&
zc&K>Q(1u8@DU}MRv0zf}skBsB$}L5H)Kb`0p2@1NTCJEdt*%<>S)j7fwQfZlAf>2H
n3O5ba(AK&lg47kO8s7-Xblqsf3Dqe@Z&LmNj`(0-$_W4fEr{^p

literal 939
zcmV;c162GUiwFP!00000|D{z+kJ~m7zWZ0`mUe>z9KKm#4}!4*4HUh!;4uazQHhXU
zX)AlT?Z5Akq9VyLP!#pS)Vzn^M-G2@C@x?8Yq%8eVY>9=@N*%HhaV5uKYTyDQ%9=&
z2@a}*f1SqmtqB)!)PMZwm=jK(X7jvKC$h}5%(6^Rn`k}<Zqi{czAK=7czM14?Np9e
zODDwXjU#a;JDSsMHPyi#i*B5X#pgVQ?s=OVV)Hb1@$XG18MeK$IdGFMw!dp$=AIT%
z<O-v@X&yTP;s9%~ya8ZkMx2&e1B-@ajVU)t0Ot6u&ZMmHJr>u=50~5xU-@N`--UI$
z+YF06awk_RPIK@=y~r}pGTVY9=D-{Hb_H}sOXqmKqGeXr0ej7C(DLY;@#Xb7TtgeT
z>5u1M$04ly_YYBf>4(qgGY$xj|1|skHogRhDNg<I=%;WQpWg#<lx1M!$76((@-l<L
zx7Cnqa$60s8fw>SRA9B_H&>(lX(lkKV*$#1Jx<g3XJ|jXd_~9K{nwDJj#A(CgMW6Q
zec$5$Q#LynccoJ}ZrWhZ$K+u!_m?pB*K^<c&mk`8*FdyCMDrD+&;2z_DZx|Pp}y0A
z1K~g|<sl`9ROYQ8u9APi|LE}3MxK)o3GfE?y+VRA!&R<m=krXm2X7K4aXsDCLe($Z
z3RM|tOR)@(-=kyNF;y+sR_&=`>>gF9U8!OQQBQs|RhX=t?*q$2AlXwXd7m?ez9NIh
z5@-ynEe;G)IJ(j5G;_x29nKgmoS}Kk8RknF;2vjGIYw?ct8Q>ahb?E0ng-H7&-M5=
zw3qL#JJfGTU8$ooQMRnRB=Uy3WxB01X$XH^zl|TVjvrX>KV9!X+YL^hX9hprQ&#zW
z@mv(2mSj1n$L_G39{k?$;F}{Nkz@YtfQWK=GX7f@bw5j0ZeJeQJ%TYSj$YwZ9F6z1
z)pq2kM|G=^(Pcp*pK6h1nPrvbeS!a#sfxeD!Aosa=$Pt);@$`?h|!#S?X_sR*M+pg
za?32WV9BADgcF7)V9MaVuR(L&)S(SLXk|hHV1ZzOvDzvO=t$QXBUIhVhWoY^H9?tS
zs4*ZE6qHyn7PJLrL0S+NxCLf`9!PB(A{!|@)VywKOQhD6O2vF9n3M&TmI_O`rPv>}
z6b`j#vTo{5D`rfmv8rc*%2qeJ6J3B5qIMzNv{Xaa=$Z)9)U0lOD<soRs|_bqrx3jh
N`3J(J#2}Cf006-=&#?di

diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index f552550362..92debca829 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -12,11 +12,13 @@ module Knapsack_Max
   var _0 : usize;
   var a : usize = a;
   var b : usize = b;
+  var _5 : bool;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../knapsack.rs" 16 7 16 12] ([#"../knapsack.rs" 16 7 16 8] a) < ([#"../knapsack.rs" 16 11 16 12] b))
+    [#"../knapsack.rs" 16 7 16 12] _5 <- ([#"../knapsack.rs" 16 7 16 12] a < b);
+    switch (_5)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -610,32 +612,43 @@ module Knapsack_Knapsack01Dyn
   var max_weight : usize = max_weight;
   var best_value : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
   var _7 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _8 : usize;
+  var _10 : usize;
   var _11 : usize;
   var i : usize;
   var _19 : ();
+  var _20 : bool;
   var _22 : usize;
   var it : Knapsack_Item_Type.t_item name;
   var _25 : Knapsack_Item_Type.t_item name;
   var w : usize;
+  var _35 : bool;
   var _38 : usize;
+  var _39 : bool;
   var _42 : usize;
   var _44 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
   var _49 : usize;
   var _51 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _55 : usize;
   var _57 : usize;
   var _59 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _62 : usize;
   var _66 : borrowed usize;
   var _67 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _68 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _69 : borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+  var _70 : usize;
   var result : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
   var _80 : usize;
   var left_weight : usize;
   var j : usize;
+  var _88 : bool;
   var it1 : Knapsack_Item_Type.t_item name;
   var _91 : Knapsack_Item_Type.t_item name;
+  var _94 : bool;
   var _96 : usize;
   var _98 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _100 : usize;
   var _104 : usize;
   var _106 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
   var _110 : ();
@@ -644,21 +657,25 @@ module Knapsack_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 ([#"../knapsack.rs" 49 35 49 36] [#"../knapsack.rs" 49 35 49 36] (0 : usize)) ([#"../knapsack.rs" 49 38 49 52] ([#"../knapsack.rs" 49 38 49 48] max_weight) + ([#"../knapsack.rs" 49 51 49 52] [#"../knapsack.rs" 49 51 49 52] (1 : usize))));
+    [#"../knapsack.rs" 49 38 49 52] _8 <- ([#"../knapsack.rs" 49 38 49 52] max_weight + (1 : usize));
+    [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 (0 : usize) _8);
+    _8 <- any usize;
     goto BB1
   }
   BB1 {
-    [#"../knapsack.rs" 49 55 49 66] _11 <- ([#"../knapsack.rs" 49 55 49 66] len0 ([#"../knapsack.rs" 49 55 49 60] items));
+    [#"../knapsack.rs" 49 55 49 66] _11 <- ([#"../knapsack.rs" 49 55 49 66] len0 items);
     goto BB2
   }
   BB2 {
-    [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 ([#"../knapsack.rs" 49 55 49 70] _11 + ([#"../knapsack.rs" 49 69 49 70] [#"../knapsack.rs" 49 69 49 70] (1 : usize))));
-    _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+    [#"../knapsack.rs" 49 55 49 70] _10 <- ([#"../knapsack.rs" 49 55 49 70] _11 + (1 : usize));
     _11 <- any usize;
+    [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 _10);
+    _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+    _10 <- any usize;
     goto BB3
   }
   BB3 {
-    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] [#"../knapsack.rs" 50 16 50 17] (0 : usize));
+    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -681,24 +698,26 @@ module Knapsack_Knapsack01Dyn
     goto BB9
   }
   BB9 {
-    [#"../knapsack.rs" 59 14 59 25] _22 <- ([#"../knapsack.rs" 59 14 59 25] len0 ([#"../knapsack.rs" 59 14 59 19] items));
+    [#"../knapsack.rs" 59 14 59 25] _22 <- ([#"../knapsack.rs" 59 14 59 25] len0 items);
     goto BB10
   }
   BB10 {
-    switch ([#"../knapsack.rs" 59 10 59 25] ([#"../knapsack.rs" 59 10 59 11] i) < _22)
+    [#"../knapsack.rs" 59 10 59 25] _20 <- ([#"../knapsack.rs" 59 10 59 25] i < _22);
+    _22 <- any usize;
+    switch (_20)
       | False -> goto BB34
       | True -> goto BB11
       end
   }
   BB11 {
-    [#"../knapsack.rs" 60 23 60 26] _25 <- ([#"../knapsack.rs" 60 23 60 26] index0 ([#"../knapsack.rs" 60 18 60 23] items) ([#"../knapsack.rs" 60 24 60 25] i));
+    [#"../knapsack.rs" 60 23 60 26] _25 <- ([#"../knapsack.rs" 60 23 60 26] index0 items i);
     goto BB12
   }
   BB12 {
     [#"../knapsack.rs" 60 17 60 26] it <- ([#"../knapsack.rs" 60 17 60 26] _25);
     assert { [@expl:type invariant] inv1 _25 };
     assume { resolve2 _25 };
-    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] [#"../knapsack.rs" 64 20 64 21] (0 : usize));
+    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -725,23 +744,25 @@ module Knapsack_Knapsack01Dyn
     goto BB19
   }
   BB19 {
-    switch ([#"../knapsack.rs" 76 14 76 29] ([#"../knapsack.rs" 76 14 76 15] w) <= ([#"../knapsack.rs" 76 19 76 29] max_weight))
+    [#"../knapsack.rs" 76 14 76 29] _35 <- ([#"../knapsack.rs" 76 14 76 29] w <= max_weight);
+    switch (_35)
       | False -> goto BB33
       | True -> goto BB20
       end
   }
   BB20 {
-    switch ([#"../knapsack.rs" 77 38 77 51] ([#"../knapsack.rs" 77 38 77 47] Knapsack_Item_Type.item_weight it) > ([#"../knapsack.rs" 77 50 77 51] w))
+    [#"../knapsack.rs" 77 38 77 51] _39 <- ([#"../knapsack.rs" 77 38 77 51] Knapsack_Item_Type.item_weight it > w);
+    switch (_39)
       | False -> goto BB24
       | True -> goto BB21
       end
   }
   BB21 {
-    [#"../knapsack.rs" 78 26 78 29] _44 <- ([#"../knapsack.rs" 78 26 78 29] index1 ([#"../knapsack.rs" 78 16 78 26] best_value) ([#"../knapsack.rs" 78 27 78 28] i));
+    [#"../knapsack.rs" 78 26 78 29] _44 <- ([#"../knapsack.rs" 78 26 78 29] index1 best_value i);
     goto BB22
   }
   BB22 {
-    [#"../knapsack.rs" 78 29 78 32] _42 <- ([#"../knapsack.rs" 78 29 78 32] index2 ([#"../knapsack.rs" 78 16 78 29] _44) ([#"../knapsack.rs" 78 30 78 31] w));
+    [#"../knapsack.rs" 78 29 78 32] _42 <- ([#"../knapsack.rs" 78 29 78 32] index2 _44 w);
     goto BB23
   }
   BB23 {
@@ -749,23 +770,27 @@ module Knapsack_Knapsack01Dyn
     goto BB30
   }
   BB24 {
-    [#"../knapsack.rs" 80 30 80 33] _51 <- ([#"../knapsack.rs" 80 30 80 33] index1 ([#"../knapsack.rs" 80 20 80 30] best_value) ([#"../knapsack.rs" 80 31 80 32] i));
+    [#"../knapsack.rs" 80 30 80 33] _51 <- ([#"../knapsack.rs" 80 30 80 33] index1 best_value i);
     goto BB25
   }
   BB25 {
-    [#"../knapsack.rs" 80 33 80 36] _49 <- ([#"../knapsack.rs" 80 33 80 36] index2 ([#"../knapsack.rs" 80 20 80 33] _51) ([#"../knapsack.rs" 80 34 80 35] w));
+    [#"../knapsack.rs" 80 33 80 36] _49 <- ([#"../knapsack.rs" 80 33 80 36] index2 _51 w);
     goto BB26
   }
   BB26 {
-    [#"../knapsack.rs" 80 48 80 51] _59 <- ([#"../knapsack.rs" 80 48 80 51] index1 ([#"../knapsack.rs" 80 38 80 48] best_value) ([#"../knapsack.rs" 80 49 80 50] i));
+    [#"../knapsack.rs" 80 48 80 51] _59 <- ([#"../knapsack.rs" 80 48 80 51] index1 best_value i);
     goto BB27
   }
   BB27 {
-    [#"../knapsack.rs" 80 51 80 66] _57 <- ([#"../knapsack.rs" 80 51 80 66] index2 ([#"../knapsack.rs" 80 38 80 51] _59) ([#"../knapsack.rs" 80 52 80 65] ([#"../knapsack.rs" 80 52 80 53] w) - ([#"../knapsack.rs" 80 56 80 65] Knapsack_Item_Type.item_weight it)));
+    [#"../knapsack.rs" 80 52 80 65] _62 <- ([#"../knapsack.rs" 80 52 80 65] w - Knapsack_Item_Type.item_weight it);
+    [#"../knapsack.rs" 80 51 80 66] _57 <- ([#"../knapsack.rs" 80 51 80 66] index2 _59 _62);
+    _62 <- any usize;
     goto BB28
   }
   BB28 {
-    [#"../knapsack.rs" 80 16 80 78] _38 <- ([#"../knapsack.rs" 80 16 80 78] max0 ([#"../knapsack.rs" 80 20 80 36] _49) ([#"../knapsack.rs" 80 38 80 77] ([#"../knapsack.rs" 80 38 80 66] _57) + ([#"../knapsack.rs" 80 69 80 77] Knapsack_Item_Type.item_value it)));
+    [#"../knapsack.rs" 80 38 80 77] _55 <- ([#"../knapsack.rs" 80 38 80 77] _57 + Knapsack_Item_Type.item_value it);
+    [#"../knapsack.rs" 80 16 80 78] _38 <- ([#"../knapsack.rs" 80 16 80 78] max0 _49 _55);
+    _55 <- any usize;
     goto BB29
   }
   BB29 {
@@ -774,35 +799,37 @@ module Knapsack_Knapsack01Dyn
   BB30 {
     [#"../knapsack.rs" 77 12 77 22] _69 <- Borrow.borrow_mut best_value;
     [#"../knapsack.rs" 77 12 77 22] best_value <-  ^ _69;
-    [#"../knapsack.rs" 77 22 77 29] _68 <- ([#"../knapsack.rs" 77 22 77 29] index_mut0 _69 ([#"../knapsack.rs" 77 23 77 28] ([#"../knapsack.rs" 77 23 77 24] i) + ([#"../knapsack.rs" 77 27 77 28] [#"../knapsack.rs" 77 27 77 28] (1 : usize))));
+    [#"../knapsack.rs" 77 23 77 28] _70 <- ([#"../knapsack.rs" 77 23 77 28] i + (1 : usize));
+    [#"../knapsack.rs" 77 22 77 29] _68 <- ([#"../knapsack.rs" 77 22 77 29] index_mut0 _69 _70);
     _69 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+    _70 <- any usize;
     goto BB31
   }
   BB31 {
     [#"../knapsack.rs" 77 12 77 29] _67 <- Borrow.borrow_final ( * _68) (Borrow.get_id _68);
     [#"../knapsack.rs" 77 12 77 29] _68 <- { _68 with current = ( ^ _67) ; };
-    [#"../knapsack.rs" 77 29 77 32] _66 <- ([#"../knapsack.rs" 77 29 77 32] index_mut1 _67 ([#"../knapsack.rs" 77 30 77 31] w));
+    [#"../knapsack.rs" 77 29 77 32] _66 <- ([#"../knapsack.rs" 77 29 77 32] index_mut1 _67 w);
     _67 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     goto BB32
   }
   BB32 {
     [#"../knapsack.rs" 77 12 81 13] _66 <- { _66 with current = ([#"../knapsack.rs" 77 12 81 13] _38) ; };
-    [#"../knapsack.rs" 77 12 81 13] _38 <- any usize;
+    _38 <- any usize;
     assume { resolve3 _66 };
     assume { resolve4 _68 };
-    [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + ([#"../knapsack.rs" 82 17 82 18] [#"../knapsack.rs" 82 17 82 18] (1 : usize)));
+    [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + (1 : usize));
     [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] ());
     goto BB18
   }
   BB33 {
     assert { [@expl:type invariant] inv1 it };
     assume { resolve2 it };
-    [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + ([#"../knapsack.rs" 84 13 84 14] [#"../knapsack.rs" 84 13 84 14] (1 : usize)));
+    [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + (1 : usize));
     [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] ());
     goto BB8
   }
   BB34 {
-    [#"../knapsack.rs" 87 40 87 51] _80 <- ([#"../knapsack.rs" 87 40 87 51] len0 ([#"../knapsack.rs" 87 40 87 45] items));
+    [#"../knapsack.rs" 87 40 87 51] _80 <- ([#"../knapsack.rs" 87 40 87 51] len0 items);
     goto BB35
   }
   BB35 {
@@ -812,7 +839,7 @@ module Knapsack_Knapsack01Dyn
   }
   BB36 {
     [#"../knapsack.rs" 88 26 88 36] left_weight <- ([#"../knapsack.rs" 88 26 88 36] max_weight);
-    [#"../knapsack.rs" 90 16 90 27] j <- ([#"../knapsack.rs" 90 16 90 27] len0 ([#"../knapsack.rs" 90 16 90 21] items));
+    [#"../knapsack.rs" 90 16 90 27] j <- ([#"../knapsack.rs" 90 16 90 27] len0 items);
     goto BB37
   }
   BB37 {
@@ -824,37 +851,41 @@ module Knapsack_Knapsack01Dyn
     goto BB39
   }
   BB39 {
-    switch ([#"../knapsack.rs" 93 10 93 15] ([#"../knapsack.rs" 93 10 93 11] [#"../knapsack.rs" 93 10 93 11] (0 : usize)) < ([#"../knapsack.rs" 93 14 93 15] j))
+    [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 15] (0 : usize) < j);
+    switch (_88)
       | False -> goto BB50
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - ([#"../knapsack.rs" 94 13 94 14] [#"../knapsack.rs" 94 13 94 14] (1 : usize)));
-    [#"../knapsack.rs" 95 23 95 26] _91 <- ([#"../knapsack.rs" 95 23 95 26] index0 ([#"../knapsack.rs" 95 18 95 23] items) ([#"../knapsack.rs" 95 24 95 25] j));
+    [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - (1 : usize));
+    [#"../knapsack.rs" 95 23 95 26] _91 <- ([#"../knapsack.rs" 95 23 95 26] index0 items j);
     goto BB41
   }
   BB41 {
     [#"../knapsack.rs" 95 17 95 26] it1 <- ([#"../knapsack.rs" 95 17 95 26] _91);
     assert { [@expl:type invariant] inv1 _91 };
     assume { resolve2 _91 };
-    [#"../knapsack.rs" 96 21 96 28] _98 <- ([#"../knapsack.rs" 96 21 96 28] index1 ([#"../knapsack.rs" 96 11 96 21] best_value) ([#"../knapsack.rs" 96 22 96 27] ([#"../knapsack.rs" 96 22 96 23] j) + ([#"../knapsack.rs" 96 26 96 27] [#"../knapsack.rs" 96 26 96 27] (1 : usize))));
+    [#"../knapsack.rs" 96 22 96 27] _100 <- ([#"../knapsack.rs" 96 22 96 27] j + (1 : usize));
+    [#"../knapsack.rs" 96 21 96 28] _98 <- ([#"../knapsack.rs" 96 21 96 28] index1 best_value _100);
+    _100 <- any usize;
     goto BB42
   }
   BB42 {
-    [#"../knapsack.rs" 96 28 96 41] _96 <- ([#"../knapsack.rs" 96 28 96 41] index2 ([#"../knapsack.rs" 96 11 96 28] _98) ([#"../knapsack.rs" 96 29 96 40] left_weight));
+    [#"../knapsack.rs" 96 28 96 41] _96 <- ([#"../knapsack.rs" 96 28 96 41] index2 _98 left_weight);
     goto BB43
   }
   BB43 {
-    [#"../knapsack.rs" 96 55 96 58] _106 <- ([#"../knapsack.rs" 96 55 96 58] index1 ([#"../knapsack.rs" 96 45 96 55] best_value) ([#"../knapsack.rs" 96 56 96 57] j));
+    [#"../knapsack.rs" 96 55 96 58] _106 <- ([#"../knapsack.rs" 96 55 96 58] index1 best_value j);
     goto BB44
   }
   BB44 {
-    [#"../knapsack.rs" 96 58 96 71] _104 <- ([#"../knapsack.rs" 96 58 96 71] index2 ([#"../knapsack.rs" 96 45 96 58] _106) ([#"../knapsack.rs" 96 59 96 70] left_weight));
+    [#"../knapsack.rs" 96 58 96 71] _104 <- ([#"../knapsack.rs" 96 58 96 71] index2 _106 left_weight);
     goto BB45
   }
   BB45 {
-    switch ([#"../knapsack.rs" 96 11 96 71] ([#"../knapsack.rs" 96 11 96 41] _96) <> ([#"../knapsack.rs" 96 45 96 71] _104))
+    [#"../knapsack.rs" 96 11 96 71] _94 <- ([#"../knapsack.rs" 96 11 96 71] _96 <> _104);
+    switch (_94)
       | False -> goto BB48
       | True -> goto BB46
       end
@@ -863,14 +894,14 @@ module Knapsack_Knapsack01Dyn
     [#"../knapsack.rs" 97 12 97 18] _111 <- Borrow.borrow_mut result;
     [#"../knapsack.rs" 97 12 97 18] result <-  ^ _111;
     assume { inv2 ( ^ _111) };
-    [#"../knapsack.rs" 97 12 97 27] _110 <- ([#"../knapsack.rs" 97 12 97 27] push0 _111 ([#"../knapsack.rs" 97 24 97 26] it1));
+    [#"../knapsack.rs" 97 12 97 27] _110 <- ([#"../knapsack.rs" 97 12 97 27] push0 _111 it1);
     _111 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global));
     goto BB47
   }
   BB47 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve2 it1 };
-    [#"../knapsack.rs" 98 12 98 36] left_weight <- ([#"../knapsack.rs" 98 12 98 36] left_weight - ([#"../knapsack.rs" 98 27 98 36] Knapsack_Item_Type.item_weight it1));
+    [#"../knapsack.rs" 98 12 98 36] left_weight <- ([#"../knapsack.rs" 98 12 98 36] left_weight - Knapsack_Item_Type.item_weight it1);
     [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] ());
     goto BB49
   }
@@ -888,7 +919,7 @@ module Knapsack_Knapsack01Dyn
     assert { [@expl:type invariant] inv0 items };
     assume { resolve1 items };
     [#"../knapsack.rs" 102 4 102 10] _0 <- ([#"../knapsack.rs" 102 4 102 10] result);
-    [#"../knapsack.rs" 102 4 102 10] result <- any Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
+    result <- any Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
     goto BB51
   }
   BB51 {
diff --git a/creusot/tests/should_succeed/knapsack/why3session.xml b/creusot/tests/should_succeed/knapsack/why3session.xml
index 7ba3a17b69..098364b3b7 100644
--- a/creusot/tests/should_succeed/knapsack/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack/why3session.xml
@@ -8,7 +8,7 @@
 <path name=".."/><path name="knapsack.mlcfg"/>
 <theory name="Knapsack_Max" proved="true">
  <goal name="max&#39;vc" expl="VC for max" proved="true">
- <proof prover="0"><result status="valid" time="0.010475" steps="1914"/></proof>
+ <proof prover="0"><result status="valid" time="0.010475" steps="2085"/></proof>
  </goal>
 </theory>
 <theory name="Knapsack_M_Impl" proved="true">
@@ -54,267 +54,267 @@
   <proof prover="4"><result status="valid" time="0.033104" steps="30"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.034403" steps="33"/></proof>
+  <proof prover="4"><result status="valid" time="0.016541" steps="34"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016541" steps="34"/></proof>
+  <proof prover="0"><result status="valid" time="0.035227" steps="11433"/></proof>
+  <proof prover="4"><result status="valid" time="0.024569" steps="43"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.012134" steps="62"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.12" expl="loop invariant init" proved="true">
+  <proof prover="0"><result status="valid" time="0.021945" steps="73401"/></proof>
+  <proof prover="4"><result status="valid" time="0.020432" steps="47"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.13" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.014373" steps="11399"/></proof>
-  <proof prover="4"><result status="valid" time="0.016321" steps="38"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.13" expl="loop invariant init" proved="true">
+  <proof prover="4"><result status="valid" time="0.012313" steps="47"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.14" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.011246" steps="42"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.14" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.012153" steps="54"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.15" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.033589" steps="140348"/></proof>
-  <proof prover="4"><result status="valid" time="0.024306" steps="70"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.15" expl="postcondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.016143" steps="109"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.16" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.015213" steps="79"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.16" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.016329" steps="104"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.025233" steps="44"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.17" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.034686" steps="144988"/></proof>
+  <proof prover="4"><result status="valid" time="0.039702" steps="55"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.019913" steps="79"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.18" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.017497" steps="55"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.234663" steps="143287"/></proof>
-  <proof prover="4"><result status="valid" time="0.026965" steps="48"/></proof>
+  <proof prover="4"><result status="valid" time="0.010686" steps="117"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.015702" steps="88"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.20" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.014471" steps="60"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.021750" steps="89"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.21" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.017070" steps="122"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.012635" steps="99"/></proof>
+  <proof prover="4"><result status="valid" time="0.019122" steps="64"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.018302" steps="54"/></proof>
+  <proof prover="4"><result status="valid" time="0.016731" steps="133"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.012902" steps="96"/></proof>
+  <proof prover="4"><result status="valid" time="0.013462" steps="134"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.017967" steps="48"/></proof>
+  <proof prover="0"><result status="valid" time="0.033715" steps="159028"/></proof>
+  <proof prover="4"><result status="valid" time="0.017439" steps="147"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.26" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.034484" steps="144670"/></proof>
-  <proof prover="4"><result status="valid" time="0.024108" steps="88"/></proof>
+  <proof prover="4"><result status="valid" time="0.016020" steps="70"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.014616" steps="144743"/></proof>
-  <proof prover="4"><result status="valid" time="0.019176" steps="89"/></proof>
+  <proof prover="4"><result status="valid" time="0.011598" steps="144"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.011640" steps="99"/></proof>
+  <proof prover="4"><result status="valid" time="0.020090" steps="72"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.033914" steps="11831"/></proof>
-  <proof prover="4"><result status="valid" time="0.040180" steps="54"/></proof>
+  <proof prover="0"><result status="valid" time="0.034261" steps="147643"/></proof>
+  <proof prover="4"><result status="valid" time="0.020592" steps="149"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013089" steps="96"/></proof>
+  <proof prover="0"><result status="valid" time="0.014438" steps="147718"/></proof>
+  <proof prover="4"><result status="valid" time="0.017682" steps="150"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013287" steps="56"/></proof>
+  <proof prover="4"><result status="valid" time="0.013227" steps="163"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.32" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.034551" steps="145211"/></proof>
-  <proof prover="4"><result status="valid" time="0.022048" steps="99"/></proof>
+  <proof prover="0"><result status="valid" time="0.034121" steps="11634"/></proof>
+  <proof prover="4"><result status="valid" time="0.047239" steps="78"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.011772" steps="101"/></proof>
+  <proof prover="0"><result status="valid" time="0.018436" steps="147975"/></proof>
+  <proof prover="4"><result status="valid" time="0.017651" steps="158"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.34" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.017363" steps="134"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.34" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.012565" steps="84"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013132" steps="146"/></proof>
+  <proof prover="4"><result status="valid" time="0.016001" steps="200"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016266" steps="63"/></proof>
+  <proof prover="0"><result status="valid" time="0.014454" steps="40777"/></proof>
+  <proof prover="4"><result status="valid" time="0.020645" steps="90"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.37" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013464" steps="124"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.37" expl="type invariant" proved="true">
+  <proof prover="0"><result status="valid" time="0.014367" steps="40727"/></proof>
+  <proof prover="4"><result status="valid" time="0.026674" steps="90"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.38" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.057712" steps="881"/></proof>
+  <proof prover="0"><result status="valid" time="0.046638" steps="206120"/></proof>
+  <proof prover="4"><result status="valid" time="0.540940" steps="6475"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.015254" steps="11881"/></proof>
-  <proof prover="4"><result status="valid" time="0.023774" steps="65"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.39" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.014308" steps="96"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.40" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.018467" steps="35330"/></proof>
-  <proof prover="4"><result status="valid" time="0.026172" steps="46"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.40" expl="loop invariant preservation" proved="true">
+  <proof prover="0"><result status="valid" time="0.037301" steps="162436"/></proof>
+  <proof prover="4"><result status="valid" time="0.047101" steps="427"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.41" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.015728" steps="92"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.41" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.034403" steps="35"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.42" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.013130" steps="50"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.42" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.016318" steps="35"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.43" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.051104" steps="94"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.43" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.012134" steps="62"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.041703" steps="169604"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.44" expl="type invariant" proved="true">
+  <proof prover="0"><result status="valid" time="0.014373" steps="11420"/></proof>
+  <proof prover="4"><result status="valid" time="0.016321" steps="40"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.45" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.034712" steps="147078"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.45" expl="loop invariant init" proved="true">
+  <proof prover="4"><result status="valid" time="0.011246" steps="44"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.46" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.138196" steps="116"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.46" expl="loop invariant init" proved="true">
+  <proof prover="0"><result status="valid" time="0.033589" steps="145666"/></proof>
+  <proof prover="4"><result status="valid" time="0.024306" steps="71"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.47" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.018226" steps="120"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.47" expl="loop invariant init" proved="true">
+  <proof prover="4"><result status="valid" time="0.015213" steps="80"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.48" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.013882" steps="148313"/></proof>
-  <proof prover="4"><result status="valid" time="0.020366" steps="114"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.48" expl="loop invariant init" proved="true">
+  <proof prover="4"><result status="valid" time="0.025233" steps="46"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.49" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.021684" steps="115"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.49" expl="loop invariant init" proved="true">
+  <proof prover="4"><result status="valid" time="0.019913" steps="79"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.50" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.012752" steps="332"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.50" expl="type invariant" proved="true">
+  <proof prover="0"><result status="valid" time="0.018467" steps="40979"/></proof>
+  <proof prover="4"><result status="valid" time="0.026172" steps="50"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.51" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013922" steps="140"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.51" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.015988" steps="95"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.52" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013591" steps="139"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.52" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.023658" steps="54"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.53" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.023103" steps="173"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.53" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.051104" steps="96"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.54" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.023658" steps="175"/></proof>
+  <proof prover="0"><result status="valid" time="0.036858" steps="175299"/></proof>
+  <proof prover="4"><result status="valid" time="0.048129" steps="227"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.55" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.016105" steps="606"/></proof>
+  <proof prover="0"><result status="valid" time="0.042696" steps="152809"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.56" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.036858" steps="157375"/></proof>
-  <proof prover="4"><result status="valid" time="0.048129" steps="687"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.56" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.017967" steps="54"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.57" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.064285" steps="187543"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.57" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.034484" steps="150395"/></proof>
+  <proof prover="4"><result status="valid" time="0.024108" steps="91"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.58" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.042696" steps="187535"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.58" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.014616" steps="150470"/></proof>
+  <proof prover="4"><result status="valid" time="0.019176" steps="92"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.59" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.035227" steps="11384"/></proof>
-  <proof prover="4"><result status="valid" time="0.024569" steps="33"/></proof>
+  <proof prover="4"><result status="valid" time="0.011640" steps="103"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.60" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.017497" steps="41"/></proof>
+  <proof prover="0"><result status="valid" time="0.033914" steps="11882"/></proof>
+  <proof prover="4"><result status="valid" time="0.040180" steps="60"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.61" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.021945" steps="68093"/></proof>
-  <proof prover="4"><result status="valid" time="0.020432" steps="46"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.61" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.013089" steps="100"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.62" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.012313" steps="47"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.62" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.013287" steps="62"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.63" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.016329" steps="100"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.63" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.034551" steps="150950"/></proof>
+  <proof prover="4"><result status="valid" time="0.022048" steps="103"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.64" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.034686" steps="139595"/></proof>
-  <proof prover="4"><result status="valid" time="0.039702" steps="53"/></proof>
+  <proof prover="4"><result status="valid" time="0.011772" steps="104"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.65" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016318" steps="53"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.65" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.017363" steps="138"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.66" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010686" steps="113"/></proof>
+  <proof prover="4"><result status="valid" time="0.013132" steps="150"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.67" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.014471" steps="56"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.67" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.016266" steps="69"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.68" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.017070" steps="119"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.68" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.013464" steps="128"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.69" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.019122" steps="61"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.69" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.057712" steps="982"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.70" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016731" steps="131"/></proof>
+  <proof prover="0"><result status="valid" time="0.015254" steps="11932"/></proof>
+  <proof prover="4"><result status="valid" time="0.023774" steps="71"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.71" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013462" steps="131"/></proof>
+  <proof prover="0"><result status="valid" time="0.034830" steps="149001"/></proof>
+  <proof prover="4"><result status="valid" time="0.026965" steps="54"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.72" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.033715" steps="153607"/></proof>
-  <proof prover="4"><result status="valid" time="0.017439" steps="146"/></proof>
+  <proof prover="4"><result status="valid" time="0.015702" steps="91"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.73" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016020" steps="66"/></proof>
+  <proof prover="4"><result status="valid" time="0.021750" steps="92"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.74" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.018436" steps="141990"/></proof>
-  <proof prover="4"><result status="valid" time="0.017651" steps="141"/></proof>
+  <proof prover="4"><result status="valid" time="0.012635" steps="103"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.75" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020090" steps="68"/></proof>
+  <proof prover="4"><result status="valid" time="0.018302" steps="60"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.76" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.034261" steps="142210"/></proof>
-  <proof prover="4"><result status="valid" time="0.020592" steps="146"/></proof>
+  <proof prover="4"><result status="valid" time="0.013591" steps="100"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.77" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.014438" steps="142283"/></proof>
-  <proof prover="4"><result status="valid" time="0.017682" steps="148"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.77" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.015728" steps="119"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.78" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.013227" steps="161"/></proof>
+  <proof prover="4"><result status="valid" time="0.018226" steps="123"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.79" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.034121" steps="11596"/></proof>
-  <proof prover="4"><result status="valid" time="0.047239" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.013882" steps="154536"/></proof>
+  <proof prover="4"><result status="valid" time="0.020366" steps="117"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.80" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.011598" steps="155"/></proof>
+  <proof prover="4"><result status="valid" time="0.021684" steps="118"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.81" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.012565" steps="78"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.81" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.012752" steps="337"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.82" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016001" steps="196"/></proof>
+  <proof prover="4"><result status="valid" time="0.013922" steps="143"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.83" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.014454" steps="40546"/></proof>
-  <proof prover="4"><result status="valid" time="0.020645" steps="84"/></proof>
+  <proof prover="4"><result status="valid" time="0.012902" steps="142"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.84" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.014367" steps="40496"/></proof>
-  <proof prover="4"><result status="valid" time="0.026674" steps="84"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.84" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.023103" steps="177"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.85" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.046638" steps="205908"/></proof>
-  <proof prover="4"><result status="valid" time="0.955648" steps="3528"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.85" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.013130" steps="178"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.86" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.012153" steps="50"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.86" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.016105" steps="609"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.87" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016143" steps="106"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.87" expl="loop invariant preservation" proved="true">
+  <proof prover="0"><result status="valid" time="0.041703" steps="163861"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.88" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.014308" steps="78"/></proof>
+  <proof prover="0"><result status="valid" time="0.064285" steps="190766"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.89" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.037301" steps="156569"/></proof>
-  <proof prover="4"><result status="valid" time="0.047101" steps="290"/></proof>
+  <proof prover="0"><result status="valid" time="0.034712" steps="196874"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/knapsack/why3shapes.gz b/creusot/tests/should_succeed/knapsack/why3shapes.gz
index 0dd9b5ce0c21626965ba360a8f8088ade8cc33d9..cf84daa5a187fd2734e8115ce0e81e1750dd965d 100644
GIT binary patch
literal 5324
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

literal 5103
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
RhWlm=@_*4!yEW!}008jz^}+xE

diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index a45e9fe18e..d33904c30f 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -11,11 +11,13 @@ module KnapsackFull_Max
   var _0 : usize;
   var a : usize = a;
   var b : usize = b;
+  var _4 : bool;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../knapsack_full.rs" 16 7 16 12] ([#"../knapsack_full.rs" 16 7 16 8] a) < ([#"../knapsack_full.rs" 16 11 16 12] b))
+    [#"../knapsack_full.rs" 16 7 16 12] _4 <- ([#"../knapsack_full.rs" 16 7 16 12] a < b);
+    switch (_4)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -1044,8 +1046,11 @@ module KnapsackFull_Knapsack01Dyn
   var max_weight : usize = max_weight;
   var best_value : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
   var _10 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _11 : usize;
+  var _13 : usize;
   var _14 : usize;
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _18 : Core_Ops_Range_Range_Type.t_range usize;
   var _19 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
@@ -1069,24 +1074,31 @@ module KnapsackFull_Knapsack01Dyn
   var _63 : Snapshot.snap_ty (Seq.seq usize);
   var w : usize;
   var _66 : usize;
+  var _67 : bool;
   var _70 : usize;
   var _72 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
   var _77 : usize;
   var _79 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _83 : usize;
   var _85 : usize;
   var _87 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _90 : usize;
   var _94 : borrowed usize;
   var _95 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _96 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _97 : borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+  var _98 : usize;
   var result : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
   var _104 : usize;
   var left_weight : usize;
   var j : usize;
+  var _115 : bool;
   var it1 : KnapsackFull_Item_Type.t_item name;
   var _118 : KnapsackFull_Item_Type.t_item name;
+  var _121 : bool;
   var _123 : usize;
   var _125 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _127 : usize;
   var _131 : usize;
   var _133 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
   var _137 : ();
@@ -1095,26 +1107,32 @@ module KnapsackFull_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 ([#"../knapsack_full.rs" 86 35 86 36] [#"../knapsack_full.rs" 86 35 86 36] (0 : usize)) ([#"../knapsack_full.rs" 86 38 86 52] ([#"../knapsack_full.rs" 86 38 86 48] max_weight) + ([#"../knapsack_full.rs" 86 51 86 52] [#"../knapsack_full.rs" 86 51 86 52] (1 : usize))));
+    [#"../knapsack_full.rs" 86 38 86 52] _11 <- ([#"../knapsack_full.rs" 86 38 86 52] max_weight + (1 : usize));
+    [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 (0 : usize) _11);
+    _11 <- any usize;
     goto BB1
   }
   BB1 {
-    [#"../knapsack_full.rs" 86 55 86 66] _14 <- ([#"../knapsack_full.rs" 86 55 86 66] len0 ([#"../knapsack_full.rs" 86 55 86 60] items));
+    [#"../knapsack_full.rs" 86 55 86 66] _14 <- ([#"../knapsack_full.rs" 86 55 86 66] len0 items);
     goto BB2
   }
   BB2 {
-    [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 ([#"../knapsack_full.rs" 86 55 86 70] _14 + ([#"../knapsack_full.rs" 86 69 86 70] [#"../knapsack_full.rs" 86 69 86 70] (1 : usize))));
-    _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+    [#"../knapsack_full.rs" 86 55 86 70] _13 <- ([#"../knapsack_full.rs" 86 55 86 70] _14 + (1 : usize));
     _14 <- any usize;
+    [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 _13);
+    _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+    _13 <- any usize;
     goto BB3
   }
   BB3 {
-    [#"../knapsack_full.rs" 95 16 95 27] _19 <- ([#"../knapsack_full.rs" 95 16 95 27] len0 ([#"../knapsack_full.rs" 95 16 95 21] items));
+    [#"../knapsack_full.rs" 95 16 95 27] _19 <- ([#"../knapsack_full.rs" 95 16 95 27] len0 items);
     goto BB4
   }
   BB4 {
-    [#"../knapsack_full.rs" 88 4 88 55] iter <- ([#"../knapsack_full.rs" 88 4 88 55] into_iter0 ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range ([#"../knapsack_full.rs" 95 13 95 14] [#"../knapsack_full.rs" 95 13 95 14] (0 : usize)) _19));
+    [#"../knapsack_full.rs" 95 13 95 27] _18 <- ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range (0 : usize) _19);
     _19 <- any usize;
+    [#"../knapsack_full.rs" 88 4 88 55] iter <- ([#"../knapsack_full.rs" 88 4 88 55] into_iter0 _18);
+    _18 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB5
   }
   BB5 {
@@ -1166,7 +1184,7 @@ module KnapsackFull_Knapsack01Dyn
       end
   }
   BB15 {
-    [#"../knapsack_full.rs" 119 49 119 60] _104 <- ([#"../knapsack_full.rs" 119 49 119 60] len0 ([#"../knapsack_full.rs" 119 49 119 54] items));
+    [#"../knapsack_full.rs" 119 49 119 60] _104 <- ([#"../knapsack_full.rs" 119 49 119 60] len0 items);
     goto BB49
   }
   BB16 {
@@ -1183,16 +1201,16 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB19 {
     [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] _37);
-    [#"../knapsack_full.rs" 88 4 88 55] _37 <- any Snapshot.snap_ty (Seq.seq usize);
+    _37 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../knapsack_full.rs" 96 23 96 26] _41 <- ([#"../knapsack_full.rs" 96 23 96 26] index0 ([#"../knapsack_full.rs" 96 18 96 23] items) ([#"../knapsack_full.rs" 96 24 96 25] i));
+    [#"../knapsack_full.rs" 96 23 96 26] _41 <- ([#"../knapsack_full.rs" 96 23 96 26] index0 items i);
     goto BB20
   }
   BB20 {
     [#"../knapsack_full.rs" 96 17 96 26] it <- ([#"../knapsack_full.rs" 96 17 96 26] _41);
     assert { [@expl:type invariant] inv1 _41 };
     assume { resolve1 _41 };
-    [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 ([#"../knapsack_full.rs" 110 17 110 18] [#"../knapsack_full.rs" 110 17 110 18] (0 : usize)) ([#"../knapsack_full.rs" 110 21 110 31] max_weight));
+    [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 (0 : usize) max_weight);
     goto BB21
   }
   BB21 {
@@ -1268,19 +1286,20 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB36 {
     [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] _63);
-    [#"../knapsack_full.rs" 98 8 98 59] _63 <- any Snapshot.snap_ty (Seq.seq usize);
+    _63 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    switch ([#"../knapsack_full.rs" 111 38 111 51] ([#"../knapsack_full.rs" 111 38 111 47] KnapsackFull_Item_Type.item_weight it) > ([#"../knapsack_full.rs" 111 50 111 51] w))
+    [#"../knapsack_full.rs" 111 38 111 51] _67 <- ([#"../knapsack_full.rs" 111 38 111 51] KnapsackFull_Item_Type.item_weight it > w);
+    switch (_67)
       | False -> goto BB40
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../knapsack_full.rs" 112 26 112 29] _72 <- ([#"../knapsack_full.rs" 112 26 112 29] index1 ([#"../knapsack_full.rs" 112 16 112 26] best_value) ([#"../knapsack_full.rs" 112 27 112 28] i));
+    [#"../knapsack_full.rs" 112 26 112 29] _72 <- ([#"../knapsack_full.rs" 112 26 112 29] index1 best_value i);
     goto BB38
   }
   BB38 {
-    [#"../knapsack_full.rs" 112 29 112 32] _70 <- ([#"../knapsack_full.rs" 112 29 112 32] index2 ([#"../knapsack_full.rs" 112 16 112 29] _72) ([#"../knapsack_full.rs" 112 30 112 31] w));
+    [#"../knapsack_full.rs" 112 29 112 32] _70 <- ([#"../knapsack_full.rs" 112 29 112 32] index2 _72 w);
     goto BB39
   }
   BB39 {
@@ -1288,23 +1307,27 @@ module KnapsackFull_Knapsack01Dyn
     goto BB46
   }
   BB40 {
-    [#"../knapsack_full.rs" 114 30 114 33] _79 <- ([#"../knapsack_full.rs" 114 30 114 33] index1 ([#"../knapsack_full.rs" 114 20 114 30] best_value) ([#"../knapsack_full.rs" 114 31 114 32] i));
+    [#"../knapsack_full.rs" 114 30 114 33] _79 <- ([#"../knapsack_full.rs" 114 30 114 33] index1 best_value i);
     goto BB41
   }
   BB41 {
-    [#"../knapsack_full.rs" 114 33 114 36] _77 <- ([#"../knapsack_full.rs" 114 33 114 36] index2 ([#"../knapsack_full.rs" 114 20 114 33] _79) ([#"../knapsack_full.rs" 114 34 114 35] w));
+    [#"../knapsack_full.rs" 114 33 114 36] _77 <- ([#"../knapsack_full.rs" 114 33 114 36] index2 _79 w);
     goto BB42
   }
   BB42 {
-    [#"../knapsack_full.rs" 114 48 114 51] _87 <- ([#"../knapsack_full.rs" 114 48 114 51] index1 ([#"../knapsack_full.rs" 114 38 114 48] best_value) ([#"../knapsack_full.rs" 114 49 114 50] i));
+    [#"../knapsack_full.rs" 114 48 114 51] _87 <- ([#"../knapsack_full.rs" 114 48 114 51] index1 best_value i);
     goto BB43
   }
   BB43 {
-    [#"../knapsack_full.rs" 114 51 114 66] _85 <- ([#"../knapsack_full.rs" 114 51 114 66] index2 ([#"../knapsack_full.rs" 114 38 114 51] _87) ([#"../knapsack_full.rs" 114 52 114 65] ([#"../knapsack_full.rs" 114 52 114 53] w) - ([#"../knapsack_full.rs" 114 56 114 65] KnapsackFull_Item_Type.item_weight it)));
+    [#"../knapsack_full.rs" 114 52 114 65] _90 <- ([#"../knapsack_full.rs" 114 52 114 65] w - KnapsackFull_Item_Type.item_weight it);
+    [#"../knapsack_full.rs" 114 51 114 66] _85 <- ([#"../knapsack_full.rs" 114 51 114 66] index2 _87 _90);
+    _90 <- any usize;
     goto BB44
   }
   BB44 {
-    [#"../knapsack_full.rs" 114 16 114 78] _66 <- ([#"../knapsack_full.rs" 114 16 114 78] max0 ([#"../knapsack_full.rs" 114 20 114 36] _77) ([#"../knapsack_full.rs" 114 38 114 77] ([#"../knapsack_full.rs" 114 38 114 66] _85) + ([#"../knapsack_full.rs" 114 69 114 77] KnapsackFull_Item_Type.item_value it)));
+    [#"../knapsack_full.rs" 114 38 114 77] _83 <- ([#"../knapsack_full.rs" 114 38 114 77] _85 + KnapsackFull_Item_Type.item_value it);
+    [#"../knapsack_full.rs" 114 16 114 78] _66 <- ([#"../knapsack_full.rs" 114 16 114 78] max0 _77 _83);
+    _83 <- any usize;
     goto BB45
   }
   BB45 {
@@ -1313,20 +1336,22 @@ module KnapsackFull_Knapsack01Dyn
   BB46 {
     [#"../knapsack_full.rs" 111 12 111 22] _97 <- Borrow.borrow_mut best_value;
     [#"../knapsack_full.rs" 111 12 111 22] best_value <-  ^ _97;
-    [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 ([#"../knapsack_full.rs" 111 23 111 28] ([#"../knapsack_full.rs" 111 23 111 24] i) + ([#"../knapsack_full.rs" 111 27 111 28] [#"../knapsack_full.rs" 111 27 111 28] (1 : usize))));
+    [#"../knapsack_full.rs" 111 23 111 28] _98 <- ([#"../knapsack_full.rs" 111 23 111 28] i + (1 : usize));
+    [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 _98);
     _97 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+    _98 <- any usize;
     goto BB47
   }
   BB47 {
     [#"../knapsack_full.rs" 111 12 111 29] _95 <- Borrow.borrow_final ( * _96) (Borrow.get_id _96);
     [#"../knapsack_full.rs" 111 12 111 29] _96 <- { _96 with current = ( ^ _95) ; };
-    [#"../knapsack_full.rs" 111 29 111 32] _94 <- ([#"../knapsack_full.rs" 111 29 111 32] index_mut1 _95 ([#"../knapsack_full.rs" 111 30 111 31] w));
+    [#"../knapsack_full.rs" 111 29 111 32] _94 <- ([#"../knapsack_full.rs" 111 29 111 32] index_mut1 _95 w);
     _95 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     goto BB48
   }
   BB48 {
     [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = ([#"../knapsack_full.rs" 111 12 115 13] _66) ; };
-    [#"../knapsack_full.rs" 111 12 115 13] _66 <- any usize;
+    _66 <- any usize;
     assume { resolve3 _94 };
     assume { resolve4 _96 };
     [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] ());
@@ -1339,7 +1364,7 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB50 {
     [#"../knapsack_full.rs" 120 26 120 36] left_weight <- ([#"../knapsack_full.rs" 120 26 120 36] max_weight);
-    [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 ([#"../knapsack_full.rs" 122 16 122 21] items));
+    [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 items);
     goto BB51
   }
   BB51 {
@@ -1363,37 +1388,41 @@ module KnapsackFull_Knapsack01Dyn
     goto BB56
   }
   BB56 {
-    switch ([#"../knapsack_full.rs" 140 10 140 15] ([#"../knapsack_full.rs" 140 10 140 11] [#"../knapsack_full.rs" 140 10 140 11] (0 : usize)) < ([#"../knapsack_full.rs" 140 14 140 15] j))
+    [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 15] (0 : usize) < j);
+    switch (_115)
       | False -> goto BB67
       | True -> goto BB57
       end
   }
   BB57 {
-    [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - ([#"../knapsack_full.rs" 141 13 141 14] [#"../knapsack_full.rs" 141 13 141 14] (1 : usize)));
-    [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 ([#"../knapsack_full.rs" 142 18 142 23] items) ([#"../knapsack_full.rs" 142 24 142 25] j));
+    [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - (1 : usize));
+    [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 items j);
     goto BB58
   }
   BB58 {
     [#"../knapsack_full.rs" 142 17 142 26] it1 <- ([#"../knapsack_full.rs" 142 17 142 26] _118);
     assert { [@expl:type invariant] inv1 _118 };
     assume { resolve1 _118 };
-    [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 ([#"../knapsack_full.rs" 143 11 143 21] best_value) ([#"../knapsack_full.rs" 143 22 143 27] ([#"../knapsack_full.rs" 143 22 143 23] j) + ([#"../knapsack_full.rs" 143 26 143 27] [#"../knapsack_full.rs" 143 26 143 27] (1 : usize))));
+    [#"../knapsack_full.rs" 143 22 143 27] _127 <- ([#"../knapsack_full.rs" 143 22 143 27] j + (1 : usize));
+    [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 best_value _127);
+    _127 <- any usize;
     goto BB59
   }
   BB59 {
-    [#"../knapsack_full.rs" 143 28 143 41] _123 <- ([#"../knapsack_full.rs" 143 28 143 41] index2 ([#"../knapsack_full.rs" 143 11 143 28] _125) ([#"../knapsack_full.rs" 143 29 143 40] left_weight));
+    [#"../knapsack_full.rs" 143 28 143 41] _123 <- ([#"../knapsack_full.rs" 143 28 143 41] index2 _125 left_weight);
     goto BB60
   }
   BB60 {
-    [#"../knapsack_full.rs" 143 55 143 58] _133 <- ([#"../knapsack_full.rs" 143 55 143 58] index1 ([#"../knapsack_full.rs" 143 45 143 55] best_value) ([#"../knapsack_full.rs" 143 56 143 57] j));
+    [#"../knapsack_full.rs" 143 55 143 58] _133 <- ([#"../knapsack_full.rs" 143 55 143 58] index1 best_value j);
     goto BB61
   }
   BB61 {
-    [#"../knapsack_full.rs" 143 58 143 71] _131 <- ([#"../knapsack_full.rs" 143 58 143 71] index2 ([#"../knapsack_full.rs" 143 45 143 58] _133) ([#"../knapsack_full.rs" 143 59 143 70] left_weight));
+    [#"../knapsack_full.rs" 143 58 143 71] _131 <- ([#"../knapsack_full.rs" 143 58 143 71] index2 _133 left_weight);
     goto BB62
   }
   BB62 {
-    switch ([#"../knapsack_full.rs" 143 11 143 71] ([#"../knapsack_full.rs" 143 11 143 41] _123) <> ([#"../knapsack_full.rs" 143 45 143 71] _131))
+    [#"../knapsack_full.rs" 143 11 143 71] _121 <- ([#"../knapsack_full.rs" 143 11 143 71] _123 <> _131);
+    switch (_121)
       | False -> goto BB65
       | True -> goto BB63
       end
@@ -1402,14 +1431,14 @@ module KnapsackFull_Knapsack01Dyn
     [#"../knapsack_full.rs" 144 12 144 18] _138 <- Borrow.borrow_mut result;
     [#"../knapsack_full.rs" 144 12 144 18] result <-  ^ _138;
     assume { inv5 ( ^ _138) };
-    [#"../knapsack_full.rs" 144 12 144 27] _137 <- ([#"../knapsack_full.rs" 144 12 144 27] push0 _138 ([#"../knapsack_full.rs" 144 24 144 26] it1));
+    [#"../knapsack_full.rs" 144 12 144 27] _137 <- ([#"../knapsack_full.rs" 144 12 144 27] push0 _138 it1);
     _138 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global));
     goto BB64
   }
   BB64 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
-    [#"../knapsack_full.rs" 145 12 145 36] left_weight <- ([#"../knapsack_full.rs" 145 12 145 36] left_weight - ([#"../knapsack_full.rs" 145 27 145 36] KnapsackFull_Item_Type.item_weight it1));
+    [#"../knapsack_full.rs" 145 12 145 36] left_weight <- ([#"../knapsack_full.rs" 145 12 145 36] left_weight - KnapsackFull_Item_Type.item_weight it1);
     [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] ());
     goto BB66
   }
@@ -1427,7 +1456,7 @@ module KnapsackFull_Knapsack01Dyn
     assert { [@expl:type invariant] inv4 items };
     assume { resolve6 items };
     [#"../knapsack_full.rs" 149 4 149 10] _0 <- ([#"../knapsack_full.rs" 149 4 149 10] result);
-    [#"../knapsack_full.rs" 149 4 149 10] result <- any Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
+    result <- any Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
     goto BB68
   }
   BB68 {
diff --git a/creusot/tests/should_succeed/knapsack_full/why3session.xml b/creusot/tests/should_succeed/knapsack_full/why3session.xml
index 909372f228..d157d16530 100644
--- a/creusot/tests/should_succeed/knapsack_full/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack_full/why3session.xml
@@ -10,7 +10,7 @@
 <path name=".."/><path name="knapsack_full.mlcfg"/>
 <theory name="KnapsackFull_Max" proved="true">
  <goal name="max&#39;vc" expl="VC for max" proved="true">
- <proof prover="1"><result status="valid" time="0.008841" steps="1914"/></proof>
+ <proof prover="1"><result status="valid" time="0.008841" steps="2085"/></proof>
  </goal>
 </theory>
 <theory name="KnapsackFull_SumWeights_Impl" proved="true">
@@ -55,333 +55,326 @@
   <proof prover="1"><result status="valid" time="0.013403" steps="13023"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017854" steps="29"/></proof>
+  <proof prover="6"><result status="valid" time="0.017854" steps="31"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034141" steps="148413"/></proof>
+  <proof prover="1"><result status="valid" time="0.034141" steps="161631"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.8" expl="loop invariant init" proved="true">
-  <proof prover="1"><result status="valid" time="0.013758" steps="13380"/></proof>
+  <proof prover="1"><result status="valid" time="0.013758" steps="13385"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.9" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.016613" steps="65"/></proof>
+  <proof prover="6"><result status="valid" time="0.016613" steps="66"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.10" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.011336" steps="36"/></proof>
+  <proof prover="6"><result status="valid" time="0.011336" steps="38"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.11" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.013452" steps="70"/></proof>
+  <proof prover="6"><result status="valid" time="0.013452" steps="72"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.12" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.024395" steps="343"/></proof>
+  <proof prover="6"><result status="valid" time="0.024395" steps="344"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.018805" steps="173"/></proof>
+  <proof prover="6"><result status="valid" time="0.018805" steps="175"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.016312" steps="79"/></proof>
+  <proof prover="6"><result status="valid" time="0.016312" steps="80"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.066507" steps="56"/></proof>
+  <proof prover="6"><result status="valid" time="0.014599" steps="58"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014599" steps="64"/></proof>
+  <proof prover="1"><result status="valid" time="0.013598" steps="13792"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.012700" steps="66"/></proof>
+  <proof prover="6"><result status="valid" time="0.012700" steps="68"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.012375" steps="68"/></proof>
+  <proof prover="6"><result status="valid" time="0.012375" steps="69"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.19" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.012916" steps="74"/></proof>
+  <proof prover="6"><result status="valid" time="0.012916" steps="76"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.20" expl="loop invariant init" proved="true">
-  <proof prover="1"><result status="valid" time="0.022066" steps="89129"/></proof>
+  <proof prover="1"><result status="valid" time="0.022066" steps="89157"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.21" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.013177" steps="74"/></proof>
+  <proof prover="6"><result status="valid" time="0.013177" steps="76"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.22" expl="integer overflow" proved="true">
-  <proof prover="6"><result status="valid" time="0.016048" steps="121"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.22" expl="type invariant" proved="true">
+  <proof prover="6"><result status="valid" time="0.025140" steps="78"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.040548" steps="180195"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.23" expl="postcondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.061701" steps="739"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.013598" steps="14220"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.24" expl="postcondition" proved="true">
+  <proof prover="1"><result status="valid" time="0.078676" steps="451634"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.012444" steps="183248"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.25" expl="postcondition" proved="true">
+  <proof prover="1"><result status="valid" time="0.034538" steps="186361"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.26" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.017596" steps="80"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.26" expl="postcondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.036480" steps="138"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.27" expl="integer overflow" proved="true">
-  <proof prover="6"><result status="valid" time="0.016336" steps="137"/></proof>
+  <proof prover="6"><result status="valid" time="0.016048" steps="123"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.018504" steps="84"/></proof>
+  <proof prover="1"><result status="valid" time="0.040548" steps="180466"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.016999" steps="149"/></proof>
+  <proof prover="6"><result status="valid" time="0.011820" steps="79"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035417" steps="184068"/></proof>
+  <proof prover="1"><result status="valid" time="0.012444" steps="183519"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.013700" steps="166"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.31" expl="type invariant" proved="true">
+  <proof prover="6"><result status="valid" time="0.017596" steps="84"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.32" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017476" steps="90"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.32" expl="integer overflow" proved="true">
+  <proof prover="6"><result status="valid" time="0.016336" steps="140"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014143" steps="158"/></proof>
+  <proof prover="6"><result status="valid" time="0.018504" steps="88"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.055707" steps="92"/></proof>
+  <proof prover="6"><result status="valid" time="0.016999" steps="151"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017609" steps="165"/></proof>
+  <proof prover="1"><result status="valid" time="0.035641" steps="184339"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.014097" steps="184579"/></proof>
+  <proof prover="6"><result status="valid" time="0.013700" steps="167"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.37" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.013470" steps="181"/></proof>
+  <proof prover="6"><result status="valid" time="0.017476" steps="94"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.015952" steps="98"/></proof>
+  <proof prover="6"><result status="valid" time="0.017854" steps="161"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017854" steps="172"/></proof>
+  <proof prover="6"><result status="valid" time="0.055707" steps="96"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.40" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.013722" steps="102"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.40" expl="precondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.017609" steps="167"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.41" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.018274" steps="186049"/></proof>
+  <proof prover="1"><result status="valid" time="0.014097" steps="184850"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.42" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014302" steps="110"/></proof>
+  <proof prover="6"><result status="valid" time="0.013470" steps="184"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.43" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.014203" steps="110"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.43" expl="precondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.015952" steps="102"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.44" expl="integer overflow" proved="true">
-  <proof prover="1"><result status="valid" time="0.145125" steps="662161"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.44" expl="precondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.014143" steps="175"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.45" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.025140" steps="74"/></proof>
+  <proof prover="6"><result status="valid" time="0.014203" steps="108"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.46" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.061701" steps="718"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.46" expl="precondition" proved="true">
+  <proof prover="1"><result status="valid" time="0.018274" steps="186154"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.47" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.078676" steps="451532"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.47" expl="precondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.014302" steps="116"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.48" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034538" steps="186253"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.48" expl="type invariant" proved="true">
+  <proof prover="6"><result status="valid" time="0.013722" steps="116"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.49" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.036480" steps="135"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.49" expl="integer overflow" proved="true">
+  <proof prover="1"><result status="valid" time="0.145125" steps="662252"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.50" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.020488" steps="102"/></proof>
+  <proof prover="6"><result status="valid" time="0.020488" steps="120"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.51" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.024641" steps="324"/></proof>
+  <proof prover="6"><result status="valid" time="0.024641" steps="486"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.52" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.406472" steps="1049418"/></proof>
+  <proof prover="1"><result status="valid" time="0.406472" steps="1300948"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.53" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.538858" steps="1560453"/></proof>
+  <proof prover="1"><result status="valid" time="1.701983" steps="15514028"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.54" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.110153" steps="493483"/></proof>
+  <proof prover="1"><result status="valid" time="0.303310" steps="1098886"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.55" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.043258" steps="183831"/></proof>
+  <proof prover="1"><result status="valid" time="0.043258" steps="183857"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.56" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.011820" steps="70"/></proof>
+  <proof prover="6"><result status="valid" time="0.066507" steps="72"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.57" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.021841" steps="107"/></proof>
+  <proof prover="6"><result status="valid" time="0.021841" steps="108"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.58" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.014931" steps="74"/></proof>
+  <proof prover="6"><result status="valid" time="0.014931" steps="76"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.59" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.033029" steps="109"/></proof>
+  <proof prover="6"><result status="valid" time="0.033029" steps="110"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.60" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.058942" steps="111"/></proof>
+  <proof prover="6"><result status="valid" time="0.058942" steps="112"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.61" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.011043" steps="82"/></proof>
+  <proof prover="6"><result status="valid" time="0.011043" steps="84"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.62" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014713" steps="82"/></proof>
+  <proof prover="6"><result status="valid" time="0.014713" steps="84"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.63" expl="loop invariant init" proved="true">
-  <proof prover="1"><result status="valid" time="0.012712" steps="14130"/></proof>
+  <proof prover="1"><result status="valid" time="0.012712" steps="14135"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.64" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.013632" steps="132"/></proof>
+  <proof prover="6"><result status="valid" time="0.013632" steps="134"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.65" expl="loop invariant init" proved="true">
-  <proof prover="1"><result status="valid" time="0.014170" steps="13990"/></proof>
+  <proof prover="1"><result status="valid" time="0.014170" steps="13995"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.66" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.016992" steps="133"/></proof>
+  <proof prover="6"><result status="valid" time="0.016992" steps="134"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.67" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.049417" steps="828"/></proof>
+  <proof prover="6"><result status="valid" time="0.049417" steps="825"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.68" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.018353" steps="153"/></proof>
+  <proof prover="6"><result status="valid" time="0.018353" steps="154"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.69" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.017460" steps="140"/></proof>
+  <proof prover="6"><result status="valid" time="0.017460" steps="141"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.70" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035299" steps="178767"/></proof>
+  <proof prover="1"><result status="valid" time="0.035299" steps="178793"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.71" expl="type invariant" proved="true">
-  <proof prover="1"><result status="valid" time="0.018851" steps="50820"/></proof>
+  <proof prover="1"><result status="valid" time="0.018851" steps="50848"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.72" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.128749" steps="24066"/></proof>
+  <proof prover="0"><result status="valid" time="0.128749" steps="24083"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.73" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.238214" steps="803459"/></proof>
+  <proof prover="1"><result status="valid" time="0.238214" steps="803478"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.74" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.026553" steps="117"/></proof>
+  <proof prover="6"><result status="valid" time="0.014586" steps="119"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.75" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.049064" steps="159"/></proof>
+  <proof prover="6"><result status="valid" time="0.060599" steps="161"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.76" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.205650" steps="1227"/></proof>
+  <transf name="split_vc" proved="true" >
+   <goal name="knapsack01_dyn&#39;vc.76.0" expl="loop invariant preservation" proved="true">
+   <proof prover="6"><result status="valid" time="0.085910" steps="1228"/></proof>
+   </goal>
+  </transf>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.77" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.036477" steps="189363"/></proof>
+  <proof prover="0"><result status="valid" time="0.257253" steps="29565"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.78" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.258779" steps="1301"/></proof>
+  <proof prover="1"><result status="valid" time="0.048816" steps="220164"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.79" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034240" steps="183637"/></proof>
+  <proof prover="1"><result status="valid" time="0.034266" steps="190394"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.80" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.014478" steps="183712"/></proof>
+  <proof prover="6"><result status="valid" time="0.015843" steps="189"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.81" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.500832" steps="1231836"/></proof>
+  <proof prover="2"><result status="valid" time="0.372058" steps="57183"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.82" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.022194" steps="131"/></proof>
+  <proof prover="1"><result status="valid" time="0.032934" steps="14799"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.83" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035028" steps="183964"/></proof>
+  <proof prover="6"><result status="valid" time="0.040623" steps="196"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.84" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.048816" steps="213360"/></proof>
+  <proof prover="1"><result status="valid" time="0.048551" steps="220783"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.85" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034266" steps="183590"/></proof>
+  <proof prover="6"><result status="valid" time="0.018515" steps="201"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.86" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.015843" steps="186"/></proof>
+  <proof prover="0"><result status="valid" time="0.107794" steps="24793"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.87" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.664853" steps="57317"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.87" expl="integer overflow" proved="true">
+  <proof prover="6"><result status="valid" time="0.022286" steps="265"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.88" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.032934" steps="14777"/></proof>
+  <proof prover="1"><result status="valid" time="0.355222" steps="1282481"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.89" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.040623" steps="195"/></proof>
+  <proof prover="1"><result status="valid" time="0.035633" steps="14856"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.90" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.048551" steps="213963"/></proof>
+  <proof prover="1"><result status="valid" time="0.035417" steps="191345"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.91" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.018515" steps="198"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.91" expl="integer overflow" proved="true">
+  <proof prover="1"><result status="valid" time="0.362721" steps="1266367"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.92" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.107794" steps="24747"/></proof>
+  <proof prover="6"><result status="valid" time="0.099321" steps="1315"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.93" expl="integer overflow" proved="true">
-  <proof prover="6"><result status="valid" time="0.022286" steps="262"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.93" expl="precondition" proved="true">
+  <proof prover="1"><result status="valid" time="0.034240" steps="190434"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.94" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.737148" steps="1275650"/></proof>
+  <proof prover="1"><result status="valid" time="0.014478" steps="190509"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.95" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035633" steps="14834"/></proof>
+  <proof prover="1"><result status="valid" time="0.346653" steps="1238840"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.96" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035641" steps="184541"/></proof>
+  <proof prover="6"><result status="valid" time="0.022194" steps="135"/></proof>
   </goal>
-  <goal name="knapsack01_dyn&#39;vc.97" expl="integer overflow" proved="true">
-  <proof prover="1"><result status="valid" time="0.680346" steps="1259451"/></proof>
+  <goal name="knapsack01_dyn&#39;vc.97" expl="precondition" proved="true">
+  <proof prover="6"><result status="valid" time="0.033259" steps="196"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.98" expl="integer overflow" proved="true">
-  <proof prover="6"><result status="valid" time="0.070200" steps="944"/></proof>
+  <proof prover="6"><result status="valid" time="0.070200" steps="950"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.99" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.148180" steps="918"/></proof>
+  <proof prover="6"><result status="valid" time="0.148180" steps="925"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.100" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.020097" steps="168"/></proof>
+  <proof prover="6"><result status="valid" time="0.020097" steps="170"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.101" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035901" steps="193851"/></proof>
+  <proof prover="1"><result status="valid" time="0.035901" steps="194336"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.102" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.342224" steps="43989"/></proof>
+  <proof prover="0"><result status="valid" time="0.342224" steps="44227"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.103" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.015268" steps="202"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.104" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.033259" steps="201"/></proof>
+  <proof prover="1"><result status="valid" time="0.035028" steps="196636"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.105" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.035649" steps="198670"/></proof>
+  <proof prover="1"><result status="valid" time="0.035649" steps="199105"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.106" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.263423" steps="36661"/></proof>
+  <proof prover="0"><result status="valid" time="0.263423" steps="36598"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.107" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.014586" steps="231"/></proof>
+  <proof prover="6"><result status="valid" time="0.026553" steps="232"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.108" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.060599" steps="1038"/></proof>
+  <proof prover="6"><result status="valid" time="0.049064" steps="1043"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.109" expl="loop invariant preservation" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="knapsack01_dyn&#39;vc.109.0" expl="loop invariant preservation" proved="true">
-   <transf name="split_vc" proved="true" >
-    <goal name="knapsack01_dyn&#39;vc.109.0.0" expl="loop invariant preservation" proved="true">
-    <proof prover="1"><result status="valid" time="0.868099" steps="1623214"/></proof>
-    </goal>
-    <goal name="knapsack01_dyn&#39;vc.109.0.1" expl="loop invariant preservation" proved="true">
-    <proof prover="0" timelimit="5"><result status="valid" time="0.640925" steps="48540"/></proof>
-    </goal>
-   </transf>
-   </goal>
-  </transf>
+  <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.205650" steps="3492"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.110" expl="loop invariant preservation" proved="true">
-  <proof prover="1" timelimit="5"><result status="valid" time="1.764700" steps="3733295"/></proof>
+  <proof prover="1" timelimit="5"><result status="valid" time="0.778141" steps="2429797"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.111" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.524849" steps="69545"/></proof>
+  <proof prover="1"><result status="valid" time="0.733632" steps="2244080"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/knapsack_full/why3shapes.gz b/creusot/tests/should_succeed/knapsack_full/why3shapes.gz
index 96abf9b3dc4592ecf332b2462638dd49b88f95b3..6c8e7012cf249cd29a64fb46d69e5129182a8f53 100644
GIT binary patch
literal 8521
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
Dqq45@

literal 8611
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

diff --git a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
index fa1b93035d..93e062ce56 100644
--- a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
+++ b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
@@ -21,22 +21,23 @@ module BranchBorrow2_F
   var _8 : ();
   var _11 : borrowed int32;
   var _12 : borrowed int32;
+  var _14 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] [#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] [#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] [#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
     [#"../branch_borrow_2.rs" 8 12 8 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 8 12 8 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 9 12 9 18] y <- Borrow.borrow_mut b;
     [#"../branch_borrow_2.rs" 9 12 9 18] b <-  ^ y;
     [#"../branch_borrow_2.rs" 10 12 10 18] z <- Borrow.borrow_mut c;
     [#"../branch_borrow_2.rs" 10 12 10 18] c <-  ^ z;
-    switch (([#"../branch_borrow_2.rs" 13 10 13 11] [#"../branch_borrow_2.rs" 13 10 13 11] (3 : int32)) = 1)
+    switch ((3 : int32) = 1)
       | True -> goto BB1
-      | False -> switch (([#"../branch_borrow_2.rs" 13 10 13 11] [#"../branch_borrow_2.rs" 13 10 13 11] (3 : int32)) = 2)
+      | False -> switch ((3 : int32) = 2)
         | True -> goto BB2
         | False -> goto BB12
         end
@@ -49,39 +50,40 @@ module BranchBorrow2_F
     goto BB5
   }
   BB3 {
-    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] [#"../branch_borrow_2.rs" 23 17 23 18] (8 : int32)) ; };
+    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] (8 : int32)) ; };
     [#"../branch_borrow_2.rs" 24 16 24 17] _12 <- Borrow.borrow_final ( * z) (Borrow.get_id z);
     [#"../branch_borrow_2.rs" 24 16 24 17] z <- { z with current = ( ^ _12) ; };
     [#"../branch_borrow_2.rs" 24 12 24 17] w <- ([#"../branch_borrow_2.rs" 24 12 24 17] _12);
-    [#"../branch_borrow_2.rs" 24 12 24 17] _12 <- any borrowed int32;
+    _12 <- any borrowed int32;
     [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] ());
     goto BB6
   }
   BB4 {
     assume { resolve0 z };
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] [#"../branch_borrow_2.rs" 15 17 15 18] (6 : int32)) ; };
-    [#"../branch_borrow_2.rs" 16 12 16 17] w <- ([#"../branch_borrow_2.rs" 16 16 16 17] x);
-    [#"../branch_borrow_2.rs" 16 16 16 17] x <- any borrowed int32;
+    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 16 12 16 17] w <- ([#"../branch_borrow_2.rs" 16 12 16 17] x);
+    x <- any borrowed int32;
     [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] ());
     goto BB6
   }
   BB5 {
     assume { resolve0 z };
-    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] [#"../branch_borrow_2.rs" 19 17 19 18] (7 : int32)) ; };
+    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] (7 : int32)) ; };
     [#"../branch_borrow_2.rs" 20 16 20 17] _11 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 20 16 20 17] y <- { y with current = ( ^ _11) ; };
     [#"../branch_borrow_2.rs" 20 12 20 17] w <- ([#"../branch_borrow_2.rs" 20 12 20 17] _11);
-    [#"../branch_borrow_2.rs" 20 12 20 17] _11 <- any borrowed int32;
+    _11 <- any borrowed int32;
     [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] ());
     goto BB6
   }
   BB6 {
-    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] [#"../branch_borrow_2.rs" 28 9 28 10] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] (5 : int32)) ; };
     assume { resolve0 w };
     assume { resolve0 z };
     assume { resolve0 y };
-    switch ([#"../branch_borrow_2.rs" 30 12 30 18] ([#"../branch_borrow_2.rs" 30 12 30 13] c) = ([#"../branch_borrow_2.rs" 30 17 30 18] [#"../branch_borrow_2.rs" 30 17 30 18] (5 : int32)))
+    [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- ([#"../branch_borrow_2.rs" 30 12 30 18] c = (5 : int32));
+    switch (_14)
       | False -> goto BB8
       | True -> goto BB7
       end
@@ -149,6 +151,8 @@ module BranchBorrow2_G
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : (BranchBorrow2_MyInt_Type.t_myint, BranchBorrow2_MyInt_Type.t_myint);
+  var _2 : BranchBorrow2_MyInt_Type.t_myint;
+  var _3 : BranchBorrow2_MyInt_Type.t_myint;
   var b : borrowed (BranchBorrow2_MyInt_Type.t_myint, BranchBorrow2_MyInt_Type.t_myint);
   var c : borrowed (BranchBorrow2_MyInt_Type.t_myint);
   var d : borrowed (BranchBorrow2_MyInt_Type.t_myint);
@@ -156,7 +160,11 @@ module BranchBorrow2_G
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 36 16 36 37] a <- ([#"../branch_borrow_2.rs" 36 16 36 37] (([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 23 36 25] [#"../branch_borrow_2.rs" 36 23 36 25] (10 : usize))), ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 34 36 35] [#"../branch_borrow_2.rs" 36 34 36 35] (5 : usize)))));
+    [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- ([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt (10 : usize));
+    [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt (5 : usize));
+    [#"../branch_borrow_2.rs" 36 16 36 37] a <- ([#"../branch_borrow_2.rs" 36 16 36 37] (_2, _3));
+    _2 <- any BranchBorrow2_MyInt_Type.t_myint;
+    _3 <- any BranchBorrow2_MyInt_Type.t_myint;
     [#"../branch_borrow_2.rs" 37 12 37 18] b <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 37 12 37 18] a <-  ^ b;
     [#"../branch_borrow_2.rs" 39 12 39 20] c <- Borrow.borrow_final (let (_, a) =  * b in a) (Borrow.inherit_id (Borrow.get_id b) 2);
@@ -195,32 +203,32 @@ module BranchBorrow2_H
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] [#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] [#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
     [#"../branch_borrow_2.rs" 49 12 49 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 49 12 49 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 50 12 50 18] y <- Borrow.borrow_mut b;
     [#"../branch_borrow_2.rs" 50 12 50 18] b <-  ^ y;
-    switch ([#"../branch_borrow_2.rs" 52 7 52 11] [#"../branch_borrow_2.rs" 52 7 52 11] true)
+    switch (true)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] [#"../branch_borrow_2.rs" 53 13 53 14] (5 : int32)) ; };
-    [#"../branch_borrow_2.rs" 54 8 54 13] w <- ([#"../branch_borrow_2.rs" 54 12 54 13] x);
-    [#"../branch_borrow_2.rs" 54 12 54 13] x <- any borrowed int32;
+    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 54 8 54 13] w <- ([#"../branch_borrow_2.rs" 54 8 54 13] x);
+    x <- any borrowed int32;
     [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] ());
     goto BB3
   }
   BB2 {
     assume { resolve0 x };
-    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] [#"../branch_borrow_2.rs" 56 13 56 14] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] (6 : int32)) ; };
     [#"../branch_borrow_2.rs" 57 12 57 13] _9 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 57 12 57 13] y <- { y with current = ( ^ _9) ; };
     [#"../branch_borrow_2.rs" 57 8 57 13] w <- ([#"../branch_borrow_2.rs" 57 8 57 13] _9);
-    [#"../branch_borrow_2.rs" 57 8 57 13] _9 <- any borrowed int32;
+    _9 <- any borrowed int32;
     [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] ());
     goto BB3
   }
diff --git a/creusot/tests/should_succeed/lang/const.mlcfg b/creusot/tests/should_succeed/lang/const.mlcfg
index a792facef9..f70cc9cd93 100644
--- a/creusot/tests/should_succeed/lang/const.mlcfg
+++ b/creusot/tests/should_succeed/lang/const.mlcfg
@@ -11,7 +11,7 @@ module Const_Foo
     goto BB0
   }
   BB0 {
-    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] [#"../const.rs" 9 4 9 7] (42 : usize));
+    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] (42 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/float_ops.mlcfg b/creusot/tests/should_succeed/lang/float_ops.mlcfg
index bca734789b..fb0bf00ad0 100644
--- a/creusot/tests/should_succeed/lang/float_ops.mlcfg
+++ b/creusot/tests/should_succeed/lang/float_ops.mlcfg
@@ -10,7 +10,7 @@ module FloatOps_Eq
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] ([#"../float_ops.rs" 6 4 6 7] [#"../float_ops.rs" 6 4 6 7] (1.0 : Float64.t)) .= ([#"../float_ops.rs" 6 11 6 14] [#"../float_ops.rs" 6 11 6 14] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] (1.0 : Float64.t) .= (2.0 : Float64.t));
     return _0
   }
   
@@ -26,7 +26,7 @@ module FloatOps_Lt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] ([#"../float_ops.rs" 11 4 11 7] [#"../float_ops.rs" 11 4 11 7] (1.0 : Float64.t)) .< ([#"../float_ops.rs" 11 10 11 13] [#"../float_ops.rs" 11 10 11 13] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] (1.0 : Float64.t) .< (2.0 : Float64.t));
     return _0
   }
   
@@ -42,7 +42,7 @@ module FloatOps_Le
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] ([#"../float_ops.rs" 16 4 16 7] [#"../float_ops.rs" 16 4 16 7] (1.0 : Float64.t)) .<= ([#"../float_ops.rs" 16 11 16 14] [#"../float_ops.rs" 16 11 16 14] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] (1.0 : Float64.t) .<= (2.0 : Float64.t));
     return _0
   }
   
@@ -58,7 +58,7 @@ module FloatOps_Gt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] ([#"../float_ops.rs" 21 4 21 7] [#"../float_ops.rs" 21 4 21 7] (2.0 : Float64.t)) .> ([#"../float_ops.rs" 21 10 21 13] [#"../float_ops.rs" 21 10 21 13] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] (2.0 : Float64.t) .> (1.0 : Float64.t));
     return _0
   }
   
@@ -74,7 +74,7 @@ module FloatOps_Ge
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] ([#"../float_ops.rs" 26 4 26 7] [#"../float_ops.rs" 26 4 26 7] (2.0 : Float64.t)) .>= ([#"../float_ops.rs" 26 11 26 14] [#"../float_ops.rs" 26 11 26 14] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] (2.0 : Float64.t) .>= (1.0 : Float64.t));
     return _0
   }
   
@@ -90,7 +90,7 @@ module FloatOps_Neg
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] ([#"../float_ops.rs" 31 4 31 8] [#"../float_ops.rs" 31 4 31 8] (-2.0 : Float64.t)) .<= ([#"../float_ops.rs" 31 12 31 15] [#"../float_ops.rs" 31 12 31 15] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] (-2.0 : Float64.t) .<= (1.0 : Float64.t));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/literals.mlcfg b/creusot/tests/should_succeed/lang/literals.mlcfg
index 5fa569fbe6..9d41184fea 100644
--- a/creusot/tests/should_succeed/lang/literals.mlcfg
+++ b/creusot/tests/should_succeed/lang/literals.mlcfg
@@ -6,22 +6,27 @@ module Literals_FloatOperation
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Float32.t;
   var x : Float32.t;
+  var _2 : bool;
+  var _3 : Float32.t;
   {
     goto BB0
   }
   BB0 {
-    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] [#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
-    switch ([#"../literals.rs" 6 7 6 24] ([#"../literals.rs" 6 7 6 17] ([#"../literals.rs" 6 7 6 8] x) .+ ([#"../literals.rs" 6 11 6 17] [#"../literals.rs" 6 11 6 17] (0x1.020c40000000p0 : Float32.t))) .= ([#"../literals.rs" 6 21 6 24] [#"../literals.rs" 6 21 6 24] (2.0 : Float32.t)))
+    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
+    [#"../literals.rs" 6 7 6 17] _3 <- ([#"../literals.rs" 6 7 6 17] x .+ (0x1.020c40000000p0 : Float32.t));
+    [#"../literals.rs" 6 7 6 24] _2 <- ([#"../literals.rs" 6 7 6 24] _3 .= (2.0 : Float32.t));
+    _3 <- any Float32.t;
+    switch (_2)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] ([#"../literals.rs" 7 8 7 11] [#"../literals.rs" 7 8 7 11] (3.0 : Float32.t)) .- ([#"../literals.rs" 7 14 7 17] [#"../literals.rs" 7 14 7 17] (1.0 : Float32.t)));
+    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] (3.0 : Float32.t) .- (1.0 : Float32.t));
     goto BB3
   }
   BB2 {
-    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] [#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
+    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/lang/modules.mlcfg b/creusot/tests/should_succeed/lang/modules.mlcfg
index a353e82c30..b99b2775c1 100644
--- a/creusot/tests/should_succeed/lang/modules.mlcfg
+++ b/creusot/tests/should_succeed/lang/modules.mlcfg
@@ -25,7 +25,7 @@ module Modules_Nested_InnerFunc
   BB0 {
     [#"../modules.rs" 14 16 14 28] _2 <- ([#"../modules.rs" 14 16 14 28] Modules_Nested_Nested_Type.C_Test);
     assume { resolve0 _2 };
-    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] [#"../modules.rs" 15 8 15 12] true);
+    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] true);
     return _0
   }
   
@@ -38,7 +38,7 @@ module Modules_Nested_Further_Another
     goto BB0
   }
   BB0 {
-    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] [#"../modules.rs" 20 12 20 17] false);
+    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] false);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/move_path.mlcfg b/creusot/tests/should_succeed/lang/move_path.mlcfg
index bebe98b778..47fdd9eba6 100644
--- a/creusot/tests/should_succeed/lang/move_path.mlcfg
+++ b/creusot/tests/should_succeed/lang/move_path.mlcfg
@@ -19,14 +19,14 @@ module MovePath_F
     goto BB0
   }
   BB0 {
-    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] [#"../move_path.rs" 4 16 4 17] (1 : int32));
+    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] (1 : int32));
     [#"../move_path.rs" 6 12 6 18] y <- Borrow.borrow_mut x;
     [#"../move_path.rs" 6 12 6 18] x <-  ^ y;
     [#"../move_path.rs" 7 12 7 13] d <- ([#"../move_path.rs" 7 12 7 13] y);
-    [#"../move_path.rs" 7 12 7 13] y <- any borrowed int32;
+    y <- any borrowed int32;
     [#"../move_path.rs" 8 12 8 13] z <- ([#"../move_path.rs" 8 12 8 13] d);
-    [#"../move_path.rs" 8 12 8 13] d <- any borrowed int32;
-    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] [#"../move_path.rs" 10 17 10 18] (2 : int32)) ; };
+    d <- any borrowed int32;
+    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] (2 : int32)) ; };
     assume { resolve0 z };
     [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
index 6ad2202d29..e6ae9886b7 100644
--- a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
+++ b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
@@ -13,10 +13,10 @@ module MultipleScopes_MultipleScopes
     goto BB0
   }
   BB0 {
-    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] [#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
-    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] [#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
-    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] [#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
-    [#"../multiple_scopes.rs" 9 8 9 15] _x <- ([#"../multiple_scopes.rs" 9 13 9 15] _y1);
+    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
+    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
+    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
+    [#"../multiple_scopes.rs" 9 8 9 15] _x <- ([#"../multiple_scopes.rs" 9 8 9 15] _y1);
     [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
index 1ee6a720cd..d1c5522c1c 100644
--- a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
+++ b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
@@ -22,10 +22,10 @@ module PromotedConstants_PromotedNone
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 28 6 30] [#"../promoted_constants.rs" 6 28 6 30] (43 : int32)) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0
+    let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some (43 : int32) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0
   let constant promoted1 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 17 6 19] [#"../promoted_constants.rs" 6 17 6 19] (42 : int32)) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0
+    let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some (42 : int32) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0
   let rec cfg promoted_none [#"../promoted_constants.rs" 3 0 3 22] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -38,10 +38,10 @@ module PromotedConstants_PromotedNone
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 4 19 4 20] [#"../promoted_constants.rs" 4 19 4 20] (0 : int32)));
-    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] [#"../promoted_constants.rs" 6 11 6 20] promoted1);
-    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] [#"../promoted_constants.rs" 6 22 6 31] promoted0);
-    [#"../promoted_constants.rs" 6 10 6 32] _2 <- ([#"../promoted_constants.rs" 6 10 6 32] (([#"../promoted_constants.rs" 6 11 6 20] _11), ([#"../promoted_constants.rs" 6 22 6 31] _10)));
+    [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some (0 : int32));
+    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] promoted1);
+    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] promoted0);
+    [#"../promoted_constants.rs" 6 10 6 32] _2 <- ([#"../promoted_constants.rs" 6 10 6 32] (_11, _10));
     switch (let (a, _) = _2 in a)
       | Core_Option_Option_Type.C_None -> goto BB1
       | _ -> goto BB6
@@ -76,20 +76,22 @@ module PromotedConstants_PromotedInt
   use prelude.Int32
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 12 0 12 21]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _2 = [#"../promoted_constants.rs" 13 15 13 20] ([#"../promoted_constants.rs" 13 15 13 16] [#"../promoted_constants.rs" 13 15 13 16] (1 : int32)) + ([#"../promoted_constants.rs" 13 19 13 20] [#"../promoted_constants.rs" 13 19 13 20] (5 : int32)) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + ([#"../promoted_constants.rs" 13 23 13 25] [#"../promoted_constants.rs" 13 23 13 25] (10 : int32)) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0
+    let _2 = [#"../promoted_constants.rs" 13 15 13 20] (1 : int32) + (5 : int32) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + (10 : int32) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0
   let rec cfg promoted_int [#"../promoted_constants.rs" 12 0 12 21] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var ix : int32;
+  var _4 : bool;
   var _9 : int32;
   {
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] [#"../promoted_constants.rs" 13 13 13 26] promoted0);
+    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] promoted0);
     [#"../promoted_constants.rs" 13 13 13 26] ix <- ([#"../promoted_constants.rs" 13 13 13 26] _9);
-    switch ([#"../promoted_constants.rs" 15 7 15 16] ([#"../promoted_constants.rs" 15 7 15 10] ix) <> ([#"../promoted_constants.rs" 15 14 15 16] [#"../promoted_constants.rs" 15 14 15 16] (16 : int32)))
+    [#"../promoted_constants.rs" 15 7 15 16] _4 <- ([#"../promoted_constants.rs" 15 7 15 16] ix <> (16 : int32));
+    switch (_4)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -180,7 +182,7 @@ module PromotedConstants_Str
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] [#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
     [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/lang/unary_op.mlcfg b/creusot/tests/should_succeed/lang/unary_op.mlcfg
index fc10b391f0..658fdcaece 100644
--- a/creusot/tests/should_succeed/lang/unary_op.mlcfg
+++ b/creusot/tests/should_succeed/lang/unary_op.mlcfg
@@ -7,7 +7,7 @@ module UnaryOp_F
     goto BB0
   }
   BB0 {
-    switch ([#"../unary_op.rs" 5 13 5 18] [#"../unary_op.rs" 5 13 5 18] false)
+    switch (false)
       | False -> goto BB2
       | True -> goto BB1
       end
diff --git a/creusot/tests/should_succeed/lang/while_let.mlcfg b/creusot/tests/should_succeed/lang/while_let.mlcfg
index ed500058c6..fd16a49e54 100644
--- a/creusot/tests/should_succeed/lang/while_let.mlcfg
+++ b/creusot/tests/should_succeed/lang/while_let.mlcfg
@@ -20,11 +20,12 @@ module WhileLet_F
   var _0 : ();
   var a : Core_Option_Option_Type.t_option int32;
   var b : borrowed (Core_Option_Option_Type.t_option int32);
+  var _6 : Core_Option_Option_Type.t_option int32;
   {
     goto BB0
   }
   BB0 {
-    [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some ([#"../while_let.rs" 5 21 5 23] [#"../while_let.rs" 5 21 5 23] (10 : int32)));
+    [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some (10 : int32));
     [#"../while_let.rs" 6 12 6 18] b <- Borrow.borrow_mut a;
     [#"../while_let.rs" 6 12 6 18] a <-  ^ b;
     goto BB1
@@ -43,7 +44,9 @@ module WhileLet_F
     goto BB4
   }
   BB4 {
-    [#"../while_let.rs" 10 8 10 17] b <- { b with current = ([#"../while_let.rs" 10 13 10 17] Core_Option_Option_Type.C_None) ; };
+    [#"../while_let.rs" 10 13 10 17] _6 <- ([#"../while_let.rs" 10 13 10 17] Core_Option_Option_Type.C_None);
+    [#"../while_let.rs" 10 8 10 17] b <- { b with current = ([#"../while_let.rs" 10 8 10 17] _6) ; };
+    _6 <- any Core_Option_Option_Type.t_option int32;
     goto BB1
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg
index dfacf48032..63d4c7f073 100644
--- a/creusot/tests/should_succeed/list_index_mut.mlcfg
+++ b/creusot/tests/should_succeed/list_index_mut.mlcfg
@@ -138,6 +138,7 @@ module ListIndexMut_IndexMut
   var _3 : borrowed uint32;
   var old_l : Snapshot.snap_ty (borrowed (ListIndexMut_List_Type.t_list));
   var old_ix : Snapshot.snap_ty usize;
+  var _20 : bool;
   var _22 : borrowed (ListIndexMut_List_Type.t_list);
   var _23 : borrowed (ListIndexMut_List_Type.t_list);
   var _24 : Core_Option_Option_Type.t_option (borrowed (ListIndexMut_List_Type.t_list));
@@ -166,7 +167,8 @@ module ListIndexMut_IndexMut
     goto BB4
   }
   BB4 {
-    switch ([#"../list_index_mut.rs" 49 10 49 16] ([#"../list_index_mut.rs" 49 10 49 12] ix) > ([#"../list_index_mut.rs" 49 15 49 16] [#"../list_index_mut.rs" 49 15 49 16] (0 : usize)))
+    [#"../list_index_mut.rs" 49 10 49 16] _20 <- ([#"../list_index_mut.rs" 49 10 49 16] ix > (0 : usize));
+    switch (_20)
       | False -> goto BB8
       | True -> goto BB5
       end
@@ -188,9 +190,9 @@ module ListIndexMut_IndexMut
     [#"../list_index_mut.rs" 50 12 50 33] _23 <- { _23 with current = ( ^ _22) ; };
     assume { resolve1 l };
     [#"../list_index_mut.rs" 50 8 50 33] l <- ([#"../list_index_mut.rs" 50 8 50 33] _22);
-    [#"../list_index_mut.rs" 50 8 50 33] _22 <- any borrowed (ListIndexMut_List_Type.t_list);
+    _22 <- any borrowed (ListIndexMut_List_Type.t_list);
     assume { resolve2 _23 };
-    [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - ([#"../list_index_mut.rs" 52 14 52 15] [#"../list_index_mut.rs" 52 14 52 15] (1 : usize)));
+    [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - (1 : usize));
     goto BB3
   }
   BB8 {
@@ -273,12 +275,12 @@ module ListIndexMut_Write
   BB0 {
     [#"../list_index_mut.rs" 64 15 64 16] _10 <- Borrow.borrow_final ( * l) (Borrow.get_id l);
     [#"../list_index_mut.rs" 64 15 64 16] l <- { l with current = ( ^ _10) ; };
-    [#"../list_index_mut.rs" 64 5 64 21] _9 <- ([#"../list_index_mut.rs" 64 5 64 21] index_mut0 _10 ([#"../list_index_mut.rs" 64 18 64 20] ix));
+    [#"../list_index_mut.rs" 64 5 64 21] _9 <- ([#"../list_index_mut.rs" 64 5 64 21] index_mut0 _10 ix);
     _10 <- any borrowed (ListIndexMut_List_Type.t_list);
     goto BB1
   }
   BB1 {
-    [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = ([#"../list_index_mut.rs" 64 24 64 25] v) ; };
+    [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = ([#"../list_index_mut.rs" 64 4 64 25] v) ; };
     assume { resolve0 _9 };
     assume { resolve1 l };
     [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] ());
@@ -331,6 +333,9 @@ module ListIndexMut_F
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var l : ListIndexMut_List_Type.t_list;
+  var _2 : Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
+  var _4 : ListIndexMut_List_Type.t_list;
+  var _5 : Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
   var _6 : ();
   var _7 : borrowed (ListIndexMut_List_Type.t_list);
   var _8 : borrowed (ListIndexMut_List_Type.t_list);
@@ -338,16 +343,22 @@ module ListIndexMut_F
     goto BB0
   }
   BB0 {
+    [#"../list_index_mut.rs" 68 47 68 51] _5 <- ([#"../list_index_mut.rs" 68 47 68 51] Core_Option_Option_Type.C_None);
+    [#"../list_index_mut.rs" 68 38 68 52] _4 <- ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List (10 : uint32) _5);
+    _5 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB1
   }
   BB1 {
     goto BB2
   }
   BB2 {
+    [#"../list_index_mut.rs" 68 24 68 54] _2 <- ([#"../list_index_mut.rs" 68 24 68 54] Core_Option_Option_Type.C_Some _4);
+    _4 <- any ListIndexMut_List_Type.t_list;
     goto BB3
   }
   BB3 {
-    [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 21 68 22] [#"../list_index_mut.rs" 68 21 68 22] (1 : uint32)) ([#"../list_index_mut.rs" 68 24 68 54] Core_Option_Option_Type.C_Some ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 43 68 45] [#"../list_index_mut.rs" 68 43 68 45] (10 : uint32)) ([#"../list_index_mut.rs" 68 47 68 51] Core_Option_Option_Type.C_None))));
+    [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List (1 : uint32) _2);
+    _2 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB4
   }
   BB4 {
@@ -355,7 +366,7 @@ module ListIndexMut_F
     [#"../list_index_mut.rs" 69 10 69 16] l <-  ^ _8;
     [#"../list_index_mut.rs" 69 10 69 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../list_index_mut.rs" 69 10 69 16] _8 <- { _8 with current = ( ^ _7) ; };
-    [#"../list_index_mut.rs" 69 4 69 23] _6 <- ([#"../list_index_mut.rs" 69 4 69 23] write0 _7 ([#"../list_index_mut.rs" 69 18 69 19] [#"../list_index_mut.rs" 69 18 69 19] (0 : usize)) ([#"../list_index_mut.rs" 69 21 69 22] [#"../list_index_mut.rs" 69 21 69 22] (2 : uint32)));
+    [#"../list_index_mut.rs" 69 4 69 23] _6 <- ([#"../list_index_mut.rs" 69 4 69 23] write0 _7 (0 : usize) (2 : uint32));
     _7 <- any borrowed (ListIndexMut_List_Type.t_list);
     goto BB5
   }
diff --git a/creusot/tests/should_succeed/list_index_mut/why3session.xml b/creusot/tests/should_succeed/list_index_mut/why3session.xml
index 7236aee344..a7d03fcecf 100644
--- a/creusot/tests/should_succeed/list_index_mut/why3session.xml
+++ b/creusot/tests/should_succeed/list_index_mut/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="list_index_mut.mlcfg"/>
 <theory name="ListIndexMut_IndexMut" proved="true">
  <goal name="index_mut&#39;vc" expl="VC for index_mut" proved="true">
- <proof prover="0"><result status="valid" time="0.098784" steps="2325"/></proof>
+ <proof prover="0"><result status="valid" time="0.229601" steps="3909"/></proof>
  </goal>
 </theory>
 <theory name="ListIndexMut_Write" proved="true">
@@ -17,7 +17,7 @@
 </theory>
 <theory name="ListIndexMut_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="0"><result status="valid" time="0.009247" steps="66"/></proof>
+ <proof prover="0"><result status="valid" time="0.009247" steps="86"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/list_index_mut/why3shapes.gz b/creusot/tests/should_succeed/list_index_mut/why3shapes.gz
index 53c1b2df3779ed9f430a1759a3ce1913c6a1b57d..623415d5847fad4da31e274035e1b83687ede508 100644
GIT binary patch
literal 748
zcmV<I0u%ioiwFP!00000|9w>3irX*{efL-RZCgV@7wh7(c~}A_fwC_JJ+4t=xohg!
zZIa#X=XZ3Cl9Uo+q?yq<GdeT+RF$V!{mY!ncXK?A%lx(EW%ao@|JLLDP84dx5-S{+
zNRhT!uk}j*FlVGIMHRt*{o>Z!XT7qf^U{s;S=CSa(QYR*yJ*<1_5gz0C%|x4IG4Fs
zdfk0r4hGD)Nx&Ig3aC;*l?80|(VUj)-9XZp4KSi?gT>ZniS%wc9+wZ(KOBB~!eN~C
zq%hZG58u{?;YML;SI#CaW#_y$m&#hI6e?~Jc|^qSH1=U!VU`eCLc{@)*-r?quMpSW
zxAAngz)&6y*uuhyHaL}n)2==ngAxq_`CiR&v{aE%>?0-86P)erT>?_8r;|w{zre}a
z92HYkgbU9sPH=EQD^1h#(H)lFOjvO%Jea+*F+Rvog-a`{TPrG)l6K=UWfYZqFqzt<
zjyN)FqsVbXxy|~l&Ji;H3(-x*|ETKH`FF>v{~UYFf^W*uZ(!&3gZEnHC|A@sNbX|#
zOTL$TJ4EB$?UuK>KixS~zY|5NLxrm)Z8jjplhK=|r6e>KMYeOO>mjfz>UvUFg<6-x
zaxBNWH-Ear+qt;h3Q}omVd;cyV(Hk**u?Tt5V6Uh0+e~<q$`pT6Vmpa)xomSmNr+J
zSER`GoY(-N_@x6YRoejw9Cq!}#^@?<oKlP32g8+RUT5y?5#tFrL(ASUo^nY3HtUx3
za@IC&cB51sDswt{nLy(>@-&V)@<UGTwSw~=9A5e$=?6Rzrbr?CRJ6FeSKt?cpIJI~
zb+cgLk)L^f4u2oSRP8${rVF|G*J}@5=?o-_AKt;_N1;#zmgi+QDfOW!8r1WqVP>Fo
z*JDkIAd>PL553t5Em2u-=!R_Y1{H{rnht^uqUVTd+SIVn4Q7aNiT9-B8&+tIxsj|v
e91T=JOtT|RBjHB`XBwAsBZ|Lm#}=4J2LJ$ppLUA?

literal 727
zcmV;|0x10-iwFP!00000|BX~jYuqppzWZ1Bmex?vTUN;)!h+d_l1o9y7_BWgre3@C
zI!S+iC0WvHowoEMMl+*tUZ3VekzbzG4}HmB^?d24@pI1d;$yb_RQ>phB&fUyB@7~v
zsLJ}i+Np1P0jiK#BCyI&PCh=WomDMU-H(eT59;1t2R%A(bKNxt1XK?O!)eXC#Jp4c
z`s;MoMh(jdoWMngB03a_!%@xpG7YcVB#q+*NGQ?^JDMz^P^W30r#Ic+oxiUEyM9!I
zgjDsdIV<N@O31C`blirloz>=2SWOXK*%pxoMBrY7)s0F>A|i>1z#|fScvpObxUawT
zm&F2`B9O=C7KT^eD5ZJL-CH0<h$77Jp7q?@Kp`G);2Kb<!91*OBY72P`(&PsdX`jT
z=KGvz+?<WUFlZR2xB5J_dVrGIc^maQ(BSW<j+sj*3>8bv;{fet#pGd@m^v^X*%8=-
zdBUC$V-xb2&<m#sN&IV|O~rqx>Pq-`&x(IMyHA`qWvCaUXXI|R+JRxy*p(NliKtKM
zy=<VVz8~w;^fI=Wcg9F_Br$TRrnRt2{smftp$%6t^n60XG6p&B7_G#PiZ*kbzR_oL
zpLf%o_hYMn)#sNbySB%0E;QJPZlWUe0NQzq&<EhBDbiH{5^MPB5=F#_bX<~xX!5m7
zn{=6$CO7}YI&hg#v5>_6Pang|E^P>I@`f=r;uD8AON=DuWQnneo1i5-jKv(Hy-H{U
zBdSfCZbn9YWp25w3xh};{yYvJ-R~7_+iHyO!9g79n^_S$i!KfLulUFj=CAS5HU8>^
zB=nSmK5gK)R|7+9!rfXPr%}fgyDVdr63#o&oftc{f@y#NK}5h(a3QeH$pIhG0UkgG
zC?dGywBs!URAE7kpai4<u@W{YX9t=QtWQnXf({4*2rV1c!V{up#}E~qHhFpA*>6#S
Jj599>004z9VmJT*

diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index a3f62bf56b..d87a7114c1 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -179,7 +179,7 @@ module ListReversalLasso_Impl1_Index
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 31 15 31 18] _6 <- ([#"../list_reversal_lasso.rs" 31 15 31 18] index0 ([#"../list_reversal_lasso.rs" 31 9 31 15] ListReversalLasso_Memory_Type.memory_0 self) ([#"../list_reversal_lasso.rs" 31 16 31 17] i));
+    [#"../list_reversal_lasso.rs" 31 15 31 18] _6 <- ([#"../list_reversal_lasso.rs" 31 15 31 18] index0 (ListReversalLasso_Memory_Type.memory_0 self) i);
     goto BB1
   }
   BB1 {
@@ -343,7 +343,7 @@ module ListReversalLasso_Impl2_IndexMut
   BB0 {
     [#"../list_reversal_lasso.rs" 42 13 42 19] _11 <- Borrow.borrow_final (ListReversalLasso_Memory_Type.memory_0 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../list_reversal_lasso.rs" 42 13 42 19] self <- { self with current = (let ListReversalLasso_Memory_Type.C_Memory x0 =  * self in ListReversalLasso_Memory_Type.C_Memory ( ^ _11)) ; };
-    [#"../list_reversal_lasso.rs" 42 19 42 22] _10 <- ([#"../list_reversal_lasso.rs" 42 19 42 22] index_mut0 _11 ([#"../list_reversal_lasso.rs" 42 20 42 21] i));
+    [#"../list_reversal_lasso.rs" 42 19 42 22] _10 <- ([#"../list_reversal_lasso.rs" 42 19 42 22] index_mut0 _11 i);
     _11 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     goto BB1
   }
@@ -444,7 +444,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     ensures { result = resolve0 self }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
@@ -461,6 +461,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
   var self : borrowed (ListReversalLasso_Memory_Type.t_memory) = self;
   var l : usize = l;
   var r : usize;
+  var _12 : bool;
   var tmp : usize;
   var _16 : usize;
   var _20 : borrowed usize;
@@ -469,7 +470,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] [#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
     goto BB1
   }
   BB1 {
@@ -479,28 +480,29 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB2
   }
   BB2 {
-    switch ([#"../list_reversal_lasso.rs" 71 14 71 23] ([#"../list_reversal_lasso.rs" 71 14 71 15] l) <> ([#"../list_reversal_lasso.rs" 71 19 71 23] [#"../list_reversal_lasso.rs" 71 19 71 23] (18446744073709551615 : usize)))
+    [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- ([#"../list_reversal_lasso.rs" 71 14 71 23] l <> (18446744073709551615 : usize));
+    switch (_12)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
     [#"../list_reversal_lasso.rs" 72 22 72 23] tmp <- ([#"../list_reversal_lasso.rs" 72 22 72 23] l);
-    [#"../list_reversal_lasso.rs" 73 20 73 23] _16 <- ([#"../list_reversal_lasso.rs" 73 20 73 23] index0 ([#"../list_reversal_lasso.rs" 73 16 73 20]  * self) ([#"../list_reversal_lasso.rs" 73 21 73 22] l));
+    [#"../list_reversal_lasso.rs" 73 20 73 23] _16 <- ([#"../list_reversal_lasso.rs" 73 20 73 23] index0 ( * self) l);
     goto BB4
   }
   BB4 {
-    [#"../list_reversal_lasso.rs" 73 12 73 23] l <- ([#"../list_reversal_lasso.rs" 73 16 73 23] _16);
+    [#"../list_reversal_lasso.rs" 73 12 73 23] l <- ([#"../list_reversal_lasso.rs" 73 12 73 23] _16);
     [#"../list_reversal_lasso.rs" 74 12 74 16] _21 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 74 12 74 16] self <- { self with current = ( ^ _21) ; };
-    [#"../list_reversal_lasso.rs" 74 16 74 21] _20 <- ([#"../list_reversal_lasso.rs" 74 16 74 21] index_mut0 _21 ([#"../list_reversal_lasso.rs" 74 17 74 20] tmp));
+    [#"../list_reversal_lasso.rs" 74 16 74 21] _20 <- ([#"../list_reversal_lasso.rs" 74 16 74 21] index_mut0 _21 tmp);
     _21 <- any borrowed (ListReversalLasso_Memory_Type.t_memory);
     goto BB5
   }
   BB5 {
-    [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = ([#"../list_reversal_lasso.rs" 74 24 74 25] r) ; };
+    [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = ([#"../list_reversal_lasso.rs" 74 12 74 25] r) ; };
     assume { resolve1 _20 };
-    [#"../list_reversal_lasso.rs" 75 12 75 19] r <- ([#"../list_reversal_lasso.rs" 75 16 75 19] tmp);
+    [#"../list_reversal_lasso.rs" 75 12 75 19] r <- ([#"../list_reversal_lasso.rs" 75 12 75 19] tmp);
     goto BB1
   }
   BB6 {
@@ -606,7 +608,7 @@ module ListReversalLasso_Impl4_ListReversalList
     ensures { result = list_seg0 self first s last l h }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
@@ -655,6 +657,7 @@ module ListReversalLasso_Impl4_ListReversalList
   var s : Snapshot.snap_ty (Seq.seq usize) = s;
   var r : usize;
   var n : Snapshot.snap_ty int;
+  var _15 : bool;
   var _17 : usize;
   var _18 : borrowed usize;
   var _19 : borrowed usize;
@@ -668,7 +671,7 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] [#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 101 20 101 35] n <- ([#"../list_reversal_lasso.rs" 101 20 101 35] Snapshot.new 0);
     goto BB1
   }
@@ -682,7 +685,8 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB3
   }
   BB3 {
-    switch ([#"../list_reversal_lasso.rs" 107 14 107 23] ([#"../list_reversal_lasso.rs" 107 14 107 15] l) <> ([#"../list_reversal_lasso.rs" 107 19 107 23] [#"../list_reversal_lasso.rs" 107 19 107 23] (18446744073709551615 : usize)))
+    [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- ([#"../list_reversal_lasso.rs" 107 14 107 23] l <> (18446744073709551615 : usize));
+    switch (_15)
       | False -> goto BB9
       | True -> goto BB4
       end
@@ -690,7 +694,7 @@ module ListReversalLasso_Impl4_ListReversalList
   BB4 {
     [#"../list_reversal_lasso.rs" 108 39 108 43] _21 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 108 39 108 43] self <- { self with current = ( ^ _21) ; };
-    [#"../list_reversal_lasso.rs" 108 43 108 46] _20 <- ([#"../list_reversal_lasso.rs" 108 43 108 46] index_mut0 _21 ([#"../list_reversal_lasso.rs" 108 44 108 45] l));
+    [#"../list_reversal_lasso.rs" 108 43 108 46] _20 <- ([#"../list_reversal_lasso.rs" 108 43 108 46] index_mut0 _21 l);
     _21 <- any borrowed (ListReversalLasso_Memory_Type.t_memory);
     goto BB5
   }
@@ -703,7 +707,7 @@ module ListReversalLasso_Impl4_ListReversalList
     [#"../list_reversal_lasso.rs" 108 66 108 72] r <-  ^ _25;
     [#"../list_reversal_lasso.rs" 108 66 108 72] _24 <- Borrow.borrow_final ( * _25) (Borrow.get_id _25);
     [#"../list_reversal_lasso.rs" 108 66 108 72] _25 <- { _25 with current = ( ^ _24) ; };
-    [#"../list_reversal_lasso.rs" 108 48 108 76] _23 <- ([#"../list_reversal_lasso.rs" 108 48 108 76] replace0 _24 ([#"../list_reversal_lasso.rs" 108 74 108 75] l));
+    [#"../list_reversal_lasso.rs" 108 48 108 76] _23 <- ([#"../list_reversal_lasso.rs" 108 48 108 76] replace0 _24 l);
     _24 <- any borrowed usize;
     goto BB6
   }
@@ -718,13 +722,13 @@ module ListReversalLasso_Impl4_ListReversalList
     assume { resolve1 _20 };
     assume { resolve1 _19 };
     [#"../list_reversal_lasso.rs" 108 12 108 77] l <- ([#"../list_reversal_lasso.rs" 108 12 108 77] _17);
-    [#"../list_reversal_lasso.rs" 108 12 108 77] _17 <- any usize;
+    _17 <- any usize;
     [#"../list_reversal_lasso.rs" 109 16 109 36] _27 <- ([#"../list_reversal_lasso.rs" 109 16 109 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
     [#"../list_reversal_lasso.rs" 109 12 109 36] n <- ([#"../list_reversal_lasso.rs" 109 12 109 36] _27);
-    [#"../list_reversal_lasso.rs" 109 12 109 36] _27 <- any Snapshot.snap_ty int;
+    _27 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
@@ -873,7 +877,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     ensures { result = index_logic0 self ix }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   use prelude.Snapshot
   use prelude.Snapshot
   let rec cfg list_reversal_loop [#"../list_reversal_lasso.rs" 125 4 125 82] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Snapshot.snap_ty (Seq.seq usize)) : usize
@@ -888,6 +892,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
   var s : Snapshot.snap_ty (Seq.seq usize) = s;
   var r : usize;
   var n : Snapshot.snap_ty int;
+  var _17 : bool;
   var _21 : usize;
   var _22 : borrowed usize;
   var _23 : borrowed usize;
@@ -901,7 +906,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] [#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 127 20 127 35] n <- ([#"../list_reversal_lasso.rs" 127 20 127 35] Snapshot.new 0);
     goto BB1
   }
@@ -916,7 +921,8 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB3
   }
   BB3 {
-    switch ([#"../list_reversal_lasso.rs" 137 14 137 23] ([#"../list_reversal_lasso.rs" 137 14 137 15] l) <> ([#"../list_reversal_lasso.rs" 137 19 137 23] [#"../list_reversal_lasso.rs" 137 19 137 23] (18446744073709551615 : usize)))
+    [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- ([#"../list_reversal_lasso.rs" 137 14 137 23] l <> (18446744073709551615 : usize));
+    switch (_17)
       | False -> goto BB9
       | True -> goto BB4
       end
@@ -925,7 +931,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 138 12 138 77] Snapshot.inner n = Seq.length (Snapshot.inner s) -> l = Seq.get (Reverse.reverse (Snapshot.inner s)) (Seq.length (Snapshot.inner s) - 1) };
     [#"../list_reversal_lasso.rs" 139 39 139 43] _25 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 139 39 139 43] self <- { self with current = ( ^ _25) ; };
-    [#"../list_reversal_lasso.rs" 139 43 139 46] _24 <- ([#"../list_reversal_lasso.rs" 139 43 139 46] index_mut0 _25 ([#"../list_reversal_lasso.rs" 139 44 139 45] l));
+    [#"../list_reversal_lasso.rs" 139 43 139 46] _24 <- ([#"../list_reversal_lasso.rs" 139 43 139 46] index_mut0 _25 l);
     _25 <- any borrowed (ListReversalLasso_Memory_Type.t_memory);
     goto BB5
   }
@@ -938,7 +944,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     [#"../list_reversal_lasso.rs" 139 66 139 72] r <-  ^ _29;
     [#"../list_reversal_lasso.rs" 139 66 139 72] _28 <- Borrow.borrow_final ( * _29) (Borrow.get_id _29);
     [#"../list_reversal_lasso.rs" 139 66 139 72] _29 <- { _29 with current = ( ^ _28) ; };
-    [#"../list_reversal_lasso.rs" 139 48 139 76] _27 <- ([#"../list_reversal_lasso.rs" 139 48 139 76] replace0 _28 ([#"../list_reversal_lasso.rs" 139 74 139 75] l));
+    [#"../list_reversal_lasso.rs" 139 48 139 76] _27 <- ([#"../list_reversal_lasso.rs" 139 48 139 76] replace0 _28 l);
     _28 <- any borrowed usize;
     goto BB6
   }
@@ -953,13 +959,13 @@ module ListReversalLasso_Impl4_ListReversalLoop
     assume { resolve1 _24 };
     assume { resolve1 _23 };
     [#"../list_reversal_lasso.rs" 139 12 139 77] l <- ([#"../list_reversal_lasso.rs" 139 12 139 77] _21);
-    [#"../list_reversal_lasso.rs" 139 12 139 77] _21 <- any usize;
+    _21 <- any usize;
     [#"../list_reversal_lasso.rs" 140 16 140 36] _31 <- ([#"../list_reversal_lasso.rs" 140 16 140 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
     [#"../list_reversal_lasso.rs" 140 12 140 36] n <- ([#"../list_reversal_lasso.rs" 140 12 140 36] _31);
-    [#"../list_reversal_lasso.rs" 140 12 140 36] _31 <- any Snapshot.snap_ty int;
+    _31 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
@@ -1107,7 +1113,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     ensures { result = resolve0 self }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   use seq.Reverse
   use prelude.Snapshot
   function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize =
@@ -1129,6 +1135,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
   var s2 : Snapshot.snap_ty (Seq.seq usize) = s2;
   var r : usize;
   var n : Snapshot.snap_ty int;
+  var _17 : bool;
   var _19 : usize;
   var _20 : borrowed usize;
   var _21 : borrowed usize;
@@ -1142,7 +1149,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] [#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 170 20 170 35] n <- ([#"../list_reversal_lasso.rs" 170 20 170 35] Snapshot.new 0);
     goto BB1
   }
@@ -1165,7 +1172,8 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB3
   }
   BB3 {
-    switch ([#"../list_reversal_lasso.rs" 190 14 190 23] ([#"../list_reversal_lasso.rs" 190 14 190 15] l) <> ([#"../list_reversal_lasso.rs" 190 19 190 23] [#"../list_reversal_lasso.rs" 190 19 190 23] (18446744073709551615 : usize)))
+    [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- ([#"../list_reversal_lasso.rs" 190 14 190 23] l <> (18446744073709551615 : usize));
+    switch (_17)
       | False -> goto BB9
       | True -> goto BB4
       end
@@ -1173,7 +1181,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
   BB4 {
     [#"../list_reversal_lasso.rs" 191 39 191 43] _23 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 191 39 191 43] self <- { self with current = ( ^ _23) ; };
-    [#"../list_reversal_lasso.rs" 191 43 191 46] _22 <- ([#"../list_reversal_lasso.rs" 191 43 191 46] index_mut0 _23 ([#"../list_reversal_lasso.rs" 191 44 191 45] l));
+    [#"../list_reversal_lasso.rs" 191 43 191 46] _22 <- ([#"../list_reversal_lasso.rs" 191 43 191 46] index_mut0 _23 l);
     _23 <- any borrowed (ListReversalLasso_Memory_Type.t_memory);
     goto BB5
   }
@@ -1186,7 +1194,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     [#"../list_reversal_lasso.rs" 191 66 191 72] r <-  ^ _27;
     [#"../list_reversal_lasso.rs" 191 66 191 72] _26 <- Borrow.borrow_final ( * _27) (Borrow.get_id _27);
     [#"../list_reversal_lasso.rs" 191 66 191 72] _27 <- { _27 with current = ( ^ _26) ; };
-    [#"../list_reversal_lasso.rs" 191 48 191 76] _25 <- ([#"../list_reversal_lasso.rs" 191 48 191 76] replace0 _26 ([#"../list_reversal_lasso.rs" 191 74 191 75] l));
+    [#"../list_reversal_lasso.rs" 191 48 191 76] _25 <- ([#"../list_reversal_lasso.rs" 191 48 191 76] replace0 _26 l);
     _26 <- any borrowed usize;
     goto BB6
   }
@@ -1201,13 +1209,13 @@ module ListReversalLasso_Impl4_ListReversalLasso
     assume { resolve1 _22 };
     assume { resolve1 _21 };
     [#"../list_reversal_lasso.rs" 191 12 191 77] l <- ([#"../list_reversal_lasso.rs" 191 12 191 77] _19);
-    [#"../list_reversal_lasso.rs" 191 12 191 77] _19 <- any usize;
+    _19 <- any usize;
     [#"../list_reversal_lasso.rs" 192 16 192 36] _29 <- ([#"../list_reversal_lasso.rs" 192 16 192 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
     [#"../list_reversal_lasso.rs" 192 12 192 36] n <- ([#"../list_reversal_lasso.rs" 192 12 192 36] _29);
-    [#"../list_reversal_lasso.rs" 192 12 192 36] _29 <- any Snapshot.snap_ty int;
+    _29 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
@@ -1419,7 +1427,7 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     ensures { result = lasso0 self first s1 s2 }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
@@ -1583,7 +1591,7 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     ensures { result = lasso0 self first s1 s2 }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 13 0 13 15] [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
+    (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
index 0d10576edc..322885afcb 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
+++ b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
@@ -20,7 +20,7 @@
 </theory>
 <theory name="ListReversalLasso_Impl4_ListReversalSafe" proved="true">
  <goal name="list_reversal_safe&#39;vc" expl="VC for list_reversal_safe" proved="true">
- <proof prover="4" timelimit="5"><result status="valid" time="0.433615" steps="50475"/></proof>
+ <proof prover="4" timelimit="5"><result status="valid" time="0.433615" steps="57146"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_ListReversalList" proved="true">
@@ -36,16 +36,16 @@
   <proof prover="4"><result status="valid" time="0.100000" steps="11257"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.3" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.070000" steps="697"/></proof>
+  <proof prover="6"><result status="valid" time="0.070000" steps="1767"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.110000" steps="13076"/></proof>
+  <proof prover="4"><result status="valid" time="0.110000" steps="13091"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.019600" steps="76"/></proof>
+  <proof prover="6"><result status="valid" time="0.019600" steps="77"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014740" steps="76"/></proof>
+  <proof prover="6"><result status="valid" time="0.014740" steps="78"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.7" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.016210" steps="84"/></proof>
@@ -54,7 +54,7 @@
   <proof prover="6"><result status="valid" time="0.020939" steps="74"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.9" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.110000" steps="12801"/></proof>
+  <proof prover="4"><result status="valid" time="0.110000" steps="12814"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.10" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
@@ -63,16 +63,16 @@
     <goal name="list_reversal_list&#39;vc.10.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_list&#39;vc.10.0.0.0" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.070918" steps="368"/></proof>
+     <proof prover="6"><result status="valid" time="0.070918" steps="369"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.1" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.100356" steps="821"/></proof>
+     <proof prover="6"><result status="valid" time="0.100356" steps="824"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.2" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.083977" steps="522"/></proof>
+     <proof prover="6"><result status="valid" time="0.083977" steps="524"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.3" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.099827" steps="206"/></proof>
+     <proof prover="6"><result status="valid" time="0.099827" steps="207"/></proof>
      </goal>
     </transf>
     </goal>
@@ -81,7 +81,7 @@
   </transf>
   </goal>
   <goal name="list_reversal_list&#39;vc.11" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="0.727557" steps="3838"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="0.360444" steps="4480"/></proof>
   </goal>
  </transf>
  </goal>
@@ -102,7 +102,7 @@
   <proof prover="4"><result status="valid" time="0.140000" steps="12391"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.4" expl="assertion" proved="true">
-  <proof prover="6"><result status="valid" time="0.916711" steps="5484"/></proof>
+  <proof prover="6"><result status="valid" time="0.135870" steps="2143"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.5" expl="postcondition" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
@@ -115,7 +115,7 @@
       <goal name="list_reversal_loop&#39;vc.5.0.0.0.0" expl="postcondition" proved="true">
       <transf name="split_all_full" proved="true" >
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.0" expl="VC for list_reversal_loop" proved="true">
-       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.903253" steps="98955"/></proof>
+       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.621148" steps="100781"/></proof>
        </goal>
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1" expl="VC for list_reversal_loop" proved="true">
        <transf name="split_vc" proved="true" >
@@ -124,10 +124,10 @@
          <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0" expl="VC for list_reversal_loop" proved="true">
          <transf name="split_all_full" proved="true" >
           <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0.0" expl="VC for list_reversal_loop" proved="true">
-          <proof prover="6"><result status="valid" time="0.065729" steps="238"/></proof>
+          <proof prover="6"><result status="valid" time="0.065729" steps="246"/></proof>
           </goal>
           <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0.1" expl="VC for list_reversal_loop" proved="true">
-          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="1.170496" steps="111201"/></proof>
+          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.715400" steps="112790"/></proof>
           </goal>
          </transf>
          </goal>
@@ -140,7 +140,7 @@
         <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.2.0" expl="VC for list_reversal_loop" proved="true">
         <transf name="inline_goal" proved="true" >
          <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.2.0.0" expl="VC for list_reversal_loop" proved="true">
-         <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.934149" steps="98300"/></proof>
+         <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.612459" steps="97326"/></proof>
          </goal>
         </transf>
         </goal>
@@ -149,7 +149,7 @@
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.3" expl="VC for list_reversal_loop" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.3.0" expl="VC for list_reversal_loop" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="5.336607" steps="30438"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="2.757621" steps="58001"/></proof>
         </goal>
        </transf>
        </goal>
@@ -164,55 +164,55 @@
   </transf>
   </goal>
   <goal name="list_reversal_loop&#39;vc.6" expl="assertion" proved="true">
-  <proof prover="6"><result status="valid" time="0.020000" steps="235"/></proof>
+  <proof prover="6"><result status="valid" time="0.020000" steps="236"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.150000" steps="17801"/></proof>
+  <proof prover="4"><result status="valid" time="0.150000" steps="17812"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.033165" steps="83"/></proof>
+  <proof prover="6"><result status="valid" time="0.033165" steps="85"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.037369" steps="85"/></proof>
+  <proof prover="6"><result status="valid" time="0.037369" steps="86"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.023187" steps="91"/></proof>
+  <proof prover="6"><result status="valid" time="0.023187" steps="93"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.038181" steps="78"/></proof>
+  <proof prover="6"><result status="valid" time="0.038181" steps="79"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.12" expl="loop invariant preservation" proved="true">
-  <proof prover="4" timelimit="5"><result status="valid" time="0.080000" steps="11516"/></proof>
+  <proof prover="4" timelimit="5"><result status="valid" time="0.080000" steps="11530"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.13" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="list_reversal_loop&#39;vc.13.0" expl="loop invariant preservation" proved="true">
-   <proof prover="6"><result status="valid" time="0.022487" steps="288"/></proof>
+   <proof prover="6"><result status="valid" time="0.022487" steps="290"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.1" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.028169" steps="91888"/></proof>
+   <proof prover="1"><result status="valid" time="0.028169" steps="92032"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.2" expl="loop invariant preservation" proved="true">
-   <proof prover="6"><result status="valid" time="0.032291" steps="500"/></proof>
+   <proof prover="6"><result status="valid" time="0.032291" steps="503"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.3" expl="loop invariant preservation" proved="true">
-   <proof prover="6"><result status="valid" time="0.043839" steps="706"/></proof>
+   <proof prover="6"><result status="valid" time="0.043839" steps="704"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.4" expl="loop invariant preservation" proved="true">
    <transf name="inline_goal" proved="true" >
     <goal name="list_reversal_loop&#39;vc.13.4.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_loop&#39;vc.13.4.0.0" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.119170" steps="682"/></proof>
+     <proof prover="6"><result status="valid" time="0.119170" steps="662"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.1" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.465517" steps="2107"/></proof>
+     <proof prover="6"><result status="valid" time="0.156515" steps="2100"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.2" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.041175" steps="506"/></proof>
+     <proof prover="6"><result status="valid" time="0.041175" steps="505"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.3" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.130458" steps="298"/></proof>
+     <proof prover="6"><result status="valid" time="0.130458" steps="300"/></proof>
      </goal>
     </transf>
     </goal>
@@ -221,10 +221,10 @@
   </transf>
   </goal>
   <goal name="list_reversal_loop&#39;vc.14" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.605750" steps="2658"/></proof>
+  <proof prover="6"><result status="valid" time="0.324983" steps="4876"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.15" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="1.857280" steps="8062"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="1.128802" steps="15620"/></proof>
   </goal>
  </transf>
  </goal>
@@ -249,18 +249,18 @@
    <goal name="list_reversal_lasso&#39;vc.4.0" expl="VC for list_reversal_lasso" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="list_reversal_lasso&#39;vc.4.0.0" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="4"><result status="valid" time="0.131381" steps="16038"/></proof>
+    <proof prover="4"><result status="valid" time="0.131381" steps="16138"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.4.0.1" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.040167" steps="400"/></proof>
+    <proof prover="6"><result status="valid" time="0.040167" steps="405"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.4.0.2" expl="VC for list_reversal_lasso" proved="true">
     <transf name="replace" proved="true" arg1="mid" arg2="mid1">
      <goal name="list_reversal_lasso&#39;vc.4.0.2.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.354144" steps="43248"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.354144" steps="43376"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.4.0.2.1" expl="equality hypothesis" proved="true">
-     <proof prover="6"><result status="valid" time="0.038061" steps="463"/></proof>
+     <proof prover="6"><result status="valid" time="0.038061" steps="470"/></proof>
      </goal>
     </transf>
     </goal>
@@ -271,31 +271,31 @@
       <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="split_all_full" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.043054" steps="513"/></proof>
+       <proof prover="6"><result status="valid" time="0.043054" steps="540"/></proof>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.210164" steps="786"/></proof>
+       <proof prover="6"><result status="valid" time="0.061661" steps="712"/></proof>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.2" expl="VC for list_reversal_lasso" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.2.0" expl="VC for list_reversal_lasso" proved="true">
         <transf name="inline_goal" proved="true" >
          <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-         <proof prover="4" timelimit="30" memlimit="4000"><result status="valid" time="2.479375" steps="177669"/></proof>
+         <proof prover="4" timelimit="30" memlimit="4000"><result status="valid" time="1.762701" steps="201662"/></proof>
          </goal>
         </transf>
         </goal>
        </transf>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.3" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.041484" steps="408"/></proof>
+       <proof prover="6"><result status="valid" time="0.041484" steps="412"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.4.0.3.1" expl="equality hypothesis" proved="true">
-     <proof prover="6"><result status="valid" time="0.037707" steps="463"/></proof>
+     <proof prover="6"><result status="valid" time="0.037707" steps="470"/></proof>
      </goal>
     </transf>
     </goal>
@@ -304,29 +304,29 @@
   </transf>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="0.253628" steps="1064"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="0.085851" steps="1067"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.038848" steps="90"/></proof>
+  <proof prover="6"><result status="valid" time="0.038848" steps="91"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.7" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.036739" steps="91"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.028086" steps="97"/></proof>
+  <proof prover="6"><result status="valid" time="0.028086" steps="99"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.038466" steps="77"/></proof>
+  <proof prover="6"><result status="valid" time="0.038466" steps="78"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.10" expl="loop invariant preservation" proved="true">
-  <proof prover="4" timelimit="5"><result status="valid" time="0.231123" steps="17684"/></proof>
+  <proof prover="4" timelimit="5"><result status="valid" time="0.231123" steps="17698"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.11" expl="loop invariant preservation" proved="true">
   <transf name="inline_goal" proved="true" >
    <goal name="list_reversal_lasso&#39;vc.11.0" expl="loop invariant preservation" proved="true">
    <transf name="split_all_full" proved="true" >
     <goal name="list_reversal_lasso&#39;vc.11.0.0" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.078949" steps="677"/></proof>
+    <proof prover="6"><result status="valid" time="0.078949" steps="680"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.1" expl="VC for list_reversal_lasso" proved="true">
     <transf name="split_vc" proved="true" >
@@ -335,10 +335,10 @@
       <goal name="list_reversal_lasso&#39;vc.11.0.1.0.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="split_all_full" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.11.0.1.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.118556" steps="345"/></proof>
+       <proof prover="6"><result status="valid" time="0.118556" steps="346"/></proof>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.11.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.293811" steps="1183"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.098632" steps="1106"/></proof>
        </goal>
       </transf>
       </goal>
@@ -347,38 +347,38 @@
     </transf>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.2" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.225510" steps="1049"/></proof>
+    <proof prover="6"><result status="valid" time="0.058259" steps="769"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.3" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.086437" steps="350"/></proof>
+    <proof prover="6"><result status="valid" time="0.086437" steps="351"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.4" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.084219" steps="97"/></proof>
+    <proof prover="6"><result status="valid" time="0.084219" steps="99"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.5" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="0"><result status="valid" time="1.356591" steps="104398"/></proof>
+    <proof prover="0"><result status="valid" time="1.036602" steps="146470"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.6" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.167591" steps="675"/></proof>
+    <proof prover="6"><result status="valid" time="0.167591" steps="680"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.7" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.030601" steps="301"/></proof>
+    <proof prover="6"><result status="valid" time="0.030601" steps="303"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.8" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.131043" steps="622"/></proof>
+    <proof prover="6"><result status="valid" time="0.131043" steps="628"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.9" expl="VC for list_reversal_lasso" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.11.0.9.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.627702" steps="2363"/></proof>
+     <proof prover="6"><result status="valid" time="0.162694" steps="1987"/></proof>
      </goal>
     </transf>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.10" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.550858" steps="2475"/></proof>
+    <proof prover="6"><result status="valid" time="0.155330" steps="2095"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.11" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.139036" steps="685"/></proof>
+    <proof prover="6"><result status="valid" time="0.139036" steps="684"/></proof>
     </goal>
    </transf>
    </goal>
@@ -391,13 +391,13 @@
     <goal name="list_reversal_lasso&#39;vc.12.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.253328" steps="1127"/></proof>
+     <proof prover="6"><result status="valid" time="0.086807" steps="1239"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="3.902302" steps="240302"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="2.511568" steps="305755"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.215982" steps="1008"/></proof>
+     <proof prover="6"><result status="valid" time="0.075475" steps="942"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.3" expl="VC for list_reversal_lasso" proved="true">
      <proof prover="6"><result status="valid" time="0.023413" steps="331"/></proof>
@@ -411,24 +411,24 @@
     <goal name="list_reversal_lasso&#39;vc.12.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.1.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.120000" steps="981"/></proof>
+     <proof prover="6"><result status="valid" time="0.120000" steps="972"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="5"><result status="valid" time="2.502654" steps="9650"/></proof>
+     <proof prover="6" timelimit="5"><result status="valid" time="0.204464" steps="2394"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.2" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="list_reversal_lasso&#39;vc.12.1.0.2.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.12.1.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="1.041367" steps="4793"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.334367" steps="4544"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.227164" steps="895"/></proof>
+     <proof prover="6"><result status="valid" time="0.084522" steps="899"/></proof>
      </goal>
     </transf>
     </goal>
@@ -439,16 +439,16 @@
     <goal name="list_reversal_lasso&#39;vc.12.2.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.273683" steps="1210"/></proof>
+     <proof prover="6"><result status="valid" time="0.088090" steps="1209"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.463162" steps="54929"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.293937" steps="56097"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.463076" steps="2119"/></proof>
+     <proof prover="6"><result status="valid" time="0.182226" steps="2544"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.147772" steps="418"/></proof>
+     <proof prover="6"><result status="valid" time="0.147772" steps="419"/></proof>
      </goal>
     </transf>
     </goal>
@@ -463,7 +463,7 @@
     <goal name="list_reversal_lasso&#39;vc.13.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="1.848996" steps="8656"/></proof>
+     <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.577339" steps="8398"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.1" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
@@ -472,10 +472,10 @@
        <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0" expl="VC for list_reversal_lasso" proved="true">
        <transf name="split_all_full" proved="true" >
         <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6"><result status="valid" time="0.045678" steps="341"/></proof>
+        <proof prover="6"><result status="valid" time="0.045678" steps="342"/></proof>
         </goal>
         <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="6.317379" steps="61847"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="6.317379" steps="88589"/></proof>
         </goal>
        </transf>
        </goal>
@@ -484,10 +484,10 @@
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.449253" steps="2050"/></proof>
+     <proof prover="6"><result status="valid" time="0.147455" steps="2136"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.424193" steps="49546"/></proof>
+     <proof prover="0"><result status="valid" time="0.267606" steps="49571"/></proof>
      </goal>
     </transf>
     </goal>
@@ -498,7 +498,7 @@
     <goal name="list_reversal_lasso&#39;vc.13.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.1.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.277745" steps="1143"/></proof>
+     <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.088310" steps="1142"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.1.0.1" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
@@ -507,10 +507,10 @@
        <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0" expl="VC for list_reversal_lasso" proved="true">
        <transf name="split_all_full" proved="true" >
         <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6"><result status="valid" time="0.060000" steps="346"/></proof>
+        <proof prover="6"><result status="valid" time="0.060000" steps="347"/></proof>
         </goal>
         <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="2.549601" steps="14134"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="1.006947" steps="12601"/></proof>
         </goal>
        </transf>
        </goal>
@@ -523,14 +523,14 @@
       <goal name="list_reversal_lasso&#39;vc.13.1.0.2.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.13.1.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="1.677275" steps="7266"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.542984" steps="7320"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.1.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.206932" steps="723"/></proof>
+     <proof prover="6"><result status="valid" time="0.062914" steps="727"/></proof>
      </goal>
     </transf>
     </goal>
@@ -541,16 +541,16 @@
     <goal name="list_reversal_lasso&#39;vc.13.2.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.193332" steps="863"/></proof>
+     <proof prover="6"><result status="valid" time="0.066484" steps="865"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.526618" steps="59178"/></proof>
+     <proof prover="0"><result status="valid" time="0.322550" steps="60363"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="1.201159" steps="5413"/></proof>
+     <proof prover="6"><result status="valid" time="0.268209" steps="3628"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.261809" steps="31506"/></proof>
+     <proof prover="0"><result status="valid" time="0.261809" steps="31531"/></proof>
      </goal>
     </transf>
     </goal>
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz b/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz
index 4a7b1a8df3b4a7141a17c5bb492171bd18dea85a..a2551c2dbda295b54ac3ec112947c6ca4424a1ad 100644
GIT binary patch
literal 13005
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
P#~1wnkJ@=MlU@M;7|Bt>

literal 12905
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
T64o;6_=5i*B<6*5<6Qv&)pYo2

diff --git a/creusot/tests/should_succeed/loop.mlcfg b/creusot/tests/should_succeed/loop.mlcfg
index c501790634..f5384ca1dd 100644
--- a/creusot/tests/should_succeed/loop.mlcfg
+++ b/creusot/tests/should_succeed/loop.mlcfg
@@ -17,10 +17,10 @@ module Loop_F
     goto BB0
   }
   BB0 {
-    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] [#"../loop.rs" 4 16 4 18] (10 : int32));
+    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] (10 : int32));
     [#"../loop.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../loop.rs" 5 12 5 18] a <-  ^ b;
-    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] [#"../loop.rs" 6 9 6 10] (5 : int32)) ; };
+    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] (5 : int32)) ; };
     assume { resolve0 b };
     goto BB1
   }
@@ -28,7 +28,7 @@ module Loop_F
     goto BB2
   }
   BB2 {
-    switch ([#"../loop.rs" 8 11 8 15] [#"../loop.rs" 8 11 8 15] true)
+    switch (true)
       | False -> goto BB4
       | True -> goto BB3
       end
diff --git a/creusot/tests/should_succeed/mapping_test.mlcfg b/creusot/tests/should_succeed/mapping_test.mlcfg
index e44734dd03..e754183262 100644
--- a/creusot/tests/should_succeed/mapping_test.mlcfg
+++ b/creusot/tests/should_succeed/mapping_test.mlcfg
@@ -69,7 +69,7 @@ module MappingTest_Incr
     goto BB1
   }
   BB1 {
-    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + ([#"../mapping_test.rs" 32 14 32 15] [#"../mapping_test.rs" 32 14 32 15] (1 : int32)))) ; };
+    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + (1 : int32))) ; };
     assume { resolve0 t };
     assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Snapshot.inner old_t))) 1 };
     [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] ());
@@ -122,7 +122,7 @@ module MappingTest_F
     goto BB0
   }
   BB0 {
-    [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T ([#"../mapping_test.rs" 39 23 39 25] [#"../mapping_test.rs" 39 23 39 25] (42 : int32)));
+    [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T (42 : int32));
     assert { [@expl:assertion] [#"../mapping_test.rs" 40 19 40 34] Map.get (shallow_model0 x) 13 = 1 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 41 19 41 34] Map.get (shallow_model0 x) 42 = 0 };
     [#"../mapping_test.rs" 42 9 42 15] _8 <- Borrow.borrow_mut x;
diff --git a/creusot/tests/should_succeed/match_int.mlcfg b/creusot/tests/should_succeed/match_int.mlcfg
index 7454523f38..96b4b86e70 100644
--- a/creusot/tests/should_succeed/match_int.mlcfg
+++ b/creusot/tests/should_succeed/match_int.mlcfg
@@ -6,18 +6,22 @@ module MatchInt_F
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var _1 : int32;
+  var _2 : bool;
+  var _3 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] [#"../match_int.rs" 8 10 8 11] (1 : int32));
-    switch ([#"../match_int.rs" 9 8 9 13] ([#"../match_int.rs" 9 8 9 13] [#"../match_int.rs" 9 8 9 13] (0 : int32)) <= _1)
+    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] (1 : int32));
+    [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] (0 : int32) <= _1);
+    switch (_2)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    switch ([#"../match_int.rs" 9 8 9 13] _1 < ([#"../match_int.rs" 9 8 9 13] [#"../match_int.rs" 9 8 9 13] (10 : int32)))
+    [#"../match_int.rs" 9 8 9 13] _3 <- ([#"../match_int.rs" 9 8 9 13] _1 < (10 : int32));
+    switch (_3)
       | False -> goto BB3
       | True -> goto BB2
       end
@@ -41,13 +45,13 @@ module MatchInt_F
     goto BB10
   }
   BB6 {
-    switch ([#"../match_int.rs" 16 20 16 25] [#"../match_int.rs" 16 20 16 25] false)
+    switch (false)
       | False -> goto BB13
       | True -> goto BB14
       end
   }
   BB7 {
-    switch ([#"../match_int.rs" 10 20 10 24] [#"../match_int.rs" 10 20 10 24] true)
+    switch (true)
       | False -> goto BB8
       | True -> goto BB9
       end
@@ -61,7 +65,7 @@ module MatchInt_F
     goto BB15
   }
   BB10 {
-    switch ([#"../match_int.rs" 13 20 13 25] [#"../match_int.rs" 13 20 13 25] false)
+    switch (false)
       | False -> goto BB11
       | True -> goto BB12
       end
diff --git a/creusot/tests/should_succeed/match_int/why3session.xml b/creusot/tests/should_succeed/match_int/why3session.xml
index 029b3bfa46..da3aef9e74 100644
--- a/creusot/tests/should_succeed/match_int/why3session.xml
+++ b/creusot/tests/should_succeed/match_int/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="match_int.mlcfg"/>
 <theory name="MatchInt_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="0"><result status="valid" time="0.005815" steps="9"/></proof>
+ <proof prover="0"><result status="valid" time="0.005815" steps="30"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/match_int/why3shapes.gz b/creusot/tests/should_succeed/match_int/why3shapes.gz
index 9bda644fe123fd1c646ac82c9dee788e226518b5..a6d77063dbd99c60772923c5efd1cefbf1a15a6e 100644
GIT binary patch
literal 241
zcmV<N01p2jiwFP!00000|9z0X4#FT1fOnpP&7TQML27hpOo?5bO!o_g*u<!5tIsb#
zHCjzwxZK@$+z0a|?oMzs9e$X$Yp$0y7I?WpwzRn|VOtR`@)%qO&826_%$=cd2n`<l
z{JYQdT@MP*oq0tI$M$Zj#1AA*tc4P6Mw65jk))oaV{)s>CtSqsw8*2fcVa<y2p=#T
zoLP_^!l=*73Fq)gKIzQf&Z#HUf6gp8yAk#CLw&qMdObP0O}K3;k}FTH{%sS=BW^^Y
rYKQH$#TFrBv)X`>kP#3j)w*^GtusocW{^ot_XIrw+#Df*90C9U?JaIX

literal 182
zcmV;n07?HJiwFP!00000|80#i6M`@dh4=o7Y${VjDToI{&(pIDBYRru$pRj5{(hll
z0M8{ac`wO#j9`4xyBXor3}f4O7f2yGF{hn!n#!8nR0WwQYP(6qhq-#A@_`Jw{LQ7R
zsMtBkH5H}hTQeNvO$Fle5<P2`%`UD;^sH5Oxzu|k{zIbj$9PxM@+O`;R$syO131P=
k=9w@gQl3B2Jf*P?v&0F>c_Pf&0zNqV0*!S4RyF|u0IQ!<v;Y7A

diff --git a/creusot/tests/should_succeed/mc91.mlcfg b/creusot/tests/should_succeed/mc91.mlcfg
index d9c36fda93..f09ff21c56 100644
--- a/creusot/tests/should_succeed/mc91.mlcfg
+++ b/creusot/tests/should_succeed/mc91.mlcfg
@@ -8,22 +8,27 @@ module Mc91_Mc91
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : uint32;
   var x : uint32 = x;
+  var _3 : bool;
   var _6 : uint32;
+  var _7 : uint32;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../mc91.rs" 8 7 8 14] ([#"../mc91.rs" 8 7 8 8] x) > ([#"../mc91.rs" 8 11 8 14] [#"../mc91.rs" 8 11 8 14] (100 : uint32)))
+    [#"../mc91.rs" 8 7 8 14] _3 <- ([#"../mc91.rs" 8 7 8 14] x > (100 : uint32));
+    switch (_3)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] ([#"../mc91.rs" 9 8 9 9] x) - ([#"../mc91.rs" 9 12 9 14] [#"../mc91.rs" 9 12 9 14] (10 : uint32)));
+    [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] x - (10 : uint32));
     goto BB5
   }
   BB2 {
-    [#"../mc91.rs" 11 13 11 25] _6 <- ([#"../mc91.rs" 11 13 11 25] mc91 ([#"../mc91.rs" 11 18 11 24] ([#"../mc91.rs" 11 18 11 19] x) + ([#"../mc91.rs" 11 22 11 24] [#"../mc91.rs" 11 22 11 24] (11 : uint32))));
+    [#"../mc91.rs" 11 18 11 24] _7 <- ([#"../mc91.rs" 11 18 11 24] x + (11 : uint32));
+    [#"../mc91.rs" 11 13 11 25] _6 <- ([#"../mc91.rs" 11 13 11 25] mc91 _7);
+    _7 <- any uint32;
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/mc91/why3session.xml b/creusot/tests/should_succeed/mc91/why3session.xml
index bfb5658fb7..55e9bbc6ef 100644
--- a/creusot/tests/should_succeed/mc91/why3session.xml
+++ b/creusot/tests/should_succeed/mc91/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="mc91.mlcfg"/>
 <theory name="Mc91_Mc91" proved="true">
  <goal name="mc91&#39;vc" expl="VC for mc91" proved="true">
- <proof prover="0"><result status="valid" time="0.007568" steps="85"/></proof>
+ <proof prover="0"><result status="valid" time="0.007568" steps="62"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/mc91/why3shapes.gz b/creusot/tests/should_succeed/mc91/why3shapes.gz
index e9497767199efb59ce8cf4e57337b280f410f122..6ebd1aec4ccc9d9ab55c5e685415c931f65a5990 100644
GIT binary patch
literal 248
zcmV<U00;jciwFP!00000|AmlUYlAQphVSz$a<{dkkeDwWwIC9y_anFC*rrt2w3yo8
zKkeFXCPHrlIqx~o!#S@@?2d4<4qt5N>b7~u5-%4BQt0dE%%Yd!H569=zhp;A2^+se
zGDr>GCA5Tf8iZv&rbcB`w3?!2h?aM>nn7PfJ*LtK?Xks_%|kZ7v&9UXKiJ$bpUvRS
zTajug;LF+Tnz7d&hZofF(e>6uqadnpvtw!IvbxA}sGHBK?VG&|)wk)tj==USOUgl(
yJdqUzGC4l99sVA!f)JqxMJfTLii8D8Y+R`Xn6;cSr37HQCFln>+qYXu0ssIAM|mv(

literal 212
zcmV;_04x6=iwFP!00000|83CU3W6{c2Jrhm#qKI2*k5&#frODSu-iE5q+O(;+4HA@
zpw64Y&Ug61clI7`U+^(4{+Xt=b#=x*_6`Ul=xp`nY}db<!fE~`IVCAv*CP@`q-m~b
z3YW+UQ#+(u#!Ff*Y2nghqU8oXhRKi$&6AbQmo{^4Hraf`W|O@b!f{oNCSx&wwdlJy
zOEzwHk1g2hnbloYw5~nN9BxZP`i9H8!SB8gLRpxpl5rEz&`6>Thf>H)F%ghLC?YX^
O5cCJFd;3!Z0ssI_GG*NW

diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg
index fdb4f10ec5..ece0d14179 100644
--- a/creusot/tests/should_succeed/mutex.mlcfg
+++ b/creusot/tests/should_succeed/mutex.mlcfg
@@ -143,24 +143,27 @@ module Mutex_Impl3_Call
   var v : Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even);
   var val' : uint32;
   var _5 : uint32;
+  var _7 : bool;
   var _9 : ();
   var _10 : borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
+  var _11 : uint32;
   var _13 : ();
   var _14 : borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
   {
     goto BB0
   }
   BB0 {
-    [#"../mutex.rs" 101 20 101 37] v <- ([#"../mutex.rs" 101 20 101 37] lock0 ([#"../mutex.rs" 101 20 101 30] Mutex_AddsTwo_Type.addstwo_mutex self));
+    [#"../mutex.rs" 101 20 101 37] v <- ([#"../mutex.rs" 101 20 101 37] lock0 (Mutex_AddsTwo_Type.addstwo_mutex self));
     goto BB1
   }
   BB1 {
-    [#"../mutex.rs" 102 19 102 28] _5 <- ([#"../mutex.rs" 102 19 102 28] deref0 ([#"../mutex.rs" 102 19 102 20] v));
+    [#"../mutex.rs" 102 19 102 28] _5 <- ([#"../mutex.rs" 102 19 102 28] deref0 v);
     goto BB2
   }
   BB2 {
     [#"../mutex.rs" 102 18 102 28] val' <- ([#"../mutex.rs" 102 18 102 28] _5);
-    switch ([#"../mutex.rs" 103 11 103 23] ([#"../mutex.rs" 103 11 103 14] val') < ([#"../mutex.rs" 103 17 103 23] [#"../mutex.rs" 103 17 103 23] (100000 : uint32)))
+    [#"../mutex.rs" 103 11 103 23] _7 <- ([#"../mutex.rs" 103 11 103 23] val' < (100000 : uint32));
+    switch (_7)
       | False -> goto BB5
       | True -> goto BB3
       end
@@ -168,8 +171,10 @@ module Mutex_Impl3_Call
   BB3 {
     [#"../mutex.rs" 104 12 104 13] _10 <- Borrow.borrow_mut v;
     [#"../mutex.rs" 104 12 104 13] v <-  ^ _10;
-    [#"../mutex.rs" 104 12 104 26] _9 <- ([#"../mutex.rs" 104 12 104 26] set0 _10 ([#"../mutex.rs" 104 18 104 25] ([#"../mutex.rs" 104 18 104 21] val') + ([#"../mutex.rs" 104 24 104 25] [#"../mutex.rs" 104 24 104 25] (2 : uint32))));
+    [#"../mutex.rs" 104 18 104 25] _11 <- ([#"../mutex.rs" 104 18 104 25] val' + (2 : uint32));
+    [#"../mutex.rs" 104 12 104 26] _9 <- ([#"../mutex.rs" 104 12 104 26] set0 _10 _11);
     _10 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
+    _11 <- any uint32;
     goto BB4
   }
   BB4 {
@@ -179,7 +184,7 @@ module Mutex_Impl3_Call
   BB5 {
     [#"../mutex.rs" 106 12 106 13] _14 <- Borrow.borrow_mut v;
     [#"../mutex.rs" 106 12 106 13] v <-  ^ _14;
-    [#"../mutex.rs" 106 12 106 20] _13 <- ([#"../mutex.rs" 106 12 106 20] set0 _14 ([#"../mutex.rs" 106 18 106 19] [#"../mutex.rs" 106 18 106 19] (0 : uint32)));
+    [#"../mutex.rs" 106 12 106 20] _13 <- ([#"../mutex.rs" 106 12 106 20] set0 _14 (0 : uint32));
     _14 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
     goto BB6
   }
@@ -405,6 +410,7 @@ module Mutex_Concurrent
   var m : Mutex_Mutex_Type.t_mutex uint32 (Mutex_Even_Type.t_even);
   var _2 : borrowed (Mutex_Mutex_Type.t_mutex uint32 (Mutex_Even_Type.t_even));
   var _4 : Mutex_Mutex_Type.t_mutex uint32 (Mutex_Even_Type.t_even);
+  var _5 : Mutex_Even_Type.t_even;
   var t1 : Mutex_AddsTwo_Type.t_addstwo;
   var _8 : Mutex_Mutex_Type.t_mutex uint32 (Mutex_Even_Type.t_even);
   var j1 : Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo));
@@ -417,7 +423,9 @@ module Mutex_Concurrent
     goto BB0
   }
   BB0 {
-    [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 ([#"../mutex.rs" 164 49 164 50] [#"../mutex.rs" 164 49 164 50] (0 : uint32)) ([#"../mutex.rs" 164 52 164 56] Mutex_Even_Type.C_Even));
+    [#"../mutex.rs" 164 52 164 56] _5 <- ([#"../mutex.rs" 164 52 164 56] Mutex_Even_Type.C_Even);
+    [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 (0 : uint32) _5);
+    _5 <- any Mutex_Even_Type.t_even;
     goto BB1
   }
   BB1 {
@@ -432,26 +440,26 @@ module Mutex_Concurrent
     [#"../mutex.rs" 164 24 164 59] m <- ([#"../mutex.rs" 164 24 164 59]  * _2);
     assume { resolve0 _2 };
     [#"../mutex.rs" 165 30 165 32] _8 <- ([#"../mutex.rs" 165 30 165 32] m);
-    [#"../mutex.rs" 165 13 165 34] t1 <- ([#"../mutex.rs" 165 13 165 34] Mutex_AddsTwo_Type.C_AddsTwo ([#"../mutex.rs" 165 30 165 32] _8));
-    [#"../mutex.rs" 166 13 166 22] j1 <- ([#"../mutex.rs" 166 13 166 22] spawn0 ([#"../mutex.rs" 166 19 166 21] t1));
-    [#"../mutex.rs" 166 19 166 21] t1 <- any Mutex_AddsTwo_Type.t_addstwo;
+    [#"../mutex.rs" 165 13 165 34] t1 <- ([#"../mutex.rs" 165 13 165 34] Mutex_AddsTwo_Type.C_AddsTwo _8);
+    [#"../mutex.rs" 166 13 166 22] j1 <- ([#"../mutex.rs" 166 13 166 22] spawn0 t1);
+    t1 <- any Mutex_AddsTwo_Type.t_addstwo;
     goto BB4
   }
   BB4 {
     [#"../mutex.rs" 167 30 167 32] _13 <- ([#"../mutex.rs" 167 30 167 32] m);
-    [#"../mutex.rs" 167 13 167 34] t2 <- ([#"../mutex.rs" 167 13 167 34] Mutex_AddsTwo_Type.C_AddsTwo ([#"../mutex.rs" 167 30 167 32] _13));
-    [#"../mutex.rs" 168 13 168 22] j2 <- ([#"../mutex.rs" 168 13 168 22] spawn0 ([#"../mutex.rs" 168 19 168 21] t2));
-    [#"../mutex.rs" 168 19 168 21] t2 <- any Mutex_AddsTwo_Type.t_addstwo;
+    [#"../mutex.rs" 167 13 167 34] t2 <- ([#"../mutex.rs" 167 13 167 34] Mutex_AddsTwo_Type.C_AddsTwo _13);
+    [#"../mutex.rs" 168 13 168 22] j2 <- ([#"../mutex.rs" 168 13 168 22] spawn0 t2);
+    t2 <- any Mutex_AddsTwo_Type.t_addstwo;
     goto BB5
   }
   BB5 {
-    [#"../mutex.rs" 171 12 171 21] _16 <- ([#"../mutex.rs" 171 12 171 21] join0 ([#"../mutex.rs" 171 12 171 14] j1));
-    [#"../mutex.rs" 171 12 171 14] j1 <- any Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo));
+    [#"../mutex.rs" 171 12 171 21] _16 <- ([#"../mutex.rs" 171 12 171 21] join0 j1);
+    j1 <- any Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo));
     goto BB6
   }
   BB6 {
-    [#"../mutex.rs" 172 12 172 21] _18 <- ([#"../mutex.rs" 172 12 172 21] join0 ([#"../mutex.rs" 172 12 172 14] j2));
-    [#"../mutex.rs" 172 12 172 14] j2 <- any Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo));
+    [#"../mutex.rs" 172 12 172 21] _18 <- ([#"../mutex.rs" 172 12 172 21] join0 j2);
+    j2 <- any Mutex_JoinHandle_Type.t_joinhandle () (Mutex_SpawnPostCond_Type.t_spawnpostcond (Mutex_AddsTwo_Type.t_addstwo));
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/mutex/why3session.xml b/creusot/tests/should_succeed/mutex/why3session.xml
index 559a6ed8d4..d91e9c0791 100644
--- a/creusot/tests/should_succeed/mutex/why3session.xml
+++ b/creusot/tests/should_succeed/mutex/why3session.xml
@@ -9,12 +9,12 @@
 <path name=".."/><path name="mutex.mlcfg"/>
 <theory name="Mutex_Impl3_Call" proved="true">
  <goal name="call&#39;vc" expl="VC for call" proved="true">
- <proof prover="1"><result status="valid" time="0.017331" steps="30618"/></proof>
+ <proof prover="1"><result status="valid" time="0.017331" steps="30906"/></proof>
  </goal>
 </theory>
 <theory name="Mutex_Concurrent" proved="true">
  <goal name="concurrent&#39;vc" expl="VC for concurrent" proved="true">
- <proof prover="3"><result status="valid" time="0.010000" steps="314"/></proof>
+ <proof prover="3"><result status="valid" time="0.010000" steps="316"/></proof>
  </goal>
 </theory>
 <theory name="Mutex_Impl3" proved="true">
diff --git a/creusot/tests/should_succeed/mutex/why3shapes.gz b/creusot/tests/should_succeed/mutex/why3shapes.gz
index 3db86a94df61bc03e1c694befe3a50acf929d89e..b1886030a6767f8d48fed2ff65857faf7c004899 100644
GIT binary patch
literal 593
zcmV-X0<QfZiwFP!00000|9w=;j+-zP-SZXf+NK*{KXKJA&}fh&RqAHsZDeDolQsh>
zkWBmc^#ej?`p5!K%)Q6Q_Z)b;DaS{1@?&}N!+7Ys4<#=*?~3V%Idm7UQ8PoPVS!ZR
z1!7GW2%0VsY1R~XiJ(RG+)Wc8;nMlRJe?>1^Xu6RZU<%)p0;RfK83pm(gYOOh^`vb
znB(ZP7N{03{$H+GnaC;)B9WaB-9+%4a1ATw{fqz5;wIAVY=7?D_~+9^6*$?Vi$z@z
z!`W-d5Ak7^85hmRR|J6KuSu1lVMa*H0Maz&KTo5pP*vwarz2Hb<Sx*n4r)?ysN;WY
z7P%E^-W2+--1kG-n&WXcNv__C)my%L%T{mc>Me=hF6Q&qe9;t{3X^T7$FxovsAg^7
z`a}0<I(PIzTkr-mbGQ5QT~E)U^uC^jq+?>DG0q1S5!JIasLg5cZQr@W6tarK%I82*
zJ2yT&_Zp`RVWdIkA<H>U*C^yY#6lQ@^pX(xEg`Vf9Mjv}#&hsvf4q3K1c1a?;9P=(
z%Xz2J26c{1^1aTZ1oSch<i_K4hxw&Jx@u9BbAR#OcDj1lckOu?d^cT(kJdLYIB8D(
zINc6Olgz85_E!U(cM7iir_=Onm%au?VLhXW?|~a{_jE6@#GdcD5G{8cSyu|h6;o6Z
zg%v1NSSP&ak_v~pB{B4sb=X>OiLs8^5`+S-fGMB~h=R}t3XqbjDyWr|T1583c_T&Z
feT#ToRm@3-q_-sog^>cOpelX?mKP39vjhMDOywt@

literal 571
zcmV-B0>u3viwFP!00000|9w+UZ=5g`yz?u#wM{R6{&v+KP!!}ym3pasT^TUVwj0<2
zyJ`P@A2x*Dq%8*+%)IgN=K1YSK0f$k81r)&#(m#?$Yp->E}MS(eRr0QlnWFNR>&P)
zA$4qp;P?uO6J@rK0yQa?Y8C;*TNeiZc$&hmZzn%AJMcI7wI=ue6Fwc#64AUyoi39L
zkgJOLuL=_6TzuMh6QghNjtl<%)jQO*oJDq3f9jg?_1EYFmH6s|&ptlBpaGe$$OQ+a
zjEFdcAhyW-)2P$PDpL3KT&A5$Rp3;CTShYS<ll-_DkV;qnY+!~e#mQoI4qqvTVQGn
zOm2aREik?X#^%7*MCF#KDzhX-*?p3yytti_Uc7zp_uYf<nnOTupdA(dcK79no1Tz*
zS1d;2Z&KzcO+Tt;R4mq@@W&z4eb?+K96*9ApHZY}n(^yX?`Ui?B@Rq#vcV}yNIOug
zAgEPv9+qoCke7lWt`eT}je<iM`@=aPJ&gd1Gngn8Q%*Z!85C(QV(vw1C6Ma@U>6z3
zCoCs{I9-$3&fPh5&k6QjeHw<)P0y_-+hM{S{jndX%NDtGoWRY_U$k%82Qv?k$LaSj
z9`G!yf;WcIn#oGEQkcLMBE<p|zNWOvm6cXlZkeSPEXg=&EAUEkqE!&u2NQhjP21KU
z6<U&mvLG!83)}*;fMsBTSYvg@E5mt3SgRV`SJffZMAll1#t33Ul~b^kSTGiJ_6H_x
JO815Y008eD5QhK&

diff --git a/creusot/tests/should_succeed/one_side_update.mlcfg b/creusot/tests/should_succeed/one_side_update.mlcfg
index 9837a61ac9..8a9675a0ff 100644
--- a/creusot/tests/should_succeed/one_side_update.mlcfg
+++ b/creusot/tests/should_succeed/one_side_update.mlcfg
@@ -21,14 +21,15 @@ module OneSideUpdate_F
   var _0 : ();
   var a : OneSideUpdate_MyInt_Type.t_myint;
   var b : borrowed (OneSideUpdate_MyInt_Type.t_myint);
+  var _6 : OneSideUpdate_MyInt_Type.t_myint;
   {
     goto BB0
   }
   BB0 {
-    [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 6 22 6 24] [#"../one_side_update.rs" 6 22 6 24] (10 : usize)));
+    [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt (10 : usize));
     [#"../one_side_update.rs" 7 12 7 18] b <- Borrow.borrow_mut a;
     [#"../one_side_update.rs" 7 12 7 18] a <-  ^ b;
-    switch ([#"../one_side_update.rs" 8 7 8 11] [#"../one_side_update.rs" 8 7 8 11] true)
+    switch (true)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -39,7 +40,9 @@ module OneSideUpdate_F
     goto BB3
   }
   BB2 {
-    [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 11 19 11 20] [#"../one_side_update.rs" 11 19 11 20] (5 : usize))) ; };
+    [#"../one_side_update.rs" 11 13 11 21] _6 <- ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt (5 : usize));
+    [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = ([#"../one_side_update.rs" 11 8 11 21] _6) ; };
+    _6 <- any OneSideUpdate_MyInt_Type.t_myint;
     assume { resolve0 b };
     [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] ());
     goto BB3
diff --git a/creusot/tests/should_succeed/option.mlcfg b/creusot/tests/should_succeed/option.mlcfg
index a20c0465cf..8091735123 100644
--- a/creusot/tests/should_succeed/option.mlcfg
+++ b/creusot/tests/should_succeed/option.mlcfg
@@ -242,8 +242,11 @@ module Option_TestOption
   var _6 : bool;
   var _10 : bool;
   var _12 : bool;
+  var _16 : bool;
   var _17 : int32;
+  var _21 : bool;
   var _22 : int32;
+  var _26 : bool;
   var _27 : int32;
   var _31 : bool;
   var _33 : Core_Option_Option_Type.t_option (borrowed int32);
@@ -251,56 +254,78 @@ module Option_TestOption
   var _36 : borrowed int32;
   var _37 : Core_Option_Option_Type.t_option (borrowed int32);
   var _38 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _40 : bool;
   var _41 : int32;
   var _44 : borrowed int32;
   var _45 : Core_Option_Option_Type.t_option (borrowed int32);
   var _46 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _48 : bool;
   var _49 : int32;
   var _53 : bool;
   var _55 : Core_Option_Option_Type.t_option int32;
+  var _59 : bool;
   var _61 : int32;
   var _62 : Core_Option_Option_Type.t_option int32;
   var _66 : bool;
   var _68 : Core_Option_Option_Type.t_option int32;
   var _73 : bool;
   var _75 : Core_Option_Option_Type.t_option int32;
+  var _77 : Core_Option_Option_Type.t_option int32;
   var _80 : bool;
   var _82 : Core_Option_Option_Type.t_option int32;
+  var _87 : bool;
   var _88 : int32;
   var _89 : Core_Option_Option_Type.t_option int32;
+  var _91 : Core_Option_Option_Type.t_option int32;
   var _94 : bool;
   var _96 : Core_Option_Option_Type.t_option int32;
+  var _101 : bool;
   var _102 : int32;
   var _103 : Core_Option_Option_Type.t_option int32;
+  var _105 : Core_Option_Option_Type.t_option int32;
+  var _108 : bool;
   var _109 : int32;
   var _110 : Core_Option_Option_Type.t_option int32;
+  var _115 : bool;
   var _116 : int32;
   var _117 : Core_Option_Option_Type.t_option int32;
+  var _119 : Core_Option_Option_Type.t_option int32;
   var _122 : bool;
   var _124 : Core_Option_Option_Type.t_option int32;
   var _125 : borrowed (Core_Option_Option_Type.t_option int32);
   var _128 : bool;
+  var _132 : bool;
   var _133 : int32;
   var _134 : Core_Option_Option_Type.t_option int32;
   var _135 : borrowed (Core_Option_Option_Type.t_option int32);
   var _138 : bool;
+  var _141 : Core_Option_Option_Type.t_option int32;
   var _143 : bool;
   var _145 : Core_Option_Option_Type.t_option int32;
   var _146 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _149 : bool;
   var _150 : int32;
+  var _153 : Core_Option_Option_Type.t_option int32;
+  var _155 : bool;
   var _156 : int32;
   var _157 : Core_Option_Option_Type.t_option int32;
   var _158 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _161 : bool;
   var _162 : int32;
+  var _166 : bool;
   var _167 : int32;
   var _168 : Core_Option_Option_Type.t_option int32;
   var _169 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _172 : bool;
   var _173 : int32;
+  var _177 : bool;
   var _178 : int32;
+  var _182 : bool;
   var _183 : int32;
   var _187 : bool;
   var _189 : Core_Option_Option_Type.t_option int32;
   var _190 : Core_Option_Option_Type.t_option int32;
+  var _194 : bool;
   var _195 : int32;
   var _196 : Core_Option_Option_Type.t_option int32;
   var _197 : Core_Option_Option_Type.t_option int32;
@@ -308,6 +333,7 @@ module Option_TestOption
   var _203 : Core_Option_Option_Type.t_option int32;
   var _204 : Core_Option_Option_Type.t_option (borrowed int32);
   var _205 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _208 : bool;
   var _209 : int32;
   var _210 : Core_Option_Option_Type.t_option int32;
   var _211 : Core_Option_Option_Type.t_option (borrowed int32);
@@ -315,6 +341,7 @@ module Option_TestOption
   var _215 : bool;
   var _217 : Core_Option_Option_Type.t_option int32;
   var _218 : Core_Option_Option_Type.t_option int32;
+  var _222 : bool;
   var _223 : int32;
   var _224 : Core_Option_Option_Type.t_option int32;
   var _225 : Core_Option_Option_Type.t_option int32;
@@ -322,6 +349,7 @@ module Option_TestOption
   var _231 : Core_Option_Option_Type.t_option int32;
   var _232 : Core_Option_Option_Type.t_option (borrowed int32);
   var _233 : borrowed (Core_Option_Option_Type.t_option int32);
+  var _236 : bool;
   var _237 : int32;
   var _238 : Core_Option_Option_Type.t_option int32;
   var _239 : Core_Option_Option_Type.t_option (borrowed int32);
@@ -330,9 +358,12 @@ module Option_TestOption
   var _244 : bool;
   var _246 : Core_Option_Option_Type.t_option int32;
   var opt1 : Core_Option_Option_Type.t_option (Core_Option_Option_Type.t_option int32);
+  var _250 : Core_Option_Option_Type.t_option int32;
   var _252 : bool;
   var _254 : Core_Option_Option_Type.t_option int32;
   var opt2 : Core_Option_Option_Type.t_option (Core_Option_Option_Type.t_option int32);
+  var _258 : Core_Option_Option_Type.t_option int32;
+  var _260 : bool;
   var _261 : int32;
   var _262 : Core_Option_Option_Type.t_option int32;
   {
@@ -340,8 +371,8 @@ module Option_TestOption
   }
   BB0 {
     [#"../option.rs" 5 32 5 36] none <- ([#"../option.rs" 5 32 5 36] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some ([#"../option.rs" 6 37 6 38] [#"../option.rs" 6 37 6 38] (1 : int32)));
-    [#"../option.rs" 9 12 9 26] _4 <- ([#"../option.rs" 9 12 9 26] is_some0 ([#"../option.rs" 9 12 9 16] some));
+    [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 9 12 9 26] _4 <- ([#"../option.rs" 9 12 9 26] is_some0 some);
     goto BB1
   }
   BB1 {
@@ -351,7 +382,7 @@ module Option_TestOption
       end
   }
   BB2 {
-    [#"../option.rs" 9 31 9 45] _6 <- ([#"../option.rs" 9 31 9 45] is_some0 ([#"../option.rs" 9 31 9 35] none));
+    [#"../option.rs" 9 31 9 45] _6 <- ([#"../option.rs" 9 31 9 45] is_some0 none);
     goto BB3
   }
   BB3 {
@@ -364,7 +395,7 @@ module Option_TestOption
     goto BB7
   }
   BB5 {
-    [#"../option.rs" 11 12 11 26] _10 <- ([#"../option.rs" 11 12 11 26] is_none0 ([#"../option.rs" 11 12 11 16] none));
+    [#"../option.rs" 11 12 11 26] _10 <- ([#"../option.rs" 11 12 11 26] is_none0 none);
     goto BB8
   }
   BB6 {
@@ -381,7 +412,7 @@ module Option_TestOption
       end
   }
   BB9 {
-    [#"../option.rs" 11 31 11 45] _12 <- ([#"../option.rs" 11 31 11 45] is_none0 ([#"../option.rs" 11 31 11 35] some));
+    [#"../option.rs" 11 31 11 45] _12 <- ([#"../option.rs" 11 31 11 45] is_none0 some);
     goto BB10
   }
   BB10 {
@@ -394,7 +425,7 @@ module Option_TestOption
     goto BB14
   }
   BB12 {
-    [#"../option.rs" 14 12 14 25] _17 <- ([#"../option.rs" 14 12 14 25] unwrap0 ([#"../option.rs" 14 12 14 16] some));
+    [#"../option.rs" 14 12 14 25] _17 <- ([#"../option.rs" 14 12 14 25] unwrap0 some);
     goto BB15
   }
   BB13 {
@@ -405,13 +436,15 @@ module Option_TestOption
     absurd
   }
   BB15 {
-    switch ([#"../option.rs" 14 12 14 30] _17 = ([#"../option.rs" 14 29 14 30] [#"../option.rs" 14 29 14 30] (1 : int32)))
+    [#"../option.rs" 14 12 14 30] _16 <- ([#"../option.rs" 14 12 14 30] _17 = (1 : int32));
+    _17 <- any int32;
+    switch (_16)
       | False -> goto BB17
       | True -> goto BB16
       end
   }
   BB16 {
-    [#"../option.rs" 19 12 19 29] _22 <- ([#"../option.rs" 19 12 19 29] unwrap_or0 ([#"../option.rs" 19 12 19 16] some) ([#"../option.rs" 19 27 19 28] [#"../option.rs" 19 27 19 28] (2 : int32)));
+    [#"../option.rs" 19 12 19 29] _22 <- ([#"../option.rs" 19 12 19 29] unwrap_or0 some (2 : int32));
     goto BB18
   }
   BB17 {
@@ -419,13 +452,15 @@ module Option_TestOption
     absurd
   }
   BB18 {
-    switch ([#"../option.rs" 19 12 19 34] _22 = ([#"../option.rs" 19 33 19 34] [#"../option.rs" 19 33 19 34] (1 : int32)))
+    [#"../option.rs" 19 12 19 34] _21 <- ([#"../option.rs" 19 12 19 34] _22 = (1 : int32));
+    _22 <- any int32;
+    switch (_21)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../option.rs" 20 12 20 29] _27 <- ([#"../option.rs" 20 12 20 29] unwrap_or0 ([#"../option.rs" 20 12 20 16] none) ([#"../option.rs" 20 27 20 28] [#"../option.rs" 20 27 20 28] (2 : int32)));
+    [#"../option.rs" 20 12 20 29] _27 <- ([#"../option.rs" 20 12 20 29] unwrap_or0 none (2 : int32));
     goto BB21
   }
   BB20 {
@@ -433,7 +468,9 @@ module Option_TestOption
     absurd
   }
   BB21 {
-    switch ([#"../option.rs" 20 12 20 34] _27 = ([#"../option.rs" 20 33 20 34] [#"../option.rs" 20 33 20 34] (2 : int32)))
+    [#"../option.rs" 20 12 20 34] _26 <- ([#"../option.rs" 20 12 20 34] _27 = (2 : int32));
+    _27 <- any int32;
+    switch (_26)
       | False -> goto BB23
       | True -> goto BB22
       end
@@ -450,7 +487,7 @@ module Option_TestOption
     absurd
   }
   BB24 {
-    [#"../option.rs" 23 12 23 35] _31 <- ([#"../option.rs" 23 12 23 35] is_none1 ([#"../option.rs" 23 12 23 25] _33));
+    [#"../option.rs" 23 12 23 35] _31 <- ([#"../option.rs" 23 12 23 35] is_none1 _33);
     goto BB25
   }
   BB25 {
@@ -476,13 +513,15 @@ module Option_TestOption
     goto BB29
   }
   BB29 {
-    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] [#"../option.rs" 24 30 24 31] (2 : int32)) ; };
+    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] (2 : int32)) ; };
     assume { resolve0 _36 };
-    [#"../option.rs" 25 12 25 25] _41 <- ([#"../option.rs" 25 12 25 25] unwrap0 ([#"../option.rs" 25 12 25 16] some));
+    [#"../option.rs" 25 12 25 25] _41 <- ([#"../option.rs" 25 12 25 25] unwrap0 some);
     goto BB30
   }
   BB30 {
-    switch ([#"../option.rs" 25 12 25 30] _41 = ([#"../option.rs" 25 29 25 30] [#"../option.rs" 25 29 25 30] (2 : int32)))
+    [#"../option.rs" 25 12 25 30] _40 <- ([#"../option.rs" 25 12 25 30] _41 = (2 : int32));
+    _41 <- any int32;
+    switch (_40)
       | False -> goto BB32
       | True -> goto BB31
       end
@@ -504,19 +543,21 @@ module Option_TestOption
     goto BB34
   }
   BB34 {
-    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] [#"../option.rs" 26 30 26 31] (1 : int32)) ; };
+    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] (1 : int32)) ; };
     assume { resolve0 _44 };
-    [#"../option.rs" 27 12 27 25] _49 <- ([#"../option.rs" 27 12 27 25] unwrap0 ([#"../option.rs" 27 12 27 16] some));
+    [#"../option.rs" 27 12 27 25] _49 <- ([#"../option.rs" 27 12 27 25] unwrap0 some);
     goto BB35
   }
   BB35 {
-    switch ([#"../option.rs" 27 12 27 30] _49 = ([#"../option.rs" 27 29 27 30] [#"../option.rs" 27 29 27 30] (1 : int32)))
+    [#"../option.rs" 27 12 27 30] _48 <- ([#"../option.rs" 27 12 27 30] _49 = (1 : int32));
+    _49 <- any int32;
+    switch (_48)
       | False -> goto BB37
       | True -> goto BB36
       end
   }
   BB36 {
-    [#"../option.rs" 29 12 29 25] _55 <- ([#"../option.rs" 29 12 29 25] as_ref0 ([#"../option.rs" 29 12 29 16] none));
+    [#"../option.rs" 29 12 29 25] _55 <- ([#"../option.rs" 29 12 29 25] as_ref0 none);
     goto BB38
   }
   BB37 {
@@ -524,7 +565,7 @@ module Option_TestOption
     absurd
   }
   BB38 {
-    [#"../option.rs" 29 12 29 35] _53 <- ([#"../option.rs" 29 12 29 35] is_none2 ([#"../option.rs" 29 12 29 25] _55));
+    [#"../option.rs" 29 12 29 35] _53 <- ([#"../option.rs" 29 12 29 35] is_none2 _55);
     goto BB39
   }
   BB39 {
@@ -534,7 +575,7 @@ module Option_TestOption
       end
   }
   BB40 {
-    [#"../option.rs" 30 13 30 26] _62 <- ([#"../option.rs" 30 13 30 26] as_ref0 ([#"../option.rs" 30 13 30 17] some));
+    [#"../option.rs" 30 13 30 26] _62 <- ([#"../option.rs" 30 13 30 26] as_ref0 some);
     goto BB42
   }
   BB41 {
@@ -547,13 +588,14 @@ module Option_TestOption
     goto BB43
   }
   BB43 {
-    switch ([#"../option.rs" 30 12 30 40] ([#"../option.rs" 30 12 30 35] _61) = ([#"../option.rs" 30 39 30 40] [#"../option.rs" 30 39 30 40] (1 : int32)))
+    [#"../option.rs" 30 12 30 40] _59 <- ([#"../option.rs" 30 12 30 40] _61 = (1 : int32));
+    switch (_59)
       | False -> goto BB45
       | True -> goto BB44
       end
   }
   BB44 {
-    [#"../option.rs" 33 12 33 26] _68 <- ([#"../option.rs" 33 12 33 26] and0 ([#"../option.rs" 33 12 33 16] none) ([#"../option.rs" 33 21 33 25] none));
+    [#"../option.rs" 33 12 33 26] _68 <- ([#"../option.rs" 33 12 33 26] and0 none none);
     goto BB46
   }
   BB45 {
@@ -561,7 +603,7 @@ module Option_TestOption
     absurd
   }
   BB46 {
-    [#"../option.rs" 33 12 33 36] _66 <- ([#"../option.rs" 33 12 33 36] is_none0 ([#"../option.rs" 33 12 33 26] _68));
+    [#"../option.rs" 33 12 33 36] _66 <- ([#"../option.rs" 33 12 33 36] is_none0 _68);
     goto BB47
   }
   BB47 {
@@ -571,7 +613,9 @@ module Option_TestOption
       end
   }
   BB48 {
-    [#"../option.rs" 34 12 34 29] _75 <- ([#"../option.rs" 34 12 34 29] and0 ([#"../option.rs" 34 12 34 16] none) ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 34 26 34 27] [#"../option.rs" 34 26 34 27] (2 : int32))));
+    [#"../option.rs" 34 21 34 28] _77 <- ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 34 12 34 29] _75 <- ([#"../option.rs" 34 12 34 29] and0 none _77);
+    _77 <- any Core_Option_Option_Type.t_option int32;
     goto BB50
   }
   BB49 {
@@ -579,7 +623,7 @@ module Option_TestOption
     absurd
   }
   BB50 {
-    [#"../option.rs" 34 12 34 39] _73 <- ([#"../option.rs" 34 12 34 39] is_none0 ([#"../option.rs" 34 12 34 29] _75));
+    [#"../option.rs" 34 12 34 39] _73 <- ([#"../option.rs" 34 12 34 39] is_none0 _75);
     goto BB51
   }
   BB51 {
@@ -589,7 +633,7 @@ module Option_TestOption
       end
   }
   BB52 {
-    [#"../option.rs" 35 12 35 26] _82 <- ([#"../option.rs" 35 12 35 26] and0 ([#"../option.rs" 35 12 35 16] some) ([#"../option.rs" 35 21 35 25] none));
+    [#"../option.rs" 35 12 35 26] _82 <- ([#"../option.rs" 35 12 35 26] and0 some none);
     goto BB54
   }
   BB53 {
@@ -597,7 +641,7 @@ module Option_TestOption
     absurd
   }
   BB54 {
-    [#"../option.rs" 35 12 35 36] _80 <- ([#"../option.rs" 35 12 35 36] is_none0 ([#"../option.rs" 35 12 35 26] _82));
+    [#"../option.rs" 35 12 35 36] _80 <- ([#"../option.rs" 35 12 35 36] is_none0 _82);
     goto BB55
   }
   BB55 {
@@ -607,7 +651,9 @@ module Option_TestOption
       end
   }
   BB56 {
-    [#"../option.rs" 36 12 36 29] _89 <- ([#"../option.rs" 36 12 36 29] and0 ([#"../option.rs" 36 12 36 16] some) ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 36 26 36 27] [#"../option.rs" 36 26 36 27] (2 : int32))));
+    [#"../option.rs" 36 21 36 28] _91 <- ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 36 12 36 29] _89 <- ([#"../option.rs" 36 12 36 29] and0 some _91);
+    _91 <- any Core_Option_Option_Type.t_option int32;
     goto BB58
   }
   BB57 {
@@ -620,13 +666,15 @@ module Option_TestOption
     goto BB59
   }
   BB59 {
-    switch ([#"../option.rs" 36 12 36 43] _88 = ([#"../option.rs" 36 42 36 43] [#"../option.rs" 36 42 36 43] (2 : int32)))
+    [#"../option.rs" 36 12 36 43] _87 <- ([#"../option.rs" 36 12 36 43] _88 = (2 : int32));
+    _88 <- any int32;
+    switch (_87)
       | False -> goto BB61
       | True -> goto BB60
       end
   }
   BB60 {
-    [#"../option.rs" 38 12 38 25] _96 <- ([#"../option.rs" 38 12 38 25] or0 ([#"../option.rs" 38 12 38 16] none) ([#"../option.rs" 38 20 38 24] none));
+    [#"../option.rs" 38 12 38 25] _96 <- ([#"../option.rs" 38 12 38 25] or0 none none);
     goto BB62
   }
   BB61 {
@@ -634,7 +682,7 @@ module Option_TestOption
     absurd
   }
   BB62 {
-    [#"../option.rs" 38 12 38 35] _94 <- ([#"../option.rs" 38 12 38 35] is_none0 ([#"../option.rs" 38 12 38 25] _96));
+    [#"../option.rs" 38 12 38 35] _94 <- ([#"../option.rs" 38 12 38 35] is_none0 _96);
     goto BB63
   }
   BB63 {
@@ -644,7 +692,9 @@ module Option_TestOption
       end
   }
   BB64 {
-    [#"../option.rs" 39 12 39 28] _103 <- ([#"../option.rs" 39 12 39 28] or0 ([#"../option.rs" 39 12 39 16] none) ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 39 25 39 26] [#"../option.rs" 39 25 39 26] (2 : int32))));
+    [#"../option.rs" 39 20 39 27] _105 <- ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 39 12 39 28] _103 <- ([#"../option.rs" 39 12 39 28] or0 none _105);
+    _105 <- any Core_Option_Option_Type.t_option int32;
     goto BB66
   }
   BB65 {
@@ -657,13 +707,15 @@ module Option_TestOption
     goto BB67
   }
   BB67 {
-    switch ([#"../option.rs" 39 12 39 42] _102 = ([#"../option.rs" 39 41 39 42] [#"../option.rs" 39 41 39 42] (2 : int32)))
+    [#"../option.rs" 39 12 39 42] _101 <- ([#"../option.rs" 39 12 39 42] _102 = (2 : int32));
+    _102 <- any int32;
+    switch (_101)
       | False -> goto BB69
       | True -> goto BB68
       end
   }
   BB68 {
-    [#"../option.rs" 40 12 40 25] _110 <- ([#"../option.rs" 40 12 40 25] or0 ([#"../option.rs" 40 12 40 16] some) ([#"../option.rs" 40 20 40 24] none));
+    [#"../option.rs" 40 12 40 25] _110 <- ([#"../option.rs" 40 12 40 25] or0 some none);
     goto BB70
   }
   BB69 {
@@ -676,13 +728,17 @@ module Option_TestOption
     goto BB71
   }
   BB71 {
-    switch ([#"../option.rs" 40 12 40 39] _109 = ([#"../option.rs" 40 38 40 39] [#"../option.rs" 40 38 40 39] (1 : int32)))
+    [#"../option.rs" 40 12 40 39] _108 <- ([#"../option.rs" 40 12 40 39] _109 = (1 : int32));
+    _109 <- any int32;
+    switch (_108)
       | False -> goto BB73
       | True -> goto BB72
       end
   }
   BB72 {
-    [#"../option.rs" 41 12 41 28] _117 <- ([#"../option.rs" 41 12 41 28] or0 ([#"../option.rs" 41 12 41 16] some) ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 41 25 41 26] [#"../option.rs" 41 25 41 26] (2 : int32))));
+    [#"../option.rs" 41 20 41 27] _119 <- ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 41 12 41 28] _117 <- ([#"../option.rs" 41 12 41 28] or0 some _119);
+    _119 <- any Core_Option_Option_Type.t_option int32;
     goto BB74
   }
   BB73 {
@@ -695,7 +751,9 @@ module Option_TestOption
     goto BB75
   }
   BB75 {
-    switch ([#"../option.rs" 41 12 41 42] _116 = ([#"../option.rs" 41 41 41 42] [#"../option.rs" 41 41 41 42] (1 : int32)))
+    [#"../option.rs" 41 12 41 42] _115 <- ([#"../option.rs" 41 12 41 42] _116 = (1 : int32));
+    _116 <- any int32;
+    switch (_115)
       | False -> goto BB77
       | True -> goto BB76
       end
@@ -712,7 +770,7 @@ module Option_TestOption
     absurd
   }
   BB78 {
-    [#"../option.rs" 44 12 44 33] _122 <- ([#"../option.rs" 44 12 44 33] is_none0 ([#"../option.rs" 44 12 44 23] _124));
+    [#"../option.rs" 44 12 44 33] _122 <- ([#"../option.rs" 44 12 44 33] is_none0 _124);
     goto BB79
   }
   BB79 {
@@ -722,7 +780,7 @@ module Option_TestOption
       end
   }
   BB80 {
-    [#"../option.rs" 45 12 45 26] _128 <- ([#"../option.rs" 45 12 45 26] is_none0 ([#"../option.rs" 45 12 45 16] none));
+    [#"../option.rs" 45 12 45 26] _128 <- ([#"../option.rs" 45 12 45 26] is_none0 none);
     goto BB82
   }
   BB81 {
@@ -752,13 +810,15 @@ module Option_TestOption
     goto BB86
   }
   BB86 {
-    switch ([#"../option.rs" 46 12 46 37] _133 = ([#"../option.rs" 46 36 46 37] [#"../option.rs" 46 36 46 37] (1 : int32)))
+    [#"../option.rs" 46 12 46 37] _132 <- ([#"../option.rs" 46 12 46 37] _133 = (1 : int32));
+    _133 <- any int32;
+    switch (_132)
       | False -> goto BB88
       | True -> goto BB87
       end
   }
   BB87 {
-    [#"../option.rs" 47 12 47 26] _138 <- ([#"../option.rs" 47 12 47 26] is_none0 ([#"../option.rs" 47 12 47 16] some));
+    [#"../option.rs" 47 12 47 26] _138 <- ([#"../option.rs" 47 12 47 26] is_none0 some);
     goto BB89
   }
   BB88 {
@@ -772,10 +832,12 @@ module Option_TestOption
       end
   }
   BB90 {
-    [#"../option.rs" 48 4 48 18] some <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some ([#"../option.rs" 48 16 48 17] [#"../option.rs" 48 16 48 17] (1 : int32)));
+    [#"../option.rs" 48 11 48 18] _141 <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 48 4 48 18] some <- ([#"../option.rs" 48 4 48 18] _141);
+    _141 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 50 12 50 16] _146 <- Borrow.borrow_mut none;
     [#"../option.rs" 50 12 50 16] none <-  ^ _146;
-    [#"../option.rs" 50 12 50 27] _145 <- ([#"../option.rs" 50 12 50 27] replace0 _146 ([#"../option.rs" 50 25 50 26] [#"../option.rs" 50 25 50 26] (2 : int32)));
+    [#"../option.rs" 50 12 50 27] _145 <- ([#"../option.rs" 50 12 50 27] replace0 _146 (2 : int32));
     _146 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB92
   }
@@ -784,7 +846,7 @@ module Option_TestOption
     absurd
   }
   BB92 {
-    [#"../option.rs" 50 12 50 37] _143 <- ([#"../option.rs" 50 12 50 37] is_none0 ([#"../option.rs" 50 12 50 27] _145));
+    [#"../option.rs" 50 12 50 37] _143 <- ([#"../option.rs" 50 12 50 37] is_none0 _145);
     goto BB93
   }
   BB93 {
@@ -794,7 +856,7 @@ module Option_TestOption
       end
   }
   BB94 {
-    [#"../option.rs" 51 12 51 25] _150 <- ([#"../option.rs" 51 12 51 25] unwrap0 ([#"../option.rs" 51 12 51 16] none));
+    [#"../option.rs" 51 12 51 25] _150 <- ([#"../option.rs" 51 12 51 25] unwrap0 none);
     goto BB96
   }
   BB95 {
@@ -802,16 +864,20 @@ module Option_TestOption
     absurd
   }
   BB96 {
-    switch ([#"../option.rs" 51 12 51 30] _150 = ([#"../option.rs" 51 29 51 30] [#"../option.rs" 51 29 51 30] (2 : int32)))
+    [#"../option.rs" 51 12 51 30] _149 <- ([#"../option.rs" 51 12 51 30] _150 = (2 : int32));
+    _150 <- any int32;
+    switch (_149)
       | False -> goto BB98
       | True -> goto BB97
       end
   }
   BB97 {
-    [#"../option.rs" 52 4 52 15] none <- ([#"../option.rs" 52 11 52 15] Core_Option_Option_Type.C_None);
+    [#"../option.rs" 52 11 52 15] _153 <- ([#"../option.rs" 52 11 52 15] Core_Option_Option_Type.C_None);
+    [#"../option.rs" 52 4 52 15] none <- ([#"../option.rs" 52 4 52 15] _153);
+    _153 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 53 12 53 16] _158 <- Borrow.borrow_mut some;
     [#"../option.rs" 53 12 53 16] some <-  ^ _158;
-    [#"../option.rs" 53 12 53 27] _157 <- ([#"../option.rs" 53 12 53 27] replace0 _158 ([#"../option.rs" 53 25 53 26] [#"../option.rs" 53 25 53 26] (2 : int32)));
+    [#"../option.rs" 53 12 53 27] _157 <- ([#"../option.rs" 53 12 53 27] replace0 _158 (2 : int32));
     _158 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB99
   }
@@ -825,13 +891,15 @@ module Option_TestOption
     goto BB100
   }
   BB100 {
-    switch ([#"../option.rs" 53 12 53 41] _156 = ([#"../option.rs" 53 40 53 41] [#"../option.rs" 53 40 53 41] (1 : int32)))
+    [#"../option.rs" 53 12 53 41] _155 <- ([#"../option.rs" 53 12 53 41] _156 = (1 : int32));
+    _156 <- any int32;
+    switch (_155)
       | False -> goto BB102
       | True -> goto BB101
       end
   }
   BB101 {
-    [#"../option.rs" 54 12 54 25] _162 <- ([#"../option.rs" 54 12 54 25] unwrap0 ([#"../option.rs" 54 12 54 16] some));
+    [#"../option.rs" 54 12 54 25] _162 <- ([#"../option.rs" 54 12 54 25] unwrap0 some);
     goto BB103
   }
   BB102 {
@@ -839,7 +907,9 @@ module Option_TestOption
     absurd
   }
   BB103 {
-    switch ([#"../option.rs" 54 12 54 30] _162 = ([#"../option.rs" 54 29 54 30] [#"../option.rs" 54 29 54 30] (2 : int32)))
+    [#"../option.rs" 54 12 54 30] _161 <- ([#"../option.rs" 54 12 54 30] _162 = (2 : int32));
+    _162 <- any int32;
+    switch (_161)
       | False -> goto BB105
       | True -> goto BB104
       end
@@ -847,7 +917,7 @@ module Option_TestOption
   BB104 {
     [#"../option.rs" 55 12 55 16] _169 <- Borrow.borrow_mut some;
     [#"../option.rs" 55 12 55 16] some <-  ^ _169;
-    [#"../option.rs" 55 12 55 27] _168 <- ([#"../option.rs" 55 12 55 27] replace0 _169 ([#"../option.rs" 55 25 55 26] [#"../option.rs" 55 25 55 26] (1 : int32)));
+    [#"../option.rs" 55 12 55 27] _168 <- ([#"../option.rs" 55 12 55 27] replace0 _169 (1 : int32));
     _169 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB106
   }
@@ -861,13 +931,15 @@ module Option_TestOption
     goto BB107
   }
   BB107 {
-    switch ([#"../option.rs" 55 12 55 41] _167 = ([#"../option.rs" 55 40 55 41] [#"../option.rs" 55 40 55 41] (2 : int32)))
+    [#"../option.rs" 55 12 55 41] _166 <- ([#"../option.rs" 55 12 55 41] _167 = (2 : int32));
+    _167 <- any int32;
+    switch (_166)
       | False -> goto BB109
       | True -> goto BB108
       end
   }
   BB108 {
-    [#"../option.rs" 56 12 56 25] _173 <- ([#"../option.rs" 56 12 56 25] unwrap0 ([#"../option.rs" 56 12 56 16] some));
+    [#"../option.rs" 56 12 56 25] _173 <- ([#"../option.rs" 56 12 56 25] unwrap0 some);
     goto BB110
   }
   BB109 {
@@ -875,13 +947,15 @@ module Option_TestOption
     absurd
   }
   BB110 {
-    switch ([#"../option.rs" 56 12 56 30] _173 = ([#"../option.rs" 56 29 56 30] [#"../option.rs" 56 29 56 30] (1 : int32)))
+    [#"../option.rs" 56 12 56 30] _172 <- ([#"../option.rs" 56 12 56 30] _173 = (1 : int32));
+    _173 <- any int32;
+    switch (_172)
       | False -> goto BB112
       | True -> goto BB111
       end
   }
   BB111 {
-    [#"../option.rs" 59 12 59 36] _178 <- ([#"../option.rs" 59 12 59 36] unwrap_or_default0 ([#"../option.rs" 59 12 59 16] none));
+    [#"../option.rs" 59 12 59 36] _178 <- ([#"../option.rs" 59 12 59 36] unwrap_or_default0 none);
     goto BB113
   }
   BB112 {
@@ -889,13 +963,15 @@ module Option_TestOption
     absurd
   }
   BB113 {
-    switch ([#"../option.rs" 59 12 59 41] _178 = ([#"../option.rs" 59 40 59 41] [#"../option.rs" 59 40 59 41] (0 : int32)))
+    [#"../option.rs" 59 12 59 41] _177 <- ([#"../option.rs" 59 12 59 41] _178 = (0 : int32));
+    _178 <- any int32;
+    switch (_177)
       | False -> goto BB115
       | True -> goto BB114
       end
   }
   BB114 {
-    [#"../option.rs" 60 12 60 36] _183 <- ([#"../option.rs" 60 12 60 36] unwrap_or_default0 ([#"../option.rs" 60 12 60 16] some));
+    [#"../option.rs" 60 12 60 36] _183 <- ([#"../option.rs" 60 12 60 36] unwrap_or_default0 some);
     goto BB116
   }
   BB115 {
@@ -903,13 +979,15 @@ module Option_TestOption
     absurd
   }
   BB116 {
-    switch ([#"../option.rs" 60 12 60 41] _183 = ([#"../option.rs" 60 40 60 41] [#"../option.rs" 60 40 60 41] (1 : int32)))
+    [#"../option.rs" 60 12 60 41] _182 <- ([#"../option.rs" 60 12 60 41] _183 = (1 : int32));
+    _183 <- any int32;
+    switch (_182)
       | False -> goto BB118
       | True -> goto BB117
       end
   }
   BB117 {
-    [#"../option.rs" 63 12 63 25] _190 <- ([#"../option.rs" 63 12 63 25] as_ref0 ([#"../option.rs" 63 12 63 16] none));
+    [#"../option.rs" 63 12 63 25] _190 <- ([#"../option.rs" 63 12 63 25] as_ref0 none);
     goto BB119
   }
   BB118 {
@@ -922,7 +1000,7 @@ module Option_TestOption
     goto BB120
   }
   BB120 {
-    [#"../option.rs" 63 12 63 44] _187 <- ([#"../option.rs" 63 12 63 44] is_none0 ([#"../option.rs" 63 12 63 34] _189));
+    [#"../option.rs" 63 12 63 44] _187 <- ([#"../option.rs" 63 12 63 44] is_none0 _189);
     goto BB121
   }
   BB121 {
@@ -932,7 +1010,7 @@ module Option_TestOption
       end
   }
   BB122 {
-    [#"../option.rs" 64 12 64 25] _197 <- ([#"../option.rs" 64 12 64 25] as_ref0 ([#"../option.rs" 64 12 64 16] some));
+    [#"../option.rs" 64 12 64 25] _197 <- ([#"../option.rs" 64 12 64 25] as_ref0 some);
     goto BB124
   }
   BB123 {
@@ -950,7 +1028,9 @@ module Option_TestOption
     goto BB126
   }
   BB126 {
-    switch ([#"../option.rs" 64 12 64 48] _195 = ([#"../option.rs" 64 47 64 48] [#"../option.rs" 64 47 64 48] (1 : int32)))
+    [#"../option.rs" 64 12 64 48] _194 <- ([#"../option.rs" 64 12 64 48] _195 = (1 : int32));
+    _195 <- any int32;
+    switch (_194)
       | False -> goto BB128
       | True -> goto BB127
       end
@@ -972,7 +1052,7 @@ module Option_TestOption
     goto BB130
   }
   BB130 {
-    [#"../option.rs" 65 12 65 44] _201 <- ([#"../option.rs" 65 12 65 44] is_none0 ([#"../option.rs" 65 12 65 34] _203));
+    [#"../option.rs" 65 12 65 44] _201 <- ([#"../option.rs" 65 12 65 44] is_none0 _203);
     goto BB131
   }
   BB131 {
@@ -1003,13 +1083,15 @@ module Option_TestOption
     goto BB136
   }
   BB136 {
-    switch ([#"../option.rs" 66 12 66 48] _209 = ([#"../option.rs" 66 47 66 48] [#"../option.rs" 66 47 66 48] (1 : int32)))
+    [#"../option.rs" 66 12 66 48] _208 <- ([#"../option.rs" 66 12 66 48] _209 = (1 : int32));
+    _209 <- any int32;
+    switch (_208)
       | False -> goto BB138
       | True -> goto BB137
       end
   }
   BB137 {
-    [#"../option.rs" 68 12 68 25] _218 <- ([#"../option.rs" 68 12 68 25] as_ref0 ([#"../option.rs" 68 12 68 16] none));
+    [#"../option.rs" 68 12 68 25] _218 <- ([#"../option.rs" 68 12 68 25] as_ref0 none);
     goto BB139
   }
   BB138 {
@@ -1022,7 +1104,7 @@ module Option_TestOption
     goto BB140
   }
   BB140 {
-    [#"../option.rs" 68 12 68 44] _215 <- ([#"../option.rs" 68 12 68 44] is_none0 ([#"../option.rs" 68 12 68 34] _217));
+    [#"../option.rs" 68 12 68 44] _215 <- ([#"../option.rs" 68 12 68 44] is_none0 _217);
     goto BB141
   }
   BB141 {
@@ -1032,7 +1114,7 @@ module Option_TestOption
       end
   }
   BB142 {
-    [#"../option.rs" 69 12 69 25] _225 <- ([#"../option.rs" 69 12 69 25] as_ref0 ([#"../option.rs" 69 12 69 16] some));
+    [#"../option.rs" 69 12 69 25] _225 <- ([#"../option.rs" 69 12 69 25] as_ref0 some);
     goto BB144
   }
   BB143 {
@@ -1050,7 +1132,9 @@ module Option_TestOption
     goto BB146
   }
   BB146 {
-    switch ([#"../option.rs" 69 12 69 48] _223 = ([#"../option.rs" 69 47 69 48] [#"../option.rs" 69 47 69 48] (1 : int32)))
+    [#"../option.rs" 69 12 69 48] _222 <- ([#"../option.rs" 69 12 69 48] _223 = (1 : int32));
+    _223 <- any int32;
+    switch (_222)
       | False -> goto BB148
       | True -> goto BB147
       end
@@ -1072,7 +1156,7 @@ module Option_TestOption
     goto BB150
   }
   BB150 {
-    [#"../option.rs" 70 12 70 44] _229 <- ([#"../option.rs" 70 12 70 44] is_none0 ([#"../option.rs" 70 12 70 34] _231));
+    [#"../option.rs" 70 12 70 44] _229 <- ([#"../option.rs" 70 12 70 44] is_none0 _231);
     goto BB151
   }
   BB151 {
@@ -1103,14 +1187,16 @@ module Option_TestOption
     goto BB156
   }
   BB156 {
-    switch ([#"../option.rs" 71 12 71 48] _237 = ([#"../option.rs" 71 47 71 48] [#"../option.rs" 71 47 71 48] (1 : int32)))
+    [#"../option.rs" 71 12 71 48] _236 <- ([#"../option.rs" 71 12 71 48] _237 = (1 : int32));
+    _237 <- any int32;
+    switch (_236)
       | False -> goto BB158
       | True -> goto BB157
       end
   }
   BB157 {
     [#"../option.rs" 74 35 74 39] opt <- ([#"../option.rs" 74 35 74 39] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 75 12 75 25] _246 <- ([#"../option.rs" 75 12 75 25] flatten0 ([#"../option.rs" 75 12 75 15] opt));
+    [#"../option.rs" 75 12 75 25] _246 <- ([#"../option.rs" 75 12 75 25] flatten0 opt);
     goto BB159
   }
   BB158 {
@@ -1118,7 +1204,7 @@ module Option_TestOption
     absurd
   }
   BB159 {
-    [#"../option.rs" 75 12 75 35] _244 <- ([#"../option.rs" 75 12 75 35] is_none0 ([#"../option.rs" 75 12 75 25] _246));
+    [#"../option.rs" 75 12 75 35] _244 <- ([#"../option.rs" 75 12 75 35] is_none0 _246);
     goto BB160
   }
   BB160 {
@@ -1128,8 +1214,10 @@ module Option_TestOption
       end
   }
   BB161 {
-    [#"../option.rs" 76 35 76 45] opt1 <- ([#"../option.rs" 76 35 76 45] Core_Option_Option_Type.C_Some ([#"../option.rs" 76 40 76 44] Core_Option_Option_Type.C_None));
-    [#"../option.rs" 77 12 77 25] _254 <- ([#"../option.rs" 77 12 77 25] flatten0 ([#"../option.rs" 77 12 77 15] opt1));
+    [#"../option.rs" 76 40 76 44] _250 <- ([#"../option.rs" 76 40 76 44] Core_Option_Option_Type.C_None);
+    [#"../option.rs" 76 35 76 45] opt1 <- ([#"../option.rs" 76 35 76 45] Core_Option_Option_Type.C_Some _250);
+    _250 <- any Core_Option_Option_Type.t_option int32;
+    [#"../option.rs" 77 12 77 25] _254 <- ([#"../option.rs" 77 12 77 25] flatten0 opt1);
     goto BB163
   }
   BB162 {
@@ -1137,7 +1225,7 @@ module Option_TestOption
     absurd
   }
   BB163 {
-    [#"../option.rs" 77 12 77 35] _252 <- ([#"../option.rs" 77 12 77 35] is_none0 ([#"../option.rs" 77 12 77 25] _254));
+    [#"../option.rs" 77 12 77 35] _252 <- ([#"../option.rs" 77 12 77 35] is_none0 _254);
     goto BB164
   }
   BB164 {
@@ -1147,8 +1235,10 @@ module Option_TestOption
       end
   }
   BB165 {
-    [#"../option.rs" 78 35 78 48] opt2 <- ([#"../option.rs" 78 35 78 48] Core_Option_Option_Type.C_Some ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some ([#"../option.rs" 78 45 78 46] [#"../option.rs" 78 45 78 46] (1 : int32))));
-    [#"../option.rs" 79 12 79 25] _262 <- ([#"../option.rs" 79 12 79 25] flatten0 ([#"../option.rs" 79 12 79 15] opt2));
+    [#"../option.rs" 78 40 78 47] _258 <- ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 78 35 78 48] opt2 <- ([#"../option.rs" 78 35 78 48] Core_Option_Option_Type.C_Some _258);
+    _258 <- any Core_Option_Option_Type.t_option int32;
+    [#"../option.rs" 79 12 79 25] _262 <- ([#"../option.rs" 79 12 79 25] flatten0 opt2);
     goto BB167
   }
   BB166 {
@@ -1161,7 +1251,9 @@ module Option_TestOption
     goto BB168
   }
   BB168 {
-    switch ([#"../option.rs" 79 12 79 39] _261 = ([#"../option.rs" 79 38 79 39] [#"../option.rs" 79 38 79 39] (1 : int32)))
+    [#"../option.rs" 79 12 79 39] _260 <- ([#"../option.rs" 79 12 79 39] _261 = (1 : int32));
+    _261 <- any int32;
+    switch (_260)
       | False -> goto BB170
       | True -> goto BB169
       end
diff --git a/creusot/tests/should_succeed/option/why3session.xml b/creusot/tests/should_succeed/option/why3session.xml
index bf75572f37..f9f1151e66 100644
--- a/creusot/tests/should_succeed/option/why3session.xml
+++ b/creusot/tests/should_succeed/option/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="option.mlcfg"/>
 <theory name="Option_TestOption" proved="true">
  <goal name="test_option&#39;vc" expl="VC for test_option" proved="true">
- <proof prover="1"><result status="valid" time="0.111139" steps="318979"/></proof>
+ <proof prover="1"><result status="valid" time="0.111139" steps="397626"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/option/why3shapes.gz b/creusot/tests/should_succeed/option/why3shapes.gz
index 367c3c03ee565526cf8fdda3ac74be0ee4e4790c..9ba0082fdccdf797b2403248084891c492fb1000 100644
GIT binary patch
literal 365
zcmV-z0h0b7iwFP!00000|Lv5$PQx$|$M-yiH=vV0Vmm=%up%O7DFeuB<)*f%1Wjo|
zpP!3kr;v&lKn%8jKK*?k%3W?(sDHIb*Q2vL_51E{j|5uXWy6QvAI_!0b;QDugwoK2
z!mxzg<Oy@b6EY(bQX>-*QzXQutTW$u<(q1-wSDVd<)?G7FQ-pu2vha}_WfiH#`S2y
zw%V+_gL{lR8g%qZN0LsZ+jIBsS~A^dFDhmcqgTJBQ-){d_b{V@FS03utXRtOSr+U*
zs%22itK9R2R}pmLO2>cH$QL!vUesLF1wz@W)PMd999xw#*}&(AW6_0_iI&t&A^;f0
zfzcb-XVVC<IOxLk0zxyz&Khs9@>)&v45-%OP3pDDLk^2g9!60ZWy<Kq3wr`fW-8>n
z6B=AUY`WtB|Di0igtdOlEJUKz7s3fi${oSGtrW7wTSSN^SeLrcQVY#>u9>EqXq<fk
Ldjho&)&u|m_T96E

literal 424
zcmV;Z0ayMXiwFP!00000|CLldZ-X!p-T4)4Z8P}`Y**@lP?1@Zp_SLjCANyxhBVOp
z{u&z-AWD=DzC6Ese!i2BJg(yQQyp|0pY*Y<oBeZ~#;d2O`%(4&#3d*O$RrGqN)%u!
zae#>=0TP)6h-Dfek~BalS%5(DA~L1POqqA8P+zUijsNY``|(#xh%@zKW9?Z-u6qWk
ze7kP;`gPDDr$ZMy7<5_Ky*1yuf_^``WJ49h?fJEGxI4zD*YrfPsD?QiTgu2NbG#YU
z)T!x3?PTGaI$e69OJ+SLiylXpY;0--wQGACa~FO3Ha}&q;oF|KeeTKL6Yr_#zswZ-
z$>|>gK~TYR0_==;7(LiH%Si-yQTorqLi<X?ll42hSdsY;#lp-P12#Nj>34Qf@6e0f
z{2-8?UFc?H`cpnnXC5I}l(WO*@DzUN5J<crSqw7*VX%C)eOJUwiCy?y9`@Ixb9s0(
zGQB}0^Vl@UxYKR7Z4RCNCyF9gaaGZZAZ!dlW~V7pXa~7Q9~xjzV+aKVf(s_7NJS!u
Szyb*<K=cPmX#IcK1ONbI*~zK^

diff --git a/creusot/tests/should_succeed/ord_trait.mlcfg b/creusot/tests/should_succeed/ord_trait.mlcfg
index 92fceb55f1..af0d60501e 100644
--- a/creusot/tests/should_succeed/ord_trait.mlcfg
+++ b/creusot/tests/should_succeed/ord_trait.mlcfg
@@ -162,7 +162,7 @@ module OrdTrait_X
   }
   BB0 {
     [#"../ord_trait.rs" 9 9 9 10] _5 <- ([#"../ord_trait.rs" 9 9 9 10] x);
-    [#"../ord_trait.rs" 9 4 9 10] _0 <- ([#"../ord_trait.rs" 9 4 9 10] le0 ([#"../ord_trait.rs" 9 4 9 5] x) ([#"../ord_trait.rs" 9 9 9 10] _5));
+    [#"../ord_trait.rs" 9 4 9 10] _0 <- ([#"../ord_trait.rs" 9 4 9 10] le0 x _5);
     goto BB1
   }
   BB1 {
@@ -334,7 +334,7 @@ module OrdTrait_GtOrLe
     [#"../ord_trait.rs" 17 9 17 10] _6 <- ([#"../ord_trait.rs" 17 9 17 10] y);
     assert { [@expl:type invariant] inv0 y };
     assume { resolve0 y };
-    [#"../ord_trait.rs" 17 4 17 10] _0 <- ([#"../ord_trait.rs" 17 4 17 10] ge0 ([#"../ord_trait.rs" 17 4 17 5] x) ([#"../ord_trait.rs" 17 9 17 10] _6));
+    [#"../ord_trait.rs" 17 4 17 10] _0 <- ([#"../ord_trait.rs" 17 4 17 10] ge0 x _6);
     goto BB1
   }
   BB1 {
@@ -361,7 +361,7 @@ module OrdTrait_GtOrLeInt
     goto BB0
   }
   BB0 {
-    [#"../ord_trait.rs" 22 4 22 10] _0 <- ([#"../ord_trait.rs" 22 4 22 10] ([#"../ord_trait.rs" 22 4 22 5] x) <= ([#"../ord_trait.rs" 22 9 22 10] y));
+    [#"../ord_trait.rs" 22 4 22 10] _0 <- ([#"../ord_trait.rs" 22 4 22 10] x <= y);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/projection_toggle.mlcfg b/creusot/tests/should_succeed/projection_toggle.mlcfg
index d771323062..97b3ca30db 100644
--- a/creusot/tests/should_succeed/projection_toggle.mlcfg
+++ b/creusot/tests/should_succeed/projection_toggle.mlcfg
@@ -47,7 +47,7 @@ module ProjectionToggle_ProjToggle
     goto BB0
   }
   BB0 {
-    switch ([#"../projection_toggle.rs" 6 7 6 13] toggle)
+    switch (toggle)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -131,12 +131,13 @@ module ProjectionToggle_F
   var _5 : borrowed int32;
   var _6 : borrowed int32;
   var _7 : borrowed int32;
+  var _9 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] [#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
-    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] [#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
+    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
+    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
     [#"../projection_toggle.rs" 17 30 17 36] _5 <- Borrow.borrow_mut a;
     [#"../projection_toggle.rs" 17 30 17 36] a <-  ^ _5;
     [#"../projection_toggle.rs" 17 30 17 36] _4 <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
@@ -145,7 +146,7 @@ module ProjectionToggle_F
     [#"../projection_toggle.rs" 17 38 17 44] b <-  ^ _7;
     [#"../projection_toggle.rs" 17 38 17 44] _6 <- Borrow.borrow_final ( * _7) (Borrow.get_id _7);
     [#"../projection_toggle.rs" 17 38 17 44] _7 <- { _7 with current = ( ^ _6) ; };
-    [#"../projection_toggle.rs" 17 12 17 45] x <- ([#"../projection_toggle.rs" 17 12 17 45] proj_toggle0 ([#"../projection_toggle.rs" 17 24 17 28] [#"../projection_toggle.rs" 17 24 17 28] true) _4 _6);
+    [#"../projection_toggle.rs" 17 12 17 45] x <- ([#"../projection_toggle.rs" 17 12 17 45] proj_toggle0 true _4 _6);
     _4 <- any borrowed int32;
     _6 <- any borrowed int32;
     goto BB1
@@ -153,9 +154,10 @@ module ProjectionToggle_F
   BB1 {
     assume { resolve0 _7 };
     assume { resolve0 _5 };
-    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11]  * x + ([#"../projection_toggle.rs" 19 10 19 11] [#"../projection_toggle.rs" 19 10 19 11] (5 : int32))) ; };
+    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11]  * x + (5 : int32)) ; };
     assume { resolve0 x };
-    switch ([#"../projection_toggle.rs" 20 12 20 19] ([#"../projection_toggle.rs" 20 12 20 13] a) = ([#"../projection_toggle.rs" 20 17 20 19] [#"../projection_toggle.rs" 20 17 20 19] (15 : int32)))
+    [#"../projection_toggle.rs" 20 12 20 19] _9 <- ([#"../projection_toggle.rs" 20 12 20 19] a = (15 : int32));
+    switch (_9)
       | False -> goto BB3
       | True -> goto BB2
       end
diff --git a/creusot/tests/should_succeed/projection_toggle/why3shapes.gz b/creusot/tests/should_succeed/projection_toggle/why3shapes.gz
index 8e63fe15980395f3a1c1c978c19c12f155bb5b04..b71a8e4fd42381bba0a0157246801d58ed38c6f5 100644
GIT binary patch
literal 661
zcmV;G0&4vqiwFP!00000|9w<VkDEXYz4I%$ZJS=k^G&53P!yC%JyvsUG$D}EreO<g
z`u97Yk1S!edq@~;^XA!p_NP@o{<P1{nBSUV?E351T;{9K+4R?T*Bcm8#Un9LW${4E
z&aUkb!|cki(ypDwaBtzx!lQ+`2esdamu7E=X6!Gwh8VFA7@~~NnNLQaj6ON@0gFyx
zWjf5=B)Lg)2Mah-K=;Uq*<(Kp{lDh)^yjxX+qS#fiz#e(GDWoyv;pvhCIEYGrUN=%
zN-i^JSoy#RT=-AO0=I~;3Ne(2EsRc}I$^4Ssol>7ZCsQvAvc6ZuaOI66_Ggt`7$d5
z`1EXfLgtaJZ^pKKtx_r-vz5J!4c>skuT|8kc>0kD=y#Za^jFJmB%=};mB@gMY!v=s
zVCo7wj94~BMr4LCL0r;+*d}0+fLX*9D8hM`JSM@t_6)7c&12gBh4OnFDZ?I7zMw)`
zq(TYaOo?wLWrot!OiB|QN&+2cS%uI9PW)G}1Sb!92549K;x4{onP`EDRx{D_sQG2W
z3p1-Sv&q|j$e)M)*J0|<=Sy>+YB%7UcHfq5D9#ixAV|CDV#&~m-Ks%&s(A23uM?wB
z?mt>)Qrf@K4Qe3DMuc8gj~LGXW&SE_QDG8?WB+nJjc=UaeE(;+>cz%z41}A5DlG>d
z7Z++V2%F;?Sch$}!p#<pYO2cnvI__G@e%<q5+EO~5g@ZYl0r#XJ-Atn7nXT%*uvQR
z5M^Y7my5BNIQ5}PxRCvc2Zf=43<Ry!p^;EK9!Vc<mYuXz&@j*-K}u0`&bS5I0#S{!
vgy(EWcd#Q_QHWL_X{&2(n^sEAMcrCBY6VuDw94g9?0EJc<_XP)U<LpH?5042

literal 649
zcmV;40(Si$iwFP!00000|9w<VkDD+Mz4I%$ZA&j6f5J*RpeQIvRZo?VjSPV_Z5p<a
zP5*v9{zwR`-2>Rn49{;oZ{|~$PCv~{H>KBZoQ}i!IhASlIl25b$MY35slt|MsFJXu
z<<YFn56w)bS!q_*qPeqhYvIAd>_W}=@wKbX*iFOf+7T^kk0Hvi&U`ZXWbnzE4_I&l
zE8}MFCeclz+grer0$L*@W}0CfhkxDv>CbOxHvREzPP#D1y)LTS(+0pDngGn9yX??u
zQ?i*^L*@blaN&L-3)~{WD#TC@w$OP5%_FArn7Msy(Aq``?Q=tD^lG_4RsoqKkh^B3
z0awSCM`Rw@x?*g~`z^(*W2Q2vslyX6_<oCdyuAF82;}cD0qKsGn?OcIGAfb*8Q3U%
zVPLEZI<#08MFwPsFkW0zgV;o15rJ926)3`amOLcEo%S@X%JpN~?t}7M87adWQNEx;
zS)f7*o=k}=C1sk@SWHSI8%jJKYsq|Q1Sjq<Sb~#>JUz6%_~ItMVwq@xiB>bw^Pu@<
z!V5F261`6QVN74f;n(gm91f@M*44Jb`?@dt`WsfG1ySEu8*yRu$-aYSrj+`PEU?5u
z6~dRQdc?5)FY`~?iV8XIn&I`lpWZmXy7JCW%@+f~G7whgRqTBp<`PQH>y~4euY9v-
zIJmq~U8?dn%lt-tJR`tq0LVvE0?2Gk#8BcV3l0wLbfe$vCEwL9L}?k}<)W)4Hnj^9
zIB(sKdjX+7G<Yes!XMvS9<ls=lI(M-pkt7O1Sv(!IpYRs4@7m!5T3Fv-NKe6EN_}#
jv8FG$guDPz^jxr}m96QDTtO<gV#|~NG|*iFKL!8*V{Aa3

diff --git a/creusot/tests/should_succeed/projections.mlcfg b/creusot/tests/should_succeed/projections.mlcfg
index 3d3c8dd4ef..2c202a2f4b 100644
--- a/creusot/tests/should_succeed/projections.mlcfg
+++ b/creusot/tests/should_succeed/projections.mlcfg
@@ -64,7 +64,7 @@ module Projections_CopyOutOfSum
   }
   BB2 {
     [#"../projections.rs" 12 12 12 13] y <- ([#"../projections.rs" 12 12 12 13] Core_Result_Result_Type.err_0 x);
-    [#"../projections.rs" 12 12 12 13] x <- (let Core_Result_Result_Type.C_Err x0 = x in Core_Result_Result_Type.C_Err (any borrowed uint32));
+    x <- (let Core_Result_Result_Type.C_Err x0 = x in Core_Result_Result_Type.C_Err (any borrowed uint32));
     [#"../projections.rs" 12 18 12 20] _0 <- ([#"../projections.rs" 12 18 12 20]  * y);
     assume { resolve0 y };
     goto BB5
@@ -75,7 +75,7 @@ module Projections_CopyOutOfSum
   }
   BB4 {
     [#"../projections.rs" 11 11 11 12] x1 <- ([#"../projections.rs" 11 11 11 12] Core_Result_Result_Type.ok_0 x);
-    [#"../projections.rs" 11 11 11 12] x <- (let Core_Result_Result_Type.C_Ok x0 = x in Core_Result_Result_Type.C_Ok (any borrowed uint32));
+    x <- (let Core_Result_Result_Type.C_Ok x0 = x in Core_Result_Result_Type.C_Ok (any borrowed uint32));
     [#"../projections.rs" 11 17 11 19] _0 <- ([#"../projections.rs" 11 17 11 19]  * x1);
     assume { resolve0 x1 };
     goto BB5
@@ -142,7 +142,7 @@ module Projections_WriteIntoSum
   BB4 {
     [#"../projections.rs" 18 13 18 14] y <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * x)) (Borrow.inherit_id (Borrow.get_id x) 1);
     [#"../projections.rs" 18 13 18 14] x <- { x with current = (let Core_Option_Option_Type.C_Some x0 =  * x in Core_Option_Option_Type.C_Some ( ^ y)) ; };
-    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] [#"../projections.rs" 18 24 18 26] (10 : uint32)) ; };
+    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] (10 : uint32)) ; };
     assume { resolve0 y };
     [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] ());
     assume { resolve1 x };
@@ -167,14 +167,14 @@ module Projections_F
     goto BB0
   }
   BB0 {
-    [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some ([#"../projections.rs" 24 15 24 17] [#"../projections.rs" 24 15 24 17] (10 : int32)));
+    [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some (10 : int32));
     switch (_2)
       | Core_Option_Option_Type.C_None -> goto BB1
       | Core_Option_Option_Type.C_Some _ -> goto BB2
       end
   }
   BB1 {
-    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] [#"../projections.rs" 26 16 26 21] false);
+    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] false);
     goto BB5
   }
   BB2 {
@@ -186,7 +186,7 @@ module Projections_F
   }
   BB4 {
     [#"../projections.rs" 25 13 25 14] x <- ([#"../projections.rs" 25 13 25 14] Core_Option_Option_Type.some_0 _2);
-    [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] ([#"../projections.rs" 25 19 25 20] x) = ([#"../projections.rs" 25 24 25 25] [#"../projections.rs" 25 24 25 25] (0 : int32)));
+    [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] x = (0 : int32));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/prophecy.mlcfg b/creusot/tests/should_succeed/prophecy.mlcfg
index 3bfc023793..a25acd9ae6 100644
--- a/creusot/tests/should_succeed/prophecy.mlcfg
+++ b/creusot/tests/should_succeed/prophecy.mlcfg
@@ -17,10 +17,10 @@ module Prophecy_F
     goto BB0
   }
   BB0 {
-    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] [#"../prophecy.rs" 4 16 4 17] (0 : int32));
+    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] (0 : int32));
     [#"../prophecy.rs" 5 12 5 18] y <- Borrow.borrow_mut x;
     [#"../prophecy.rs" 5 12 5 18] x <-  ^ y;
-    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] [#"../prophecy.rs" 9 9 9 10] (5 : int32)) ; };
+    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] (5 : int32)) ; };
     assume { resolve0 y };
     [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index 5a1b50dfbf..c75504381d 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -1073,7 +1073,7 @@ module RedBlackTree_Impl13_IsRed
       end
   }
   BB1 {
-    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] [#"../red_black_tree.rs" 391 17 391 22] false);
+    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] false);
     goto BB5
   }
   BB2 {
@@ -1088,7 +1088,7 @@ module RedBlackTree_Impl13_IsRed
     goto BB4
   }
   BB4 {
-    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] [#"../red_black_tree.rs" 390 49 390 53] true);
+    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] true);
     goto BB5
   }
   BB5 {
@@ -1521,6 +1521,8 @@ module RedBlackTree_Impl14_RotateRight
   var _28 : borrowed (RedBlackTree_Color_Type.t_color);
   var _29 : borrowed (RedBlackTree_Color_Type.t_color);
   var _30 : borrowed (RedBlackTree_Color_Type.t_color);
+  var _33 : RedBlackTree_Tree_Type.t_tree k v;
+  var _34 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   {
     goto BB0
   }
@@ -1605,17 +1607,21 @@ module RedBlackTree_Impl14_RotateRight
     assume { resolve4 _30 };
     assume { resolve4 _28 };
     assert { [@expl:assertion] [#"../red_black_tree.rs" 441 8 441 90] has_mapping0 (RedBlackTree_Node_Type.node_left ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
+    [#"../red_black_tree.rs" 442 34 442 41] _34 <- ([#"../red_black_tree.rs" 442 34 442 41] Core_Option_Option_Type.C_Some x);
+    x <- any RedBlackTree_Node_Type.t_node k v;
     goto BB7
   }
   BB7 {
+    [#"../red_black_tree.rs" 442 21 442 43] _33 <- ([#"../red_black_tree.rs" 442 21 442 43] RedBlackTree_Tree_Type.C_Tree _34);
+    _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB8
   }
   BB8 {
     goto BB9
   }
   BB9 {
-    [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 ([#"../red_black_tree.rs" 442 21 442 43] RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 442 34 442 41] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 442 39 442 40] x)))) ; };
-    [#"../red_black_tree.rs" 442 39 442 40] x <- any RedBlackTree_Node_Type.t_node k v;
+    [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 ([#"../red_black_tree.rs" 442 8 442 18] _33)) ; };
+    _33 <- any RedBlackTree_Tree_Type.t_tree k v;
     assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_right ( * self)) };
     assume { resolve5 (RedBlackTree_Node_Type.node_right ( * self)) };
     assert { [@expl:type invariant] inv8 self };
@@ -2051,6 +2057,8 @@ module RedBlackTree_Impl14_RotateLeft
   var _28 : borrowed (RedBlackTree_Color_Type.t_color);
   var _29 : borrowed (RedBlackTree_Color_Type.t_color);
   var _30 : borrowed (RedBlackTree_Color_Type.t_color);
+  var _33 : RedBlackTree_Tree_Type.t_tree k v;
+  var _34 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   {
     goto BB0
   }
@@ -2135,17 +2143,21 @@ module RedBlackTree_Impl14_RotateLeft
     assume { resolve4 _30 };
     assume { resolve4 _28 };
     assert { [@expl:assertion] [#"../red_black_tree.rs" 468 8 468 91] has_mapping0 (RedBlackTree_Node_Type.node_right ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
+    [#"../red_black_tree.rs" 469 33 469 40] _34 <- ([#"../red_black_tree.rs" 469 33 469 40] Core_Option_Option_Type.C_Some x);
+    x <- any RedBlackTree_Node_Type.t_node k v;
     goto BB7
   }
   BB7 {
+    [#"../red_black_tree.rs" 469 20 469 42] _33 <- ([#"../red_black_tree.rs" 469 20 469 42] RedBlackTree_Tree_Type.C_Tree _34);
+    _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB8
   }
   BB8 {
     goto BB9
   }
   BB9 {
-    [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node ([#"../red_black_tree.rs" 469 20 469 42] RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 469 33 469 40] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 469 38 469 39] x))) x1 x2 x3 x4) ; };
-    [#"../red_black_tree.rs" 469 38 469 39] x <- any RedBlackTree_Node_Type.t_node k v;
+    [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node ([#"../red_black_tree.rs" 469 8 469 17] _33) x1 x2 x3 x4) ; };
+    _33 <- any RedBlackTree_Tree_Type.t_tree k v;
     assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_left ( * self)) };
     assume { resolve5 (RedBlackTree_Node_Type.node_left ( * self)) };
     assert { [@expl:type invariant] inv8 self };
@@ -2544,7 +2556,7 @@ module RedBlackTree_Impl14_FlipColors
     goto BB2
   }
   BB2 {
-    [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _13 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 487 49 487 59] RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _13 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 487 8 487 59] RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; };
     assert { [@expl:type invariant] inv1 _13 };
     assume { resolve0 _13 };
     [#"../red_black_tree.rs" 488 23 488 38] _18 <- Borrow.borrow_final (RedBlackTree_Node_Type.node_color ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
@@ -3027,7 +3039,7 @@ module RedBlackTree_Impl14_Balance
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 511 11 511 30] _15 <- ([#"../red_black_tree.rs" 511 11 511 30] is_red0 ([#"../red_black_tree.rs" 511 11 511 21] RedBlackTree_Node_Type.node_right ( * self)));
+    [#"../red_black_tree.rs" 511 11 511 30] _15 <- ([#"../red_black_tree.rs" 511 11 511 30] is_red0 (RedBlackTree_Node_Type.node_right ( * self)));
     goto BB1
   }
   BB1 {
@@ -3037,7 +3049,7 @@ module RedBlackTree_Impl14_Balance
       end
   }
   BB2 {
-    [#"../red_black_tree.rs" 511 35 511 53] _17 <- ([#"../red_black_tree.rs" 511 35 511 53] is_red0 ([#"../red_black_tree.rs" 511 35 511 44] RedBlackTree_Node_Type.node_left ( * self)));
+    [#"../red_black_tree.rs" 511 35 511 53] _17 <- ([#"../red_black_tree.rs" 511 35 511 53] is_red0 (RedBlackTree_Node_Type.node_left ( * self)));
     goto BB3
   }
   BB3 {
@@ -3069,7 +3081,7 @@ module RedBlackTree_Impl14_Balance
     goto BB9
   }
   BB9 {
-    [#"../red_black_tree.rs" 515 11 515 29] _22 <- ([#"../red_black_tree.rs" 515 11 515 29] is_red0 ([#"../red_black_tree.rs" 515 11 515 20] RedBlackTree_Node_Type.node_left ( * self)));
+    [#"../red_black_tree.rs" 515 11 515 29] _22 <- ([#"../red_black_tree.rs" 515 11 515 29] is_red0 (RedBlackTree_Node_Type.node_left ( * self)));
     goto BB10
   }
   BB10 {
@@ -3079,7 +3091,7 @@ module RedBlackTree_Impl14_Balance
       end
   }
   BB11 {
-    [#"../red_black_tree.rs" 515 33 515 56] _27 <- ([#"../red_black_tree.rs" 515 33 515 56] as_ref0 ([#"../red_black_tree.rs" 515 33 515 47] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * self))));
+    [#"../red_black_tree.rs" 515 33 515 56] _27 <- ([#"../red_black_tree.rs" 515 33 515 56] as_ref0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * self))));
     goto BB12
   }
   BB12 {
@@ -3090,7 +3102,7 @@ module RedBlackTree_Impl14_Balance
   BB13 {
     assert { [@expl:type invariant] inv1 _26 };
     assume { resolve0 _26 };
-    [#"../red_black_tree.rs" 515 33 515 79] _24 <- ([#"../red_black_tree.rs" 515 33 515 79] is_red0 ([#"../red_black_tree.rs" 515 33 515 70] RedBlackTree_Node_Type.node_left _26));
+    [#"../red_black_tree.rs" 515 33 515 79] _24 <- ([#"../red_black_tree.rs" 515 33 515 79] is_red0 (RedBlackTree_Node_Type.node_left _26));
     goto BB14
   }
   BB14 {
@@ -3122,7 +3134,7 @@ module RedBlackTree_Impl14_Balance
     goto BB20
   }
   BB20 {
-    [#"../red_black_tree.rs" 519 11 519 29] _31 <- ([#"../red_black_tree.rs" 519 11 519 29] is_red0 ([#"../red_black_tree.rs" 519 11 519 20] RedBlackTree_Node_Type.node_left ( * self)));
+    [#"../red_black_tree.rs" 519 11 519 29] _31 <- ([#"../red_black_tree.rs" 519 11 519 29] is_red0 (RedBlackTree_Node_Type.node_left ( * self)));
     goto BB21
   }
   BB21 {
@@ -3132,7 +3144,7 @@ module RedBlackTree_Impl14_Balance
       end
   }
   BB22 {
-    [#"../red_black_tree.rs" 519 33 519 52] _33 <- ([#"../red_black_tree.rs" 519 33 519 52] is_red0 ([#"../red_black_tree.rs" 519 33 519 43] RedBlackTree_Node_Type.node_right ( * self)));
+    [#"../red_black_tree.rs" 519 33 519 52] _33 <- ([#"../red_black_tree.rs" 519 33 519 52] is_red0 (RedBlackTree_Node_Type.node_right ( * self)));
     goto BB23
   }
   BB23 {
@@ -3650,7 +3662,7 @@ module RedBlackTree_Impl14_MoveRedLeft
     goto BB3
   }
   BB3 {
-    [#"../red_black_tree.rs" 544 11 544 58] _18 <- ([#"../red_black_tree.rs" 544 11 544 58] is_red0 ([#"../red_black_tree.rs" 544 11 544 49] RedBlackTree_Node_Type.node_left ( * _20)));
+    [#"../red_black_tree.rs" 544 11 544 58] _18 <- ([#"../red_black_tree.rs" 544 11 544 58] is_red0 (RedBlackTree_Node_Type.node_left ( * _20)));
     goto BB4
   }
   BB4 {
@@ -3725,7 +3737,7 @@ module RedBlackTree_Impl14_MoveRedLeft
     assert { [@expl:type invariant] inv2 _20 };
     assume { resolve0 _20 };
     [#"../red_black_tree.rs" 550 15 550 19] _0 <- ([#"../red_black_tree.rs" 550 15 550 19] self);
-    [#"../red_black_tree.rs" 550 15 550 19] self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     goto BB14
   }
   BB14 {
@@ -4197,7 +4209,7 @@ module RedBlackTree_Impl14_MoveRedRight
     goto BB3
   }
   BB3 {
-    [#"../red_black_tree.rs" 573 11 573 57] _18 <- ([#"../red_black_tree.rs" 573 11 573 57] is_red0 ([#"../red_black_tree.rs" 573 11 573 48] RedBlackTree_Node_Type.node_left ( * _20)));
+    [#"../red_black_tree.rs" 573 11 573 57] _18 <- ([#"../red_black_tree.rs" 573 11 573 57] is_red0 (RedBlackTree_Node_Type.node_left ( * _20)));
     goto BB4
   }
   BB4 {
@@ -4249,7 +4261,7 @@ module RedBlackTree_Impl14_MoveRedRight
     assert { [@expl:type invariant] inv2 _20 };
     assume { resolve0 _20 };
     [#"../red_black_tree.rs" 578 15 578 19] _0 <- ([#"../red_black_tree.rs" 578 15 578 19] self);
-    [#"../red_black_tree.rs" 578 15 578 19] self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     goto BB11
   }
   BB11 {
@@ -4500,11 +4512,14 @@ module RedBlackTree_Impl15_New
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : RedBlackTree_Tree_Type.t_tree k v;
+  var _3 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   {
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 589 8 589 27] _0 <- ([#"../red_black_tree.rs" 589 8 589 27] RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 589 21 589 25] Core_Option_Option_Type.C_None));
+    [#"../red_black_tree.rs" 589 21 589 25] _3 <- ([#"../red_black_tree.rs" 589 21 589 25] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 589 8 589 27] _0 <- ([#"../red_black_tree.rs" 589 8 589 27] RedBlackTree_Tree_Type.C_Tree _3);
+    _3 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB1
   }
   BB1 {
@@ -4954,6 +4969,13 @@ module RedBlackTree_Impl15_InsertRec
   var _25 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _28 : ();
   var _29 : borrowed (RedBlackTree_Node_Type.t_node k v);
+  var _31 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
+  var _33 : RedBlackTree_Node_Type.t_node k v;
+  var _34 : RedBlackTree_Tree_Type.t_tree k v;
+  var _35 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
+  var _36 : RedBlackTree_Color_Type.t_color;
+  var _39 : RedBlackTree_Tree_Type.t_tree k v;
+  var _40 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   {
     goto BB0
   }
@@ -4982,7 +5004,7 @@ module RedBlackTree_Impl15_InsertRec
     [#"../red_black_tree.rs" 602 26 602 35] _18 <- ([#"../red_black_tree.rs" 602 26 602 35] RedBlackTree_Node_Type.node_key ( * node));
     assert { [@expl:type invariant] inv2 _18 };
     assume { resolve0 _18 };
-    [#"../red_black_tree.rs" 602 18 602 36] _15 <- ([#"../red_black_tree.rs" 602 18 602 36] cmp0 ([#"../red_black_tree.rs" 602 18 602 21] key) ([#"../red_black_tree.rs" 602 26 602 35] _18));
+    [#"../red_black_tree.rs" 602 18 602 36] _15 <- ([#"../red_black_tree.rs" 602 18 602 36] cmp0 key _18);
     goto BB5
   }
   BB5 {
@@ -5002,10 +5024,10 @@ module RedBlackTree_Impl15_InsertRec
     [#"../red_black_tree.rs" 608 27 608 37] _25 <- Borrow.borrow_mut (RedBlackTree_Node_Type.node_right ( * node));
     [#"../red_black_tree.rs" 608 27 608 37] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 ( ^ _25)) ; };
     assume { inv3 ( ^ _25) };
-    [#"../red_black_tree.rs" 608 27 608 58] _14 <- ([#"../red_black_tree.rs" 608 27 608 58] insert_rec _25 ([#"../red_black_tree.rs" 608 49 608 52] key) ([#"../red_black_tree.rs" 608 54 608 57] val'));
+    [#"../red_black_tree.rs" 608 27 608 58] _14 <- ([#"../red_black_tree.rs" 608 27 608 58] insert_rec _25 key val');
     _25 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 608 49 608 52] key <- any k;
-    [#"../red_black_tree.rs" 608 54 608 57] val' <- any v;
+    key <- any k;
+    val' <- any v;
     goto BB16
   }
   BB9 {
@@ -5026,10 +5048,10 @@ module RedBlackTree_Impl15_InsertRec
     [#"../red_black_tree.rs" 603 24 603 33] _20 <- Borrow.borrow_mut (RedBlackTree_Node_Type.node_left ( * node));
     [#"../red_black_tree.rs" 603 24 603 33] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node ( ^ _20) x1 x2 x3 x4) ; };
     assume { inv3 ( ^ _20) };
-    [#"../red_black_tree.rs" 603 24 603 54] _14 <- ([#"../red_black_tree.rs" 603 24 603 54] insert_rec _20 ([#"../red_black_tree.rs" 603 45 603 48] key) ([#"../red_black_tree.rs" 603 50 603 53] val'));
+    [#"../red_black_tree.rs" 603 24 603 54] _14 <- ([#"../red_black_tree.rs" 603 24 603 54] insert_rec _20 key val');
     _20 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 603 45 603 48] key <- any k;
-    [#"../red_black_tree.rs" 603 50 603 53] val' <- any v;
+    key <- any k;
+    val' <- any v;
     goto BB11
   }
   BB11 {
@@ -5041,8 +5063,8 @@ module RedBlackTree_Impl15_InsertRec
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 ([#"../red_black_tree.rs" 605 31 605 34] val') x4) ; };
-    [#"../red_black_tree.rs" 605 31 605 34] val' <- any v;
+    [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 ([#"../red_black_tree.rs" 605 20 605 28] val') x4) ; };
+    val' <- any v;
     assert { [@expl:type invariant] inv5 (RedBlackTree_Node_Type.node_val ( * node)) };
     assume { resolve2 (RedBlackTree_Node_Type.node_val ( * node)) };
     assert { [@expl:type invariant] inv6 node };
@@ -5081,12 +5103,25 @@ module RedBlackTree_Impl15_InsertRec
   BB19 {
     assert { [@expl:type invariant] inv7 _11 };
     assume { resolve4 _11 };
+    [#"../red_black_tree.rs" 613 35 613 39] _35 <- ([#"../red_black_tree.rs" 613 35 613 39] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 613 22 613 41] _34 <- ([#"../red_black_tree.rs" 613 22 613 41] RedBlackTree_Tree_Type.C_Tree _35);
+    _35 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB20
   }
   BB20 {
+    [#"../red_black_tree.rs" 614 23 614 26] _36 <- ([#"../red_black_tree.rs" 614 23 614 26] RedBlackTree_Color_Type.C_Red);
+    [#"../red_black_tree.rs" 617 36 617 40] _40 <- ([#"../red_black_tree.rs" 617 36 617 40] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 617 23 617 42] _39 <- ([#"../red_black_tree.rs" 617 23 617 42] RedBlackTree_Tree_Type.C_Tree _40);
+    _40 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB21
   }
   BB21 {
+    [#"../red_black_tree.rs" 612 38 618 13] _33 <- ([#"../red_black_tree.rs" 612 38 618 13] RedBlackTree_Node_Type.C_Node _34 _36 key val' _39);
+    _34 <- any RedBlackTree_Tree_Type.t_tree k v;
+    _36 <- any RedBlackTree_Color_Type.t_color;
+    key <- any k;
+    val' <- any v;
+    _39 <- any RedBlackTree_Tree_Type.t_tree k v;
     goto BB22
   }
   BB22 {
@@ -5102,15 +5137,16 @@ module RedBlackTree_Impl15_InsertRec
     goto BB26
   }
   BB26 {
+    [#"../red_black_tree.rs" 612 24 618 15] _31 <- ([#"../red_black_tree.rs" 612 24 618 15] Core_Option_Option_Type.C_Some _33);
+    _33 <- any RedBlackTree_Node_Type.t_node k v;
     goto BB27
   }
   BB27 {
     goto BB28
   }
   BB28 {
-    [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 612 24 618 15] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 612 38 618 13] RedBlackTree_Node_Type.C_Node ([#"../red_black_tree.rs" 613 22 613 41] RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 613 35 613 39] Core_Option_Option_Type.C_None)) ([#"../red_black_tree.rs" 614 23 614 26] RedBlackTree_Color_Type.C_Red) ([#"../red_black_tree.rs" 615 16 615 19] key) ([#"../red_black_tree.rs" 616 16 616 19] val') ([#"../red_black_tree.rs" 617 23 617 42] RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 617 36 617 40] Core_Option_Option_Type.C_None))))) ; };
-    [#"../red_black_tree.rs" 615 16 615 19] key <- any k;
-    [#"../red_black_tree.rs" 616 16 616 19] val' <- any v;
+    [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 612 12 612 21] _31)) ; };
+    _31 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv0 (RedBlackTree_Tree_Type.tree_node ( * self)) };
     assume { resolve6 (RedBlackTree_Tree_Type.tree_node ( * self)) };
     assert { [@expl:type invariant] inv8 self };
@@ -5561,6 +5597,7 @@ module RedBlackTree_Impl15_Insert
   var val' : v = val';
   var _7 : ();
   var _8 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
+  var _11 : RedBlackTree_Color_Type.t_color;
   var _12 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _13 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _14 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -5575,13 +5612,14 @@ module RedBlackTree_Impl15_Insert
     [#"../red_black_tree.rs" 627 8 627 12] _8 <- Borrow.borrow_mut ( * self);
     [#"../red_black_tree.rs" 627 8 627 12] self <- { self with current = ( ^ _8) ; };
     assume { inv0 ( ^ _8) };
-    [#"../red_black_tree.rs" 627 8 627 33] _7 <- ([#"../red_black_tree.rs" 627 8 627 33] insert_rec0 _8 ([#"../red_black_tree.rs" 627 24 627 27] key) ([#"../red_black_tree.rs" 627 29 627 32] val'));
+    [#"../red_black_tree.rs" 627 8 627 33] _7 <- ([#"../red_black_tree.rs" 627 8 627 33] insert_rec0 _8 key val');
     _8 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 627 24 627 27] key <- any k;
-    [#"../red_black_tree.rs" 627 29 627 32] val' <- any v;
+    key <- any k;
+    val' <- any v;
     goto BB2
   }
   BB2 {
+    [#"../red_black_tree.rs" 628 44 628 49] _11 <- ([#"../red_black_tree.rs" 628 44 628 49] RedBlackTree_Color_Type.C_Black);
     [#"../red_black_tree.rs" 628 8 628 17] _14 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 628 8 628 17] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _14)) ; };
     assume { inv1 ( ^ _14) };
@@ -5595,7 +5633,8 @@ module RedBlackTree_Impl15_Insert
     goto BB4
   }
   BB4 {
-    [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _12 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 628 44 628 49] RedBlackTree_Color_Type.C_Black) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _12 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 628 8 628 49] _11) x2 x3 x4) ; };
+    _11 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _12 };
     assume { resolve0 _12 };
     assert { [@expl:type invariant] inv3 self };
@@ -6211,7 +6250,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
   BB3 {
     assert { [@expl:type invariant] inv2 _13 };
     assume { resolve0 _13 };
-    [#"../red_black_tree.rs" 645 11 645 29] _17 <- ([#"../red_black_tree.rs" 645 11 645 29] is_red0 ([#"../red_black_tree.rs" 645 11 645 20] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 645 11 645 29] _17 <- ([#"../red_black_tree.rs" 645 11 645 29] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB4
   }
   BB4 {
@@ -6269,9 +6308,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
   BB12 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve4 node1 };
-    [#"../red_black_tree.rs" 650 19 650 39] _0 <- ([#"../red_black_tree.rs" 650 19 650 39] (([#"../red_black_tree.rs" 650 20 650 28] RedBlackTree_Node_Type.node_key node1), ([#"../red_black_tree.rs" 650 30 650 38] RedBlackTree_Node_Type.node_val node1)));
-    [#"../red_black_tree.rs" 650 20 650 28] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
-    [#"../red_black_tree.rs" 650 30 650 38] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
+    [#"../red_black_tree.rs" 650 19 650 39] _0 <- ([#"../red_black_tree.rs" 650 19 650 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB13
   }
   BB13 {
@@ -6281,7 +6320,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     goto BB30
   }
   BB15 {
-    [#"../red_black_tree.rs" 652 12 652 31] _30 <- ([#"../red_black_tree.rs" 652 12 652 31] is_red0 ([#"../red_black_tree.rs" 652 12 652 22] RedBlackTree_Node_Type.node_right ( * node)));
+    [#"../red_black_tree.rs" 652 12 652 31] _30 <- ([#"../red_black_tree.rs" 652 12 652 31] is_red0 (RedBlackTree_Node_Type.node_right ( * node)));
     goto BB16
   }
   BB16 {
@@ -6294,7 +6333,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     goto BB25
   }
   BB18 {
-    [#"../red_black_tree.rs" 652 36 652 60] _35 <- ([#"../red_black_tree.rs" 652 36 652 60] as_ref0 ([#"../red_black_tree.rs" 652 36 652 51] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
+    [#"../red_black_tree.rs" 652 36 652 60] _35 <- ([#"../red_black_tree.rs" 652 36 652 60] as_ref0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
     goto BB19
   }
   BB19 {
@@ -6305,7 +6344,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
   BB20 {
     assert { [@expl:type invariant] inv7 _34 };
     assume { resolve5 _34 };
-    [#"../red_black_tree.rs" 652 36 652 83] _32 <- ([#"../red_black_tree.rs" 652 36 652 83] is_red0 ([#"../red_black_tree.rs" 652 36 652 74] RedBlackTree_Node_Type.node_left _34));
+    [#"../red_black_tree.rs" 652 36 652 83] _32 <- ([#"../red_black_tree.rs" 652 36 652 83] is_red0 (RedBlackTree_Node_Type.node_left _34));
     goto BB21
   }
   BB21 {
@@ -6332,7 +6371,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     assert { [@expl:type invariant] inv4 node };
     assume { resolve1 node };
     [#"../red_black_tree.rs" 653 12 653 40] node <- ([#"../red_black_tree.rs" 653 12 653 40] _37);
-    [#"../red_black_tree.rs" 653 12 653 40] _37 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    _37 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv4 _38 };
     assume { resolve1 _38 };
     [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] ());
@@ -6364,7 +6403,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
     [#"../red_black_tree.rs" 657 8 657 9] _0 <- ([#"../red_black_tree.rs" 657 8 657 9] r);
-    [#"../red_black_tree.rs" 657 8 657 9] r <- any (k, v);
+    r <- any (k, v);
     goto BB29
   }
   BB29 {
@@ -6857,10 +6896,12 @@ module RedBlackTree_Impl15_DeleteMax
   var _8 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _11 : bool;
+  var _13 : RedBlackTree_Color_Type.t_color;
   var r : (k, v);
   var _18 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _19 : ();
   var _20 : bool;
+  var _22 : RedBlackTree_Color_Type.t_color;
   var _23 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _24 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _25 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -6890,7 +6931,7 @@ module RedBlackTree_Impl15_DeleteMax
     [#"../red_black_tree.rs" 669 20 669 24] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _8)) (Borrow.inherit_id (Borrow.get_id _8) 1);
     [#"../red_black_tree.rs" 669 20 669 24] _8 <- { _8 with current = (let Core_Option_Option_Type.C_Some x0 =  * _8 in Core_Option_Option_Type.C_Some ( ^ node)) ; };
     assume { inv2 ( ^ node) };
-    [#"../red_black_tree.rs" 670 16 670 34] _11 <- ([#"../red_black_tree.rs" 670 16 670 34] is_red0 ([#"../red_black_tree.rs" 670 16 670 25] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 670 16 670 34] _11 <- ([#"../red_black_tree.rs" 670 16 670 34] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB4
   }
   BB4 {
@@ -6908,7 +6949,9 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 671 29 671 32] RedBlackTree_Color_Type.C_Red) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 671 29 671 32] _13 <- ([#"../red_black_tree.rs" 671 29 671 32] RedBlackTree_Color_Type.C_Red);
+    [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 671 16 671 32] _13) x2 x3 x4) ; };
+    _13 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv3 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv4 _8 };
@@ -6934,7 +6977,7 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB19
   }
   BB9 {
-    [#"../red_black_tree.rs" 678 11 678 24] _20 <- ([#"../red_black_tree.rs" 678 11 678 24] is_red0 ([#"../red_black_tree.rs" 678 11 678 15]  * self));
+    [#"../red_black_tree.rs" 678 11 678 24] _20 <- ([#"../red_black_tree.rs" 678 11 678 24] is_red0 ( * self));
     goto BB10
   }
   BB10 {
@@ -6944,6 +6987,7 @@ module RedBlackTree_Impl15_DeleteMax
       end
   }
   BB11 {
+    [#"../red_black_tree.rs" 679 48 679 53] _22 <- ([#"../red_black_tree.rs" 679 48 679 53] RedBlackTree_Color_Type.C_Black);
     [#"../red_black_tree.rs" 679 12 679 21] _25 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 679 12 679 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _25)) ; };
     assume { inv1 ( ^ _25) };
@@ -6957,7 +7001,8 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _23 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 679 48 679 53] RedBlackTree_Color_Type.C_Black) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _23 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 679 12 679 53] _22) x2 x3 x4) ; };
+    _22 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv3 _23 };
     assume { resolve1 _23 };
     assert { [@expl:type invariant] inv6 self };
@@ -6977,8 +7022,8 @@ module RedBlackTree_Impl15_DeleteMax
   }
   BB16 {
     assume { resolve4 _26 };
-    [#"../red_black_tree.rs" 682 8 682 15] _0 <- ([#"../red_black_tree.rs" 682 8 682 15] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 682 13 682 14] r));
-    [#"../red_black_tree.rs" 682 13 682 14] r <- any (k, v);
+    [#"../red_black_tree.rs" 682 8 682 15] _0 <- ([#"../red_black_tree.rs" 682 8 682 15] Core_Option_Option_Type.C_Some r);
+    r <- any (k, v);
     goto BB17
   }
   BB17 {
@@ -7605,9 +7650,9 @@ module RedBlackTree_Impl15_DeleteMinRec
   BB7 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve4 node1 };
-    [#"../red_black_tree.rs" 700 19 700 39] _0 <- ([#"../red_black_tree.rs" 700 19 700 39] (([#"../red_black_tree.rs" 700 20 700 28] RedBlackTree_Node_Type.node_key node1), ([#"../red_black_tree.rs" 700 30 700 38] RedBlackTree_Node_Type.node_val node1)));
-    [#"../red_black_tree.rs" 700 20 700 28] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
-    [#"../red_black_tree.rs" 700 30 700 38] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
+    [#"../red_black_tree.rs" 700 19 700 39] _0 <- ([#"../red_black_tree.rs" 700 19 700 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB8
   }
   BB8 {
@@ -7617,7 +7662,7 @@ module RedBlackTree_Impl15_DeleteMinRec
     goto BB25
   }
   BB10 {
-    [#"../red_black_tree.rs" 702 12 702 30] _26 <- ([#"../red_black_tree.rs" 702 12 702 30] is_red0 ([#"../red_black_tree.rs" 702 12 702 21] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 702 12 702 30] _26 <- ([#"../red_black_tree.rs" 702 12 702 30] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB11
   }
   BB11 {
@@ -7630,7 +7675,7 @@ module RedBlackTree_Impl15_DeleteMinRec
     goto BB20
   }
   BB13 {
-    [#"../red_black_tree.rs" 702 35 702 58] _31 <- ([#"../red_black_tree.rs" 702 35 702 58] as_ref0 ([#"../red_black_tree.rs" 702 35 702 49] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
+    [#"../red_black_tree.rs" 702 35 702 58] _31 <- ([#"../red_black_tree.rs" 702 35 702 58] as_ref0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
     goto BB14
   }
   BB14 {
@@ -7641,7 +7686,7 @@ module RedBlackTree_Impl15_DeleteMinRec
   BB15 {
     assert { [@expl:type invariant] inv6 _30 };
     assume { resolve5 _30 };
-    [#"../red_black_tree.rs" 702 35 702 81] _28 <- ([#"../red_black_tree.rs" 702 35 702 81] is_red0 ([#"../red_black_tree.rs" 702 35 702 72] RedBlackTree_Node_Type.node_left _30));
+    [#"../red_black_tree.rs" 702 35 702 81] _28 <- ([#"../red_black_tree.rs" 702 35 702 81] is_red0 (RedBlackTree_Node_Type.node_left _30));
     goto BB16
   }
   BB16 {
@@ -7668,7 +7713,7 @@ module RedBlackTree_Impl15_DeleteMinRec
     assert { [@expl:type invariant] inv3 node };
     assume { resolve1 node };
     [#"../red_black_tree.rs" 703 12 703 39] node <- ([#"../red_black_tree.rs" 703 12 703 39] _33);
-    [#"../red_black_tree.rs" 703 12 703 39] _33 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    _33 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv3 _34 };
     assume { resolve1 _34 };
     [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] ());
@@ -7700,7 +7745,7 @@ module RedBlackTree_Impl15_DeleteMinRec
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
     [#"../red_black_tree.rs" 707 8 707 9] _0 <- ([#"../red_black_tree.rs" 707 8 707 9] r);
-    [#"../red_black_tree.rs" 707 8 707 9] r <- any (k, v);
+    r <- any (k, v);
     goto BB24
   }
   BB24 {
@@ -8171,10 +8216,12 @@ module RedBlackTree_Impl15_DeleteMin
   var _8 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _11 : bool;
+  var _13 : RedBlackTree_Color_Type.t_color;
   var r : (k, v);
   var _16 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _17 : ();
   var _18 : bool;
+  var _20 : RedBlackTree_Color_Type.t_color;
   var _21 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _22 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _23 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -8202,7 +8249,7 @@ module RedBlackTree_Impl15_DeleteMin
     [#"../red_black_tree.rs" 722 20 722 24] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _8)) (Borrow.inherit_id (Borrow.get_id _8) 1);
     [#"../red_black_tree.rs" 722 20 722 24] _8 <- { _8 with current = (let Core_Option_Option_Type.C_Some x0 =  * _8 in Core_Option_Option_Type.C_Some ( ^ node)) ; };
     assume { inv1 ( ^ node) };
-    [#"../red_black_tree.rs" 723 16 723 34] _11 <- ([#"../red_black_tree.rs" 723 16 723 34] is_red0 ([#"../red_black_tree.rs" 723 16 723 25] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 723 16 723 34] _11 <- ([#"../red_black_tree.rs" 723 16 723 34] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB4
   }
   BB4 {
@@ -8220,7 +8267,9 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 724 29 724 32] RedBlackTree_Color_Type.C_Red) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 724 29 724 32] _13 <- ([#"../red_black_tree.rs" 724 29 724 32] RedBlackTree_Color_Type.C_Red);
+    [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 724 16 724 32] _13) x2 x3 x4) ; };
+    _13 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _8 };
@@ -8245,7 +8294,7 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB18
   }
   BB9 {
-    [#"../red_black_tree.rs" 730 11 730 24] _18 <- ([#"../red_black_tree.rs" 730 11 730 24] is_red0 ([#"../red_black_tree.rs" 730 11 730 15]  * self));
+    [#"../red_black_tree.rs" 730 11 730 24] _18 <- ([#"../red_black_tree.rs" 730 11 730 24] is_red0 ( * self));
     goto BB10
   }
   BB10 {
@@ -8255,6 +8304,7 @@ module RedBlackTree_Impl15_DeleteMin
       end
   }
   BB11 {
+    [#"../red_black_tree.rs" 731 48 731 53] _20 <- ([#"../red_black_tree.rs" 731 48 731 53] RedBlackTree_Color_Type.C_Black);
     [#"../red_black_tree.rs" 731 12 731 21] _23 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 731 12 731 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _23)) ; };
     assume { inv0 ( ^ _23) };
@@ -8268,7 +8318,8 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _21 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 731 48 731 53] RedBlackTree_Color_Type.C_Black) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _21 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 731 12 731 53] _20) x2 x3 x4) ; };
+    _20 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _21 };
     assume { resolve1 _21 };
     assert { [@expl:type invariant] inv5 self };
@@ -8283,8 +8334,8 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB15
   }
   BB15 {
-    [#"../red_black_tree.rs" 733 8 733 15] _0 <- ([#"../red_black_tree.rs" 733 8 733 15] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 733 13 733 14] r));
-    [#"../red_black_tree.rs" 733 13 733 14] r <- any (k, v);
+    [#"../red_black_tree.rs" 733 8 733 15] _0 <- ([#"../red_black_tree.rs" 733 8 733 15] Core_Option_Option_Type.C_Some r);
+    r <- any (k, v);
     goto BB16
   }
   BB16 {
@@ -9085,6 +9136,7 @@ module RedBlackTree_Impl15_DeleteRec
   var _57 : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
   var _58 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var _59 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
+  var _60 : (k, v);
   var _63 : ();
   var _64 : bool;
   var _66 : RedBlackTree_Node_Type.t_node k v;
@@ -9105,6 +9157,7 @@ module RedBlackTree_Impl15_DeleteRec
   var _84 : borrowed v;
   var _85 : borrowed v;
   var _86 : borrowed v;
+  var _87 : Core_Option_Option_Type.t_option (k, v);
   var _89 : Core_Option_Option_Type.t_option (k, v);
   var _90 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _92 : ();
@@ -9139,7 +9192,7 @@ module RedBlackTree_Impl15_DeleteRec
     [#"../red_black_tree.rs" 751 22 751 31] _21 <- ([#"../red_black_tree.rs" 751 22 751 31] RedBlackTree_Node_Type.node_key ( * node));
     assert { [@expl:type invariant] inv3 _21 };
     assume { resolve1 _21 };
-    [#"../red_black_tree.rs" 751 14 751 32] _18 <- ([#"../red_black_tree.rs" 751 14 751 32] cmp0 ([#"../red_black_tree.rs" 751 14 751 17] key) ([#"../red_black_tree.rs" 751 22 751 31] _21));
+    [#"../red_black_tree.rs" 751 14 751 32] _18 <- ([#"../red_black_tree.rs" 751 14 751 32] cmp0 key _21);
     goto BB4
   }
   BB4 {
@@ -9153,11 +9206,11 @@ module RedBlackTree_Impl15_DeleteRec
   }
   BB6 {
     [#"../red_black_tree.rs" 761 12 761 15] ord <- ([#"../red_black_tree.rs" 761 12 761 15] _18);
-    [#"../red_black_tree.rs" 762 19 762 37] _42 <- ([#"../red_black_tree.rs" 762 19 762 37] is_red0 ([#"../red_black_tree.rs" 762 19 762 28] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 762 19 762 37] _42 <- ([#"../red_black_tree.rs" 762 19 762 37] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB26
   }
   BB7 {
-    [#"../red_black_tree.rs" 753 19 753 43] _24 <- ([#"../red_black_tree.rs" 753 19 753 43] is_none0 ([#"../red_black_tree.rs" 753 19 753 33] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
+    [#"../red_black_tree.rs" 753 19 753 43] _24 <- ([#"../red_black_tree.rs" 753 19 753 43] is_none0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
     goto BB8
   }
   BB8 {
@@ -9177,7 +9230,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB74
   }
   BB10 {
-    [#"../red_black_tree.rs" 756 20 756 38] _28 <- ([#"../red_black_tree.rs" 756 20 756 38] is_red0 ([#"../red_black_tree.rs" 756 20 756 29] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 756 20 756 38] _28 <- ([#"../red_black_tree.rs" 756 20 756 38] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB11
   }
   BB11 {
@@ -9190,7 +9243,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB20
   }
   BB13 {
-    [#"../red_black_tree.rs" 756 43 756 66] _33 <- ([#"../red_black_tree.rs" 756 43 756 66] as_ref0 ([#"../red_black_tree.rs" 756 43 756 57] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
+    [#"../red_black_tree.rs" 756 43 756 66] _33 <- ([#"../red_black_tree.rs" 756 43 756 66] as_ref0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * node))));
     goto BB14
   }
   BB14 {
@@ -9201,7 +9254,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB15 {
     assert { [@expl:type invariant] inv4 _32 };
     assume { resolve2 _32 };
-    [#"../red_black_tree.rs" 756 43 756 89] _30 <- ([#"../red_black_tree.rs" 756 43 756 89] is_red0 ([#"../red_black_tree.rs" 756 43 756 80] RedBlackTree_Node_Type.node_left _32));
+    [#"../red_black_tree.rs" 756 43 756 89] _30 <- ([#"../red_black_tree.rs" 756 43 756 89] is_red0 (RedBlackTree_Node_Type.node_left _32));
     goto BB16
   }
   BB16 {
@@ -9228,7 +9281,7 @@ module RedBlackTree_Impl15_DeleteRec
     assert { [@expl:type invariant] inv6 node };
     assume { resolve3 node };
     [#"../red_black_tree.rs" 757 20 757 47] node <- ([#"../red_black_tree.rs" 757 20 757 47] _35);
-    [#"../red_black_tree.rs" 757 20 757 47] _35 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    _35 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _36 };
     assume { resolve3 _36 };
     [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] ());
@@ -9244,7 +9297,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { inv7 ( ^ _39) };
     assert { [@expl:type invariant] inv3 key };
     assume { resolve1 key };
-    [#"../red_black_tree.rs" 759 20 759 45] _38 <- ([#"../red_black_tree.rs" 759 20 759 45] delete_rec _39 ([#"../red_black_tree.rs" 759 41 759 44] key));
+    [#"../red_black_tree.rs" 759 20 759 45] _38 <- ([#"../red_black_tree.rs" 759 20 759 45] delete_rec _39 key);
     _39 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB22
   }
@@ -9253,7 +9306,7 @@ module RedBlackTree_Impl15_DeleteRec
   }
   BB23 {
     [#"../red_black_tree.rs" 759 16 759 17] r <- ([#"../red_black_tree.rs" 759 16 759 17] _38);
-    [#"../red_black_tree.rs" 759 16 759 17] _38 <- any Core_Option_Option_Type.t_option (k, v);
+    _38 <- any Core_Option_Option_Type.t_option (k, v);
     [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] ());
     goto BB25
   }
@@ -9280,7 +9333,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { inv7 ( ^ _47) };
     assert { [@expl:type invariant] inv3 key };
     assume { resolve1 key };
-    [#"../red_black_tree.rs" 764 24 764 50] _46 <- ([#"../red_black_tree.rs" 764 24 764 50] delete_rec _47 ([#"../red_black_tree.rs" 764 46 764 49] key));
+    [#"../red_black_tree.rs" 764 24 764 50] _46 <- ([#"../red_black_tree.rs" 764 24 764 50] delete_rec _47 key);
     _47 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB29
   }
@@ -9289,7 +9342,7 @@ module RedBlackTree_Impl15_DeleteRec
   }
   BB30 {
     [#"../red_black_tree.rs" 764 20 764 21] r <- ([#"../red_black_tree.rs" 764 20 764 21] _46);
-    [#"../red_black_tree.rs" 764 20 764 21] _46 <- any Core_Option_Option_Type.t_option (k, v);
+    _46 <- any Core_Option_Option_Type.t_option (k, v);
     [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] ());
     goto BB32
   }
@@ -9297,7 +9350,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB68
   }
   BB33 {
-    [#"../red_black_tree.rs" 766 23 766 48] _50 <- ([#"../red_black_tree.rs" 766 23 766 48] is_none0 ([#"../red_black_tree.rs" 766 23 766 38] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
+    [#"../red_black_tree.rs" 766 23 766 48] _50 <- ([#"../red_black_tree.rs" 766 23 766 48] is_none0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
     goto BB34
   }
   BB34 {
@@ -9348,22 +9401,24 @@ module RedBlackTree_Impl15_DeleteRec
   BB40 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve9 node1 };
+    [#"../red_black_tree.rs" 771 36 771 56] _60 <- ([#"../red_black_tree.rs" 771 36 771 56] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
+    node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB41
   }
   BB41 {
     goto BB42
   }
   BB42 {
-    [#"../red_black_tree.rs" 771 31 771 57] _0 <- ([#"../red_black_tree.rs" 771 31 771 57] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 771 36 771 56] (([#"../red_black_tree.rs" 771 37 771 45] RedBlackTree_Node_Type.node_key node1), ([#"../red_black_tree.rs" 771 47 771 55] RedBlackTree_Node_Type.node_val node1))));
-    [#"../red_black_tree.rs" 771 37 771 45] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
-    [#"../red_black_tree.rs" 771 47 771 55] node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
+    [#"../red_black_tree.rs" 771 31 771 57] _0 <- ([#"../red_black_tree.rs" 771 31 771 57] Core_Option_Option_Type.C_Some _60);
+    _60 <- any (k, v);
     goto BB43
   }
   BB43 {
     goto BB72
   }
   BB44 {
-    [#"../red_black_tree.rs" 773 24 773 48] _67 <- ([#"../red_black_tree.rs" 773 24 773 48] as_ref0 ([#"../red_black_tree.rs" 773 24 773 39] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
+    [#"../red_black_tree.rs" 773 24 773 48] _67 <- ([#"../red_black_tree.rs" 773 24 773 48] as_ref0 (RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * node))));
     goto BB45
   }
   BB45 {
@@ -9374,7 +9429,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB46 {
     assert { [@expl:type invariant] inv4 _66 };
     assume { resolve2 _66 };
-    [#"../red_black_tree.rs" 773 24 773 71] _64 <- ([#"../red_black_tree.rs" 773 24 773 71] is_red0 ([#"../red_black_tree.rs" 773 24 773 62] RedBlackTree_Node_Type.node_left _66));
+    [#"../red_black_tree.rs" 773 24 773 71] _64 <- ([#"../red_black_tree.rs" 773 24 773 71] is_red0 (RedBlackTree_Node_Type.node_left _66));
     goto BB47
   }
   BB47 {
@@ -9402,7 +9457,7 @@ module RedBlackTree_Impl15_DeleteRec
     assert { [@expl:type invariant] inv6 node };
     assume { resolve3 node };
     [#"../red_black_tree.rs" 774 24 774 52] node <- ([#"../red_black_tree.rs" 774 24 774 52] _69);
-    [#"../red_black_tree.rs" 774 24 774 52] _69 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
+    _69 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _70 };
     assume { resolve3 _70 };
     [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] ());
@@ -9477,14 +9532,16 @@ module RedBlackTree_Impl15_DeleteRec
     assume { resolve7 _86 };
     assert { [@expl:type invariant] inv12 _84 };
     assume { resolve7 _84 };
+    [#"../red_black_tree.rs" 781 28 781 36] _87 <- ([#"../red_black_tree.rs" 781 28 781 36] Core_Option_Option_Type.C_Some kv);
+    kv <- any (k, v);
     goto BB58
   }
   BB58 {
     goto BB59
   }
   BB59 {
-    [#"../red_black_tree.rs" 781 24 781 25] r <- ([#"../red_black_tree.rs" 781 28 781 36] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 781 33 781 35] kv));
-    [#"../red_black_tree.rs" 781 33 781 35] kv <- any (k, v);
+    [#"../red_black_tree.rs" 781 24 781 25] r <- ([#"../red_black_tree.rs" 781 24 781 25] _87);
+    _87 <- any Core_Option_Option_Type.t_option (k, v);
     [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] ());
     goto BB61
   }
@@ -9500,7 +9557,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { inv7 ( ^ _90) };
     assert { [@expl:type invariant] inv3 key };
     assume { resolve1 key };
-    [#"../red_black_tree.rs" 783 28 783 54] _89 <- ([#"../red_black_tree.rs" 783 28 783 54] delete_rec _90 ([#"../red_black_tree.rs" 783 50 783 53] key));
+    [#"../red_black_tree.rs" 783 28 783 54] _89 <- ([#"../red_black_tree.rs" 783 28 783 54] delete_rec _90 key);
     _90 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB64
   }
@@ -9509,7 +9566,7 @@ module RedBlackTree_Impl15_DeleteRec
   }
   BB65 {
     [#"../red_black_tree.rs" 783 24 783 25] r <- ([#"../red_black_tree.rs" 783 24 783 25] _89);
-    [#"../red_black_tree.rs" 783 24 783 25] _89 <- any Core_Option_Option_Type.t_option (k, v);
+    _89 <- any Core_Option_Option_Type.t_option (k, v);
     [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] ());
     goto BB67
   }
@@ -9533,7 +9590,7 @@ module RedBlackTree_Impl15_DeleteRec
     assert { [@expl:type invariant] inv8 self };
     assume { resolve4 self };
     [#"../red_black_tree.rs" 789 8 789 9] _0 <- ([#"../red_black_tree.rs" 789 8 789 9] r);
-    [#"../red_black_tree.rs" 789 8 789 9] r <- any Core_Option_Option_Type.t_option (k, v);
+    r <- any Core_Option_Option_Type.t_option (k, v);
     goto BB71
   }
   BB71 {
@@ -10028,10 +10085,12 @@ module RedBlackTree_Impl15_Delete
   var _10 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
   var node : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _13 : bool;
+  var _15 : RedBlackTree_Color_Type.t_color;
   var r : Core_Option_Option_Type.t_option (k, v);
   var _18 : borrowed (RedBlackTree_Tree_Type.t_tree k v);
   var _20 : ();
   var _21 : bool;
+  var _23 : RedBlackTree_Color_Type.t_color;
   var _24 : borrowed (RedBlackTree_Node_Type.t_node k v);
   var _25 : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v));
   var _26 : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v));
@@ -10059,7 +10118,7 @@ module RedBlackTree_Impl15_Delete
     [#"../red_black_tree.rs" 803 20 803 24] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _10)) (Borrow.inherit_id (Borrow.get_id _10) 1);
     [#"../red_black_tree.rs" 803 20 803 24] _10 <- { _10 with current = (let Core_Option_Option_Type.C_Some x0 =  * _10 in Core_Option_Option_Type.C_Some ( ^ node)) ; };
     assume { inv1 ( ^ node) };
-    [#"../red_black_tree.rs" 804 16 804 34] _13 <- ([#"../red_black_tree.rs" 804 16 804 34] is_red0 ([#"../red_black_tree.rs" 804 16 804 25] RedBlackTree_Node_Type.node_left ( * node)));
+    [#"../red_black_tree.rs" 804 16 804 34] _13 <- ([#"../red_black_tree.rs" 804 16 804 34] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB4
   }
   BB4 {
@@ -10077,7 +10136,9 @@ module RedBlackTree_Impl15_Delete
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 805 29 805 32] RedBlackTree_Color_Type.C_Red) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 805 29 805 32] _15 <- ([#"../red_black_tree.rs" 805 29 805 32] RedBlackTree_Color_Type.C_Red);
+    [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 805 16 805 32] _15) x2 x3 x4) ; };
+    _15 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _10 };
@@ -10091,7 +10152,7 @@ module RedBlackTree_Impl15_Delete
     assume { inv4 ( ^ _18) };
     assert { [@expl:type invariant] inv5 key };
     assume { resolve3 key };
-    [#"../red_black_tree.rs" 810 16 810 36] r <- ([#"../red_black_tree.rs" 810 16 810 36] delete_rec0 _18 ([#"../red_black_tree.rs" 810 32 810 35] key));
+    [#"../red_black_tree.rs" 810 16 810 36] r <- ([#"../red_black_tree.rs" 810 16 810 36] delete_rec0 _18 key);
     _18 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB9
   }
@@ -10106,7 +10167,7 @@ module RedBlackTree_Impl15_Delete
     goto BB17
   }
   BB9 {
-    [#"../red_black_tree.rs" 811 11 811 24] _21 <- ([#"../red_black_tree.rs" 811 11 811 24] is_red0 ([#"../red_black_tree.rs" 811 11 811 15]  * self));
+    [#"../red_black_tree.rs" 811 11 811 24] _21 <- ([#"../red_black_tree.rs" 811 11 811 24] is_red0 ( * self));
     goto BB10
   }
   BB10 {
@@ -10116,6 +10177,7 @@ module RedBlackTree_Impl15_Delete
       end
   }
   BB11 {
+    [#"../red_black_tree.rs" 812 48 812 53] _23 <- ([#"../red_black_tree.rs" 812 48 812 53] RedBlackTree_Color_Type.C_Black);
     [#"../red_black_tree.rs" 812 12 812 21] _26 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 812 12 812 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _26)) ; };
     assume { inv0 ( ^ _26) };
@@ -10129,7 +10191,8 @@ module RedBlackTree_Impl15_Delete
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _24 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 812 48 812 53] RedBlackTree_Color_Type.C_Black) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _24 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 812 12 812 53] _23) x2 x3 x4) ; };
+    _23 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _24 };
     assume { resolve1 _24 };
     assert { [@expl:type invariant] inv6 self };
@@ -10145,7 +10208,7 @@ module RedBlackTree_Impl15_Delete
   }
   BB15 {
     [#"../red_black_tree.rs" 814 8 814 9] _0 <- ([#"../red_black_tree.rs" 814 8 814 9] r);
-    [#"../red_black_tree.rs" 814 8 814 9] r <- any Core_Option_Option_Type.t_option (k, v);
+    r <- any Core_Option_Option_Type.t_option (k, v);
     goto BB16
   }
   BB16 {
@@ -10597,7 +10660,7 @@ module RedBlackTree_Impl15_Get
     [#"../red_black_tree.rs" 829 26 829 35] _19 <- ([#"../red_black_tree.rs" 829 26 829 35] RedBlackTree_Node_Type.node_key node);
     assert { [@expl:type invariant] inv3 _19 };
     assume { resolve3 _19 };
-    [#"../red_black_tree.rs" 829 18 829 36] _16 <- ([#"../red_black_tree.rs" 829 18 829 36] cmp0 ([#"../red_black_tree.rs" 829 18 829 21] key) ([#"../red_black_tree.rs" 829 26 829 35] _19));
+    [#"../red_black_tree.rs" 829 18 829 36] _16 <- ([#"../red_black_tree.rs" 829 18 829 36] cmp0 key _19);
     goto BB6
   }
   BB6 {
@@ -10619,7 +10682,7 @@ module RedBlackTree_Impl15_Get
     assume { resolve4 node };
     assert { [@expl:type invariant] inv0 _27 };
     assume { resolve1 _27 };
-    [#"../red_black_tree.rs" 832 27 832 45] tree <- ([#"../red_black_tree.rs" 832 34 832 45] _27);
+    [#"../red_black_tree.rs" 832 27 832 45] tree <- ([#"../red_black_tree.rs" 832 27 832 45] _27);
     [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] ());
     goto BB13
   }
@@ -10637,7 +10700,7 @@ module RedBlackTree_Impl15_Get
     assume { resolve4 node };
     assert { [@expl:type invariant] inv0 _22 };
     assume { resolve1 _22 };
-    [#"../red_black_tree.rs" 830 24 830 41] tree <- ([#"../red_black_tree.rs" 830 31 830 41] _22);
+    [#"../red_black_tree.rs" 830 24 830 41] tree <- ([#"../red_black_tree.rs" 830 24 830 41] _22);
     [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] ());
     goto BB13
   }
@@ -10649,7 +10712,7 @@ module RedBlackTree_Impl15_Get
     assume { resolve4 node };
     assert { [@expl:type invariant] inv5 _25 };
     assume { resolve5 _25 };
-    [#"../red_black_tree.rs" 831 32 831 47] _0 <- ([#"../red_black_tree.rs" 831 32 831 47] Core_Option_Option_Type.C_Some ([#"../red_black_tree.rs" 831 37 831 46] _25));
+    [#"../red_black_tree.rs" 831 32 831 47] _0 <- ([#"../red_black_tree.rs" 831 32 831 47] Core_Option_Option_Type.C_Some _25);
     goto BB15
   }
   BB13 {
@@ -11141,7 +11204,7 @@ module RedBlackTree_Impl15_GetMut
     assert { [@expl:type invariant] inv0 old_self };
     assume { resolve1 old_self };
     [#"../red_black_tree.rs" 848 23 848 27] tree <- ([#"../red_black_tree.rs" 848 23 848 27] self);
-    [#"../red_black_tree.rs" 848 23 848 27] self <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
+    self <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB3
   }
   BB3 {
@@ -11175,7 +11238,7 @@ module RedBlackTree_Impl15_GetMut
     [#"../red_black_tree.rs" 863 26 863 35] _29 <- ([#"../red_black_tree.rs" 863 26 863 35] RedBlackTree_Node_Type.node_key ( * node));
     assert { [@expl:type invariant] inv5 _29 };
     assume { resolve2 _29 };
-    [#"../red_black_tree.rs" 863 18 863 36] _26 <- ([#"../red_black_tree.rs" 863 18 863 36] cmp0 ([#"../red_black_tree.rs" 863 18 863 21] key) ([#"../red_black_tree.rs" 863 26 863 35] _29));
+    [#"../red_black_tree.rs" 863 18 863 36] _26 <- ([#"../red_black_tree.rs" 863 18 863 36] cmp0 key _29);
     goto BB7
   }
   BB7 {
@@ -11201,7 +11264,7 @@ module RedBlackTree_Impl15_GetMut
     assert { [@expl:type invariant] inv7 tree };
     assume { resolve3 tree };
     [#"../red_black_tree.rs" 866 27 866 49] tree <- ([#"../red_black_tree.rs" 866 27 866 49] _36);
-    [#"../red_black_tree.rs" 866 27 866 49] _36 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
+    _36 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] ());
     assert { [@expl:type invariant] inv7 _37 };
     assume { resolve3 _37 };
@@ -11229,7 +11292,7 @@ module RedBlackTree_Impl15_GetMut
     assert { [@expl:type invariant] inv7 tree };
     assume { resolve3 tree };
     [#"../red_black_tree.rs" 864 24 864 45] tree <- ([#"../red_black_tree.rs" 864 24 864 45] _31);
-    [#"../red_black_tree.rs" 864 24 864 45] _31 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
+    _31 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] ());
     assert { [@expl:type invariant] inv7 _32 };
     assume { resolve3 _32 };
diff --git a/creusot/tests/should_succeed/red_black_tree/why3session.xml b/creusot/tests/should_succeed/red_black_tree/why3session.xml
index 4cac005cfb..76ce5a3f71 100644
--- a/creusot/tests/should_succeed/red_black_tree/why3session.xml
+++ b/creusot/tests/should_succeed/red_black_tree/why3session.xml
@@ -119,31 +119,31 @@
   <proof prover="7"><result status="valid" time="0.030000" steps="851"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.15" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.031326" steps="264"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.031326" steps="268"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.16" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.019309" steps="265"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.019309" steps="268"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.17" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.020000" steps="162816"/></proof>
+  <proof prover="6"><result status="valid" time="0.020000" steps="162882"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.18" expl="postcondition" proved="true">
-  <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="0.998239" steps="193668"/></proof>
+  <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="2.222259" steps="212871"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.19" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.094220" steps="208626"/></proof>
+  <proof prover="6"><result status="valid" time="0.094220" steps="193257"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.20" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.128232" steps="2421"/></proof>
+  <proof prover="7"><result status="valid" time="0.128232" steps="2447"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.078283" steps="1681"/></proof>
+  <proof prover="7"><result status="valid" time="0.078283" steps="1703"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.22" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.010000" steps="293"/></proof>
+  <proof prover="7"><result status="valid" time="0.010000" steps="297"/></proof>
   </goal>
   <goal name="rotate_right&#39;vc.23" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.077800" steps="289460"/></proof>
+  <proof prover="6"><result status="valid" time="0.077800" steps="310120"/></proof>
   </goal>
  </transf>
  </goal>
@@ -197,31 +197,31 @@
   <proof prover="6"><result status="valid" time="0.020000" steps="63723"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.15" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.066892" steps="264"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.066892" steps="268"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.16" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.029148" steps="265"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.029148" steps="268"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.17" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.206098" steps="3501"/></proof>
+  <proof prover="7"><result status="valid" time="0.206098" steps="3771"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.18" expl="postcondition" proved="true">
-  <proof prover="0" timelimit="5" memlimit="2000"><result status="valid" time="1.140278" steps="492781"/></proof>
+  <proof prover="0" timelimit="5" memlimit="2000"><result status="valid" time="1.963037" steps="491330"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.19" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.057817" steps="18512"/></proof>
+  <proof prover="2"><result status="valid" time="0.057817" steps="18536"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.20" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.130726" steps="19230"/></proof>
+  <proof prover="2"><result status="valid" time="0.130726" steps="19254"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.020000" steps="134748"/></proof>
+  <proof prover="6"><result status="valid" time="0.020000" steps="134815"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.22" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.020000" steps="293"/></proof>
+  <proof prover="7"><result status="valid" time="0.020000" steps="297"/></proof>
   </goal>
   <goal name="rotate_left&#39;vc.23" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.179551" steps="1219"/></proof>
+  <proof prover="7"><result status="valid" time="0.179551" steps="1237"/></proof>
   </goal>
  </transf>
  </goal>
@@ -1576,7 +1576,7 @@
 </theory>
 <theory name="RedBlackTree_Impl15_New" proved="true">
  <goal name="new&#39;vc" expl="VC for new" proved="true">
- <proof prover="7"><result status="valid" time="0.010000" steps="67"/></proof>
+ <proof prover="7"><result status="valid" time="0.010000" steps="68"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl15_InsertRec" proved="true">
@@ -1643,10 +1643,10 @@
   <proof prover="7" timelimit="5"><result status="valid" time="0.031313" steps="32"/></proof>
   </goal>
   <goal name="insert_rec&#39;vc.20" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.025833" steps="45"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.025833" steps="58"/></proof>
   </goal>
   <goal name="insert_rec&#39;vc.21" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.028730" steps="46"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.028730" steps="59"/></proof>
   </goal>
   <goal name="insert_rec&#39;vc.22" expl="precondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -1693,7 +1693,7 @@
    <proof prover="2"><result status="valid" time="0.250926" steps="40183"/></proof>
    </goal>
    <goal name="insert_rec&#39;vc.30.1" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.146306" steps="22486"/></proof>
+   <proof prover="2"><result status="valid" time="0.146306" steps="30705"/></proof>
    </goal>
   </transf>
   </goal>
@@ -1707,7 +1707,7 @@
    </transf>
    </goal>
    <goal name="insert_rec&#39;vc.31.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.411899" steps="36814"/></proof>
+   <proof prover="0"><result status="valid" time="0.411899" steps="45403"/></proof>
    </goal>
   </transf>
   </goal>
@@ -1717,7 +1717,7 @@
    <proof prover="2"><result status="valid" time="0.391047" steps="35357"/></proof>
    </goal>
    <goal name="insert_rec&#39;vc.32.1" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.148772" steps="21960"/></proof>
+   <proof prover="2"><result status="valid" time="0.148772" steps="27384"/></proof>
    </goal>
   </transf>
   </goal>
@@ -1736,7 +1736,7 @@
     <proof prover="2"><result status="valid" time="0.090963" steps="13469"/></proof>
     </goal>
     <goal name="insert_rec&#39;vc.33.1.1" expl="postcondition" proved="true">
-    <proof prover="7"><result status="valid" time="0.102847" steps="338"/></proof>
+    <proof prover="7"><result status="valid" time="0.102847" steps="535"/></proof>
     </goal>
    </transf>
    </goal>
@@ -1748,7 +1748,7 @@
    <proof prover="6" timelimit="5"><result status="valid" time="1.860423" steps="1765632"/></proof>
    </goal>
    <goal name="insert_rec&#39;vc.34.1" expl="postcondition" proved="true">
-   <proof prover="6" timelimit="5"><result status="valid" time="0.168717" steps="188860"/></proof>
+   <proof prover="6" timelimit="5"><result status="valid" time="0.168717" steps="263100"/></proof>
    </goal>
   </transf>
   </goal>
@@ -1780,19 +1780,19 @@
   <proof prover="7"><result status="valid" time="0.037219" steps="224"/></proof>
   </goal>
   <goal name="insert&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.023588" steps="46"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.023588" steps="48"/></proof>
   </goal>
   <goal name="insert&#39;vc.8" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.046859" steps="62"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.046859" steps="63"/></proof>
   </goal>
   <goal name="insert&#39;vc.9" expl="type invariant" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.044609" steps="65"/></proof>
+  <proof prover="7" timelimit="5"><result status="valid" time="0.044609" steps="66"/></proof>
   </goal>
   <goal name="insert&#39;vc.10" expl="postcondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.189515" steps="3716"/></proof>
+  <proof prover="7"><result status="valid" time="0.189515" steps="3361"/></proof>
   </goal>
   <goal name="insert&#39;vc.11" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.209764" steps="69884"/></proof>
+  <proof prover="0"><result status="valid" time="0.409455" steps="79299"/></proof>
   </goal>
  </transf>
  </goal>
@@ -2327,10 +2327,10 @@
   <proof prover="6"><result status="valid" time="0.021546" steps="56484"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.016625" steps="53"/></proof>
+  <proof prover="7"><result status="valid" time="0.016625" steps="55"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.3" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.017658" steps="56"/></proof>
+  <proof prover="7"><result status="valid" time="0.017658" steps="57"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.4" expl="type invariant" proved="true">
   <proof prover="6"><result status="valid" time="0.024939" steps="58839"/></proof>
@@ -2348,40 +2348,40 @@
   <proof prover="7"><result status="valid" time="0.018721" steps="36"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.9" expl="assertion" proved="true">
-  <proof prover="2"><result status="valid" time="0.127202" steps="18519"/></proof>
+  <proof prover="2"><result status="valid" time="0.127202" steps="18616"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.111564" steps="17009"/></proof>
+  <proof prover="2"><result status="valid" time="0.111564" steps="17190"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.166850" steps="21402"/></proof>
+  <proof prover="2"><result status="valid" time="0.166850" steps="21478"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.12" expl="precondition" proved="true">
   <proof prover="7"><result status="valid" time="0.018237" steps="38"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.023703" steps="51323"/></proof>
+  <proof prover="6"><result status="valid" time="0.023703" steps="51383"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.14" expl="type invariant" proved="true">
   <proof prover="7"><result status="valid" time="0.017592" steps="47"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.017356" steps="60"/></proof>
+  <proof prover="7"><result status="valid" time="0.017356" steps="61"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.081002" steps="14193"/></proof>
+  <proof prover="2"><result status="valid" time="0.081002" steps="14108"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.017135" steps="60"/></proof>
+  <proof prover="7"><result status="valid" time="0.017135" steps="62"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.18" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.014061" steps="78"/></proof>
+  <proof prover="7"><result status="valid" time="0.014061" steps="79"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.19" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.014030" steps="81"/></proof>
+  <proof prover="7"><result status="valid" time="0.014030" steps="82"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.20" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.391129" steps="53215"/></proof>
+  <proof prover="2"><result status="valid" time="0.391129" steps="56920"/></proof>
   </goal>
   <goal name="delete_max&#39;vc.21" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -2389,7 +2389,7 @@
    <proof prover="7"><result status="valid" time="0.074298" steps="913"/></proof>
    </goal>
    <goal name="delete_max&#39;vc.21.1" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.080045" steps="1108"/></proof>
+   <proof prover="7"><result status="valid" time="0.080045" steps="1107"/></proof>
    </goal>
    <goal name="delete_max&#39;vc.21.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -2403,7 +2403,7 @@
     <goal name="delete_max&#39;vc.21.2.1" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="delete_max&#39;vc.21.2.1.0" expl="postcondition" proved="true">
-     <proof prover="7"><result status="valid" time="0.121642" steps="1808"/></proof>
+     <proof prover="7"><result status="valid" time="0.121642" steps="1770"/></proof>
      </goal>
      <goal name="delete_max&#39;vc.21.2.1.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
@@ -2412,10 +2412,10 @@
        <goal name="delete_max&#39;vc.21.2.1.1.0.0" expl="postcondition" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="delete_max&#39;vc.21.2.1.1.0.0.0" expl="postcondition" proved="true">
-        <proof prover="0" timelimit="5"><result status="valid" time="0.845339" steps="199724"/></proof>
+        <proof prover="0" timelimit="5"><result status="valid" time="0.421254" steps="62388"/></proof>
         </goal>
         <goal name="delete_max&#39;vc.21.2.1.1.0.0.1" expl="postcondition" proved="true">
-        <proof prover="7"><result status="valid" time="0.021413" steps="185"/></proof>
+        <proof prover="7"><result status="valid" time="0.021413" steps="187"/></proof>
         </goal>
        </transf>
        </goal>
@@ -2428,7 +2428,7 @@
    </transf>
    </goal>
    <goal name="delete_max&#39;vc.21.3" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.040269" steps="506"/></proof>
+   <proof prover="7"><result status="valid" time="0.040269" steps="505"/></proof>
    </goal>
    <goal name="delete_max&#39;vc.21.4" expl="postcondition" proved="true">
    <proof prover="7"><result status="valid" time="0.051160" steps="459"/></proof>
@@ -2778,10 +2778,10 @@
   <proof prover="7"><result status="valid" time="0.016985" steps="40"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.1" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.017777" steps="52"/></proof>
+  <proof prover="7"><result status="valid" time="0.017777" steps="53"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.017496" steps="55"/></proof>
+  <proof prover="7"><result status="valid" time="0.017496" steps="56"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.3" expl="type invariant" proved="true">
   <proof prover="2"><result status="valid" time="0.045194" steps="8486"/></proof>
@@ -2799,10 +2799,10 @@
   <proof prover="2"><result status="valid" time="0.044931" steps="8710"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.118313" steps="16977"/></proof>
+  <proof prover="2"><result status="valid" time="0.118313" steps="17154"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.158684" steps="21463"/></proof>
+  <proof prover="2"><result status="valid" time="0.158684" steps="21574"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.10" expl="precondition" proved="true">
   <proof prover="7"><result status="valid" time="0.019111" steps="35"/></proof>
@@ -2811,30 +2811,30 @@
   <proof prover="7"><result status="valid" time="0.017313" steps="40"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.12" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.022225" steps="53656"/></proof>
+  <proof prover="6"><result status="valid" time="0.022225" steps="53718"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.044646" steps="9526"/></proof>
+  <proof prover="2"><result status="valid" time="0.044646" steps="9567"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.030989" steps="344"/></proof>
+  <proof prover="7"><result status="valid" time="0.030989" steps="351"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.017949" steps="56"/></proof>
+  <proof prover="7"><result status="valid" time="0.017949" steps="58"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.16" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.039853" steps="10205"/></proof>
+  <proof prover="2"><result status="valid" time="0.039853" steps="10267"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.17" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.022003" steps="64146"/></proof>
+  <proof prover="6"><result status="valid" time="0.022003" steps="64244"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.18" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.141429" steps="36099"/></proof>
+  <proof prover="2"><result status="valid" time="0.141429" steps="36080"/></proof>
   </goal>
   <goal name="delete_min&#39;vc.19" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="delete_min&#39;vc.19.0" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.299450" steps="63327"/></proof>
+   <proof prover="2"><result status="valid" time="0.299450" steps="63819"/></proof>
    </goal>
    <goal name="delete_min&#39;vc.19.1" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -2846,14 +2846,14 @@
      <goal name="delete_min&#39;vc.19.1.1.0" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete_min&#39;vc.19.1.1.0.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.372882" steps="57120"/></proof>
+      <proof prover="0"><result status="valid" time="0.372882" steps="56963"/></proof>
       </goal>
      </transf>
      </goal>
      <goal name="delete_min&#39;vc.19.1.1.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete_min&#39;vc.19.1.1.1.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.554940" steps="93455"/></proof>
+      <proof prover="0"><result status="valid" time="0.554940" steps="92528"/></proof>
       </goal>
      </transf>
      </goal>
@@ -2891,10 +2891,10 @@
        <goal name="delete_min&#39;vc.19.2.1.0.0.0" expl="postcondition" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="delete_min&#39;vc.19.2.1.0.0.0.0" expl="postcondition" proved="true">
-        <proof prover="0" timelimit="5"><result status="valid" time="0.592981" steps="130413"/></proof>
+        <proof prover="0" timelimit="5"><result status="valid" time="0.592981" steps="66639"/></proof>
         </goal>
         <goal name="delete_min&#39;vc.19.2.1.0.0.0.1" expl="postcondition" proved="true">
-        <proof prover="7"><result status="valid" time="0.064117" steps="885"/></proof>
+        <proof prover="7"><result status="valid" time="0.064117" steps="887"/></proof>
         </goal>
        </transf>
        </goal>
@@ -2913,14 +2913,14 @@
          <goal name="delete_min&#39;vc.19.2.1.1.0.0.0.0" expl="postcondition" proved="true">
          <transf name="split_all_full" proved="true" >
           <goal name="delete_min&#39;vc.19.2.1.1.0.0.0.0.0" expl="postcondition" proved="true">
-          <proof prover="0" timelimit="5"><result status="valid" time="1.294616" steps="387348"/></proof>
+          <proof prover="0" timelimit="5"><result status="valid" time="2.700850" steps="783469"/></proof>
           </goal>
          </transf>
          </goal>
         </transf>
         </goal>
         <goal name="delete_min&#39;vc.19.2.1.1.0.0.1" expl="postcondition" proved="true">
-        <proof prover="7"><result status="valid" time="0.020224" steps="176"/></proof>
+        <proof prover="7"><result status="valid" time="0.020224" steps="177"/></proof>
         </goal>
        </transf>
        </goal>
@@ -2933,10 +2933,10 @@
    </transf>
    </goal>
    <goal name="delete_min&#39;vc.19.3" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.042274" steps="500"/></proof>
+   <proof prover="7"><result status="valid" time="0.042274" steps="499"/></proof>
    </goal>
    <goal name="delete_min&#39;vc.19.4" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.064530" steps="18862"/></proof>
+   <proof prover="2"><result status="valid" time="0.064530" steps="19258"/></proof>
    </goal>
   </transf>
   </goal>
@@ -3256,10 +3256,10 @@
        <goal name="delete_rec&#39;vc.76.1.0.0.0.0" expl="precondition" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="delete_rec&#39;vc.76.1.0.0.0.0.0" expl="precondition" proved="true">
-        <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="1.010212" steps="175840"/></proof>
+        <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="1.010212" steps="175838"/></proof>
         </goal>
         <goal name="delete_rec&#39;vc.76.1.0.0.0.0.1" expl="precondition" proved="true">
-        <proof prover="2"><result status="valid" time="0.798638" steps="131922"/></proof>
+        <proof prover="2"><result status="valid" time="0.798638" steps="132072"/></proof>
         </goal>
        </transf>
        </goal>
@@ -3276,7 +3276,7 @@
       <goal name="delete_rec&#39;vc.76.1.1.0.0" expl="precondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete_rec&#39;vc.76.1.1.0.0.0" expl="precondition" proved="true">
-       <proof prover="0"><result status="valid" time="0.614255" steps="92541"/></proof>
+       <proof prover="0"><result status="valid" time="0.614255" steps="92549"/></proof>
        </goal>
       </transf>
       </goal>
@@ -3343,7 +3343,7 @@
    </transf>
    </goal>
    <goal name="delete_rec&#39;vc.77.1" expl="precondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.841945" steps="76181"/></proof>
+   <proof prover="2"><result status="valid" time="0.841945" steps="76195"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.77.2" expl="precondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -3367,7 +3367,7 @@
    <proof prover="2"><result status="valid" time="0.268388" steps="39146"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.78.1" expl="precondition" proved="true">
-   <proof prover="6" timelimit="5"><result status="valid" time="0.329463" steps="1130243"/></proof>
+   <proof prover="6" timelimit="5"><result status="valid" time="0.329463" steps="1130298"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.78.2" expl="precondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -3397,10 +3397,10 @@
    <goal name="delete_rec&#39;vc.79.1" expl="precondition" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="delete_rec&#39;vc.79.1.0" expl="precondition" proved="true">
-    <proof prover="2"><result status="valid" time="0.570707" steps="60225"/></proof>
+    <proof prover="2"><result status="valid" time="0.570707" steps="60244"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.79.1.1" expl="precondition" proved="true">
-    <proof prover="7"><result status="valid" time="0.473737" steps="6039"/></proof>
+    <proof prover="7"><result status="valid" time="0.473737" steps="6047"/></proof>
     </goal>
    </transf>
    </goal>
@@ -3427,7 +3427,7 @@
   <proof prover="7"><result status="valid" time="0.029252" steps="48"/></proof>
   </goal>
   <goal name="delete_rec&#39;vc.82" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.025332" steps="159869"/></proof>
+  <proof prover="6"><result status="valid" time="0.025332" steps="159811"/></proof>
   </goal>
   <goal name="delete_rec&#39;vc.83" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -3439,7 +3439,7 @@
    </transf>
    </goal>
    <goal name="delete_rec&#39;vc.83.1" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.183154" steps="2206"/></proof>
+   <proof prover="7"><result status="valid" time="0.183154" steps="1914"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.83.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -3449,12 +3449,12 @@
     <goal name="delete_rec&#39;vc.83.2.1" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="delete_rec&#39;vc.83.2.1.0" expl="postcondition" proved="true">
-     <proof prover="6"><result status="valid" time="0.570278" steps="1941071"/></proof>
+     <proof prover="6"><result status="valid" time="0.570278" steps="1941099"/></proof>
      </goal>
      <goal name="delete_rec&#39;vc.83.2.1.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete_rec&#39;vc.83.2.1.1.0" expl="postcondition" proved="true">
-      <proof prover="6"><result status="valid" time="0.630143" steps="1950911"/></proof>
+      <proof prover="6"><result status="valid" time="0.630143" steps="1950901"/></proof>
       </goal>
      </transf>
      </goal>
@@ -3492,7 +3492,7 @@
    </transf>
    </goal>
    <goal name="delete_rec&#39;vc.84.1" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.367097" steps="4503"/></proof>
+   <proof prover="7"><result status="valid" time="0.367097" steps="4456"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.84.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -3502,7 +3502,7 @@
     <goal name="delete_rec&#39;vc.84.2.1" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="delete_rec&#39;vc.84.2.1.0" expl="postcondition" proved="true">
-     <proof prover="2"><result status="valid" time="0.788647" steps="73219"/></proof>
+     <proof prover="2"><result status="valid" time="0.788647" steps="73238"/></proof>
      </goal>
      <goal name="delete_rec&#39;vc.84.2.1.1" expl="postcondition" proved="true">
      <proof prover="2"><result status="valid" time="0.699481" steps="69150"/></proof>
@@ -3535,7 +3535,7 @@
     <proof prover="7"><result status="valid" time="0.391631" steps="6241"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.85.0.1" expl="postcondition" proved="true">
-    <proof prover="7"><result status="valid" time="0.372675" steps="4897"/></proof>
+    <proof prover="7"><result status="valid" time="0.775448" steps="8155"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.85.0.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3549,7 +3549,7 @@
      <goal name="delete_rec&#39;vc.85.0.2.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete_rec&#39;vc.85.0.2.1.0" expl="postcondition" proved="true">
-      <proof prover="2"><result status="valid" time="0.037432" steps="12737"/></proof>
+      <proof prover="2"><result status="valid" time="0.037432" steps="12754"/></proof>
       </goal>
       <goal name="delete_rec&#39;vc.85.0.2.1.1" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
@@ -3588,7 +3588,7 @@
     <proof prover="7"><result status="valid" time="0.027596" steps="251"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.85.1.1" expl="postcondition" proved="true">
-    <proof prover="2"><result status="valid" time="0.160846" steps="34753"/></proof>
+    <proof prover="2"><result status="valid" time="0.160846" steps="34797"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.85.1.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3596,7 +3596,7 @@
      <proof prover="2"><result status="valid" time="0.302603" steps="41051"/></proof>
      </goal>
      <goal name="delete_rec&#39;vc.85.1.2.1" expl="postcondition" proved="true">
-     <proof prover="2"><result status="valid" time="0.868974" steps="81406"/></proof>
+     <proof prover="2"><result status="valid" time="0.868974" steps="81397"/></proof>
      </goal>
      <goal name="delete_rec&#39;vc.85.1.2.2" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
@@ -3630,7 +3630,7 @@
     </transf>
     </goal>
     <goal name="delete_rec&#39;vc.85.2.1" expl="postcondition" proved="true">
-    <proof prover="7"><result status="valid" time="0.232968" steps="3179"/></proof>
+    <proof prover="7"><result status="valid" time="0.687332" steps="7276"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.85.2.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3642,7 +3642,7 @@
       <goal name="delete_rec&#39;vc.85.2.2.1.0" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete_rec&#39;vc.85.2.2.1.0.0" expl="postcondition" proved="true">
-       <proof prover="2"><result status="valid" time="0.779626" steps="73364"/></proof>
+       <proof prover="2"><result status="valid" time="0.779626" steps="73366"/></proof>
        </goal>
       </transf>
       </goal>
@@ -3691,7 +3691,7 @@
     <proof prover="7"><result status="valid" time="0.053734" steps="557"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.86.0.1" expl="postcondition" proved="true">
-    <proof prover="7"><result status="valid" time="0.277749" steps="1965"/></proof>
+    <proof prover="7"><result status="valid" time="0.277749" steps="2245"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.86.0.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3735,7 +3735,7 @@
             <goal name="delete_rec&#39;vc.86.0.2.1.0.0.0.0.0.0.0" expl="postcondition" proved="true">
             <transf name="split_vc" proved="true" >
              <goal name="delete_rec&#39;vc.86.0.2.1.0.0.0.0.0.0.0.0" expl="postcondition" proved="true">
-             <proof prover="2" timelimit="10" memlimit="4000"><result status="valid" time="5.583858" steps="559113"/></proof>
+             <proof prover="2" timelimit="10" memlimit="4000"><result status="valid" time="5.583858" steps="559142"/></proof>
              </goal>
             </transf>
             </goal>
@@ -3744,7 +3744,7 @@
           </transf>
           </goal>
           <goal name="delete_rec&#39;vc.86.0.2.1.0.0.0.0.1" expl="postcondition" proved="true">
-          <proof prover="2"><result status="valid" time="0.237532" steps="31308"/></proof>
+          <proof prover="2"><result status="valid" time="0.237532" steps="31320"/></proof>
           </goal>
          </transf>
          </goal>
@@ -3846,7 +3846,7 @@
     </transf>
     </goal>
     <goal name="delete_rec&#39;vc.86.1.1" expl="postcondition" proved="true">
-    <proof prover="2"><result status="valid" time="0.194190" steps="39622"/></proof>
+    <proof prover="2"><result status="valid" time="0.194190" steps="39675"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.86.1.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3864,10 +3864,10 @@
          <goal name="delete_rec&#39;vc.86.1.2.1.0.0.0.0" expl="postcondition" proved="true">
          <transf name="split_vc" proved="true" >
           <goal name="delete_rec&#39;vc.86.1.2.1.0.0.0.0.0" expl="postcondition" proved="true">
-          <proof prover="6"><result status="valid" time="0.436120" steps="1536382"/></proof>
+          <proof prover="6"><result status="valid" time="0.436120" steps="1536407"/></proof>
           </goal>
           <goal name="delete_rec&#39;vc.86.1.2.1.0.0.0.0.1" expl="postcondition" proved="true">
-          <proof prover="6"><result status="valid" time="0.037503" steps="133414"/></proof>
+          <proof prover="6"><result status="valid" time="0.037503" steps="133449"/></proof>
           </goal>
          </transf>
          </goal>
@@ -3880,7 +3880,7 @@
       <goal name="delete_rec&#39;vc.86.1.2.1.1" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete_rec&#39;vc.86.1.2.1.1.0" expl="postcondition" proved="true">
-       <proof prover="0" timelimit="5"><result status="valid" time="0.930262" steps="139853"/></proof>
+       <proof prover="0" timelimit="5"><result status="valid" time="0.930262" steps="139310"/></proof>
        </goal>
       </transf>
       </goal>
@@ -3930,7 +3930,7 @@
     </transf>
     </goal>
     <goal name="delete_rec&#39;vc.86.2.1" expl="postcondition" proved="true">
-    <proof prover="7" timelimit="5"><result status="valid" time="1.077057" steps="15480"/></proof>
+    <proof prover="7" timelimit="5"><result status="valid" time="1.077057" steps="9990"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.86.2.2" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
@@ -3946,14 +3946,14 @@
       <goal name="delete_rec&#39;vc.86.2.2.1.0" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete_rec&#39;vc.86.2.2.1.0.0" expl="postcondition" proved="true">
-       <proof prover="6"><result status="valid" time="0.462647" steps="1517726"/></proof>
+       <proof prover="6"><result status="valid" time="0.462647" steps="1517735"/></proof>
        </goal>
       </transf>
       </goal>
       <goal name="delete_rec&#39;vc.86.2.2.1.1" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete_rec&#39;vc.86.2.2.1.1.0" expl="postcondition" proved="true">
-       <proof prover="0"><result status="valid" time="0.900198" steps="138944"/></proof>
+       <proof prover="0"><result status="valid" time="0.900198" steps="138945"/></proof>
        </goal>
       </transf>
       </goal>
@@ -4001,7 +4001,7 @@
    </transf>
    </goal>
    <goal name="delete_rec&#39;vc.87.1" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.067054" steps="1551"/></proof>
+   <proof prover="7"><result status="valid" time="0.067054" steps="1536"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.87.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -4025,7 +4025,7 @@
      <goal name="delete_rec&#39;vc.87.2.1.0" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete_rec&#39;vc.87.2.1.0.0" expl="postcondition" proved="true">
-      <proof prover="2"><result status="valid" time="0.508643" steps="47856"/></proof>
+      <proof prover="2"><result status="valid" time="0.508643" steps="47868"/></proof>
       </goal>
      </transf>
      </goal>
@@ -4070,7 +4070,7 @@
    </transf>
    </goal>
    <goal name="delete_rec&#39;vc.88.1" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.187924" steps="2780"/></proof>
+   <proof prover="7"><result status="valid" time="0.187924" steps="2666"/></proof>
    </goal>
    <goal name="delete_rec&#39;vc.88.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -4094,7 +4094,7 @@
     </transf>
     </goal>
     <goal name="delete_rec&#39;vc.88.2.1" expl="postcondition" proved="true">
-    <proof prover="2"><result status="valid" time="1.083711" steps="94403"/></proof>
+    <proof prover="2"><result status="valid" time="1.083711" steps="94423"/></proof>
     </goal>
     <goal name="delete_rec&#39;vc.88.2.2" expl="postcondition" proved="true">
     <proof prover="2"><result status="valid" time="0.561668" steps="90793"/></proof>
@@ -4104,7 +4104,7 @@
   </transf>
   </goal>
   <goal name="delete_rec&#39;vc.89" expl="postcondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.061827" steps="167827"/></proof>
+  <proof prover="6"><result status="valid" time="0.061827" steps="167979"/></proof>
   </goal>
  </transf>
  </goal>
@@ -4116,10 +4116,10 @@
   <proof prover="7"><result status="valid" time="0.012813" steps="41"/></proof>
   </goal>
   <goal name="delete&#39;vc.1" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.022679" steps="54348"/></proof>
+  <proof prover="6"><result status="valid" time="0.022679" steps="54376"/></proof>
   </goal>
   <goal name="delete&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.013648" steps="56"/></proof>
+  <proof prover="7"><result status="valid" time="0.013648" steps="57"/></proof>
   </goal>
   <goal name="delete&#39;vc.3" expl="type invariant" proved="true">
   <proof prover="7"><result status="valid" time="0.013108" steps="44"/></proof>
@@ -4143,45 +4143,45 @@
   <proof prover="7"><result status="valid" time="0.012626" steps="26"/></proof>
   </goal>
   <goal name="delete&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="0.392310" steps="1272161"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="0.392310" steps="1641312"/></proof>
   </goal>
   <goal name="delete&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.139879" steps="21410"/></proof>
+  <proof prover="2"><result status="valid" time="0.139879" steps="21798"/></proof>
   </goal>
   <goal name="delete&#39;vc.12" expl="precondition" proved="true">
   <proof prover="7"><result status="valid" time="0.017876" steps="37"/></proof>
   </goal>
   <goal name="delete&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.012670" steps="4982"/></proof>
+  <proof prover="6"><result status="valid" time="0.012670" steps="4990"/></proof>
   </goal>
   <goal name="delete&#39;vc.14" expl="precondition" proved="true">
   <proof prover="7"><result status="valid" time="0.016168" steps="40"/></proof>
   </goal>
   <goal name="delete&#39;vc.15" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.042472" steps="9774"/></proof>
+  <proof prover="2"><result status="valid" time="0.042472" steps="9798"/></proof>
   </goal>
   <goal name="delete&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.014771" steps="57"/></proof>
+  <proof prover="7"><result status="valid" time="0.014771" steps="58"/></proof>
   </goal>
   <goal name="delete&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.029061" steps="342"/></proof>
+  <proof prover="7"><result status="valid" time="0.029061" steps="349"/></proof>
   </goal>
   <goal name="delete&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.014046" steps="58"/></proof>
+  <proof prover="7"><result status="valid" time="0.014046" steps="60"/></proof>
   </goal>
   <goal name="delete&#39;vc.19" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.037429" steps="10609"/></proof>
+  <proof prover="2"><result status="valid" time="0.037429" steps="10671"/></proof>
   </goal>
   <goal name="delete&#39;vc.20" expl="type invariant" proved="true">
-  <proof prover="7"><result status="valid" time="0.017467" steps="77"/></proof>
+  <proof prover="7"><result status="valid" time="0.017467" steps="78"/></proof>
   </goal>
   <goal name="delete&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.142745" steps="36725"/></proof>
+  <proof prover="2"><result status="valid" time="0.142745" steps="36690"/></proof>
   </goal>
   <goal name="delete&#39;vc.22" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="delete&#39;vc.22.0" expl="postcondition" proved="true">
-   <proof prover="6"><result status="valid" time="0.201149" steps="392142"/></proof>
+   <proof prover="6"><result status="valid" time="0.201149" steps="394410"/></proof>
    </goal>
    <goal name="delete&#39;vc.22.1" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
@@ -4193,14 +4193,14 @@
      <goal name="delete&#39;vc.22.1.1.0" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete&#39;vc.22.1.1.0.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.313123" steps="30499"/></proof>
+      <proof prover="0"><result status="valid" time="0.313123" steps="30570"/></proof>
       </goal>
      </transf>
      </goal>
      <goal name="delete&#39;vc.22.1.1.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete&#39;vc.22.1.1.1.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.331690" steps="44319"/></proof>
+      <proof prover="0"><result status="valid" time="0.331690" steps="44517"/></proof>
       </goal>
      </transf>
      </goal>
@@ -4218,14 +4218,14 @@
      <goal name="delete&#39;vc.22.2.1.0" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete&#39;vc.22.2.1.0.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.178093" steps="24917"/></proof>
+      <proof prover="0"><result status="valid" time="0.178093" steps="24963"/></proof>
       </goal>
      </transf>
      </goal>
      <goal name="delete&#39;vc.22.2.1.1" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="delete&#39;vc.22.2.1.1.0" expl="postcondition" proved="true">
-      <proof prover="0"><result status="valid" time="0.233699" steps="33516"/></proof>
+      <proof prover="0"><result status="valid" time="0.233699" steps="33854"/></proof>
       </goal>
      </transf>
      </goal>
@@ -4265,10 +4265,10 @@
       <goal name="delete&#39;vc.23.1.0.0.0" expl="postcondition" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="delete&#39;vc.23.1.0.0.0.0" expl="postcondition" proved="true">
-       <proof prover="0" timelimit="5"><result status="valid" time="0.527717" steps="113539"/></proof>
+       <proof prover="0" timelimit="5"><result status="valid" time="0.527717" steps="65268"/></proof>
        </goal>
        <goal name="delete&#39;vc.23.1.0.0.0.1" expl="postcondition" proved="true">
-       <proof prover="0"><result status="valid" time="0.487536" steps="35617"/></proof>
+       <proof prover="0"><result status="valid" time="0.187400" steps="35445"/></proof>
        </goal>
       </transf>
       </goal>
@@ -4287,14 +4287,14 @@
         <goal name="delete&#39;vc.23.1.1.0.0.0.0" expl="postcondition" proved="true">
         <transf name="split_all_full" proved="true" >
          <goal name="delete&#39;vc.23.1.1.0.0.0.0.0" expl="postcondition" proved="true">
-         <proof prover="0" timelimit="5"><result status="valid" time="0.893944" steps="260782"/></proof>
+         <proof prover="0" timelimit="5"><result status="valid" time="0.893944" steps="244905"/></proof>
          </goal>
         </transf>
         </goal>
        </transf>
        </goal>
        <goal name="delete&#39;vc.23.1.1.0.0.1" expl="postcondition" proved="true">
-       <proof prover="7"><result status="valid" time="0.028349" steps="166"/></proof>
+       <proof prover="7"><result status="valid" time="0.028349" steps="168"/></proof>
        </goal>
       </transf>
       </goal>
diff --git a/creusot/tests/should_succeed/red_black_tree/why3shapes.gz b/creusot/tests/should_succeed/red_black_tree/why3shapes.gz
index a8000c348a3b326dde55d09a9628c73c22cd0bad..406cbb9607e1cb48a8c38a07c5708a676cae06d4 100644
GIT binary patch
delta 79047
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
a?l_o%24<jvX^N5i|NTEV#dUv`3km?e@SlAE

delta 78702
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%0DsqGZzvFL@-3J!GKHLrt0mq(
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
Y!~Nit@l2Xx?)ZQI4=N#ZT2%%L01^*%*#H0l

diff --git a/creusot/tests/should_succeed/replace.mlcfg b/creusot/tests/should_succeed/replace.mlcfg
index c634fc596a..f360de269f 100644
--- a/creusot/tests/should_succeed/replace.mlcfg
+++ b/creusot/tests/should_succeed/replace.mlcfg
@@ -28,8 +28,8 @@ module Replace_Test
     goto BB1
   }
   BB1 {
-    [#"../replace.rs" 9 4 9 6] _a <- ([#"../replace.rs" 9 9 9 10] b);
-    [#"../replace.rs" 9 9 9 10] b <- any Replace_Something_Type.t_something;
+    [#"../replace.rs" 9 4 9 6] _a <- ([#"../replace.rs" 9 4 9 6] b);
+    b <- any Replace_Something_Type.t_something;
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/resolve_uninit.mlcfg b/creusot/tests/should_succeed/resolve_uninit.mlcfg
index 0660cb438c..f4307d233b 100644
--- a/creusot/tests/should_succeed/resolve_uninit.mlcfg
+++ b/creusot/tests/should_succeed/resolve_uninit.mlcfg
@@ -37,7 +37,7 @@ module ResolveUninit_MaybeUninit
     goto BB0
   }
   BB0 {
-    switch ([#"../resolve_uninit.rs" 7 7 7 8] b)
+    switch (b)
       | False -> goto BB6
       | True -> goto BB1
       end
@@ -51,7 +51,7 @@ module ResolveUninit_MaybeUninit
   }
   BB3 {
     [#"../resolve_uninit.rs" 8 8 8 9] x <- ([#"../resolve_uninit.rs" 8 8 8 9] _6);
-    [#"../resolve_uninit.rs" 8 8 8 9] _6 <- any t;
+    _6 <- any t;
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     goto BB5
@@ -68,13 +68,13 @@ module ResolveUninit_MaybeUninit
     goto BB8
   }
   BB8 {
-    [#"../resolve_uninit.rs" 11 4 11 5] x <- ([#"../resolve_uninit.rs" 11 8 11 9] y);
-    [#"../resolve_uninit.rs" 11 8 11 9] y <- any t;
+    [#"../resolve_uninit.rs" 11 4 11 5] x <- ([#"../resolve_uninit.rs" 11 4 11 5] y);
+    y <- any t;
     goto BB10
   }
   BB10 {
     [#"../resolve_uninit.rs" 12 4 12 5] _0 <- ([#"../resolve_uninit.rs" 12 4 12 5] x);
-    [#"../resolve_uninit.rs" 12 4 12 5] x <- any t;
+    x <- any t;
     goto BB11
   }
   BB11 {
@@ -109,11 +109,12 @@ module ResolveUninit_InitJoin
   var _10 : borrowed int32;
   var _11 : borrowed int32;
   var _12 : borrowed int32;
+  var _14 : bool;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../resolve_uninit.rs" 19 7 19 8] b)
+    switch (b)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -124,14 +125,14 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 20 12 20 18] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../resolve_uninit.rs" 20 12 20 18] _8 <- { _8 with current = ( ^ _7) ; };
     [#"../resolve_uninit.rs" 20 8 20 18] z <- ([#"../resolve_uninit.rs" 20 8 20 18] _7);
-    [#"../resolve_uninit.rs" 20 8 20 18] _7 <- any borrowed int32;
+    _7 <- any borrowed int32;
     assume { resolve0 _8 };
     [#"../resolve_uninit.rs" 21 12 21 19] _10 <- Borrow.borrow_final ( * z) (Borrow.get_id z);
     [#"../resolve_uninit.rs" 21 12 21 19] z <- { z with current = ( ^ _10) ; };
     [#"../resolve_uninit.rs" 21 12 21 19] _9 <- Borrow.borrow_final ( * _10) (Borrow.get_id _10);
     [#"../resolve_uninit.rs" 21 12 21 19] _10 <- { _10 with current = ( ^ _9) ; };
     [#"../resolve_uninit.rs" 21 8 21 19] y <- ([#"../resolve_uninit.rs" 21 8 21 19] _9);
-    [#"../resolve_uninit.rs" 21 8 21 19] _9 <- any borrowed int32;
+    _9 <- any borrowed int32;
     assume { resolve0 _10 };
     [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] ());
     goto BB7
@@ -142,15 +143,16 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 24 12 24 18] _11 <- Borrow.borrow_final ( * _12) (Borrow.get_id _12);
     [#"../resolve_uninit.rs" 24 12 24 18] _12 <- { _12 with current = ( ^ _11) ; };
     [#"../resolve_uninit.rs" 24 8 24 18] y <- ([#"../resolve_uninit.rs" 24 8 24 18] _11);
-    [#"../resolve_uninit.rs" 24 8 24 18] _11 <- any borrowed int32;
+    _11 <- any borrowed int32;
     assume { resolve0 _12 };
     [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] ());
     goto BB3
   }
   BB3 {
-    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] [#"../resolve_uninit.rs" 27 9 27 10] (5 : int32)) ; };
+    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] (5 : int32)) ; };
     assume { resolve0 y };
-    switch ([#"../resolve_uninit.rs" 28 12 28 18] ([#"../resolve_uninit.rs" 28 12 28 13] x) = ([#"../resolve_uninit.rs" 28 17 28 18] [#"../resolve_uninit.rs" 28 17 28 18] (5 : int32)))
+    [#"../resolve_uninit.rs" 28 12 28 18] _14 <- ([#"../resolve_uninit.rs" 28 12 28 18] x = (5 : int32));
+    switch (_14)
       | False -> goto BB5
       | True -> goto BB4
       end
diff --git a/creusot/tests/should_succeed/resolve_uninit/why3session.xml b/creusot/tests/should_succeed/resolve_uninit/why3session.xml
index 6bf9ef09dc..84f5e9d973 100644
--- a/creusot/tests/should_succeed/resolve_uninit/why3session.xml
+++ b/creusot/tests/should_succeed/resolve_uninit/why3session.xml
@@ -12,7 +12,7 @@
 </theory>
 <theory name="ResolveUninit_InitJoin" proved="true">
  <goal name="init_join&#39;vc" expl="VC for init_join" proved="true">
- <proof prover="1"><result status="valid" time="0.009232" steps="97"/></proof>
+ <proof prover="1"><result status="valid" time="0.009232" steps="98"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/resolve_uninit/why3shapes.gz b/creusot/tests/should_succeed/resolve_uninit/why3shapes.gz
index ae1eecd641ca164842f1b78d99a1d543ea6744b9..bc8d20db1215fa555b11076e86b6b906dce1251e 100644
GIT binary patch
literal 466
zcmV;@0WJO?iwFP!00000|6NkSlAACLz4H~^w#&(~!8V=QLnad@xp#DI#st%4n}rrg
zcKY{~uwmO=Ec;1%Pm=W|OQ%=&%TMXuk5f1FUsIiC&&mATb^TqSsFHBeC-;IHi;8W5
zvO4YQlB05!yH4JXej2WKFEHPQ1hVY6Y%H2Xgbms0-1yert}{Ik?%R0t2-R*sN2(<b
zfQ0}M#3Bg-OS&w+@_&x9S~;R$RtfIYb{Nxl_ow#fTi^BFob20EyK95U98!v<n=T47
zL~nTsU6Lh3l(UjgbOzwFQI5%7J&fb<;hU%TpO?b5UGJ_ml&(R=Bif=t@E{b|&dvOr
z=DuSY6AdTwtX{B0%a#G_e)##!9tJXcXE8`pE`w-LAA(aO93KA!NOgNi87h&mFvy2e
zB*a?4vNqTt1SrK?j}&V`V1p<j*%}Jv10xYdM!hiV5M~j~$_Qp-)Pa$ZEQEe`Q7n1X
zU>+EXN1=Qbk_)K}VL5`@gw!S^qmbf5ZsS~VI%)UfM0pA0nu=;$Encbf+tBq%Vx_H3
z?p0eDVL;`zscoanw)B_0R9dF;2uG24Z;OV|LMRW7YK5w$Zc9oqzV=R}`B5c*0Xv|`
Is*wW#01MONi~s-t

literal 450
zcmV;z0X_a7iwFP!00000|6NkSj+`(Iz4H~^c9&C}kc3p)!)OE=E_<qS>?lCe(w&7C
zn5p{rbx2^kbBSa7`90h6bC%9O%r85qH#^P!IDAP(n!O~;Z_^JqqDhs6kEqS77MfSy
za!srHh@V_DQ<=+b&1C2Ca<fF|hfsjl=L>HNEz1~|Xy<chow;5XbW8Jfx>^m@;kZPq
z6$jvj05p(Q5{Op#S##<$hpIM?n5R{ukEt7{^uzpZ?D;zML%$@hb_Z9#AsKCXy&J4q
z7=6Mw1n!e~Om3QSn#Mo2d-`~9xpDnqE;x1HY36sZqm>_&g?ZKgMdq6>Vwvz|qP(x<
z)d!^cZkMyq_&|n!7C{tieb6ty3`wq`d|Wx8=<ZMmjZm^Oz(XsP#9lypZID3-Nz~R4
zsI4K8K@=m|28H5*5s4xrU#oe5NeyCW6gwl2jKV)2dY@vw7{CEpV8|bZ*d_!kDFhhP
zKzAX!3qcg3{(*g+YdqXl+$dfa#49A#emVYP&OgU~NRomUjm#}`ToMT^Z)8(+LOEsI
sTrojYdV&*4oMRN-uH!9jvG)#fvJg@k(dE1`X?|kKKYOE^>~I4B0Qc|IB>(^b

diff --git a/creusot/tests/should_succeed/result/own.mlcfg b/creusot/tests/should_succeed/result/own.mlcfg
index a2be7e8a72..6371b85504 100644
--- a/creusot/tests/should_succeed/result/own.mlcfg
+++ b/creusot/tests/should_succeed/result/own.mlcfg
@@ -130,7 +130,7 @@ module Own_Impl0_IsErr
   BB0 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 31 9 31 21] _3 <- ([#"../own.rs" 31 9 31 21] is_ok0 ([#"../own.rs" 31 9 31 13] self));
+    [#"../own.rs" 31 9 31 21] _3 <- ([#"../own.rs" 31 9 31 21] is_ok0 self);
     goto BB1
   }
   BB1 {
@@ -239,7 +239,7 @@ module Own_Impl0_Ok
   }
   BB4 {
     [#"../own.rs" 40 27 40 28] x1 <- ([#"../own.rs" 40 27 40 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 40 27 40 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 x1 };
     assume { resolve1 x1 };
     assert { [@expl:type invariant] inv0 self };
@@ -255,11 +255,11 @@ module Own_Impl0_Ok
   }
   BB6 {
     [#"../own.rs" 38 26 38 27] x <- ([#"../own.rs" 38 26 38 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 38 26 38 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 38 32 38 39] _0 <- ([#"../own.rs" 38 32 38 39] Core_Option_Option_Type.C_Some ([#"../own.rs" 38 37 38 38] x));
-    [#"../own.rs" 38 37 38 38] x <- any t;
+    [#"../own.rs" 38 32 38 39] _0 <- ([#"../own.rs" 38 32 38 39] Core_Option_Option_Type.C_Some x);
+    x <- any t;
     goto BB7
   }
   BB7 {
@@ -367,11 +367,11 @@ module Own_Impl0_Err
   }
   BB4 {
     [#"../own.rs" 50 27 50 28] x1 <- ([#"../own.rs" 50 27 50 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 50 27 50 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 50 33 50 40] _0 <- ([#"../own.rs" 50 33 50 40] Core_Option_Option_Type.C_Some ([#"../own.rs" 50 38 50 39] x1));
-    [#"../own.rs" 50 38 50 39] x1 <- any e;
+    [#"../own.rs" 50 33 50 40] _0 <- ([#"../own.rs" 50 33 50 40] Core_Option_Option_Type.C_Some x1);
+    x1 <- any e;
     goto BB8
   }
   BB5 {
@@ -382,7 +382,7 @@ module Own_Impl0_Err
   }
   BB6 {
     [#"../own.rs" 49 26 49 27] x <- ([#"../own.rs" 49 26 49 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 49 26 49 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     assert { [@expl:type invariant] inv1 self };
@@ -489,7 +489,7 @@ module Own_Impl0_AsRef
     assume { resolve0 self };
     assert { [@expl:type invariant] inv2 x1 };
     assume { resolve2 x1 };
-    [#"../own.rs" 59 37 59 54] _0 <- ([#"../own.rs" 59 37 59 54] Own_OwnResult_Type.C_Err ([#"../own.rs" 59 52 59 53] x1));
+    [#"../own.rs" 59 37 59 54] _0 <- ([#"../own.rs" 59 37 59 54] Own_OwnResult_Type.C_Err x1);
     goto BB5
   }
   BB3 {
@@ -504,7 +504,7 @@ module Own_Impl0_AsRef
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 x };
     assume { resolve1 x };
-    [#"../own.rs" 58 36 58 52] _0 <- ([#"../own.rs" 58 36 58 52] Own_OwnResult_Type.C_Ok ([#"../own.rs" 58 50 58 51] x));
+    [#"../own.rs" 58 36 58 52] _0 <- ([#"../own.rs" 58 36 58 52] Own_OwnResult_Type.C_Ok x);
     goto BB5
   }
   BB5 {
@@ -727,7 +727,7 @@ module Own_Impl0_Unwrap
   }
   BB4 {
     [#"../own.rs" 86 27 86 29] _e <- ([#"../own.rs" 86 27 86 29] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 86 27 86 29] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 _e };
     assume { resolve1 _e };
     assert { [@expl:type invariant] inv0 self };
@@ -743,11 +743,11 @@ module Own_Impl0_Unwrap
   }
   BB6 {
     [#"../own.rs" 85 26 85 27] t <- ([#"../own.rs" 85 26 85 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 85 26 85 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     [#"../own.rs" 85 32 85 33] _0 <- ([#"../own.rs" 85 32 85 33] t);
-    [#"../own.rs" 85 32 85 33] t <- any t;
+    t <- any t;
     goto BB7
   }
   BB7 {
@@ -837,7 +837,7 @@ module Own_Impl0_Expect
   }
   BB4 {
     [#"../own.rs" 98 27 98 29] _e <- ([#"../own.rs" 98 27 98 29] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 98 27 98 29] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 _e };
     assume { resolve1 _e };
     assert { [@expl:type invariant] inv0 self };
@@ -853,11 +853,11 @@ module Own_Impl0_Expect
   }
   BB6 {
     [#"../own.rs" 97 26 97 27] t <- ([#"../own.rs" 97 26 97 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 97 26 97 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     [#"../own.rs" 97 32 97 33] _0 <- ([#"../own.rs" 97 32 97 33] t);
-    [#"../own.rs" 97 32 97 33] t <- any t;
+    t <- any t;
     goto BB7
   }
   BB7 {
@@ -946,11 +946,11 @@ module Own_Impl0_UnwrapErr
   }
   BB4 {
     [#"../own.rs" 110 27 110 28] e <- ([#"../own.rs" 110 27 110 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 110 27 110 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     [#"../own.rs" 110 33 110 34] _0 <- ([#"../own.rs" 110 33 110 34] e);
-    [#"../own.rs" 110 33 110 34] e <- any e;
+    e <- any e;
     goto BB7
   }
   BB5 {
@@ -961,7 +961,7 @@ module Own_Impl0_UnwrapErr
   }
   BB6 {
     [#"../own.rs" 109 26 109 28] _t <- ([#"../own.rs" 109 26 109 28] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 109 26 109 28] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
     assert { [@expl:type invariant] inv1 self };
@@ -1057,13 +1057,13 @@ module Own_Impl0_UnwrapOr
   }
   BB4 {
     [#"../own.rs" 120 27 120 28] e <- ([#"../own.rs" 120 27 120 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 120 27 120 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv2 e };
     assume { resolve2 e };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     [#"../own.rs" 120 33 120 40] _0 <- ([#"../own.rs" 120 33 120 40] default);
-    [#"../own.rs" 120 33 120 40] default <- any t;
+    default <- any t;
     goto BB8
   }
   BB5 {
@@ -1078,11 +1078,11 @@ module Own_Impl0_UnwrapOr
     assert { [@expl:type invariant] inv0 default };
     assume { resolve0 default };
     [#"../own.rs" 118 26 118 27] t <- ([#"../own.rs" 118 26 118 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 118 26 118 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     [#"../own.rs" 118 32 118 33] _0 <- ([#"../own.rs" 118 32 118 33] t);
-    [#"../own.rs" 118 32 118 33] t <- any t;
+    t <- any t;
     goto BB7
   }
   BB7 {
@@ -1199,11 +1199,11 @@ module Own_Impl0_UnwrapOrDefault
   }
   BB6 {
     [#"../own.rs" 131 26 131 27] x <- ([#"../own.rs" 131 26 131 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 131 26 131 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     [#"../own.rs" 131 32 131 33] _0 <- ([#"../own.rs" 131 32 131 33] x);
-    [#"../own.rs" 131 32 131 33] x <- any t;
+    x <- any t;
     goto BB7
   }
   BB7 {
@@ -1321,11 +1321,11 @@ module Own_Impl0_And
     assert { [@expl:type invariant] inv2 res };
     assume { resolve2 res };
     [#"../own.rs" 142 27 142 28] e <- ([#"../own.rs" 142 27 142 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 142 27 142 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 142 33 142 50] _0 <- ([#"../own.rs" 142 33 142 50] Own_OwnResult_Type.C_Err ([#"../own.rs" 142 48 142 49] e));
-    [#"../own.rs" 142 48 142 49] e <- any e;
+    [#"../own.rs" 142 33 142 50] _0 <- ([#"../own.rs" 142 33 142 50] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB8
   }
   BB5 {
@@ -1338,13 +1338,13 @@ module Own_Impl0_And
   }
   BB6 {
     [#"../own.rs" 141 26 141 27] x <- ([#"../own.rs" 141 26 141 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 141 26 141 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     [#"../own.rs" 141 32 141 35] _0 <- ([#"../own.rs" 141 32 141 35] res);
-    [#"../own.rs" 141 32 141 35] res <- any Own_OwnResult_Type.t_ownresult u e;
+    res <- any Own_OwnResult_Type.t_ownresult u e;
     goto BB7
   }
   BB7 {
@@ -1469,13 +1469,13 @@ module Own_Impl0_Or
   }
   BB4 {
     [#"../own.rs" 152 27 152 28] e <- ([#"../own.rs" 152 27 152 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 152 27 152 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv2 e };
     assume { resolve2 e };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     [#"../own.rs" 152 33 152 36] _0 <- ([#"../own.rs" 152 33 152 36] res);
-    [#"../own.rs" 152 33 152 36] res <- any Own_OwnResult_Type.t_ownresult t f;
+    res <- any Own_OwnResult_Type.t_ownresult t f;
     goto BB9
   }
   BB5 {
@@ -1490,11 +1490,11 @@ module Own_Impl0_Or
     assert { [@expl:type invariant] inv0 res };
     assume { resolve0 res };
     [#"../own.rs" 150 26 150 27] v <- ([#"../own.rs" 150 26 150 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 150 26 150 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 150 32 150 48] _0 <- ([#"../own.rs" 150 32 150 48] Own_OwnResult_Type.C_Ok ([#"../own.rs" 150 46 150 47] v));
-    [#"../own.rs" 150 46 150 47] v <- any t;
+    [#"../own.rs" 150 32 150 48] _0 <- ([#"../own.rs" 150 32 150 48] Own_OwnResult_Type.C_Ok v);
+    v <- any t;
     goto BB7
   }
   BB7 {
@@ -1605,11 +1605,11 @@ module Own_Impl1_Copied
   }
   BB4 {
     [#"../own.rs" 167 27 167 28] e <- ([#"../own.rs" 167 27 167 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 167 27 167 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 167 33 167 50] _0 <- ([#"../own.rs" 167 33 167 50] Own_OwnResult_Type.C_Err ([#"../own.rs" 167 48 167 49] e));
-    [#"../own.rs" 167 48 167 49] e <- any e;
+    [#"../own.rs" 167 33 167 50] _0 <- ([#"../own.rs" 167 33 167 50] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB7
   }
   BB5 {
@@ -1624,7 +1624,7 @@ module Own_Impl1_Copied
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 166 32 166 49] _0 <- ([#"../own.rs" 166 32 166 49] Own_OwnResult_Type.C_Ok ([#"../own.rs" 166 46 166 48] t));
+    [#"../own.rs" 166 32 166 49] _0 <- ([#"../own.rs" 166 32 166 49] Own_OwnResult_Type.C_Ok t);
     goto BB9
   }
   BB7 {
@@ -1744,11 +1744,11 @@ module Own_Impl1_Cloned
   }
   BB4 {
     [#"../own.rs" 180 27 180 28] e <- ([#"../own.rs" 180 27 180 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 180 27 180 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 180 33 180 50] _0 <- ([#"../own.rs" 180 33 180 50] Own_OwnResult_Type.C_Err ([#"../own.rs" 180 48 180 49] e));
-    [#"../own.rs" 180 48 180 49] e <- any e;
+    [#"../own.rs" 180 33 180 50] _0 <- ([#"../own.rs" 180 33 180 50] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB9
   }
   BB5 {
@@ -1763,7 +1763,7 @@ module Own_Impl1_Cloned
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 179 46 179 55] _6 <- ([#"../own.rs" 179 46 179 55] clone0 ([#"../own.rs" 179 46 179 47] t));
+    [#"../own.rs" 179 46 179 55] _6 <- ([#"../own.rs" 179 46 179 55] clone0 t);
     goto BB7
   }
   BB7 {
@@ -1877,11 +1877,11 @@ module Own_Impl2_Copied
   }
   BB4 {
     [#"../own.rs" 195 27 195 28] e <- ([#"../own.rs" 195 27 195 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 195 27 195 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 195 33 195 50] _0 <- ([#"../own.rs" 195 33 195 50] Own_OwnResult_Type.C_Err ([#"../own.rs" 195 48 195 49] e));
-    [#"../own.rs" 195 48 195 49] e <- any e;
+    [#"../own.rs" 195 33 195 50] _0 <- ([#"../own.rs" 195 33 195 50] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB7
   }
   BB5 {
@@ -1892,12 +1892,12 @@ module Own_Impl2_Copied
   }
   BB6 {
     [#"../own.rs" 194 26 194 27] t <- ([#"../own.rs" 194 26 194 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 194 26 194 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 194 32 194 49] _0 <- ([#"../own.rs" 194 32 194 49] Own_OwnResult_Type.C_Ok ([#"../own.rs" 194 46 194 48]  * t));
+    [#"../own.rs" 194 32 194 49] _0 <- ([#"../own.rs" 194 32 194 49] Own_OwnResult_Type.C_Ok ( * t));
     goto BB9
   }
   BB7 {
@@ -2027,11 +2027,11 @@ module Own_Impl2_Cloned
   }
   BB4 {
     [#"../own.rs" 208 27 208 28] e <- ([#"../own.rs" 208 27 208 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 208 27 208 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 208 33 208 50] _0 <- ([#"../own.rs" 208 33 208 50] Own_OwnResult_Type.C_Err ([#"../own.rs" 208 48 208 49] e));
-    [#"../own.rs" 208 48 208 49] e <- any e;
+    [#"../own.rs" 208 33 208 50] _0 <- ([#"../own.rs" 208 33 208 50] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB9
   }
   BB5 {
@@ -2042,10 +2042,10 @@ module Own_Impl2_Cloned
   }
   BB6 {
     [#"../own.rs" 207 26 207 27] t <- ([#"../own.rs" 207 26 207 27] Own_OwnResult_Type.ok_0 self);
-    [#"../own.rs" 207 26 207 27] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 207 46 207 55] _6 <- ([#"../own.rs" 207 46 207 55] clone0 ([#"../own.rs" 207 46 207 47]  * t));
+    [#"../own.rs" 207 46 207 55] _6 <- ([#"../own.rs" 207 46 207 55] clone0 ( * t));
     goto BB7
   }
   BB7 {
@@ -2142,7 +2142,9 @@ module Own_Impl3_Transpose
   var _0 : Core_Option_Option_Type.t_option (Own_OwnResult_Type.t_ownresult t e);
   var self : Own_OwnResult_Type.t_ownresult (Core_Option_Option_Type.t_option t) e = self;
   var x : t;
+  var _8 : Own_OwnResult_Type.t_ownresult t e;
   var e : e;
+  var _11 : Own_OwnResult_Type.t_ownresult t e;
   {
     goto BB0
   }
@@ -2181,21 +2183,25 @@ module Own_Impl3_Transpose
   }
   BB8 {
     [#"../own.rs" 221 27 221 28] e <- ([#"../own.rs" 221 27 221 28] Own_OwnResult_Type.err_0 self);
-    [#"../own.rs" 221 27 221 28] self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
+    self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
+    [#"../own.rs" 221 38 221 55] _11 <- ([#"../own.rs" 221 38 221 55] Own_OwnResult_Type.C_Err e);
+    e <- any e;
     goto BB14
   }
   BB9 {
     [#"../own.rs" 219 31 219 32] x <- ([#"../own.rs" 219 31 219 32] Core_Option_Option_Type.some_0 (Own_OwnResult_Type.ok_0 self));
-    [#"../own.rs" 219 31 219 32] self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (let Core_Option_Option_Type.C_Some x0 = Own_OwnResult_Type.ok_0 self in Core_Option_Option_Type.C_Some (any t)));
+    self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (let Core_Option_Option_Type.C_Some x0 = Own_OwnResult_Type.ok_0 self in Core_Option_Option_Type.C_Some (any t)));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
+    [#"../own.rs" 219 43 219 59] _8 <- ([#"../own.rs" 219 43 219 59] Own_OwnResult_Type.C_Ok x);
+    x <- any t;
     goto BB10
   }
   BB10 {
-    [#"../own.rs" 219 38 219 60] _0 <- ([#"../own.rs" 219 38 219 60] Core_Option_Option_Type.C_Some ([#"../own.rs" 219 43 219 59] Own_OwnResult_Type.C_Ok ([#"../own.rs" 219 57 219 58] x)));
-    [#"../own.rs" 219 57 219 58] x <- any t;
+    [#"../own.rs" 219 38 219 60] _0 <- ([#"../own.rs" 219 38 219 60] Core_Option_Option_Type.C_Some _8);
+    _8 <- any Own_OwnResult_Type.t_ownresult t e;
     goto BB11
   }
   BB11 {
@@ -2211,8 +2217,8 @@ module Own_Impl3_Transpose
     goto BB17
   }
   BB14 {
-    [#"../own.rs" 221 33 221 56] _0 <- ([#"../own.rs" 221 33 221 56] Core_Option_Option_Type.C_Some ([#"../own.rs" 221 38 221 55] Own_OwnResult_Type.C_Err ([#"../own.rs" 221 53 221 54] e)));
-    [#"../own.rs" 221 53 221 54] e <- any e;
+    [#"../own.rs" 221 33 221 56] _0 <- ([#"../own.rs" 221 33 221 56] Core_Option_Option_Type.C_Some _11);
+    _11 <- any Own_OwnResult_Type.t_ownresult t e;
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/result/result.mlcfg b/creusot/tests/should_succeed/result/result.mlcfg
index 2606db84d6..b01063af64 100644
--- a/creusot/tests/should_succeed/result/result.mlcfg
+++ b/creusot/tests/should_succeed/result/result.mlcfg
@@ -355,92 +355,134 @@ module Result_TestResult
   var _6 : bool;
   var _10 : bool;
   var _12 : bool;
+  var _16 : bool;
   var _17 : int32;
   var _18 : Core_Option_Option_Type.t_option int32;
   var _22 : bool;
   var _24 : Core_Option_Option_Type.t_option int32;
   var _28 : bool;
   var _30 : Core_Option_Option_Type.t_option int32;
+  var _34 : bool;
   var _35 : int32;
   var _36 : Core_Option_Option_Type.t_option int32;
+  var _40 : bool;
   var _42 : int32;
   var _43 : Core_Result_Result_Type.t_result int32 int32;
+  var _47 : bool;
   var _49 : int32;
   var _50 : Core_Result_Result_Type.t_result int32 int32;
   var _53 : borrowed int32;
   var _54 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _55 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _57 : bool;
   var _58 : int32;
   var _61 : borrowed int32;
   var _62 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _63 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _65 : bool;
   var _66 : int32;
   var _69 : borrowed int32;
   var _70 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _71 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _73 : bool;
   var _74 : int32;
   var _77 : borrowed int32;
   var _78 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _79 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _81 : bool;
   var _82 : int32;
+  var _86 : bool;
   var _87 : int32;
+  var _91 : bool;
   var _92 : int32;
+  var _96 : bool;
   var _97 : int32;
+  var _101 : bool;
   var _102 : int32;
+  var _106 : bool;
   var _107 : int32;
+  var _111 : bool;
   var _112 : int32;
+  var _116 : bool;
   var _117 : int32;
   var _118 : Core_Result_Result_Type.t_result int32 int32;
+  var _120 : Core_Result_Result_Type.t_result int32 int32;
+  var _123 : bool;
   var _124 : int32;
   var _125 : Core_Result_Result_Type.t_result int32 int32;
+  var _127 : Core_Result_Result_Type.t_result int32 int32;
+  var _130 : bool;
   var _131 : int32;
   var _132 : Core_Result_Result_Type.t_result int32 int32;
+  var _134 : Core_Result_Result_Type.t_result int32 int32;
+  var _137 : bool;
   var _138 : int32;
   var _139 : Core_Result_Result_Type.t_result int32 int32;
+  var _141 : Core_Result_Result_Type.t_result int32 int32;
+  var _144 : bool;
   var _145 : int32;
   var _146 : Core_Result_Result_Type.t_result int32 int32;
+  var _148 : Core_Result_Result_Type.t_result int32 int32;
+  var _151 : bool;
   var _152 : int32;
   var _153 : Core_Result_Result_Type.t_result int32 int32;
+  var _155 : Core_Result_Result_Type.t_result int32 int32;
+  var _158 : bool;
   var _159 : int32;
   var _160 : Core_Result_Result_Type.t_result int32 int32;
+  var _162 : Core_Result_Result_Type.t_result int32 int32;
+  var _165 : bool;
   var _166 : int32;
   var _167 : Core_Result_Result_Type.t_result int32 int32;
+  var _169 : Core_Result_Result_Type.t_result int32 int32;
+  var _172 : bool;
   var _173 : int32;
   var _174 : Core_Result_Result_Type.t_result int32 int32;
   var _175 : Core_Result_Result_Type.t_result int32 int32;
+  var _179 : bool;
   var _181 : int32;
   var _182 : Core_Result_Result_Type.t_result int32 int32;
   var _183 : Core_Result_Result_Type.t_result int32 int32;
+  var _187 : bool;
   var _188 : int32;
   var _189 : Core_Result_Result_Type.t_result int32 (borrowed int32);
   var _190 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _191 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _194 : bool;
   var _196 : borrowed int32;
   var _197 : Core_Result_Result_Type.t_result int32 (borrowed int32);
   var _198 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _199 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _202 : bool;
   var _203 : int32;
   var _204 : Core_Result_Result_Type.t_result int32 int32;
   var _205 : Core_Result_Result_Type.t_result int32 int32;
+  var _209 : bool;
   var _211 : int32;
   var _212 : Core_Result_Result_Type.t_result int32 int32;
   var _213 : Core_Result_Result_Type.t_result int32 int32;
+  var _217 : bool;
   var _218 : int32;
   var _219 : Core_Result_Result_Type.t_result int32 (borrowed int32);
   var _220 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _221 : borrowed (Core_Result_Result_Type.t_result int32 int32);
+  var _224 : bool;
   var _226 : borrowed int32;
   var _227 : Core_Result_Result_Type.t_result int32 (borrowed int32);
   var _228 : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32);
   var _229 : borrowed (Core_Result_Result_Type.t_result int32 int32);
   var res : Core_Result_Result_Type.t_result (Core_Option_Option_Type.t_option int32) int32;
+  var _232 : Core_Option_Option_Type.t_option int32;
   var _234 : bool;
   var _236 : Core_Option_Option_Type.t_option (Core_Result_Result_Type.t_result int32 int32);
   var res1 : Core_Result_Result_Type.t_result (Core_Option_Option_Type.t_option int32) int32;
+  var _240 : Core_Option_Option_Type.t_option int32;
+  var _242 : bool;
   var _243 : int32;
   var _244 : Core_Result_Result_Type.t_result int32 int32;
   var _245 : Core_Option_Option_Type.t_option (Core_Result_Result_Type.t_result int32 int32);
   var res2 : Core_Result_Result_Type.t_result (Core_Option_Option_Type.t_option int32) int32;
+  var _250 : bool;
   var _251 : int32;
   var _252 : Core_Result_Result_Type.t_result int32 int32;
   var _253 : Core_Option_Option_Type.t_option (Core_Result_Result_Type.t_result int32 int32);
@@ -448,9 +490,9 @@ module Result_TestResult
     goto BB0
   }
   BB0 {
-    [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok ([#"../result.rs" 4 38 4 39] [#"../result.rs" 4 38 4 39] (1 : int32)));
-    [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err ([#"../result.rs" 5 40 5 42] [#"../result.rs" 5 40 5 42] (-1 : int32)));
-    [#"../result.rs" 8 12 8 22] _4 <- ([#"../result.rs" 8 12 8 22] is_ok0 ([#"../result.rs" 8 12 8 14] ok));
+    [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok (1 : int32));
+    [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err (-1 : int32));
+    [#"../result.rs" 8 12 8 22] _4 <- ([#"../result.rs" 8 12 8 22] is_ok0 ok);
     goto BB1
   }
   BB1 {
@@ -460,7 +502,7 @@ module Result_TestResult
       end
   }
   BB2 {
-    [#"../result.rs" 8 27 8 38] _6 <- ([#"../result.rs" 8 27 8 38] is_ok0 ([#"../result.rs" 8 27 8 30] err));
+    [#"../result.rs" 8 27 8 38] _6 <- ([#"../result.rs" 8 27 8 38] is_ok0 err);
     goto BB3
   }
   BB3 {
@@ -473,7 +515,7 @@ module Result_TestResult
     goto BB7
   }
   BB5 {
-    [#"../result.rs" 10 12 10 24] _10 <- ([#"../result.rs" 10 12 10 24] is_err0 ([#"../result.rs" 10 12 10 15] err));
+    [#"../result.rs" 10 12 10 24] _10 <- ([#"../result.rs" 10 12 10 24] is_err0 err);
     goto BB8
   }
   BB6 {
@@ -490,7 +532,7 @@ module Result_TestResult
       end
   }
   BB9 {
-    [#"../result.rs" 10 29 10 40] _12 <- ([#"../result.rs" 10 29 10 40] is_err0 ([#"../result.rs" 10 29 10 31] ok));
+    [#"../result.rs" 10 29 10 40] _12 <- ([#"../result.rs" 10 29 10 40] is_err0 ok);
     goto BB10
   }
   BB10 {
@@ -503,7 +545,7 @@ module Result_TestResult
     goto BB14
   }
   BB12 {
-    [#"../result.rs" 13 12 13 19] _18 <- ([#"../result.rs" 13 12 13 19] ok0 ([#"../result.rs" 13 12 13 14] ok));
+    [#"../result.rs" 13 12 13 19] _18 <- ([#"../result.rs" 13 12 13 19] ok0 ok);
     goto BB15
   }
   BB13 {
@@ -519,13 +561,15 @@ module Result_TestResult
     goto BB16
   }
   BB16 {
-    switch ([#"../result.rs" 13 12 13 33] _17 = ([#"../result.rs" 13 32 13 33] [#"../result.rs" 13 32 13 33] (1 : int32)))
+    [#"../result.rs" 13 12 13 33] _16 <- ([#"../result.rs" 13 12 13 33] _17 = (1 : int32));
+    _17 <- any int32;
+    switch (_16)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../result.rs" 14 12 14 20] _24 <- ([#"../result.rs" 14 12 14 20] ok0 ([#"../result.rs" 14 12 14 15] err));
+    [#"../result.rs" 14 12 14 20] _24 <- ([#"../result.rs" 14 12 14 20] ok0 err);
     goto BB19
   }
   BB18 {
@@ -533,7 +577,7 @@ module Result_TestResult
     absurd
   }
   BB19 {
-    [#"../result.rs" 14 12 14 30] _22 <- ([#"../result.rs" 14 12 14 30] is_none0 ([#"../result.rs" 14 12 14 20] _24));
+    [#"../result.rs" 14 12 14 30] _22 <- ([#"../result.rs" 14 12 14 30] is_none0 _24);
     goto BB20
   }
   BB20 {
@@ -543,7 +587,7 @@ module Result_TestResult
       end
   }
   BB21 {
-    [#"../result.rs" 16 12 16 20] _30 <- ([#"../result.rs" 16 12 16 20] err0 ([#"../result.rs" 16 12 16 14] ok));
+    [#"../result.rs" 16 12 16 20] _30 <- ([#"../result.rs" 16 12 16 20] err0 ok);
     goto BB23
   }
   BB22 {
@@ -551,7 +595,7 @@ module Result_TestResult
     absurd
   }
   BB23 {
-    [#"../result.rs" 16 12 16 30] _28 <- ([#"../result.rs" 16 12 16 30] is_none0 ([#"../result.rs" 16 12 16 20] _30));
+    [#"../result.rs" 16 12 16 30] _28 <- ([#"../result.rs" 16 12 16 30] is_none0 _30);
     goto BB24
   }
   BB24 {
@@ -561,7 +605,7 @@ module Result_TestResult
       end
   }
   BB25 {
-    [#"../result.rs" 17 12 17 21] _36 <- ([#"../result.rs" 17 12 17 21] err0 ([#"../result.rs" 17 12 17 15] err));
+    [#"../result.rs" 17 12 17 21] _36 <- ([#"../result.rs" 17 12 17 21] err0 err);
     goto BB27
   }
   BB26 {
@@ -574,13 +618,15 @@ module Result_TestResult
     goto BB28
   }
   BB28 {
-    switch ([#"../result.rs" 17 12 17 36] _35 = ([#"../result.rs" 17 34 17 36] [#"../result.rs" 17 34 17 36] (-1 : int32)))
+    [#"../result.rs" 17 12 17 36] _34 <- ([#"../result.rs" 17 12 17 36] _35 = (-1 : int32));
+    _35 <- any int32;
+    switch (_34)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../result.rs" 20 13 20 24] _43 <- ([#"../result.rs" 20 13 20 24] as_ref0 ([#"../result.rs" 20 13 20 15] ok));
+    [#"../result.rs" 20 13 20 24] _43 <- ([#"../result.rs" 20 13 20 24] as_ref0 ok);
     goto BB31
   }
   BB30 {
@@ -593,13 +639,14 @@ module Result_TestResult
     goto BB32
   }
   BB32 {
-    switch ([#"../result.rs" 20 12 20 38] ([#"../result.rs" 20 12 20 33] _42) = ([#"../result.rs" 20 37 20 38] [#"../result.rs" 20 37 20 38] (1 : int32)))
+    [#"../result.rs" 20 12 20 38] _40 <- ([#"../result.rs" 20 12 20 38] _42 = (1 : int32));
+    switch (_40)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../result.rs" 21 13 21 25] _50 <- ([#"../result.rs" 21 13 21 25] as_ref0 ([#"../result.rs" 21 13 21 16] err));
+    [#"../result.rs" 21 13 21 25] _50 <- ([#"../result.rs" 21 13 21 25] as_ref0 err);
     goto BB35
   }
   BB34 {
@@ -612,7 +659,8 @@ module Result_TestResult
     goto BB36
   }
   BB36 {
-    switch ([#"../result.rs" 21 12 21 44] ([#"../result.rs" 21 12 21 38] _49) = ([#"../result.rs" 21 42 21 44] [#"../result.rs" 21 42 21 44] (-1 : int32)))
+    [#"../result.rs" 21 12 21 44] _47 <- ([#"../result.rs" 21 12 21 44] _49 = (-1 : int32));
+    switch (_47)
       | False -> goto BB38
       | True -> goto BB37
       end
@@ -634,13 +682,15 @@ module Result_TestResult
     goto BB40
   }
   BB40 {
-    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] [#"../result.rs" 23 28 23 29] (0 : int32)) ; };
+    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] (0 : int32)) ; };
     assume { resolve0 _53 };
-    [#"../result.rs" 24 12 24 23] _58 <- ([#"../result.rs" 24 12 24 23] unwrap3 ([#"../result.rs" 24 12 24 14] ok));
+    [#"../result.rs" 24 12 24 23] _58 <- ([#"../result.rs" 24 12 24 23] unwrap3 ok);
     goto BB41
   }
   BB41 {
-    switch ([#"../result.rs" 24 12 24 28] _58 = ([#"../result.rs" 24 27 24 28] [#"../result.rs" 24 27 24 28] (0 : int32)))
+    [#"../result.rs" 24 12 24 28] _57 <- ([#"../result.rs" 24 12 24 28] _58 = (0 : int32));
+    _58 <- any int32;
+    switch (_57)
       | False -> goto BB43
       | True -> goto BB42
       end
@@ -662,13 +712,15 @@ module Result_TestResult
     goto BB45
   }
   BB45 {
-    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] [#"../result.rs" 25 28 25 29] (1 : int32)) ; };
+    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] (1 : int32)) ; };
     assume { resolve0 _61 };
-    [#"../result.rs" 26 12 26 23] _66 <- ([#"../result.rs" 26 12 26 23] unwrap3 ([#"../result.rs" 26 12 26 14] ok));
+    [#"../result.rs" 26 12 26 23] _66 <- ([#"../result.rs" 26 12 26 23] unwrap3 ok);
     goto BB46
   }
   BB46 {
-    switch ([#"../result.rs" 26 12 26 28] _66 = ([#"../result.rs" 26 27 26 28] [#"../result.rs" 26 27 26 28] (1 : int32)))
+    [#"../result.rs" 26 12 26 28] _65 <- ([#"../result.rs" 26 12 26 28] _66 = (1 : int32));
+    _66 <- any int32;
+    switch (_65)
       | False -> goto BB48
       | True -> goto BB47
       end
@@ -690,13 +742,15 @@ module Result_TestResult
     goto BB50
   }
   BB50 {
-    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] [#"../result.rs" 27 33 27 34] (0 : int32)) ; };
+    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] (0 : int32)) ; };
     assume { resolve0 _69 };
-    [#"../result.rs" 28 12 28 28] _74 <- ([#"../result.rs" 28 12 28 28] unwrap_err2 ([#"../result.rs" 28 12 28 15] err));
+    [#"../result.rs" 28 12 28 28] _74 <- ([#"../result.rs" 28 12 28 28] unwrap_err2 err);
     goto BB51
   }
   BB51 {
-    switch ([#"../result.rs" 28 12 28 33] _74 = ([#"../result.rs" 28 32 28 33] [#"../result.rs" 28 32 28 33] (0 : int32)))
+    [#"../result.rs" 28 12 28 33] _73 <- ([#"../result.rs" 28 12 28 33] _74 = (0 : int32));
+    _74 <- any int32;
+    switch (_73)
       | False -> goto BB53
       | True -> goto BB52
       end
@@ -718,19 +772,21 @@ module Result_TestResult
     goto BB55
   }
   BB55 {
-    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] [#"../result.rs" 29 33 29 35] (-1 : int32)) ; };
+    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] (-1 : int32)) ; };
     assume { resolve0 _77 };
-    [#"../result.rs" 30 12 30 28] _82 <- ([#"../result.rs" 30 12 30 28] unwrap_err2 ([#"../result.rs" 30 12 30 15] err));
+    [#"../result.rs" 30 12 30 28] _82 <- ([#"../result.rs" 30 12 30 28] unwrap_err2 err);
     goto BB56
   }
   BB56 {
-    switch ([#"../result.rs" 30 12 30 34] _82 = ([#"../result.rs" 30 32 30 34] [#"../result.rs" 30 32 30 34] (-1 : int32)))
+    [#"../result.rs" 30 12 30 34] _81 <- ([#"../result.rs" 30 12 30 34] _82 = (-1 : int32));
+    _82 <- any int32;
+    switch (_81)
       | False -> goto BB58
       | True -> goto BB57
       end
   }
   BB57 {
-    [#"../result.rs" 33 12 33 23] _87 <- ([#"../result.rs" 33 12 33 23] unwrap3 ([#"../result.rs" 33 12 33 14] ok));
+    [#"../result.rs" 33 12 33 23] _87 <- ([#"../result.rs" 33 12 33 23] unwrap3 ok);
     goto BB59
   }
   BB58 {
@@ -738,13 +794,15 @@ module Result_TestResult
     absurd
   }
   BB59 {
-    switch ([#"../result.rs" 33 12 33 28] _87 = ([#"../result.rs" 33 27 33 28] [#"../result.rs" 33 27 33 28] (1 : int32)))
+    [#"../result.rs" 33 12 33 28] _86 <- ([#"../result.rs" 33 12 33 28] _87 = (1 : int32));
+    _87 <- any int32;
+    switch (_86)
       | False -> goto BB61
       | True -> goto BB60
       end
   }
   BB60 {
-    [#"../result.rs" 37 12 37 28] _92 <- ([#"../result.rs" 37 12 37 28] unwrap_err2 ([#"../result.rs" 37 12 37 15] err));
+    [#"../result.rs" 37 12 37 28] _92 <- ([#"../result.rs" 37 12 37 28] unwrap_err2 err);
     goto BB62
   }
   BB61 {
@@ -752,13 +810,15 @@ module Result_TestResult
     absurd
   }
   BB62 {
-    switch ([#"../result.rs" 37 12 37 34] _92 = ([#"../result.rs" 37 32 37 34] [#"../result.rs" 37 32 37 34] (-1 : int32)))
+    [#"../result.rs" 37 12 37 34] _91 <- ([#"../result.rs" 37 12 37 34] _92 = (-1 : int32));
+    _92 <- any int32;
+    switch (_91)
       | False -> goto BB64
       | True -> goto BB63
       end
   }
   BB63 {
-    [#"../result.rs" 40 12 40 27] _97 <- ([#"../result.rs" 40 12 40 27] unwrap_or0 ([#"../result.rs" 40 12 40 14] ok) ([#"../result.rs" 40 25 40 26] [#"../result.rs" 40 25 40 26] (0 : int32)));
+    [#"../result.rs" 40 12 40 27] _97 <- ([#"../result.rs" 40 12 40 27] unwrap_or0 ok (0 : int32));
     goto BB65
   }
   BB64 {
@@ -766,13 +826,15 @@ module Result_TestResult
     absurd
   }
   BB65 {
-    switch ([#"../result.rs" 40 12 40 32] _97 = ([#"../result.rs" 40 31 40 32] [#"../result.rs" 40 31 40 32] (1 : int32)))
+    [#"../result.rs" 40 12 40 32] _96 <- ([#"../result.rs" 40 12 40 32] _97 = (1 : int32));
+    _97 <- any int32;
+    switch (_96)
       | False -> goto BB67
       | True -> goto BB66
       end
   }
   BB66 {
-    [#"../result.rs" 41 12 41 28] _102 <- ([#"../result.rs" 41 12 41 28] unwrap_or0 ([#"../result.rs" 41 12 41 15] err) ([#"../result.rs" 41 26 41 27] [#"../result.rs" 41 26 41 27] (0 : int32)));
+    [#"../result.rs" 41 12 41 28] _102 <- ([#"../result.rs" 41 12 41 28] unwrap_or0 err (0 : int32));
     goto BB68
   }
   BB67 {
@@ -780,13 +842,15 @@ module Result_TestResult
     absurd
   }
   BB68 {
-    switch ([#"../result.rs" 41 12 41 33] _102 = ([#"../result.rs" 41 32 41 33] [#"../result.rs" 41 32 41 33] (0 : int32)))
+    [#"../result.rs" 41 12 41 33] _101 <- ([#"../result.rs" 41 12 41 33] _102 = (0 : int32));
+    _102 <- any int32;
+    switch (_101)
       | False -> goto BB70
       | True -> goto BB69
       end
   }
   BB69 {
-    [#"../result.rs" 43 12 43 34] _107 <- ([#"../result.rs" 43 12 43 34] unwrap_or_default0 ([#"../result.rs" 43 12 43 14] ok));
+    [#"../result.rs" 43 12 43 34] _107 <- ([#"../result.rs" 43 12 43 34] unwrap_or_default0 ok);
     goto BB71
   }
   BB70 {
@@ -794,13 +858,15 @@ module Result_TestResult
     absurd
   }
   BB71 {
-    switch ([#"../result.rs" 43 12 43 39] _107 = ([#"../result.rs" 43 38 43 39] [#"../result.rs" 43 38 43 39] (1 : int32)))
+    [#"../result.rs" 43 12 43 39] _106 <- ([#"../result.rs" 43 12 43 39] _107 = (1 : int32));
+    _107 <- any int32;
+    switch (_106)
       | False -> goto BB73
       | True -> goto BB72
       end
   }
   BB72 {
-    [#"../result.rs" 44 12 44 35] _112 <- ([#"../result.rs" 44 12 44 35] unwrap_or_default0 ([#"../result.rs" 44 12 44 15] err));
+    [#"../result.rs" 44 12 44 35] _112 <- ([#"../result.rs" 44 12 44 35] unwrap_or_default0 err);
     goto BB74
   }
   BB73 {
@@ -808,13 +874,17 @@ module Result_TestResult
     absurd
   }
   BB74 {
-    switch ([#"../result.rs" 44 12 44 40] _112 = ([#"../result.rs" 44 39 44 40] [#"../result.rs" 44 39 44 40] (0 : int32)))
+    [#"../result.rs" 44 12 44 40] _111 <- ([#"../result.rs" 44 12 44 40] _112 = (0 : int32));
+    _112 <- any int32;
+    switch (_111)
       | False -> goto BB76
       | True -> goto BB75
       end
   }
   BB75 {
-    [#"../result.rs" 47 12 47 34] _118 <- ([#"../result.rs" 47 12 47 34] and0 ([#"../result.rs" 47 12 47 14] ok) ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err ([#"../result.rs" 47 30 47 32] [#"../result.rs" 47 30 47 32] (-2 : int32))));
+    [#"../result.rs" 47 26 47 33] _120 <- ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 47 12 47 34] _118 <- ([#"../result.rs" 47 12 47 34] and0 ok _120);
+    _120 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB77
   }
   BB76 {
@@ -827,13 +897,17 @@ module Result_TestResult
     goto BB78
   }
   BB78 {
-    switch ([#"../result.rs" 47 12 47 53] _117 = ([#"../result.rs" 47 51 47 53] [#"../result.rs" 47 51 47 53] (-2 : int32)))
+    [#"../result.rs" 47 12 47 53] _116 <- ([#"../result.rs" 47 12 47 53] _117 = (-2 : int32));
+    _117 <- any int32;
+    switch (_116)
       | False -> goto BB80
       | True -> goto BB79
       end
   }
   BB79 {
-    [#"../result.rs" 48 12 48 25] _125 <- ([#"../result.rs" 48 12 48 25] and0 ([#"../result.rs" 48 12 48 14] ok) ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok ([#"../result.rs" 48 22 48 23] [#"../result.rs" 48 22 48 23] (2 : int32))));
+    [#"../result.rs" 48 19 48 24] _127 <- ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 48 12 48 25] _125 <- ([#"../result.rs" 48 12 48 25] and0 ok _127);
+    _127 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB81
   }
   BB80 {
@@ -846,13 +920,17 @@ module Result_TestResult
     goto BB82
   }
   BB82 {
-    switch ([#"../result.rs" 48 12 48 39] _124 = ([#"../result.rs" 48 38 48 39] [#"../result.rs" 48 38 48 39] (2 : int32)))
+    [#"../result.rs" 48 12 48 39] _123 <- ([#"../result.rs" 48 12 48 39] _124 = (2 : int32));
+    _124 <- any int32;
+    switch (_123)
       | False -> goto BB84
       | True -> goto BB83
       end
   }
   BB83 {
-    [#"../result.rs" 49 12 49 35] _132 <- ([#"../result.rs" 49 12 49 35] and0 ([#"../result.rs" 49 12 49 15] err) ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err ([#"../result.rs" 49 31 49 33] [#"../result.rs" 49 31 49 33] (-2 : int32))));
+    [#"../result.rs" 49 27 49 34] _134 <- ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 49 12 49 35] _132 <- ([#"../result.rs" 49 12 49 35] and0 err _134);
+    _134 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB85
   }
   BB84 {
@@ -865,13 +943,17 @@ module Result_TestResult
     goto BB86
   }
   BB86 {
-    switch ([#"../result.rs" 49 12 49 54] _131 = ([#"../result.rs" 49 52 49 54] [#"../result.rs" 49 52 49 54] (-1 : int32)))
+    [#"../result.rs" 49 12 49 54] _130 <- ([#"../result.rs" 49 12 49 54] _131 = (-1 : int32));
+    _131 <- any int32;
+    switch (_130)
       | False -> goto BB88
       | True -> goto BB87
       end
   }
   BB87 {
-    [#"../result.rs" 50 12 50 26] _139 <- ([#"../result.rs" 50 12 50 26] and0 ([#"../result.rs" 50 12 50 15] err) ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok ([#"../result.rs" 50 23 50 24] [#"../result.rs" 50 23 50 24] (2 : int32))));
+    [#"../result.rs" 50 20 50 25] _141 <- ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 50 12 50 26] _139 <- ([#"../result.rs" 50 12 50 26] and0 err _141);
+    _141 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB89
   }
   BB88 {
@@ -884,13 +966,17 @@ module Result_TestResult
     goto BB90
   }
   BB90 {
-    switch ([#"../result.rs" 50 12 50 45] _138 = ([#"../result.rs" 50 43 50 45] [#"../result.rs" 50 43 50 45] (-1 : int32)))
+    [#"../result.rs" 50 12 50 45] _137 <- ([#"../result.rs" 50 12 50 45] _138 = (-1 : int32));
+    _138 <- any int32;
+    switch (_137)
       | False -> goto BB92
       | True -> goto BB91
       end
   }
   BB91 {
-    [#"../result.rs" 53 12 53 26] _146 <- ([#"../result.rs" 53 12 53 26] or0 ([#"../result.rs" 53 12 53 14] ok) ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err ([#"../result.rs" 53 22 53 24] [#"../result.rs" 53 22 53 24] (-2 : int32))));
+    [#"../result.rs" 53 18 53 25] _148 <- ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 53 12 53 26] _146 <- ([#"../result.rs" 53 12 53 26] or0 ok _148);
+    _148 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB93
   }
   BB92 {
@@ -903,13 +989,17 @@ module Result_TestResult
     goto BB94
   }
   BB94 {
-    switch ([#"../result.rs" 53 12 53 40] _145 = ([#"../result.rs" 53 39 53 40] [#"../result.rs" 53 39 53 40] (1 : int32)))
+    [#"../result.rs" 53 12 53 40] _144 <- ([#"../result.rs" 53 12 53 40] _145 = (1 : int32));
+    _145 <- any int32;
+    switch (_144)
       | False -> goto BB96
       | True -> goto BB95
       end
   }
   BB95 {
-    [#"../result.rs" 54 12 54 31] _153 <- ([#"../result.rs" 54 12 54 31] or0 ([#"../result.rs" 54 12 54 14] ok) ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok ([#"../result.rs" 54 28 54 29] [#"../result.rs" 54 28 54 29] (2 : int32))));
+    [#"../result.rs" 54 25 54 30] _155 <- ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 54 12 54 31] _153 <- ([#"../result.rs" 54 12 54 31] or0 ok _155);
+    _155 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB97
   }
   BB96 {
@@ -922,13 +1012,17 @@ module Result_TestResult
     goto BB98
   }
   BB98 {
-    switch ([#"../result.rs" 54 12 54 45] _152 = ([#"../result.rs" 54 44 54 45] [#"../result.rs" 54 44 54 45] (1 : int32)))
+    [#"../result.rs" 54 12 54 45] _151 <- ([#"../result.rs" 54 12 54 45] _152 = (1 : int32));
+    _152 <- any int32;
+    switch (_151)
       | False -> goto BB100
       | True -> goto BB99
       end
   }
   BB99 {
-    [#"../result.rs" 55 12 55 27] _160 <- ([#"../result.rs" 55 12 55 27] or0 ([#"../result.rs" 55 12 55 15] err) ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err ([#"../result.rs" 55 23 55 25] [#"../result.rs" 55 23 55 25] (-2 : int32))));
+    [#"../result.rs" 55 19 55 26] _162 <- ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 55 12 55 27] _160 <- ([#"../result.rs" 55 12 55 27] or0 err _162);
+    _162 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB101
   }
   BB100 {
@@ -941,13 +1035,17 @@ module Result_TestResult
     goto BB102
   }
   BB102 {
-    switch ([#"../result.rs" 55 12 55 46] _159 = ([#"../result.rs" 55 44 55 46] [#"../result.rs" 55 44 55 46] (-2 : int32)))
+    [#"../result.rs" 55 12 55 46] _158 <- ([#"../result.rs" 55 12 55 46] _159 = (-2 : int32));
+    _159 <- any int32;
+    switch (_158)
       | False -> goto BB104
       | True -> goto BB103
       end
   }
   BB103 {
-    [#"../result.rs" 56 12 56 32] _167 <- ([#"../result.rs" 56 12 56 32] or0 ([#"../result.rs" 56 12 56 15] err) ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok ([#"../result.rs" 56 29 56 30] [#"../result.rs" 56 29 56 30] (2 : int32))));
+    [#"../result.rs" 56 26 56 31] _169 <- ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 56 12 56 32] _167 <- ([#"../result.rs" 56 12 56 32] or0 err _169);
+    _169 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB105
   }
   BB104 {
@@ -960,13 +1058,15 @@ module Result_TestResult
     goto BB106
   }
   BB106 {
-    switch ([#"../result.rs" 56 12 56 46] _166 = ([#"../result.rs" 56 45 56 46] [#"../result.rs" 56 45 56 46] (2 : int32)))
+    [#"../result.rs" 56 12 56 46] _165 <- ([#"../result.rs" 56 12 56 46] _166 = (2 : int32));
+    _166 <- any int32;
+    switch (_165)
       | False -> goto BB108
       | True -> goto BB107
       end
   }
   BB107 {
-    [#"../result.rs" 59 12 59 23] _175 <- ([#"../result.rs" 59 12 59 23] as_ref0 ([#"../result.rs" 59 12 59 14] ok));
+    [#"../result.rs" 59 12 59 23] _175 <- ([#"../result.rs" 59 12 59 23] as_ref0 ok);
     goto BB109
   }
   BB108 {
@@ -984,13 +1084,15 @@ module Result_TestResult
     goto BB111
   }
   BB111 {
-    switch ([#"../result.rs" 59 12 59 46] _173 = ([#"../result.rs" 59 45 59 46] [#"../result.rs" 59 45 59 46] (1 : int32)))
+    [#"../result.rs" 59 12 59 46] _172 <- ([#"../result.rs" 59 12 59 46] _173 = (1 : int32));
+    _173 <- any int32;
+    switch (_172)
       | False -> goto BB113
       | True -> goto BB112
       end
   }
   BB112 {
-    [#"../result.rs" 60 13 60 25] _183 <- ([#"../result.rs" 60 13 60 25] as_ref0 ([#"../result.rs" 60 13 60 16] err));
+    [#"../result.rs" 60 13 60 25] _183 <- ([#"../result.rs" 60 13 60 25] as_ref0 err);
     goto BB114
   }
   BB113 {
@@ -1008,7 +1110,8 @@ module Result_TestResult
     goto BB116
   }
   BB116 {
-    switch ([#"../result.rs" 60 12 60 53] ([#"../result.rs" 60 12 60 47] _181) = ([#"../result.rs" 60 51 60 53] [#"../result.rs" 60 51 60 53] (-1 : int32)))
+    [#"../result.rs" 60 12 60 53] _179 <- ([#"../result.rs" 60 12 60 53] _181 = (-1 : int32));
+    switch (_179)
       | False -> goto BB118
       | True -> goto BB117
       end
@@ -1035,7 +1138,9 @@ module Result_TestResult
     goto BB121
   }
   BB121 {
-    switch ([#"../result.rs" 61 12 61 46] _188 = ([#"../result.rs" 61 45 61 46] [#"../result.rs" 61 45 61 46] (1 : int32)))
+    [#"../result.rs" 61 12 61 46] _187 <- ([#"../result.rs" 61 12 61 46] _188 = (1 : int32));
+    _188 <- any int32;
+    switch (_187)
       | False -> goto BB123
       | True -> goto BB122
       end
@@ -1063,13 +1168,14 @@ module Result_TestResult
   }
   BB126 {
     assume { resolve0 _196 };
-    switch ([#"../result.rs" 62 12 62 53] ([#"../result.rs" 62 12 62 47]  * _196) = ([#"../result.rs" 62 51 62 53] [#"../result.rs" 62 51 62 53] (-1 : int32)))
+    [#"../result.rs" 62 12 62 53] _194 <- ([#"../result.rs" 62 12 62 53]  * _196 = (-1 : int32));
+    switch (_194)
       | False -> goto BB128
       | True -> goto BB127
       end
   }
   BB127 {
-    [#"../result.rs" 64 12 64 23] _205 <- ([#"../result.rs" 64 12 64 23] as_ref0 ([#"../result.rs" 64 12 64 14] ok));
+    [#"../result.rs" 64 12 64 23] _205 <- ([#"../result.rs" 64 12 64 23] as_ref0 ok);
     goto BB129
   }
   BB128 {
@@ -1087,13 +1193,15 @@ module Result_TestResult
     goto BB131
   }
   BB131 {
-    switch ([#"../result.rs" 64 12 64 46] _203 = ([#"../result.rs" 64 45 64 46] [#"../result.rs" 64 45 64 46] (1 : int32)))
+    [#"../result.rs" 64 12 64 46] _202 <- ([#"../result.rs" 64 12 64 46] _203 = (1 : int32));
+    _203 <- any int32;
+    switch (_202)
       | False -> goto BB133
       | True -> goto BB132
       end
   }
   BB132 {
-    [#"../result.rs" 65 13 65 25] _213 <- ([#"../result.rs" 65 13 65 25] as_ref0 ([#"../result.rs" 65 13 65 16] err));
+    [#"../result.rs" 65 13 65 25] _213 <- ([#"../result.rs" 65 13 65 25] as_ref0 err);
     goto BB134
   }
   BB133 {
@@ -1111,7 +1219,8 @@ module Result_TestResult
     goto BB136
   }
   BB136 {
-    switch ([#"../result.rs" 65 12 65 53] ([#"../result.rs" 65 12 65 47] _211) = ([#"../result.rs" 65 51 65 53] [#"../result.rs" 65 51 65 53] (-1 : int32)))
+    [#"../result.rs" 65 12 65 53] _209 <- ([#"../result.rs" 65 12 65 53] _211 = (-1 : int32));
+    switch (_209)
       | False -> goto BB138
       | True -> goto BB137
       end
@@ -1138,7 +1247,9 @@ module Result_TestResult
     goto BB141
   }
   BB141 {
-    switch ([#"../result.rs" 66 12 66 46] _218 = ([#"../result.rs" 66 45 66 46] [#"../result.rs" 66 45 66 46] (1 : int32)))
+    [#"../result.rs" 66 12 66 46] _217 <- ([#"../result.rs" 66 12 66 46] _218 = (1 : int32));
+    _218 <- any int32;
+    switch (_217)
       | False -> goto BB143
       | True -> goto BB142
       end
@@ -1166,14 +1277,17 @@ module Result_TestResult
   }
   BB146 {
     assume { resolve0 _226 };
-    switch ([#"../result.rs" 67 12 67 53] ([#"../result.rs" 67 12 67 47]  * _226) = ([#"../result.rs" 67 51 67 53] [#"../result.rs" 67 51 67 53] (-1 : int32)))
+    [#"../result.rs" 67 12 67 53] _224 <- ([#"../result.rs" 67 12 67 53]  * _226 = (-1 : int32));
+    switch (_224)
       | False -> goto BB148
       | True -> goto BB147
       end
   }
   BB147 {
-    [#"../result.rs" 70 40 70 48] res <- ([#"../result.rs" 70 40 70 48] Core_Result_Result_Type.C_Ok ([#"../result.rs" 70 43 70 47] Core_Option_Option_Type.C_None));
-    [#"../result.rs" 71 12 71 27] _236 <- ([#"../result.rs" 71 12 71 27] transpose0 ([#"../result.rs" 71 12 71 15] res));
+    [#"../result.rs" 70 43 70 47] _232 <- ([#"../result.rs" 70 43 70 47] Core_Option_Option_Type.C_None);
+    [#"../result.rs" 70 40 70 48] res <- ([#"../result.rs" 70 40 70 48] Core_Result_Result_Type.C_Ok _232);
+    _232 <- any Core_Option_Option_Type.t_option int32;
+    [#"../result.rs" 71 12 71 27] _236 <- ([#"../result.rs" 71 12 71 27] transpose0 res);
     goto BB149
   }
   BB148 {
@@ -1181,7 +1295,7 @@ module Result_TestResult
     absurd
   }
   BB149 {
-    [#"../result.rs" 71 12 71 37] _234 <- ([#"../result.rs" 71 12 71 37] is_none1 ([#"../result.rs" 71 12 71 27] _236));
+    [#"../result.rs" 71 12 71 37] _234 <- ([#"../result.rs" 71 12 71 37] is_none1 _236);
     goto BB150
   }
   BB150 {
@@ -1191,8 +1305,10 @@ module Result_TestResult
       end
   }
   BB151 {
-    [#"../result.rs" 72 40 72 51] res1 <- ([#"../result.rs" 72 40 72 51] Core_Result_Result_Type.C_Ok ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some ([#"../result.rs" 72 48 72 49] [#"../result.rs" 72 48 72 49] (1 : int32))));
-    [#"../result.rs" 73 12 73 27] _245 <- ([#"../result.rs" 73 12 73 27] transpose0 ([#"../result.rs" 73 12 73 15] res1));
+    [#"../result.rs" 72 43 72 50] _240 <- ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../result.rs" 72 40 72 51] res1 <- ([#"../result.rs" 72 40 72 51] Core_Result_Result_Type.C_Ok _240);
+    _240 <- any Core_Option_Option_Type.t_option int32;
+    [#"../result.rs" 73 12 73 27] _245 <- ([#"../result.rs" 73 12 73 27] transpose0 res1);
     goto BB153
   }
   BB152 {
@@ -1210,14 +1326,16 @@ module Result_TestResult
     goto BB155
   }
   BB155 {
-    switch ([#"../result.rs" 73 12 73 50] _243 = ([#"../result.rs" 73 49 73 50] [#"../result.rs" 73 49 73 50] (1 : int32)))
+    [#"../result.rs" 73 12 73 50] _242 <- ([#"../result.rs" 73 12 73 50] _243 = (1 : int32));
+    _243 <- any int32;
+    switch (_242)
       | False -> goto BB157
       | True -> goto BB156
       end
   }
   BB156 {
-    [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err ([#"../result.rs" 74 44 74 46] [#"../result.rs" 74 44 74 46] (-1 : int32)));
-    [#"../result.rs" 75 12 75 27] _253 <- ([#"../result.rs" 75 12 75 27] transpose0 ([#"../result.rs" 75 12 75 15] res2));
+    [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err (-1 : int32));
+    [#"../result.rs" 75 12 75 27] _253 <- ([#"../result.rs" 75 12 75 27] transpose0 res2);
     goto BB158
   }
   BB157 {
@@ -1235,7 +1353,9 @@ module Result_TestResult
     goto BB160
   }
   BB160 {
-    switch ([#"../result.rs" 75 12 75 55] _251 = ([#"../result.rs" 75 53 75 55] [#"../result.rs" 75 53 75 55] (-1 : int32)))
+    [#"../result.rs" 75 12 75 55] _250 <- ([#"../result.rs" 75 12 75 55] _251 = (-1 : int32));
+    _251 <- any int32;
+    switch (_250)
       | False -> goto BB162
       | True -> goto BB161
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
index 8fbda132fa..6bc1d51054 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
@@ -21,12 +21,14 @@ module IncMax_TakeMax
   var mb : borrowed uint32 = mb;
   var _3 : borrowed uint32;
   var _5 : borrowed uint32;
+  var _6 : bool;
   var _9 : borrowed uint32;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../inc_max.rs" 7 7 7 17] ([#"../inc_max.rs" 7 7 7 10]  * ma) >= ([#"../inc_max.rs" 7 14 7 17]  * mb))
+    [#"../inc_max.rs" 7 7 7 17] _6 <- ([#"../inc_max.rs" 7 7 7 17]  * ma >=  * mb);
+    switch (_6)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -87,6 +89,7 @@ module IncMax_IncMax
   var _6 : borrowed uint32;
   var _7 : borrowed uint32;
   var _8 : borrowed uint32;
+  var _10 : bool;
   {
     goto BB0
   }
@@ -107,9 +110,10 @@ module IncMax_IncMax
   BB1 {
     assume { resolve0 _8 };
     assume { resolve0 _6 };
-    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12]  * mc + ([#"../inc_max.rs" 17 11 17 12] [#"../inc_max.rs" 17 11 17 12] (1 : uint32))) ; };
+    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12]  * mc + (1 : uint32)) ; };
     assume { resolve0 mc };
-    switch ([#"../inc_max.rs" 18 12 18 18] ([#"../inc_max.rs" 18 12 18 13] a) <> ([#"../inc_max.rs" 18 17 18 18] b))
+    [#"../inc_max.rs" 18 12 18 18] _10 <- ([#"../inc_max.rs" 18 12 18 18] a <> b);
+    switch (_10)
       | False -> goto BB3
       | True -> goto BB2
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_max/why3session.xml
index 15b2561ce5..d1ad93ed1a 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_max/why3session.xml
@@ -7,12 +7,12 @@
 <path name=".."/><path name="inc_max.mlcfg"/>
 <theory name="IncMax_TakeMax" proved="true">
  <goal name="take_max&#39;vc" expl="VC for take_max" proved="true">
- <proof prover="0"><result status="valid" time="0.116806" steps="164"/></proof>
+ <proof prover="0"><result status="valid" time="0.116806" steps="171"/></proof>
  </goal>
 </theory>
 <theory name="IncMax_IncMax" proved="true">
  <goal name="inc_max&#39;vc" expl="VC for inc_max" proved="true">
- <proof prover="0"><result status="valid" time="0.024030" steps="526"/></proof>
+ <proof prover="0"><result status="valid" time="0.024030" steps="528"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_max/why3shapes.gz
index 106d2706f0afbca3e6672d67b695b456424243bf..51a9ac3bf20929e5f0b9fe5dcf607b13b169f0b0 100644
GIT binary patch
literal 549
zcmV+=0^0o_iwFP!00000|AkXckDD+Mz4I%$ZJS;^HW;XyN+=52NIh0QZZr_nqRm1D
z$+kbg<F5o*Z5s*49*^J5ym|9s6Hh<!m!9HRJx<-we~x9m`51M$RfU2Qx42OZpXf6N
z<_tgvz^_}pcKt>02U@M$;s^&E^)#GcHB)@H7qdOE*&#bn3}9Ff<2d}*r-zqkic?_Q
z^>|hiyOWaD!RC>he`Cn;hrS%mjms>j&pBl)9O-cq^DMD0Ql$YW4LFIzN$De}9eHtE
zwGu15#N&Z^ZirHe0$w^e-~rE5NCsN=<-J;l6`m(;kd4!w5>pAS?}fAZL$db~(-84i
z0r(QY)ZiWY3Jn4rGjDBuKwx4Y&_qBB9T%p-^ZWt7k5{e0mJZPQa*Xl6%Gg&`q;_#T
zjPV7Z_3;J&M7#FTmaRj%c<jO|qUaoI;ENJvwttD$&pZ~<G&?NR1-S*w=S(Qb0<Ebd
zv0CAg!>7erHc*w=^~ZX+_NVFX?KeyPQr7n*giRtPwyQ(uS?7*oX+>&H@+O)mv#jZq
zD>}Jl1J(+qm#(<N)K)krPQ41E2MAp*d_bVZJDQ;{7UM?KrQn~lB@C)~ceccRwwzN!
zZ{1EP?qkrn(eBH#3k@*)D_0jRT-@~3^^KKN)IgmT41_$j1)j9bxx_qWd6Q-$7i|{9
nBa8B+X$1%<Y7$0+9GS?t<`NQK*9p_Hc;wMv<;>=eBn1EfzF-Lo

literal 517
zcmV+g0{Z<QiwFP!00000|AkXcZ=5g?z4I%$rQKfqfsI{tE1_yvLF(DZtcI@^C4mYy
zX@7plHeL)-S|l5LJbp9t{N}?Uoqxiwc1~a0Y3|42b1Kur$E1g&(S{aqgo7dQfWsPy
zH&8TC_<Dqwez<aWhqH6rY-tHoJC9GVEio)w^Jq;;w8=}1K?zjjG>yO8=I;3s<7nvm
z0iKM6zA^G#x;&KqTZ4ih?e$_$d}a!VcglA-a>2>$wamFlBLa>HIGM*0IMB(`z+Baa
z@9?q(kJ{^&D3clL2(x<{@D>WufYYg1tF?r3d%Th%ED9Cx1>z2wpO#ozh?U)9@g-Ph
zC-2C1Xo%wBh`sA7qnHLe1vD1W!do-@v~lMDfBEw{G2hZ|oYE^iwwGu4lXPWQbfwRn
zME~d}RvK+K(xA#|L&e1yng?ct%iKR^43Wd9&0f~@TtGius_|uL=C`NcZT4cT$u$Y?
zk`TzRR|drzm}f~kg*lVF@%CV+Jy&wa6?0OgdwJnaU!1nJY45~PM?tZx#B?OF#nE=G
z-t-E#hN1s#3@0!CZe#GZF}zcTcm0YRw#2|*!PS@TE7X*@uh<=saBx#gKh#bvNuFy}
zi6&PS?*Md_b5)_O>2h8XQHhk^lY~fBla>+9Q1GnMT#HWSk~gjH2<STH_bmAfrSxjp
H;RFBxz!wNe

diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
index 0ad21c735d..426d30ec0c 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
@@ -26,18 +26,21 @@ module IncMax3_IncMax3
   var mb : borrowed uint32 = mb;
   var mc : borrowed uint32 = mc;
   var _6 : ();
+  var _7 : bool;
   var _10 : ();
   var _11 : borrowed (borrowed uint32);
   var _12 : borrowed (borrowed uint32);
   var _13 : borrowed (borrowed uint32);
   var _14 : borrowed (borrowed uint32);
   var _15 : ();
+  var _16 : bool;
   var _19 : ();
   var _20 : borrowed (borrowed uint32);
   var _21 : borrowed (borrowed uint32);
   var _22 : borrowed (borrowed uint32);
   var _23 : borrowed (borrowed uint32);
   var _24 : ();
+  var _25 : bool;
   var _28 : ();
   var _29 : borrowed (borrowed uint32);
   var _30 : borrowed (borrowed uint32);
@@ -47,7 +50,8 @@ module IncMax3_IncMax3
     goto BB0
   }
   BB0 {
-    switch ([#"../inc_max_3.rs" 13 7 13 16] ([#"../inc_max_3.rs" 13 7 13 10]  * ma) < ([#"../inc_max_3.rs" 13 13 13 16]  * mb))
+    [#"../inc_max_3.rs" 13 7 13 16] _7 <- ([#"../inc_max_3.rs" 13 7 13 16]  * ma <  * mb);
+    switch (_7)
       | False -> goto BB3
       | True -> goto BB1
       end
@@ -77,7 +81,8 @@ module IncMax3_IncMax3
     goto BB4
   }
   BB4 {
-    switch ([#"../inc_max_3.rs" 16 7 16 16] ([#"../inc_max_3.rs" 16 7 16 10]  * mb) < ([#"../inc_max_3.rs" 16 13 16 16]  * mc))
+    [#"../inc_max_3.rs" 16 7 16 16] _16 <- ([#"../inc_max_3.rs" 16 7 16 16]  * mb <  * mc);
+    switch (_16)
       | False -> goto BB7
       | True -> goto BB5
       end
@@ -109,7 +114,8 @@ module IncMax3_IncMax3
     goto BB8
   }
   BB8 {
-    switch ([#"../inc_max_3.rs" 19 7 19 16] ([#"../inc_max_3.rs" 19 7 19 10]  * ma) < ([#"../inc_max_3.rs" 19 13 19 16]  * mb))
+    [#"../inc_max_3.rs" 19 7 19 16] _25 <- ([#"../inc_max_3.rs" 19 7 19 16]  * ma <  * mb);
+    switch (_25)
       | False -> goto BB11
       | True -> goto BB9
       end
@@ -139,9 +145,9 @@ module IncMax3_IncMax3
     goto BB12
   }
   BB12 {
-    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12]  * ma + ([#"../inc_max_3.rs" 22 11 22 12] [#"../inc_max_3.rs" 22 11 22 12] (2 : uint32))) ; };
+    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12]  * ma + (2 : uint32)) ; };
     assume { resolve1 ma };
-    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12]  * mb + ([#"../inc_max_3.rs" 23 11 23 12] [#"../inc_max_3.rs" 23 11 23 12] (1 : uint32))) ; };
+    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12]  * mb + (1 : uint32)) ; };
     assume { resolve1 mb };
     [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] ());
     return _0
@@ -176,6 +182,9 @@ module IncMax3_TestIncMax3
   var _9 : borrowed uint32;
   var _10 : borrowed uint32;
   var _11 : borrowed uint32;
+  var _13 : bool;
+  var _16 : bool;
+  var _19 : bool;
   {
     goto BB0
   }
@@ -202,19 +211,22 @@ module IncMax3_TestIncMax3
     assume { resolve0 _11 };
     assume { resolve0 _9 };
     assume { resolve0 _7 };
-    switch ([#"../inc_max_3.rs" 29 12 29 18] ([#"../inc_max_3.rs" 29 12 29 13] a) <> ([#"../inc_max_3.rs" 29 17 29 18] b))
+    [#"../inc_max_3.rs" 29 12 29 18] _13 <- ([#"../inc_max_3.rs" 29 12 29 18] a <> b);
+    switch (_13)
       | False -> goto BB7
       | True -> goto BB2
       end
   }
   BB2 {
-    switch ([#"../inc_max_3.rs" 29 22 29 28] ([#"../inc_max_3.rs" 29 22 29 23] b) <> ([#"../inc_max_3.rs" 29 27 29 28] c))
+    [#"../inc_max_3.rs" 29 22 29 28] _16 <- ([#"../inc_max_3.rs" 29 22 29 28] b <> c);
+    switch (_16)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
-    switch ([#"../inc_max_3.rs" 29 32 29 38] ([#"../inc_max_3.rs" 29 32 29 33] c) <> ([#"../inc_max_3.rs" 29 37 29 38] a))
+    [#"../inc_max_3.rs" 29 32 29 38] _19 <- ([#"../inc_max_3.rs" 29 32 29 38] c <> a);
+    switch (_19)
       | False -> goto BB5
       | True -> goto BB4
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_max_3/why3session.xml
index 8bfcc6d23d..6a0fbad5e5 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_3/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_3/why3session.xml
@@ -7,12 +7,12 @@
 <path name=".."/><path name="inc_max_3.mlcfg"/>
 <theory name="IncMax3_IncMax3" proved="true">
  <goal name="inc_max_3&#39;vc" expl="VC for inc_max_3" proved="true">
- <proof prover="0"><result status="valid" time="0.174631" steps="48410"/></proof>
+ <proof prover="0"><result status="valid" time="0.021678" steps="41474"/></proof>
  </goal>
 </theory>
 <theory name="IncMax3_TestIncMax3" proved="true">
  <goal name="test_inc_max_3&#39;vc" expl="VC for test_inc_max_3" proved="true">
- <proof prover="0"><result status="valid" time="0.016236" steps="17302"/></proof>
+ <proof prover="0"><result status="valid" time="0.016236" steps="17857"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_max_3/why3shapes.gz
index 864e153711fa844e45d6b58264920c68c1e7968d..427548bb446f72c799cfc200868172d479d637fa 100644
GIT binary patch
literal 837
zcmV-L1G@YliwFP!00000|9w?WZ`&{oz2{ft)-Ah;q-5DcdkBga4KVC9=(s{j>@8TE
z3`yGU=Z_*K*U_-GsLC(%(G>aoZZSW7k3aj<{Ix%xc8C4Pc{5+UpM8!u@oPZ-GfR~r
z=~*^OU!7O+*q;thuRR1Xt9Zj_Tpy0d!>@jO_534raoFwSQ?PNj4fdWR;>&J-CcNU4
zy&tA(yMg;<-0dINhnM~K^q2EfTm(Bo^a;>k;58YK5+2of&1Fir!GGhiGvU$dmO*R)
zT=IVk0P#LPo%&LR3D7Rz6r`oL4f$E{s(@z&B>~d3Tn*HU(WH{m+({S)gd~X#;<x_%
zDBfgRB+H_N+LXk|LtIODrxDO`#o~vyLgZ=`5nRd+PQ!eFrXWI75W(eqO*%A`QW7T*
zxd65xa*yCHemTDM0Z6>G%e_j*cs=QEiib+)a#O2;U)?U>E*UTT4S{IVZ!%M*(SDOl
z?dkGObm<nQTxzOTa9|!6lzGvPkqcx?E6A2s5bBGvWif`PUKAMvL2d?d-D))TeV2_u
zFL&$pzPo_!c;D@K-#*`Wn+^?yw2|WAGhmYuvEjDm_M^Nly8pEwZKZ4Xk#A8@Ak4z;
zd^jBEyZz?zIsSg6*{~Xx!|L{|Y3u((1}B~Kox*AbGGF7MxoRzWBBzU&^XR@{orj4g
zHzG-OCaCgiDtRS@DwRtEyUaqB$X#Zg4B2$s!A@6yq{)sCUliGvE^A&ax~%nDmcigv
zlNHpL<UJk-1IEFCCNEtpyO|rCvShi*%PL!&XAx`-Nd;242b55NGIfXzN65@QAk3CS
z(-)!0CKU4Fn#EKzkH7dBNQe(3>5QCXHA`X~4RZXfN;Xj0u#jM{Z!V|UnhhBF`P)bK
z-#%=MFMU!hRE1kpctVzz{Jn%R<8<<gNw#j}iM+HV#G|3qCZ5Q$XCjiv*v(t3Mpsjl
zEs!ATLBqHKG(yq{2^o@vdo(ohM3I>_O@ZXG6(ciIMNMs?CiyU+)3BC#CPNlVIQJ*U
z9eH8adFcAVxvg!mwfyV1J#7ct3_~A%*UsU=%r>rfU5m^UO|y1uXRSjpmeydlXtrif
P4><b+?$1jkjR*h$=!Ky~

literal 823
zcmV-71IYXziwFP!00000|8-SOZ`&{oz2{f>)-Ah;q-@zkdoYF+4KVbmV*@3&w_t5D
zBx$#wKT=<@-8DdDilY1|>hby0vN->Azx#9X)}PM%<Kb&j70b_yM|bC*Eb?Eq!3LQ}
zTgiNVS-VqzK0d$oU_q_j9gl8%Je`hz`tIiCmu=jzKe%VB-M+K>o+I4r{%|3@;gMIr
zjHmSu?pwD%Y_`YOLwA0+_}wk79w8b5G!wik;*sFd9Iu+bvfSavc)TchwB9p_wty`^
z$pR#NWx=%92}*zz2zVD%VFDFT5M(RjIMEOoa)m~cg=Xc$z@idMe5l-y{<86_;#!Jl
znL@Pyh@VFb^(sU_&AIw@Ff&9*)d7DUphH+?p-hNSW<(v|SIQ7VNnWD;Cawr2M5)Tk
z-Hxg!UYO0Xl}Z9yr1pA;cr^*e<*Y{&(xIG0QUVhTZRC2$=cQ*S<-o`T<%ys|`eX^y
zNeR<QNriK;XPHBV>&fP9ns`=hY$z_)^XoJb5=(z|We77Ct9+eRg2Xbu&hsOLg0z}n
z;L)N^h?)!buDVFGxi2pAP54&<_vf{G&8U<*mQqV8sg8B6rL%k~^`w*w`>hy`r(%ED
zZC>2p4K0TC&<?)QjV;^woV6JfZ`?@h$B>e=OEl&iV7lG!DB0b{=PbUQZXO+P%o<_p
zl}}m38XioVQ0SpBGv4DbK+Rhx2^sg0G)J|X_MQ0Z+&WciMK1-Z8K1J9J5Jgw5(?%V
zhQwj;9ELzfX|~K^$Q*{qVGs_dP~mX0l}!}poV{yKU^9_wA7X6gZl-RO1tD$-Duqo!
zkZh6!vI2X1Hzg^V9Vq|%&l-HZhGkk4;?X>DN|}>So&0Bpy_PEf0T5qKpJM(b2S}lE
zgk<v}!goW&#bR*IwVRT5vkXW(*CC8GOl8Qd-B?FR(e4<E!op<NEE5ru^#X#kn(IrM
zAkjmH%)C-0NYoh;lX%DwLxt<fW)+46$zs9gr05nuxDA^W;nJTODa*p59<VM4=5V*|
zO{Y}jdK_TDUF|gDfCW6Lh29Qj*VI6LS2Y7dqqnXxs1U&*5)|}+i+_M(7ebH-007zB
BleGW<

diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
index cef889812e..62e0af910a 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
@@ -21,12 +21,14 @@ module IncMaxMany_TakeMax
   var mb : borrowed uint32 = mb;
   var _3 : borrowed uint32;
   var _5 : borrowed uint32;
+  var _6 : bool;
   var _9 : borrowed uint32;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../inc_max_many.rs" 7 7 7 17] ([#"../inc_max_many.rs" 7 7 7 10]  * ma) >= ([#"../inc_max_many.rs" 7 14 7 17]  * mb))
+    [#"../inc_max_many.rs" 7 7 7 17] _6 <- ([#"../inc_max_many.rs" 7 7 7 17]  * ma >=  * mb);
+    switch (_6)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -88,6 +90,10 @@ module IncMaxMany_IncMaxMany
   var _7 : borrowed uint32;
   var _8 : borrowed uint32;
   var _9 : borrowed uint32;
+  var _12 : bool;
+  var _14 : uint32;
+  var _17 : bool;
+  var _19 : uint32;
   {
     goto BB0
   }
@@ -108,9 +114,12 @@ module IncMaxMany_IncMaxMany
   BB1 {
     assume { resolve0 _9 };
     assume { resolve0 _7 };
-    [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max_many.rs" 17 4 17 12]  * mc + ([#"../inc_max_many.rs" 17 11 17 12] k)) ; };
+    [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max_many.rs" 17 4 17 12]  * mc + k) ; };
     assume { resolve0 mc };
-    switch ([#"../inc_max_many.rs" 18 12 18 22] ([#"../inc_max_many.rs" 18 12 18 13] a) >= ([#"../inc_max_many.rs" 18 17 18 22] ([#"../inc_max_many.rs" 18 17 18 18] b) + ([#"../inc_max_many.rs" 18 21 18 22] k)))
+    [#"../inc_max_many.rs" 18 17 18 22] _14 <- ([#"../inc_max_many.rs" 18 17 18 22] b + k);
+    [#"../inc_max_many.rs" 18 12 18 22] _12 <- ([#"../inc_max_many.rs" 18 12 18 22] a >= _14);
+    _14 <- any uint32;
+    switch (_12)
       | False -> goto BB3
       | True -> goto BB2
       end
@@ -119,7 +128,10 @@ module IncMaxMany_IncMaxMany
     goto BB4
   }
   BB3 {
-    switch ([#"../inc_max_many.rs" 18 26 18 36] ([#"../inc_max_many.rs" 18 26 18 27] b) >= ([#"../inc_max_many.rs" 18 31 18 36] ([#"../inc_max_many.rs" 18 31 18 32] a) + ([#"../inc_max_many.rs" 18 35 18 36] k)))
+    [#"../inc_max_many.rs" 18 31 18 36] _19 <- ([#"../inc_max_many.rs" 18 31 18 36] a + k);
+    [#"../inc_max_many.rs" 18 26 18 36] _17 <- ([#"../inc_max_many.rs" 18 26 18 36] b >= _19);
+    _19 <- any uint32;
+    switch (_17)
       | False -> goto BB5
       | True -> goto BB4
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_max_many/why3session.xml
index b220a46584..83d3114756 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_many/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_many/why3session.xml
@@ -8,12 +8,12 @@
 <path name=".."/><path name="inc_max_many.mlcfg"/>
 <theory name="IncMaxMany_TakeMax" proved="true">
  <goal name="take_max&#39;vc" expl="VC for take_max" proved="true">
- <proof prover="2"><result status="valid" time="0.011466" steps="164"/></proof>
+ <proof prover="2"><result status="valid" time="0.011466" steps="171"/></proof>
  </goal>
 </theory>
 <theory name="IncMaxMany_IncMaxMany" proved="true">
  <goal name="inc_max_many&#39;vc" expl="VC for inc_max_many" proved="true">
- <proof prover="1"><result status="valid" time="0.020667" steps="18873"/></proof>
+ <proof prover="1"><result status="valid" time="0.020667" steps="19249"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_max_many/why3shapes.gz
index 6af70ae55cef5861194b999f42fa21fb940baf09..baa7c69838c0f03bb8e46399bf676b94a9c296dd 100644
GIT binary patch
literal 605
zcmV-j0;2sNiwFP!00000|BX~jZ`&{ozWZ1B)-Ah;lJ)Sg3^0Ni4Y1>&V*@(2H>0UN
z#7VdP`{`k)vWm0|AVnfSeI(7thgCZM#9z&rJ~yYa8~V?wNLL?|4%a%@P~aL@n&5+3
zRzSP}i~#WK8ZTXcX7tYN4z{?$4o}TE9G@GaX>ex28Ax!EJ7WU~R>SEu{BG*Ir$=Ka
z$F}S7s0DVl7Uj<Qq3pjEDE!f!_g3RQQ)YRPjCjPvli6pPg9y!M9zOGAo`;)dKpTUi
zE^5spzHH(H``msgooS$jrvp0kO`p&R%(g9Fq9s`3acnHJ1-*O{8;RL(nREU_ww)~U
z+2S<<m_h&>!vv%e8_aaXzIE||A!FN_jm>Ox#+glU=s)21)1}eiLI>!kaIEm%%Gj1=
zqBm(foYFHsHv1?1lWaEat}R+mbN1wv+cZ&ro7`9qZ`3E2W|}gW+EB;vQ+VeKWm#a?
z@2la`*W+8brGL~}qi^`Pd=1_`(3HG#k1Wkbf!+2m0*2j{yN=4k<ZDoKCAp3Q5j$c4
zOMdykjx2%SY^FuvjtX7NoNK~VX}Pn*2Dqs)Uu)77sPrOvt-c4l#dRg4x^g+U#T`{U
zn?rWx4#dMu-_g1MgN7wx$4*c;@TN1-xqG#;1Ja39WKX^xHPTNdH^ZV)BmAf_Aa48I
zoifcP8%$fXUzVkE0OEc{q<~urGApiq*YyY6c4qZ|ljH!E%n2}2w>j30P*kAeL>;(f
rinTI@dy*)inaX$$iZD(LvPMxedB93k70+qP?rHK5QWhQ4Q3e12V0$iS

literal 558
zcmV+}0@3{+iwFP!00000|BX~pZ`&Xce)q5NTes|mGsfVlnG{WlYH8XdkBiPV?yR=<
zl%(DE@5g~jFjcli!hyTv`ws3q-mUWEcl=?F`Kvh`hiUwnSNZCFHsD&<8aBAbm1g+O
z4l*!r0BZpJw8ocVJn`bjeqGpN2@M|1ae8_+Oc&9dM{{7&LN=BI7`D^lF#R;$&GVz>
zsj(kMe9{#TovwC`%R|vW85BO4)1Ev&Gi8Slk_k>V<CL_mbRm@%0Y?O!(&Gp_Y!F>T
z;ZCi2f>+LXK-=k}bg98z7_A}T%~xm*_OsnwPD>Zc$$hyDK`0=u5pjpiw=-86xXLpZ
zpUF!4_`o7TvnU>p(O!2luxS+AfK~*wQ0sz98)yFS%I|iW{+##IAwS`x*+1j2tZ({F
z-+WzerE7^+1yD5>2K*4O#lpGU;4tpn>1FJWe~Wv=x^%OYlr6!M9Ivw`fw9bMC+#|}
zg$5N0>!b}%whKI!;LHC_WEuE{N>WAXs5rIKrB+$pdAWl)>quI?NN<v}7`T^EDgc=X
zfV=*(I=mu2aOwl*!$^Oj5ik0KSb!nay*%@r>DujD(M#n_D&doFdtUnI!96BP&sV<Z
zZIGb0bF)(OnS*Phy<JM>9+>-W5(iv!u;4g%$S~ehgV-_t&N3-$)rwB4miLHtE4gZ|
wt?MOknP^20cP!(khn};})P{8e?TcBph6`D>s07qq&hLus4-s%$mf8gX0J!fQS^xk5

diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
index adeffc0c7b..b673e8b19e 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
@@ -21,12 +21,14 @@ module IncMaxRepeat_TakeMax
   var mb : borrowed uint32 = mb;
   var _3 : borrowed uint32;
   var _5 : borrowed uint32;
+  var _6 : bool;
   var _9 : borrowed uint32;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../inc_max_repeat.rs" 7 7 7 17] ([#"../inc_max_repeat.rs" 7 7 7 10]  * ma) >= ([#"../inc_max_repeat.rs" 7 14 7 17]  * mb))
+    [#"../inc_max_repeat.rs" 7 7 7 17] _6 <- ([#"../inc_max_repeat.rs" 7 7 7 17]  * ma >=  * mb);
+    switch (_6)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -231,6 +233,7 @@ module IncMaxRepeat_IncMaxRepeat
   var b : uint32 = b;
   var n : uint32 = n;
   var iter : Core_Ops_Range_Range_Type.t_range uint32;
+  var _7 : Core_Ops_Range_Range_Type.t_range uint32;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range uint32);
   var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _18 : Core_Option_Option_Type.t_option uint32;
@@ -243,11 +246,17 @@ module IncMaxRepeat_IncMaxRepeat
   var _27 : borrowed uint32;
   var _28 : borrowed uint32;
   var _29 : borrowed uint32;
+  var _32 : bool;
+  var _34 : uint32;
+  var _37 : bool;
+  var _39 : uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../inc_max_repeat.rs" 16 4 16 86] iter <- ([#"../inc_max_repeat.rs" 16 4 16 86] into_iter0 ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range ([#"../inc_max_repeat.rs" 18 13 18 14] [#"../inc_max_repeat.rs" 18 13 18 14] (0 : uint32)) ([#"../inc_max_repeat.rs" 18 16 18 17] n)));
+    [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) n);
+    [#"../inc_max_repeat.rs" 16 4 16 86] iter <- ([#"../inc_max_repeat.rs" 16 4 16 86] into_iter0 _7);
+    _7 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
   }
   BB1 {
@@ -285,7 +294,10 @@ module IncMaxRepeat_IncMaxRepeat
       end
   }
   BB7 {
-    switch ([#"../inc_max_repeat.rs" 22 12 22 22] ([#"../inc_max_repeat.rs" 22 12 22 13] a) >= ([#"../inc_max_repeat.rs" 22 17 22 22] ([#"../inc_max_repeat.rs" 22 17 22 18] b) + ([#"../inc_max_repeat.rs" 22 21 22 22] n)))
+    [#"../inc_max_repeat.rs" 22 17 22 22] _34 <- ([#"../inc_max_repeat.rs" 22 17 22 22] b + n);
+    [#"../inc_max_repeat.rs" 22 12 22 22] _32 <- ([#"../inc_max_repeat.rs" 22 12 22 22] a >= _34);
+    _34 <- any uint32;
+    switch (_32)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -304,7 +316,7 @@ module IncMaxRepeat_IncMaxRepeat
   }
   BB11 {
     [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] _23);
-    [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- any Snapshot.snap_ty (Seq.seq uint32);
+    _23 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../inc_max_repeat.rs" 19 26 19 32] _27 <- Borrow.borrow_mut a;
     [#"../inc_max_repeat.rs" 19 26 19 32] a <-  ^ _27;
     [#"../inc_max_repeat.rs" 19 26 19 32] _26 <- Borrow.borrow_final ( * _27) (Borrow.get_id _27);
@@ -321,7 +333,7 @@ module IncMaxRepeat_IncMaxRepeat
   BB12 {
     assume { resolve1 _29 };
     assume { resolve1 _27 };
-    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16]  * mc + ([#"../inc_max_repeat.rs" 20 15 20 16] [#"../inc_max_repeat.rs" 20 15 20 16] (1 : uint32))) ; };
+    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16]  * mc + (1 : uint32)) ; };
     assume { resolve1 mc };
     goto BB4
   }
@@ -329,7 +341,10 @@ module IncMaxRepeat_IncMaxRepeat
     goto BB15
   }
   BB14 {
-    switch ([#"../inc_max_repeat.rs" 22 26 22 36] ([#"../inc_max_repeat.rs" 22 26 22 27] b) >= ([#"../inc_max_repeat.rs" 22 31 22 36] ([#"../inc_max_repeat.rs" 22 31 22 32] a) + ([#"../inc_max_repeat.rs" 22 35 22 36] n)))
+    [#"../inc_max_repeat.rs" 22 31 22 36] _39 <- ([#"../inc_max_repeat.rs" 22 31 22 36] a + n);
+    [#"../inc_max_repeat.rs" 22 26 22 36] _37 <- ([#"../inc_max_repeat.rs" 22 26 22 36] b >= _39);
+    _39 <- any uint32;
+    switch (_37)
       | False -> goto BB16
       | True -> goto BB15
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3session.xml
index 67cd4d381e..9a95523da0 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3session.xml
@@ -8,12 +8,12 @@
 <path name=".."/><path name="inc_max_repeat.mlcfg"/>
 <theory name="IncMaxRepeat_TakeMax" proved="true">
  <goal name="take_max&#39;vc" expl="VC for take_max" proved="true">
- <proof prover="2"><result status="valid" time="0.010682" steps="164"/></proof>
+ <proof prover="2"><result status="valid" time="0.010682" steps="171"/></proof>
  </goal>
 </theory>
 <theory name="IncMaxRepeat_IncMaxRepeat" proved="true">
  <goal name="inc_max_repeat&#39;vc" expl="VC for inc_max_repeat" proved="true">
- <proof prover="0"><result status="valid" time="0.147812" steps="666720"/></proof>
+ <proof prover="0"><result status="valid" time="0.147812" steps="647565"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_max_repeat/why3shapes.gz
index 0e80f8e5f62d652f3d2c704cbb94f695434c20ab..44dd6b46516ef03da06735c8f92f9b442d39a09e 100644
GIT binary patch
literal 764
zcmV<Y0t5XYiwFP!00000|BY42Zrd;rz3VG<OPgFc+(Z>k0mHB$14Vl&c&tHNbRxu&
zTv<-rzwdC7EvZOa1Cq(%n>UMx&+l&2)1x`sQ~F}NQ{6TnQkmYqPik|oa}5h~Z*Da)
z-|=w<5)6O_FrV(txo&z!Z}9D5lP#=GXHV_n#S%?NYc^T~8EvvP#sFfrZP&FwZFTef
zgmH4SuN!mF($tlf#oFhg+_y6*^I-dpI|-R7d;%z&@yN)-og4QMsl~t}1|A-G1U?8_
zB8vK|HJkDA$Oq2dHA-_0bP?!)4t%kNXu#KMajlk^!W>T4F+0$;C9V>DzZTBt4}29P
ziXq~q0*EDmt04mEj12}l;(UF5fMjenu(5${_{Ev~fyeoS`PQAS246Zr9m{dXe@@1#
zC=$I)_idN<=E-iJ&99{YVe00EX;Q=`)i5kU(;_j)uC2~Hd%_VicXwF4bR&buBz`k3
z<6gu)k9(ZCtG5V_BRb>~lK{%t=VSj{tLU$WOo+~lWVu}K*Zajjl-!3#FyTguiPsyU
zAs_Ep7(&K1V}1<BXISCHQ%!cXSYR@nZF_F2)7!{tj?_n_Z{;}gXAp7(&B$Lll3C>Z
zzjK@+&2salZG0wuyKy$*xZ|30bFj@r|A=&r?KFq4BP5>Qjl5>ah50z)+yU{Qw{VW}
zb=+k}q75(VaHuI?gc+gyB5R<9axD~Ud<C`0;sq4K%a53M7Xg!=3AuyUJL*n9JJ}MW
zz&smg!F(1%3miMA?gD3?hRe;R6BrqcJSwT6XvEk2E+cNT7u1i4nCm0DM#0U!;^qNH
zwSbH0!bNrS7!+KD2z7ruam{nhgXZJ0!T}1_xyJL0$TJ_41(?+QBJ}*K^ek5IwLU_*
zV~J~&1v<n;F;c;beI<i<)y>Xn*QT>aYx*SF!8XeYFj?($Q(38~G)fS)6B$!%pQTWe
uq@vX}+h!({1}b5}R@qKiZk2S~ElKlIm02lEQSy?NH2DMDfe{F#2LJ$csd*Ft

literal 751
zcmV<L0ucQliwFP!00000|BY4AZksR^edjB9>(*+L?Q4UX+DTDWM5L*E^W!3um^Nw)
z8KLd=_q!Jx0#xl53Glr>KF7YcPd=T;$9sEl$N0sy$9+?Ojg$ENbF{ZtCNq3xuk5*D
z_9s4+U_QYy!R@yz`@F9^5NG)AVY860ZR?KB<BMZPOxiGMb2bUmHEM8X%cgCcSGPNR
zdO)4bR{PpMn#AsRCdt?RJT!eNq3xaPHq_&1rt$HhbitDZ9!bMw4@ry~c+|inJ&(c%
zK~x6OuiC(ZPX<0t!>Le48r~O-Vm|PN5@G^hH>=ZXsh~jJr(!5#;p#mh=$YXrXvslK
zj#?1JB)vRPEZC66(=i&`uZ-g~#Ld7a2DV|Z1#Rtg=KtRLJdezETs3Xn*$20IvcIG5
zm)+MdU|1fS0%4)ajmRT=Xq(;h)*bPL*ozBXVL~SYyIJ^xNkXhbEJKV(>NHyUffG99
zQZoT<-P57_V{{m=hnX;w<<WJuu2$9hcD_u*vuOmJPR=Z0FJ^E(i$uOcflb*w*Sq7#
z$hXQf0I;PpTkvK7t-L_m>&<ObJCg634drBlBZfA!kFLJ!?vbu`t%3B%6v-yYWQkna
z%NggEv;OxXj(vn1cQfR8GIkmvSAI8z9Q}nGCF#;DIlU1^4fjFy7g_OqQC$SgYNo`N
zzh6=6{Z9VDC&Ch@LDtU#r^CFzC}yPgcTEbq?;<2cNNP&zH<u1^^SC!f<X`%S9-L40
z)~7s78<`I7C)3gXR1i(+6`%>RgtjuWH&5zD6Uuz{jX8>-2^sN2fC(e{s5x3BWI>ZW
za)8o*PH01BKnG3GcpH2+HQ=2d5?i}h1K!N>Ym~wd*e}%Z2gd+z{^c}Q{ZSixu`6Hs
z;e&VW>n&N=rgaBryC_Q2OqXhx>JlnzvoZx;Vs2NZP%>4jm=`Q^P$m_Zn3SME+tO_%
hQ>o<J9k&&$;;hg`S|o)kWC4YU{sPzxIVpk%000h0bz}el

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index cec949ebd3..3b576c80d4 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -77,7 +77,7 @@ module IncSome2List_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] [#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
+    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -87,11 +87,11 @@ module IncSome2List_Impl0_SumX
   BB4 {
     [#"../inc_some_2_list.rs" 45 17 45 18] a <- ([#"../inc_some_2_list.rs" 45 17 45 18] IncSome2List_List_Type.cons_0 self);
     [#"../inc_some_2_list.rs" 45 20 45 21] l <- ([#"../inc_some_2_list.rs" 45 20 45 21] IncSome2List_List_Type.cons_1 self);
-    [#"../inc_some_2_list.rs" 45 31 45 40] _8 <- ([#"../inc_some_2_list.rs" 45 31 45 40] sum_x ([#"../inc_some_2_list.rs" 45 31 45 32] l));
+    [#"../inc_some_2_list.rs" 45 31 45 40] _8 <- ([#"../inc_some_2_list.rs" 45 31 45 40] sum_x l);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- ([#"../inc_some_2_list.rs" 45 26 45 40] ([#"../inc_some_2_list.rs" 45 26 45 28] a) + _8);
+    [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- ([#"../inc_some_2_list.rs" 45 26 45 40] a + _8);
     _8 <- any uint32;
     goto BB6
   }
@@ -296,7 +296,10 @@ module IncSome2List_IncSome2List
   var mb : borrowed uint32;
   var _12 : (borrowed uint32, borrowed (IncSome2List_List_Type.t_list));
   var _13 : borrowed (IncSome2List_List_Type.t_list);
+  var _17 : bool;
   var _18 : uint32;
+  var _20 : uint32;
+  var _21 : uint32;
   {
     goto BB0
   }
@@ -304,7 +307,7 @@ module IncSome2List_IncSome2List
     goto BB1
   }
   BB1 {
-    [#"../inc_some_2_list.rs" 71 15 71 24] sum0 <- ([#"../inc_some_2_list.rs" 71 15 71 24] sum_x0 ([#"../inc_some_2_list.rs" 71 15 71 16] l));
+    [#"../inc_some_2_list.rs" 71 15 71 24] sum0 <- ([#"../inc_some_2_list.rs" 71 15 71 24] sum_x0 l);
     goto BB2
   }
   BB2 {
@@ -316,9 +319,9 @@ module IncSome2List_IncSome2List
   }
   BB3 {
     [#"../inc_some_2_list.rs" 72 9 72 11] ma <- ([#"../inc_some_2_list.rs" 72 9 72 11] let (a, _) = _9 in a);
-    [#"../inc_some_2_list.rs" 72 9 72 11] _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
+    _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
     [#"../inc_some_2_list.rs" 72 13 72 15] ml <- ([#"../inc_some_2_list.rs" 72 13 72 15] let (_, a) = _9 in a);
-    [#"../inc_some_2_list.rs" 72 13 72 15] _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2List_List_Type.t_list)));
+    _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2List_List_Type.t_list)));
     assume { resolve0 _9 };
     [#"../inc_some_2_list.rs" 73 18 73 20] _13 <- Borrow.borrow_final ( * ml) (Borrow.get_id ml);
     [#"../inc_some_2_list.rs" 73 18 73 20] ml <- { ml with current = ( ^ _13) ; };
@@ -328,18 +331,24 @@ module IncSome2List_IncSome2List
   }
   BB4 {
     [#"../inc_some_2_list.rs" 73 9 73 11] mb <- ([#"../inc_some_2_list.rs" 73 9 73 11] let (a, _) = _12 in a);
-    [#"../inc_some_2_list.rs" 73 9 73 11] _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
+    _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
     assume { resolve0 _12 };
-    [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ([#"../inc_some_2_list.rs" 74 4 74 12]  * ma + ([#"../inc_some_2_list.rs" 74 11 74 12] j)) ; };
+    [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ([#"../inc_some_2_list.rs" 74 4 74 12]  * ma + j) ; };
     assume { resolve1 ma };
-    [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ([#"../inc_some_2_list.rs" 75 4 75 12]  * mb + ([#"../inc_some_2_list.rs" 75 11 75 12] k)) ; };
+    [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ([#"../inc_some_2_list.rs" 75 4 75 12]  * mb + k) ; };
     assume { resolve1 mb };
     assume { resolve2 ml };
-    [#"../inc_some_2_list.rs" 76 12 76 21] _18 <- ([#"../inc_some_2_list.rs" 76 12 76 21] sum_x0 ([#"../inc_some_2_list.rs" 76 12 76 13] l));
+    [#"../inc_some_2_list.rs" 76 12 76 21] _18 <- ([#"../inc_some_2_list.rs" 76 12 76 21] sum_x0 l);
     goto BB5
   }
   BB5 {
-    switch ([#"../inc_some_2_list.rs" 76 12 76 37] _18 = ([#"../inc_some_2_list.rs" 76 25 76 37] ([#"../inc_some_2_list.rs" 76 25 76 33] ([#"../inc_some_2_list.rs" 76 25 76 29] sum0) + ([#"../inc_some_2_list.rs" 76 32 76 33] j)) + ([#"../inc_some_2_list.rs" 76 36 76 37] k)))
+    [#"../inc_some_2_list.rs" 76 25 76 33] _21 <- ([#"../inc_some_2_list.rs" 76 25 76 33] sum0 + j);
+    [#"../inc_some_2_list.rs" 76 25 76 37] _20 <- ([#"../inc_some_2_list.rs" 76 25 76 37] _21 + k);
+    _21 <- any uint32;
+    [#"../inc_some_2_list.rs" 76 12 76 37] _17 <- ([#"../inc_some_2_list.rs" 76 12 76 37] _18 = _20);
+    _18 <- any uint32;
+    _20 <- any uint32;
+    switch (_17)
       | False -> goto BB7
       | True -> goto BB6
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
index f7d1b6296f..cd3fc0a742 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
@@ -23,7 +23,7 @@
 </theory>
 <theory name="IncSome2List_IncSome2List" proved="true">
  <goal name="inc_some_2_list&#39;vc" expl="VC for inc_some_2_list" proved="true">
- <proof prover="2"><result status="valid" time="0.155422" steps="33911"/></proof>
+ <proof prover="2"><result status="valid" time="0.021201" steps="34183"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3shapes.gz
index 9a7d3a8879379f61cc7208bfce08417dcfb4b837..2544af080016284cec23f7bab5ef83f6f98c18a2 100644
GIT binary patch
literal 1026
zcmV+d1pWITiwFP!00000|D9G#kJ~m7zWZ0`mUfE(91cZEMYn(<tYHI1PXUh+D2d7n
zk)^<oxIe!`Qj{gFHx0T6FUfg)Gegcd`sFD)zv^%19DO&Zb363EM>2Z)b))}$*5~Vy
zDORyVKJB1lIxq5}Ki|}aR)4phV%t2|&k7ZvL`@LARo-n>9yP-$>df(|3-Vg@L*JV(
z8~v;=L(%pZ1tavq`UNGoB)XCS`3EbO`nUO(&o}W4DXUls`#<;--XA&{>WU&NKry%F
zeoJUCA=sNmb&2|jx4CZnq8zS$eO^K*^9`_rHDoH=9q!nf$4+-!{l{3uv;yY-tbRI$
zW39+z2xm8iGu7@exnRM?R8CvSe{2ocbtUEe!68gnqd#50b>^P#{qA{XcO#~LQgK+I
zPv%v3-Eb?8Lv1=3tL&xE`lH`{rh12CI{QfV^MxUa2rBWruHu6}ne)(nH(beS%~Ue2
zL8XU0cP}uZ;``g@HUuRU=i6EMd<uobqXamg%V#NYxC_=v1f$Q+{ksnR+e>vhoKC~d
z)E|ytz2m0sb*CWKZB4)KMUtU=o7T=6gMHLf>cI3)cW2`hO~ypyhwhU{?i0mja4&;<
z`|?)CaWH1i*p-$Oq;D-c;zEBhmm&zQKVkh*Cw)3yje^XYK&BvlaS(C=;oqMENnkL6
zp##GpRn5)1boU9df(aZ1HRY>0wKjk$4y?G3gv7qDoV7zIr*GjcHr14m@D3ecmgpXw
z`Z{1|51_FEkDQGiYz^;}GBTn)BtFUW%L;<q=0~9r9eG%X_y~oE1QG8EB6r+@{BeRj
zQwWO$cPn&jO<Ft+;5?my2a37quckN;M^n&aylnF3&}<w37%%?Dh4Un^9iON@w1K5c
zj3L_9VM*th&Ua2sze>Pvr6^#@zJe{r05R-4G`&)E05lG=H2`KSy9K@f!2d#T%oCIO
z7{J6+YBHMx$$bt?B**!T*-$!Pi?&f1T7|mX-c<4?i+C9wik~dgO7Sn-&~u_ice{wo
za6;=)57`dnZ^Gd#6!^)it`u!JaIX&YV~e}j?ItPGz>?ePCA;@#$u9OQN$eCT%r@C<
zE{Ok_3;2KL0!~`u2M&b~j=wt?q^qj*YIZVAEy^a=lk;I=Ro69wlxX-clCc{Z_C)v^
zfh1=2D<W8MQbBAvO3B)PngFP5WWv<dFYrR!SDqGl(X~Vj8))hhbzPPyB(G}v#4=pR
zvB@Yck;poNJ=+K_D-B?eE5;Jc>c*H-Gsb0XYQPBhe3M~iATFy+NMK1>$&!J_tSUK_
wX~W_u*~@*r7X&GIDN3f36jM{hGK~|R&_^7D+Q=l1vVFSw7uIrIh3yIe0OK(8>Hq)$

literal 1008
zcmV<M0}uQkiwFP!00000|D9G{ucI~)eb2ApZQEO|<gtx`s;LyA8wIJ_r<ETU88Ca%
z5?JM9)1Tk5jUC`7?W*@7*JftUnHgqI^2<wfepBD|Ir^bb=WZN+k3{tH>qh;#Rp;xG
zNK%s`4>zcZ%FBEl&Nq3%)2FVNWS8e^E19Ih)Oyo<=lw?JQ9GWZULTLDMAUK^he3bc
zsI9t;Wj9<TOw@(J1u1rDx}t&655_FiZ}TgiU*cDEma*jKzsKVak69a2HD*+TB=$<(
z71>^WvNywO3w0Uqa@7rGHC~72yrfR%7a)ZRBr@9<ckaw_r~94yV`^er1F?U`KMm=a
zC`9z>>_a-CcSV389wM~UH1coL!*yTLIe+jF!mClAuitxpFZcfLX>D#3r+SgGKQLF!
zo9g@VRvyPj_b_$YS-0w=yM4ia`^Wg~BlgcV1})sX#808(LY?$^?0;w~MK}|ggfqyr
z$a6b^2{zxoeQHvWTvEE5rB6dD6dn~o>D)dmfx_LeF2V<WvG7j;-Rz~R8c(P3rkfAP
zZw|Qa2GvW5RoCFBok$F{vuWZ?FqokZr2|oW)t|L1G?@yGAHpY(;1fxOhZi2+Ox`Lu
z_QAvk+tyN~bgPArC|6(grSwLF#|<8C(&y7vOUO(JWD?R>OCc5%ZvG?)B!fW4EE)4w
z+1?DKeV-6Z2;{(VDc|&|GYNz|SWR6fXm)#Lqb)mvzNa_b*i$;uTXy!kWOwAa*Pc6j
zK+S4!%-OWTCh#sPlOmdjs3&=TSy524{ESP+taune_K1c00vWp($f(s0MjsbQGs$34
z;C{t!qS1?{o}8vLaxXC#^-Y)O@u*82#>=KH+Fe_GGQ_FmR?PfiE{iOk-`<%ySxPF)
z7TS)o`9ynHj%(Iz>CG2P{Ty}aH`T<FxuUbgsbeye^yDt-L9ZyCi4+qSYq0^6`KiZ6
zHBEOk^D5$1&HQJZvvmB+?B-lEnSJGqEz|K^fa_qEiM~sRu2|qFySj2T>A<}^#C-!%
zJE(4s@ViIs!cf}jHo6tNlR%;IYGn3hCh`0~B%b{riD$u!{|g{@$<e18FKkzZb2B0z
zwv7Y<6LZ}+uInB_ii%oHx@y(mJmIcKAW$UT3AGZem80-YR*ZJPG5};YiCVhoU*-?u
zQTNiBb*sEAbVKb_ftG!Ty0C$^shDc2ig7{f27h5`s^VB@*b1JACV~Uma4KpAU>?_m
zBrI!Mtt&+c6|ruBMeIN~8LKtKRh@AGB&ljq5l}3vD+*QGk~m5Z;t(JBCTSC%wxC4}
e=$o~z<_uC!5{+;?uA=OaZvFvZh&&VQ3IG7F6!vfc

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
index 2fb45cd06c..e8fccb745a 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
@@ -78,6 +78,7 @@ module IncSome2Tree_Impl0_SumX
   var tl : IncSome2Tree_Tree_Type.t_tree;
   var a : uint32;
   var tr : IncSome2Tree_Tree_Type.t_tree;
+  var _10 : uint32;
   var _11 : uint32;
   var _14 : uint32;
   {
@@ -93,7 +94,7 @@ module IncSome2Tree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] [#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -105,16 +106,18 @@ module IncSome2Tree_Impl0_SumX
     [#"../inc_some_2_tree.rs" 47 21 47 22] a <- ([#"../inc_some_2_tree.rs" 47 21 47 22] IncSome2Tree_Tree_Type.node_1 self);
     [#"../inc_some_2_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_2_tree.rs" 47 24 47 26] IncSome2Tree_Tree_Type.node_2 self);
     assert { [@expl:assertion] [#"../inc_some_2_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true };
-    [#"../inc_some_2_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_2_tree.rs" 53 16 53 26] sum_x ([#"../inc_some_2_tree.rs" 53 16 53 18] tl));
+    [#"../inc_some_2_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_2_tree.rs" 53 16 53 26] sum_x tl);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_2_tree.rs" 53 34 53 44] sum_x ([#"../inc_some_2_tree.rs" 53 34 53 36] tr));
+    [#"../inc_some_2_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_2_tree.rs" 53 16 53 31] _11 + a);
+    _11 <- any uint32;
+    [#"../inc_some_2_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_2_tree.rs" 53 34 53 44] sum_x tr);
     goto BB6
   }
   BB6 {
-    [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_2_tree.rs" 53 16 53 44] ([#"../inc_some_2_tree.rs" 53 16 53 31] _11 + ([#"../inc_some_2_tree.rs" 53 29 53 31] a)) + _14);
-    _11 <- any uint32;
+    [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_2_tree.rs" 53 16 53 44] _10 + _14);
+    _10 <- any uint32;
     _14 <- any uint32;
     goto BB7
   }
@@ -373,7 +376,10 @@ module IncSome2Tree_IncSome2Tree
   var mb : borrowed uint32;
   var _12 : (borrowed uint32, borrowed (IncSome2Tree_Tree_Type.t_tree));
   var _13 : borrowed (IncSome2Tree_Tree_Type.t_tree);
+  var _17 : bool;
   var _18 : uint32;
+  var _20 : uint32;
+  var _21 : uint32;
   {
     goto BB0
   }
@@ -381,7 +387,7 @@ module IncSome2Tree_IncSome2Tree
     goto BB1
   }
   BB1 {
-    [#"../inc_some_2_tree.rs" 86 15 86 24] sum0 <- ([#"../inc_some_2_tree.rs" 86 15 86 24] sum_x0 ([#"../inc_some_2_tree.rs" 86 15 86 16] t));
+    [#"../inc_some_2_tree.rs" 86 15 86 24] sum0 <- ([#"../inc_some_2_tree.rs" 86 15 86 24] sum_x0 t);
     goto BB2
   }
   BB2 {
@@ -393,9 +399,9 @@ module IncSome2Tree_IncSome2Tree
   }
   BB3 {
     [#"../inc_some_2_tree.rs" 87 9 87 11] ma <- ([#"../inc_some_2_tree.rs" 87 9 87 11] let (a, _) = _9 in a);
-    [#"../inc_some_2_tree.rs" 87 9 87 11] _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
+    _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
     [#"../inc_some_2_tree.rs" 87 13 87 15] mt <- ([#"../inc_some_2_tree.rs" 87 13 87 15] let (_, a) = _9 in a);
-    [#"../inc_some_2_tree.rs" 87 13 87 15] _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2Tree_Tree_Type.t_tree)));
+    _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2Tree_Tree_Type.t_tree)));
     assume { resolve0 _9 };
     [#"../inc_some_2_tree.rs" 88 18 88 20] _13 <- Borrow.borrow_final ( * mt) (Borrow.get_id mt);
     [#"../inc_some_2_tree.rs" 88 18 88 20] mt <- { mt with current = ( ^ _13) ; };
@@ -405,18 +411,24 @@ module IncSome2Tree_IncSome2Tree
   }
   BB4 {
     [#"../inc_some_2_tree.rs" 88 9 88 11] mb <- ([#"../inc_some_2_tree.rs" 88 9 88 11] let (a, _) = _12 in a);
-    [#"../inc_some_2_tree.rs" 88 9 88 11] _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
+    _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
     assume { resolve0 _12 };
-    [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ([#"../inc_some_2_tree.rs" 89 4 89 12]  * ma + ([#"../inc_some_2_tree.rs" 89 11 89 12] j)) ; };
+    [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ([#"../inc_some_2_tree.rs" 89 4 89 12]  * ma + j) ; };
     assume { resolve1 ma };
-    [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ([#"../inc_some_2_tree.rs" 90 4 90 12]  * mb + ([#"../inc_some_2_tree.rs" 90 11 90 12] k)) ; };
+    [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ([#"../inc_some_2_tree.rs" 90 4 90 12]  * mb + k) ; };
     assume { resolve1 mb };
     assume { resolve2 mt };
-    [#"../inc_some_2_tree.rs" 91 12 91 21] _18 <- ([#"../inc_some_2_tree.rs" 91 12 91 21] sum_x0 ([#"../inc_some_2_tree.rs" 91 12 91 13] t));
+    [#"../inc_some_2_tree.rs" 91 12 91 21] _18 <- ([#"../inc_some_2_tree.rs" 91 12 91 21] sum_x0 t);
     goto BB5
   }
   BB5 {
-    switch ([#"../inc_some_2_tree.rs" 91 12 91 37] _18 = ([#"../inc_some_2_tree.rs" 91 25 91 37] ([#"../inc_some_2_tree.rs" 91 25 91 33] ([#"../inc_some_2_tree.rs" 91 25 91 29] sum0) + ([#"../inc_some_2_tree.rs" 91 32 91 33] j)) + ([#"../inc_some_2_tree.rs" 91 36 91 37] k)))
+    [#"../inc_some_2_tree.rs" 91 25 91 33] _21 <- ([#"../inc_some_2_tree.rs" 91 25 91 33] sum0 + j);
+    [#"../inc_some_2_tree.rs" 91 25 91 37] _20 <- ([#"../inc_some_2_tree.rs" 91 25 91 37] _21 + k);
+    _21 <- any uint32;
+    [#"../inc_some_2_tree.rs" 91 12 91 37] _17 <- ([#"../inc_some_2_tree.rs" 91 12 91 37] _18 = _20);
+    _18 <- any uint32;
+    _20 <- any uint32;
+    switch (_17)
       | False -> goto BB7
       | True -> goto BB6
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
index bb0f580289..5278b87c40 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
@@ -13,7 +13,7 @@
 </theory>
 <theory name="IncSome2Tree_Impl0_SumX" proved="true">
  <goal name="sum_x&#39;vc" expl="VC for sum_x" proved="true">
- <proof prover="1"><result status="valid" time="0.013090" steps="12735"/></proof>
+ <proof prover="1"><result status="valid" time="0.013090" steps="13363"/></proof>
  </goal>
 </theory>
 <theory name="IncSome2Tree_Impl0_TakeSomeRest" proved="true">
@@ -23,7 +23,7 @@
 </theory>
 <theory name="IncSome2Tree_IncSome2Tree" proved="true">
  <goal name="inc_some_2_tree&#39;vc" expl="VC for inc_some_2_tree" proved="true">
- <proof prover="1"><result status="valid" time="0.019419" steps="33912"/></proof>
+ <proof prover="1"><result status="valid" time="0.019419" steps="34667"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3shapes.gz
index 0569464489502f21fac72eac8acbe58f008cc00b..73fdd1b22853c18196dd4a1fbb79d302d5ea1fa3 100644
GIT binary patch
literal 1153
zcmV-{1b+J;iwFP!00000|BY7Lj@vd6efL-RE$tQo$RQ<?MYn)q*sy>_`x5YR1zM)E
zMr<jtwQ)bc!;7fP+CdgrndDqJb2xLz-=3D&H}l<Imp|;~dTg6Nm-+JP_l5cU*<9bx
zM3agX>okLktkQ&5#H`DI+Jn_M-Qn=Xnp%_9dTpL{uKB<ClW9Ka)JdmEP8fQ0`cgBe
zFEqQSe{Y}dLa&!~ds&|B`D{w`RyJ+Z*slxoZ02j2$l82)|9-OM<&F^UEz)7vXgb<E
zC6HBa_H4SgJT{#cVKpz-J{u}lD0@c<gHKLQh52JL=aX5!L4EwuG;^cgE6pP0B*?j@
zY%}-FW}aa@Q^624r4z?AIF_4L=M{))Fy#_-h(v`cjZ+z>nBOLXbGzMKqE*5s-{N^5
zn{wa2H;3yqB$y-%d4Z;oYsj|65E8^(foxaiufFg|MT!6OHe3VqHe+|Q{9%$mRp{+e
zSTjw(1!$m?up&}aj>4ich1IP(Z#MwwtkGLSFw6%Cw*!Q!su7ajciy{Bh3<;;zeTTL
zp71#0AP*tEnbWDgm1lH%qOlZ%^x1q4vsay`WnBA=NQ4AYB6=11(3LFA#a`Rf4+~nQ
zF~zz`6GVlMB~YyWpRX<~-Bsvz7nE!FY&A-VrQjI9mlDgy@=;QZ4}y7Gz0s?8|IlG<
zJuv(Ba%pe&@ag<5c&?9)Ik~z#9`Nh57}qQ`AR03KfNR$wXKuFUbhV-5f{E0e#FW)I
zWlmBA@@~p%EFY&V2f>GwRj=jTKXS+;n~-_RGNz1qV9Mdh7@nEvQx^E4e4H|(^X2kx
zH3P2<n$gW5cQp|psiT_5f?;E;O{5+*i6T<3V+VmDq5F6W%%4KKCA6+@4u9rcK!()d
zV{|$geDh{6$F4jc%vbAvP_JSk2NZ`!_0}E;^m;D@2P379B_b-)qaru67^w7U;_<5(
z0yh805Rfw<gpjzw8;7%ycS3OcbAKs_5JFD~o%v?VYkRgO;@mCPby2VCfO8jc=FE`}
zXUABOZZRAt2hT@-G-Fac|Iy5g@vAwVQ!b}dBE@1G)9Pc!ohkYa@GYR`8(^(Y?IuM1
z6aN#vqA%YupR;&VixHiR;gU%#2QVTt=C3TIk<lSJ4vDoXeBFr;S!C1b82?3>W{NMa
zRK++Pf4YoK!%1}tz6Rk#I569V{vxU~MHdbo&>`WGgor6@>>{?er+Hifx%Kr1B3}2t
zwRzvQ?lvDd5fYmNy~l~zs3ZA^6XPZA1#?d9jb6R`hYooNZhj4*zldt?Q4O~_Q1?tJ
zBH@tK;(6p4=h3UqF`_cQGpGu0M8CoVM*jI1Mj7%+dhtamT9YuMS_J~v(&N|j!m+6W
zEkM~_tX(WvEy$jjyb@3=keo3p01jL+Nr<ialJ3Z&ss&aO&qxLtv%po(Ni9WYDewar
zwaj*W$9Axwdy|oRPr1lyA&s$BMXOvPuT@6ax>|}|?iIl*C9Gh%wR@9Wd64)|4dYPB
TJgeDK?d0NrWjl9zgA4!w2j4t<

literal 1125
zcmV-r1e*IFiwFP!00000|BY5lkK#BGzUNnPo84ZG<X0SfwXB2?h)Av3%gD!$OmL>r
zKr(_b?9bowBaV}X)o=ip>*1=;RiF9oWpRDiKg@OU(_F5{uKjbt7cakO`tPN_-p)v&
z8kOrPks7U{fNP}J)tByI)Lr$kd^NgJXtiGJrQ(YH13$T9qfHZS${2(~L~Ab;wf2Rg
zkL(|vv(40c(R7!^$(+x+f@oFSwXOM<>7}0UK_P4X_4ear(CY&wd9;bgQ-f=Ab}S&T
zt+dpAR~_446@HhOYgY~CE709QL&+zr$6Wt0k@JbfHgo%YW=~Q{T66GHm^#Oh1g7DJ
zkk=E1@kEckUTjvqGeEk9LMx)UbC6!dK@?tusx|?V`~7aqt0N+O3%7V|t9^HC57%kR
zgiRz`PAdfU)ErOh72DO*z%xq-4B-_a+j6Xxkbs4RKz|LbD{GA0$N6AI(8LD?vm*5=
zqEEl-tsj;Vwyl#z#Lde^1a3P57dx1jF*YAU$ELQ8_-{5C=oh$zu;4zWcYQi__v#Em
zPdK!l*Dm#EFTE)qw_)!ypyvw&O);2=r=bAPi@A2EpN1$I*BH7b3V;euHKbg-kLxMu
z%axyOo0J{xe3cYLV{()|Dv9Q)J}HW_Q86!TaC&p$p9bV%F7&>;T)MkCd^&&kk(*<y
zPm1LFcz|zfMVX?0y1<db7s){yYi4?@PgmpT%)1E1P$*fZB{LK=5D!b1sXi@PjEWB>
z%fZTqe-@AhDnRp+MJO5SfRg={QMj{WD7k<y$4jwfK<De_W)vmPm?(-jqu%y}holK+
z4hsq_D>s2~<RptgvxF;BKuQok+yZsC5MKnPn!ClH+7KiM=5RS$8%Vx=H<x2y9S{1O
zu|Hr}Q(pt9{h&H;2LwcYl!Ap3V@nzV72!}3n^_K6I5gq<Wk><Y;A09{)WoMSa0PbG
z{w~CW6zusx=iHKqOJN{{UVk^$wL6;%aPG6FY*tPA#a|Y4G&U?!QiSVGqz`K7m<gjo
zzoh*7oO)-5^Hb&2dh!6^=TWD2<<N;KHPi6Grp!DN^GH~PB)mkqi^WsCEggh5D_jft
zW6~;SPcLP^3eME<)plKxrbAsibec|VIpW%hd`O4PPQky3>derlgGY3b|8E0`Ntn?x
zOsZpS*db!;o-$Iv!1)zSDH{fmZp(z;NF-*0AJH43sXn1Mf=9)i-Ug>P7yfBL=98N<
zI>Za8a)+van8yd-UObA^$^%{4h|YA55f(7W{^^GS^+OEv>M^oI>oLMPP(%D@7PR1v
z{0b}Sxmbw_e)4~xcrkh62U<9`wPyuV^%rBZj5Y<@BhBlAG?EBLDJ}>(Fi8bMreO=b
zLs@MIuya%IIbt%;H8u<#v_KMJvqz#{<U6*bJCfnO&QY_+tjL=}Xl?2m*IWXv)w(cE
ry(o6v8PZxd8gX+lf*%@bYRMSSg+5T&=S8!SJCXedN5TDeZVUhbC?Fzf

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index e1d6374a94..a07eb61556 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -77,7 +77,7 @@ module IncSomeList_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] [#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
+    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -87,11 +87,11 @@ module IncSomeList_Impl0_SumX
   BB4 {
     [#"../inc_some_list.rs" 44 17 44 18] a <- ([#"../inc_some_list.rs" 44 17 44 18] IncSomeList_List_Type.cons_0 self);
     [#"../inc_some_list.rs" 44 20 44 21] l <- ([#"../inc_some_list.rs" 44 20 44 21] IncSomeList_List_Type.cons_1 self);
-    [#"../inc_some_list.rs" 44 31 44 40] _8 <- ([#"../inc_some_list.rs" 44 31 44 40] sum_x ([#"../inc_some_list.rs" 44 31 44 32] l));
+    [#"../inc_some_list.rs" 44 31 44 40] _8 <- ([#"../inc_some_list.rs" 44 31 44 40] sum_x l);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_list.rs" 44 26 44 40] _0 <- ([#"../inc_some_list.rs" 44 26 44 40] ([#"../inc_some_list.rs" 44 26 44 28] a) + _8);
+    [#"../inc_some_list.rs" 44 26 44 40] _0 <- ([#"../inc_some_list.rs" 44 26 44 40] a + _8);
     _8 <- any uint32;
     goto BB6
   }
@@ -296,7 +296,9 @@ module IncSomeList_IncSomeList
   var sum0 : uint32;
   var ma : borrowed uint32;
   var _7 : borrowed (IncSomeList_List_Type.t_list);
+  var _10 : bool;
   var _11 : uint32;
+  var _13 : uint32;
   {
     goto BB0
   }
@@ -304,7 +306,7 @@ module IncSomeList_IncSomeList
     goto BB1
   }
   BB1 {
-    [#"../inc_some_list.rs" 68 15 68 24] sum0 <- ([#"../inc_some_list.rs" 68 15 68 24] sum_x0 ([#"../inc_some_list.rs" 68 15 68 16] l));
+    [#"../inc_some_list.rs" 68 15 68 24] sum0 <- ([#"../inc_some_list.rs" 68 15 68 24] sum_x0 l);
     goto BB2
   }
   BB2 {
@@ -315,13 +317,17 @@ module IncSomeList_IncSomeList
     goto BB3
   }
   BB3 {
-    [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ([#"../inc_some_list.rs" 70 4 70 12]  * ma + ([#"../inc_some_list.rs" 70 11 70 12] k)) ; };
+    [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ([#"../inc_some_list.rs" 70 4 70 12]  * ma + k) ; };
     assume { resolve0 ma };
-    [#"../inc_some_list.rs" 71 12 71 21] _11 <- ([#"../inc_some_list.rs" 71 12 71 21] sum_x0 ([#"../inc_some_list.rs" 71 12 71 13] l));
+    [#"../inc_some_list.rs" 71 12 71 21] _11 <- ([#"../inc_some_list.rs" 71 12 71 21] sum_x0 l);
     goto BB4
   }
   BB4 {
-    switch ([#"../inc_some_list.rs" 71 12 71 33] _11 = ([#"../inc_some_list.rs" 71 25 71 33] ([#"../inc_some_list.rs" 71 25 71 29] sum0) + ([#"../inc_some_list.rs" 71 32 71 33] k)))
+    [#"../inc_some_list.rs" 71 25 71 33] _13 <- ([#"../inc_some_list.rs" 71 25 71 33] sum0 + k);
+    [#"../inc_some_list.rs" 71 12 71 33] _10 <- ([#"../inc_some_list.rs" 71 12 71 33] _11 = _13);
+    _11 <- any uint32;
+    _13 <- any uint32;
+    switch (_10)
       | False -> goto BB6
       | True -> goto BB5
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
index 45737da04b..9e41983958 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
@@ -23,7 +23,7 @@
 </theory>
 <theory name="IncSomeList_IncSomeList" proved="true">
  <goal name="inc_some_list&#39;vc" expl="VC for inc_some_list" proved="true">
- <proof prover="0"><result status="valid" time="0.023585" steps="395"/></proof>
+ <proof prover="0"><result status="valid" time="0.023585" steps="397"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3shapes.gz
index d213ec8f15f1e9e74e74bbd46104b1e2c8edc325..73c6652a9f171825d694c04e0ffee14f8ef7ed5c 100644
GIT binary patch
literal 913
zcmV;C18)2uiwFP!00000|BY4Ks^c~kefL-RZQ2Y4-DM3ug<ujAD193ASfkkTOc=)=
z;$%)gzuJ-|U(&)HIF7Y1YcDPDE&Z~~$FJtQ9rGXdK3<3ZQ!et|ubKJd&5X|*(x^t~
zGOcipOj(sfKfddSd;9C!X|yj(^QNgL$<;>JYw$7CW!?_=ytB8PsT^w64}EXHWaiC0
zhU(fsG@eSI0T*krcdn;%Q1SuX!hBpV$#TIDE?9HT;5Xv2fJeQLn%Xg{utt7K!qQbc
zM6&Nt)o(N~-k0XuSC`@0H{-grTrMy=Ln6}Zc%EykP`fzp&F_<lMU9dFgZLuRfh>m@
z=^PWCq}@3|pa_xV1R?(c4Y#_w;PO9=IDH!P`T4!G^LFQNPij~}&9A2GhWF|=G`7PU
z7v67nnu5x|h1K6q+GuvRuzzQT=xzSl-0e7YKP=HKy*pBBxe#7YWiG@0KD^uJ!|hvu
zYp=cOH0I{oxTn_*7aB{iJJ_W8Vjq?F0>K?vb}3YB5qU%;KAVIvt}#o9EFqE!k--B(
z6Jeg-UC%BzLYIrsC3MSyOdJ%HQ-J}|7$*ieGEfr%>>g7f+MuZkOhTrYMJv~W6I2nA
zWI!t1zY8i$KgV1Xyr20};fH3cnVc$628h&;o0gh-y}`m`5z0apXW7L-$~1*(d~Gc{
z_Yhh47MUH(?t+9Zgs-t>Oryd?06`M=MKr~Si696{#9^^{g3Zx%qXjshkvt4RI@=1L
zWGTD|MU+KFSyYmxn5rsxgh0Nf99!M-0Ls`?E;N;gh?hFuI{^who#1&F7&iR*{<NBU
z&eUy79eh2usu#`!O{A;rQl`o*9xxB{%~s=Zvsu}m+kG39c?9TbR>gJF3yi+a)6l`&
zd3}z%Ay}^Xdg_)gwmx>(dG2KWpW}HQ7io~?@r*-TX|Xt;#e6=`V;j=(QZbmjppyUE
z#S3k;rlWq6_B!rQm{5OH_(^^p85swIuLg!E^Kx9|OSb<!0uub2yE^?ocA8CBlDpWK
zicNx{g<xnF%$Yt;#w78}U3Kki-$_+>9UobS+vY+|bGc9^NZq&_*%HIKRj%!s6itp#
zC}Tv_24gVS2uZ4%*4m3fhzM>QOmli788?C}K^5bM))J`}vDzAUM!D}MNh@-B5+{CQ
nnV>bfV5%-s8pN5Y3*1Q6SSxDA8&l`%RAm1G^*jr390>pbUX{R>

literal 898
zcmV-|1AY7-iwFP!00000|BY2!tK&8he)q5N+qPK>y2~m(g<ujADEqYNagAcjyI~!B
ziIYA3`PE34d`SyEa2(J5)90DdFS~sFW`5W)|7q{zb?AT3MZWtrGk?CB@p(fU)#zL%
z3D?M!RXOzIyMDO0PuEVPeOa0}O*KiTHkw|YkC`s>cDU!Az1>XZvR3`j_x5XM-ppgD
zuKh#fsq`80VlDR0^mGPFK7d)6k4up(1%7bOnrjBXF&_*0sJBs5J46-M$crS1uG%4j
zeTS<4paJo|G}pem49~t9*QMoBz~~HtNUP&{uB}4t;<z_|Oe7XHM*a`{iv$OvT*e6J
znBXMt&M5_oDH5GP<ln&ImRILo{)-Z)Ph&nme{^;}?)>dZ4HDG+X1Z>8uWmzQJFIcx
z?PjMbu>4z)zBp>5+Udgioff>e@n>_l<Iw%IM6>knK&ho5JfF&3hWmYZx6Oy!_mHl=
z_NLRAn``5qo;O@*EIsd_ljf^^RNe{zcc9rNSFz2=V@BemNpRyDvy_pgjAY8l-~p})
zFi-EUXO{<|OCfX#-C`gU1_k9*KtMFc2?34>)C2&#$K;4M+0>LwLZqifE7yWksv>5R
zAyeW0ol{x*Ip&(+{fw6iKQvp;<Wzw&$VmOTX{o8_8#Fu?p)6E!nq73HOjDS~*VdwQ
z50Q0mk=d~9E(qAB@HMuGX=IoP07$~Qh^F{30R%#cI4llNusND;w2;n6Bnv|j&bGuS
zS_)4>5ouA87L{lzrm6}a!I5tv$5wYZ05bNF3r*!A=1ZOKjgSgDo#6Qt7!LgT{<NBU
z%+wuA9eh2usu%WwCel@QAyZ`*7tF(ax79e@Y}TIJeS7}o+t|&)dGWH^hjb;qnAv)l
zuD#v5{EwZx_KU^Ia_8dED_Sg;u9%nZJc}V5FKK{b3P<;!FbvIV%dg?6{|S5T_ZN(v
zU;lnQU*|x^Zs)5h;7Prl0r?W`M_xdHe{=VtKgUk9>7H@7^^&oPFti{H&4fAC$4Qwe
zez}0IeeK($>aOD>%W&IVsA(=2$^@w!cg<R2IJe66GLxdo@d;&&h}vKb>KY+QRnuB~
zF$fXCZG&k}PbA|;a3!c>+|XJg)go3~;}(zmZj!VjmnU)JCzcV}D$$A-2`-zqAQ!5L
YlA^`R77Y?OSEnNT2ZozY_3;P*0Ak_Hw*UYD

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
index 071b0dfed9..8855917e14 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
@@ -78,6 +78,7 @@ module IncSomeTree_Impl0_SumX
   var tl : IncSomeTree_Tree_Type.t_tree;
   var a : uint32;
   var tr : IncSomeTree_Tree_Type.t_tree;
+  var _10 : uint32;
   var _11 : uint32;
   var _14 : uint32;
   {
@@ -93,7 +94,7 @@ module IncSomeTree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] [#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -105,16 +106,18 @@ module IncSomeTree_Impl0_SumX
     [#"../inc_some_tree.rs" 47 21 47 22] a <- ([#"../inc_some_tree.rs" 47 21 47 22] IncSomeTree_Tree_Type.node_1 self);
     [#"../inc_some_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_tree.rs" 47 24 47 26] IncSomeTree_Tree_Type.node_2 self);
     assert { [@expl:assertion] [#"../inc_some_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true };
-    [#"../inc_some_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_tree.rs" 53 16 53 26] sum_x ([#"../inc_some_tree.rs" 53 16 53 18] tl));
+    [#"../inc_some_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_tree.rs" 53 16 53 26] sum_x tl);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_tree.rs" 53 34 53 44] sum_x ([#"../inc_some_tree.rs" 53 34 53 36] tr));
+    [#"../inc_some_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_tree.rs" 53 16 53 31] _11 + a);
+    _11 <- any uint32;
+    [#"../inc_some_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_tree.rs" 53 34 53 44] sum_x tr);
     goto BB6
   }
   BB6 {
-    [#"../inc_some_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_tree.rs" 53 16 53 44] ([#"../inc_some_tree.rs" 53 16 53 31] _11 + ([#"../inc_some_tree.rs" 53 29 53 31] a)) + _14);
-    _11 <- any uint32;
+    [#"../inc_some_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_tree.rs" 53 16 53 44] _10 + _14);
+    _10 <- any uint32;
     _14 <- any uint32;
     goto BB7
   }
@@ -353,7 +356,9 @@ module IncSomeTree_IncSomeTree
   var sum0 : uint32;
   var ma : borrowed uint32;
   var _7 : borrowed (IncSomeTree_Tree_Type.t_tree);
+  var _10 : bool;
   var _11 : uint32;
+  var _13 : uint32;
   {
     goto BB0
   }
@@ -361,7 +366,7 @@ module IncSomeTree_IncSomeTree
     goto BB1
   }
   BB1 {
-    [#"../inc_some_tree.rs" 84 15 84 24] sum0 <- ([#"../inc_some_tree.rs" 84 15 84 24] sum_x0 ([#"../inc_some_tree.rs" 84 15 84 16] t));
+    [#"../inc_some_tree.rs" 84 15 84 24] sum0 <- ([#"../inc_some_tree.rs" 84 15 84 24] sum_x0 t);
     goto BB2
   }
   BB2 {
@@ -372,13 +377,17 @@ module IncSomeTree_IncSomeTree
     goto BB3
   }
   BB3 {
-    [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ([#"../inc_some_tree.rs" 86 4 86 12]  * ma + ([#"../inc_some_tree.rs" 86 11 86 12] k)) ; };
+    [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ([#"../inc_some_tree.rs" 86 4 86 12]  * ma + k) ; };
     assume { resolve0 ma };
-    [#"../inc_some_tree.rs" 87 12 87 21] _11 <- ([#"../inc_some_tree.rs" 87 12 87 21] sum_x0 ([#"../inc_some_tree.rs" 87 12 87 13] t));
+    [#"../inc_some_tree.rs" 87 12 87 21] _11 <- ([#"../inc_some_tree.rs" 87 12 87 21] sum_x0 t);
     goto BB4
   }
   BB4 {
-    switch ([#"../inc_some_tree.rs" 87 12 87 33] _11 = ([#"../inc_some_tree.rs" 87 25 87 33] ([#"../inc_some_tree.rs" 87 25 87 29] sum0) + ([#"../inc_some_tree.rs" 87 32 87 33] k)))
+    [#"../inc_some_tree.rs" 87 25 87 33] _13 <- ([#"../inc_some_tree.rs" 87 25 87 33] sum0 + k);
+    [#"../inc_some_tree.rs" 87 12 87 33] _10 <- ([#"../inc_some_tree.rs" 87 12 87 33] _11 = _13);
+    _11 <- any uint32;
+    _13 <- any uint32;
+    switch (_10)
       | False -> goto BB6
       | True -> goto BB5
       end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
index bca9d83a88..d9bab340bd 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
@@ -13,7 +13,7 @@
 </theory>
 <theory name="IncSomeTree_Impl0_SumX" proved="true">
  <goal name="sum_x&#39;vc" expl="VC for sum_x" proved="true">
- <proof prover="3"><result status="valid" time="0.013884" steps="12735"/></proof>
+ <proof prover="3"><result status="valid" time="0.013884" steps="13363"/></proof>
  </goal>
 </theory>
 <theory name="IncSomeTree_Impl0_TakeSome" proved="true">
@@ -23,7 +23,7 @@
 </theory>
 <theory name="IncSomeTree_IncSomeTree" proved="true">
  <goal name="inc_some_tree&#39;vc" expl="VC for inc_some_tree" proved="true">
- <proof prover="1"><result status="valid" time="0.024087" steps="399"/></proof>
+ <proof prover="1"><result status="valid" time="0.024087" steps="398"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3shapes.gz
index 10e715f7e43d36779c3600bb2cfbcfdc1e7765b7..e6a10f17f39ca96c630862b6443c93be459dee50 100644
GIT binary patch
literal 1011
zcmV<P0}T8hiwFP!00000|BY5#&*C-^eb2AR+qSGK`EIA`R|z2ykv_FAD?c_e!P!L%
z$qK^KpWpE%&ILZHJcP`6=J?F<*v>Dj{PxZKu($lDz1~h;`+F|()vuZP^Ud7u7o<^*
z%1yFJjn>J)H8Pv(ukL8|L-+9dZcU@ndb2TaT4?q+{Bh03m?p)P34{Woi&vVuc&X{D
z_*e7nGQG*0?wX(N<zgy8tJ<z@?bpn_nWYa3*_bc)A7_i+Uks90PCU*UQzvt$0(kAL
zH`903sqM84UQup*HCV1;><%N8d~)Mhn$I(v%`CBnc=*$pySD)q^C&qA<4j|^T_V#3
zGMQRMNF*BL888mOYP;@z05UC<ToE0Z6v4#NRKbM$wo#nN<KYUelQv=p>v?LcLw9eF
zw>c#;E0%~7Qi;%n@5+%9iM0~6Tbn<I#zQqm{^xU;Ce-Il;TH9iS^c;Gw2x>lBK;IZ
z6Fj38mBMO53#&w{U-v$56wqY@T2e6BqlCLr!qn9u$$%{e=+x-0IseUkz&CR~caQ1<
z>1XT;a4BY`g<IR-g7uFU$ql|x2Y6ldGQTued+W|WEzvT)gY0x_1nsFgbk}S5u*XlA
z?*XnkwdU+fJsq9UbN#>v+I_Ws<wqUCmGi7pC|V!_P(&0SaZu7}9}z*u0Z{}*@T@{;
zB#gD1kS`{Fj3xtkS}$gPCb=Xe213+NP6HvgOA{fU2+>H0yGIOVOGG*#VxNse7=<00
z5J^JB5s|nDgl_!LpPGcPNBYdE3(w_bI8Mf-17<Ru1z0n+4s)?2CzD|==H!f#Ols!#
z|8wK9)M1RzI*;*jVA^{wVF|H~2hW@|<OR~yHvtu%3EU@a8yPZqP?wz+7LJacIp3_u
z^C?LhuBL_u<LV=wICoQWKIp_{)QQVMC(Z*4@T`VNE*5}%sDb;w;WUJC%|j8+#}Z=f
z8}8~FLaFBDmGZ-p(3|hJx^)+uZJM%KH=+LCe7W8&G-znkQ&hz{W0&#NZ@hfEMy3|`
zaU42$dEP=#&rZ>K-p8lyJZ|3h!>vT(5jZ(&#draX+cl))sqC(kg6PWWtDb11Ii2Ev
z(w@h?!y2j5??AaLU+fGy^#6Qcq-`<V74j+DFOP5u{tepR*8yD*A0N&`^-QrS*!0Sr
z+?e3{9Gywxr`zS!*1nUf{%UQO(MF;JGNP8GDTrc}VoAu66;vT)8<yie%IZeKb-*~{
zgi}jcAsA|u<Q5ZlB&Nvup6%(LWW*K+$`xsjs8;M)3nq&CP!z;aMX}<!+zTJrz$d1G
h!v_(n3_bv=X%vBANgHxRA}{tT`w!E>0=2dZ003fV`=0;+

literal 985
zcmV;~119_*iwFP!00000|BY73j@vj8z3VG<%Z!5oxG#h00Su!J3uq*lfX4`wL?uRS
zDX`t~e15oz64h>Cd{C>3uO6!&OU3?UQ(nL8pXOTrGMDRd9R4m@x%sou|32yK>lrA}
zf@+s6)Pij?U<>rF{xo(*-PO&$z8Kvru-)zSlVXZ|wtuK1Gp0|NDv@Bz=<q^ehvy1E
z!av$)U#MN#kC*af&Sza)wt5(c!F((9lV1C5Av^u$_2<cemj{dJkrU3l#?ZyysQ}tK
z>q+0n`Z(Ma4_;R7d^M15?b@qd!RUiqhfIIWY?@i*d5xzlJX%`P!EKa+*ayZWAdV*l
z!a7nAX6rDli|6gl1ArcEp*2#>2gqQ;Xo_Iks-B}H_xs(I*Cs{S-k#!dsGIS1=&pIn
zh-4P7@(S&84u@I2V!wTtc!jjYmR=#WujX12idslZ^v~3~vW39^d<;|wWHBJZ_%ep4
znA`T|;-E~j?Y%9MZo%eBxcw|#>R?tSZZ=V;rgn|^U*Q4Y_31R;>$43%!Kog-QNFeQ
z3f5P}lH2-19oFm6>-b7v%ym5dGDz|C4*bE)Mi2(;X1rX+yXiihe+0VzIOvlr{n$B8
zJq%e1y?)kb59OP=)qd3_xN)9Mf`S#JC5nv9Ge+g4JNU?GWt|vVV6>i1fX0NO5{u;J
z!Vke>0WRx>B%aYKAvPt1{pL6%#O#-t5~3*~9227M5us$wh$lwqqhWwy`&}kRlo(-T
zMDAgsJOA?&64C9PK5^>W=Xx_3HzV8;6CNf2R77mUUL?s$c-V_LIU|yAMch~aw(&^n
zFhaA=BXnL^_MQt^Q#{9UlP7KCLekhb0cJiEdv}C!Xo-n^U>BVZ7E!&|r>pUNJ|sy)
z#nSL(RJ^AXrEW_~C!HvdI#E99L}|#vdNvc1vK1knYM{PvC=M{HXeh$@NMekALtR}H
z6f24zDL;*boBm<y>v%RrU-jF*`V_l}REw8vBI5jRSud{!Z;pO{?B=+<m!}IR4qdjG
zpKKnv^EVj6;ZjT29zjXrL<?hJxg*Hak^eL89QR^{_ZNmxd|y3icRn?B-t4K@vsUMC
zqWw3{T!4SGz3l6-t*rc2qwGDET{-dJt%YD<7R<UnMrV@v&6RN+THhY^?P5$(;GTm9
zXx4JnOC$)!kR#L)i3I?rCnY?9qBY3$x^Ei>h_o#X4FR1NKmuqQAli~1$N?WvfsAZ0
z6{zn(D@fNe!erY>i8K}%3R?05^FXNq$C3eIx{d%sC<6_{l55_89-*d`2T}Y6aYWEF
HcM1Ri)q?7U

diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index bc06c2fc5f..561b842d2c 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -561,6 +561,7 @@ module SelectionSortGeneric_SelectionSort
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
   var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _7 : Core_Ops_Range_Range_Type.t_range usize;
   var _8 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
@@ -573,6 +574,8 @@ module SelectionSortGeneric_SelectionSort
   var i : usize;
   var min : usize;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
+  var _31 : Core_Ops_Range_Range_Type.t_range usize;
+  var _32 : usize;
   var _34 : usize;
   var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced1 : Snapshot.snap_ty (Seq.seq usize);
@@ -599,12 +602,14 @@ module SelectionSortGeneric_SelectionSort
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../selection_sort_generic.rs" 38 16 38 23] _8 <- ([#"../selection_sort_generic.rs" 38 16 38 23] len0 ([#"../selection_sort_generic.rs" 38 16 38 17]  * v));
+    [#"../selection_sort_generic.rs" 38 16 38 23] _8 <- ([#"../selection_sort_generic.rs" 38 16 38 23] len0 ( * v));
     goto BB2
   }
   BB2 {
-    [#"../selection_sort_generic.rs" 35 4 35 43] iter <- ([#"../selection_sort_generic.rs" 35 4 35 43] into_iter0 ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range ([#"../selection_sort_generic.rs" 38 13 38 14] [#"../selection_sort_generic.rs" 38 13 38 14] (0 : usize)) _8));
+    [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8);
     _8 <- any usize;
+    [#"../selection_sort_generic.rs" 35 4 35 43] iter <- ([#"../selection_sort_generic.rs" 35 4 35 43] into_iter0 _7);
+    _7 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB3
   }
   BB3 {
@@ -662,15 +667,19 @@ module SelectionSortGeneric_SelectionSort
   }
   BB13 {
     [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] _25);
-    [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- any Snapshot.snap_ty (Seq.seq usize);
+    _25 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../selection_sort_generic.rs" 39 22 39 23] min <- ([#"../selection_sort_generic.rs" 39 22 39 23] i);
-    [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ([#"../selection_sort_generic.rs" 43 26 43 27]  * v));
+    [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- ([#"../selection_sort_generic.rs" 43 17 43 24] i + (1 : usize));
+    [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ( * v));
     goto BB14
   }
   BB14 {
-    [#"../selection_sort_generic.rs" 41 8 41 121] iter1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] into_iter0 ([#"../selection_sort_generic.rs" 43 17 43 33] Core_Ops_Range_Range_Type.C_Range ([#"../selection_sort_generic.rs" 43 17 43 24] ([#"../selection_sort_generic.rs" 43 18 43 19] i) + ([#"../selection_sort_generic.rs" 43 22 43 23] [#"../selection_sort_generic.rs" 43 22 43 23] (1 : usize))) _34));
+    [#"../selection_sort_generic.rs" 43 17 43 33] _31 <- ([#"../selection_sort_generic.rs" 43 17 43 33] Core_Ops_Range_Range_Type.C_Range _32 _34);
+    _32 <- any usize;
     _34 <- any usize;
+    [#"../selection_sort_generic.rs" 41 8 41 121] iter1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] into_iter0 _31);
+    _31 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB15
   }
   BB15 {
@@ -725,21 +734,21 @@ module SelectionSortGeneric_SelectionSort
   }
   BB24 {
     [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] _49);
-    [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- any Snapshot.snap_ty (Seq.seq usize);
+    _49 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ([#"../selection_sort_generic.rs" 44 15 44 16]  * v) ([#"../selection_sort_generic.rs" 44 17 44 18] j));
+    [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ( * v) j);
     goto BB25
   }
   BB25 {
     assert { [@expl:type invariant] inv2 _54 };
     assume { resolve2 _54 };
-    [#"../selection_sort_generic.rs" 44 23 44 28] _58 <- ([#"../selection_sort_generic.rs" 44 23 44 28] index0 ([#"../selection_sort_generic.rs" 44 22 44 23]  * v) ([#"../selection_sort_generic.rs" 44 24 44 27] min));
+    [#"../selection_sort_generic.rs" 44 23 44 28] _58 <- ([#"../selection_sort_generic.rs" 44 23 44 28] index0 ( * v) min);
     goto BB26
   }
   BB26 {
     assert { [@expl:type invariant] inv2 _58 };
     assume { resolve2 _58 };
-    [#"../selection_sort_generic.rs" 44 15 44 28] _52 <- ([#"../selection_sort_generic.rs" 44 15 44 28] lt0 ([#"../selection_sort_generic.rs" 44 15 44 19] _54) ([#"../selection_sort_generic.rs" 44 22 44 28] _58));
+    [#"../selection_sort_generic.rs" 44 15 44 28] _52 <- ([#"../selection_sort_generic.rs" 44 15 44 28] lt0 _54 _58);
     goto BB27
   }
   BB27 {
@@ -749,7 +758,7 @@ module SelectionSortGeneric_SelectionSort
       end
   }
   BB28 {
-    [#"../selection_sort_generic.rs" 45 16 45 23] min <- ([#"../selection_sort_generic.rs" 45 22 45 23] j);
+    [#"../selection_sort_generic.rs" 45 16 45 23] min <- ([#"../selection_sort_generic.rs" 45 16 45 23] j);
     [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] ());
     goto BB30
   }
@@ -764,7 +773,7 @@ module SelectionSortGeneric_SelectionSort
     [#"../selection_sort_generic.rs" 48 8 48 9] _64 <- Borrow.borrow_final ( * _65) (Borrow.get_id _65);
     [#"../selection_sort_generic.rs" 48 8 48 9] _65 <- { _65 with current = ( ^ _64) ; };
     assume { inv4 ( ^ _64) };
-    [#"../selection_sort_generic.rs" 48 8 48 22] _63 <- ([#"../selection_sort_generic.rs" 48 8 48 22] swap0 _64 ([#"../selection_sort_generic.rs" 48 15 48 16] i) ([#"../selection_sort_generic.rs" 48 18 48 21] min));
+    [#"../selection_sort_generic.rs" 48 8 48 22] _63 <- ([#"../selection_sort_generic.rs" 48 8 48 22] swap0 _64 i min);
     _64 <- any borrowed (slice t);
     goto BB32
   }
diff --git a/creusot/tests/should_succeed/selection_sort_generic/why3session.xml b/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
index ececd1be15..6fb20cc0a2 100644
--- a/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
+++ b/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
@@ -18,25 +18,25 @@
   <proof prover="4"><result status="valid" time="0.036574" steps="12"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="12"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="16"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.047018" steps="22"/></proof>
+  <proof prover="4"><result status="valid" time="0.030580" steps="22"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.4" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="22"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="24"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.5" expl="loop invariant init" proved="true">
   <proof prover="4"><result status="valid" time="0.010000" steps="32"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.6" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="90"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="91"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.7" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="80"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="82"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.8" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="84"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="86"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.9" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.010000" steps="56"/></proof>
@@ -45,64 +45,64 @@
   <proof prover="4"><result status="valid" time="0.033242" steps="61"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.11" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020000" steps="287"/></proof>
+  <proof prover="4"><result status="valid" time="0.020000" steps="288"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.12" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="69"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="70"/></proof>
   </goal>
-  <goal name="selection_sort&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.043977" steps="75"/></proof>
+  <goal name="selection_sort&#39;vc.13" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.030000" steps="512"/></proof>
   </goal>
-  <goal name="selection_sort&#39;vc.14" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.030000" steps="594"/></proof>
+  <goal name="selection_sort&#39;vc.14" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.043977" steps="84"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="70"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="74"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.030580" steps="95"/></proof>
+  <proof prover="4"><result status="valid" time="0.047018" steps="97"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="78"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="82"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="108"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="110"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.19" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.020000" steps="517"/></proof>
+  <proof prover="4"><result status="valid" time="0.020000" steps="519"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.20" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010000" steps="115"/></proof>
+  <proof prover="4"><result status="valid" time="0.010000" steps="117"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.019355" steps="123"/></proof>
+  <proof prover="4"><result status="valid" time="0.019355" steps="126"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.033361" steps="138"/></proof>
+  <proof prover="4"><result status="valid" time="0.033361" steps="140"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.23" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.177677" steps="1199"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.101040" steps="708"/></proof>
+  <proof prover="4"><result status="valid" time="0.101040" steps="712"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016432" steps="158"/></proof>
+  <proof prover="4"><result status="valid" time="0.016432" steps="160"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.26" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.026885" steps="159"/></proof>
+  <proof prover="4"><result status="valid" time="0.026885" steps="162"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.27" expl="assertion" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="selection_sort&#39;vc.27.0" expl="assertion" proved="true">
    <transf name="assert" proved="true" arg1="(length1 (inner produced) = length1 (inner produced2) + 1)">
     <goal name="selection_sort&#39;vc.27.0.0" expl="asserted formula" proved="true">
-    <proof prover="4"><result status="valid" time="0.024382" steps="179"/></proof>
+    <proof prover="4"><result status="valid" time="0.024382" steps="181"/></proof>
     </goal>
     <goal name="selection_sort&#39;vc.27.0.1" expl="assertion" proved="true">
     <transf name="remove" proved="true" arg1="one,(-),(&gt;),(&gt;=),uint64&#39;maxInt,uint64&#39;minInt,max_uint64,length1,singleton,cons,snoc,(++),mem,iseq,occ,occ_all,permut,mAX&#39;,is_inhabited,sorted_range,sorted,permutation_of,shallow_model,Mul_distr_r,Comm,Unitary,NonTrivialRing,Total,CompatOrderAdd,CompatOrderMult,Mod_inf,Div_mult,Mod_mult,Numof_append,Numof_left_no_add,Numof_left_add,Empty,Full,numof_increasing,numof_strictly_increasing,numof_change_any,numof_change_some,numof_change_equiv,length_nonnegative,([&lt;-])&#39;def,singleton&#39;spec,cons&#39;spec,snoc&#39;spec,mem_append,occ_cons,occ_tail,append_num_occ,exchange_set,permut_sym,permut_trans,permut_exists,new&#39;spec,produces_trans_spec,produces_refl_spec,is_inhabited_spec">
      <goal name="selection_sort&#39;vc.27.0.1.0" expl="assertion" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.092697" steps="471739"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.092697" steps="471797"/></proof>
      </goal>
     </transf>
     </goal>
@@ -111,27 +111,27 @@
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.119854" steps="249993"/></proof>
+  <proof prover="0"><result status="valid" time="0.119854" steps="250051"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.415124" steps="38284"/></proof>
+  <proof prover="2"><result status="valid" time="0.415124" steps="38765"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.040000" steps="655"/></proof>
+  <proof prover="4"><result status="valid" time="0.040000" steps="659"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.31" expl="loop invariant preservation" proved="true">
   <transf name="instantiate" proved="true" arg1="deep_model1_spec" arg2="( * v)">
    <goal name="selection_sort&#39;vc.31.0" expl="loop invariant preservation" proved="true">
    <transf name="assert" proved="true" arg1="(forall x, y. le_log0 x y = True &lt;-&gt; not cmp_log0 x y = C_Greater)">
     <goal name="selection_sort&#39;vc.31.0.0" expl="asserted formula" proved="true">
-    <proof prover="4"><result status="valid" time="0.260442" steps="1389"/></proof>
+    <proof prover="4"><result status="valid" time="0.100609" steps="1390"/></proof>
     </goal>
     <goal name="selection_sort&#39;vc.31.0.1" expl="loop invariant preservation" proved="true">
     <transf name="inline_goal" proved="true" >
      <goal name="selection_sort&#39;vc.31.0.1.0" expl="loop invariant preservation" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="selection_sort&#39;vc.31.0.1.0.0" expl="loop invariant preservation" proved="true">
-      <proof prover="1" timelimit="1"><result status="valid" time="1.021066" steps="127287"/></proof>
+      <proof prover="1" timelimit="1"><result status="valid" time="1.021066" steps="330563"/></proof>
       </goal>
      </transf>
      </goal>
@@ -142,53 +142,53 @@
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.32" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.239504" steps="1027"/></proof>
+  <proof prover="4"><result status="valid" time="0.083692" steps="1027"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.152739" steps="1230"/></proof>
+  <proof prover="4"><result status="valid" time="0.152739" steps="1234"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.118334" steps="151"/></proof>
+  <proof prover="4"><result status="valid" time="0.031688" steps="152"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.031963" steps="151"/></proof>
+  <proof prover="4"><result status="valid" time="0.031963" steps="153"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.36" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.044225" steps="118"/></proof>
+  <proof prover="4"><result status="valid" time="0.044225" steps="122"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.37" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.077391" steps="561"/></proof>
+  <proof prover="4"><result status="valid" time="0.077391" steps="568"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.031688" steps="153"/></proof>
+  <proof prover="4"><result status="valid" time="0.118334" steps="156"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.032602" steps="155"/></proof>
+  <proof prover="4"><result status="valid" time="0.032602" steps="156"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.40" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.029730" steps="124"/></proof>
+  <proof prover="4"><result status="valid" time="0.029730" steps="128"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.41" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.017093" steps="126"/></proof>
+  <proof prover="4"><result status="valid" time="0.017093" steps="130"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.42" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.036204" steps="126"/></proof>
+  <proof prover="4"><result status="valid" time="0.036204" steps="130"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.43" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.125893" steps="238734"/></proof>
+  <proof prover="0"><result status="valid" time="0.125893" steps="238792"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.313757" steps="37664"/></proof>
+  <proof prover="2"><result status="valid" time="0.313757" steps="37707"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.45" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="selection_sort&#39;vc.45.0" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.637192" steps="113279"/></proof>
+   <proof prover="1"><result status="valid" time="0.637192" steps="122994"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.46" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.255950" steps="43593"/></proof>
+  <proof prover="2"><result status="valid" time="0.255950" steps="43423"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/selection_sort_generic/why3shapes.gz b/creusot/tests/should_succeed/selection_sort_generic/why3shapes.gz
index 937544f0779274d17a9878b2d7962abaeb0e6053..d22afe8c60b5af75d640fa439ef4c3fbb244d421 100644
GIT binary patch
literal 4088
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

literal 4062
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
QuiQ!hAGm;~1~*~=0PX)2MgRZ+

diff --git a/creusot/tests/should_succeed/slices/01.mlcfg b/creusot/tests/should_succeed/slices/01.mlcfg
index eaa5643ca1..7dcf15e7b8 100644
--- a/creusot/tests/should_succeed/slices/01.mlcfg
+++ b/creusot/tests/should_succeed/slices/01.mlcfg
@@ -49,13 +49,15 @@ module C01_IndexSlice
   var _0 : uint32;
   var a : slice uint32 = a;
   var _3 : usize;
+  var _4 : usize;
   var _5 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] [#"../01.rs" 7 6 7 8] (10 : usize));
-    [#"../01.rs" 7 4 7 9] _5 <- ([#"../01.rs" 7 4 7 9] _3 < ([#"../01.rs" 7 4 7 9] Slice.length a));
+    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] (10 : usize));
+    [#"../01.rs" 7 4 7 9] _4 <- ([#"../01.rs" 7 4 7 9] Slice.length a);
+    [#"../01.rs" 7 4 7 9] _5 <- ([#"../01.rs" 7 4 7 9] _3 < _4);
     assert { [@expl:index in bounds] [#"../01.rs" 7 4 7 9] _5 };
     goto BB1
   }
@@ -128,18 +130,20 @@ module C01_IndexMutSlice
   var _0 : ();
   var a : borrowed (slice uint32) = a;
   var _4 : usize;
+  var _5 : usize;
   var _6 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] [#"../01.rs" 13 6 13 7] (2 : usize));
-    [#"../01.rs" 13 4 13 8] _6 <- ([#"../01.rs" 13 4 13 8] _4 < ([#"../01.rs" 13 4 13 8] Slice.length ( * a)));
+    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] (2 : usize));
+    [#"../01.rs" 13 4 13 8] _5 <- ([#"../01.rs" 13 4 13 8] Slice.length ( * a));
+    [#"../01.rs" 13 4 13 8] _6 <- ([#"../01.rs" 13 4 13 8] _4 < _5);
     assert { [@expl:index in bounds] [#"../01.rs" 13 4 13 8] _6 };
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] [#"../01.rs" 13 11 13 12] (3 : uint32)) ; };
+    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] (3 : uint32)) ; };
     assume { resolve0 a };
     [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] ());
     return _0
@@ -250,26 +254,31 @@ module C01_SliceFirst
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option t;
   var a : slice t = a;
+  var _3 : bool;
   var _4 : usize;
   var _7 : t;
   var _8 : usize;
+  var _9 : usize;
   var _10 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 21 7 21 14] _4 <- ([#"../01.rs" 21 7 21 14] len0 ([#"../01.rs" 21 7 21 8] a));
+    [#"../01.rs" 21 7 21 14] _4 <- ([#"../01.rs" 21 7 21 14] len0 a);
     goto BB1
   }
   BB1 {
-    switch ([#"../01.rs" 21 7 21 18] _4 > ([#"../01.rs" 21 17 21 18] [#"../01.rs" 21 17 21 18] (0 : usize)))
+    [#"../01.rs" 21 7 21 18] _3 <- ([#"../01.rs" 21 7 21 18] _4 > (0 : usize));
+    _4 <- any usize;
+    switch (_3)
       | False -> goto BB4
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] [#"../01.rs" 22 16 22 17] (0 : usize));
-    [#"../01.rs" 22 14 22 18] _10 <- ([#"../01.rs" 22 14 22 18] _8 < ([#"../01.rs" 22 14 22 18] Slice.length a));
+    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] (0 : usize));
+    [#"../01.rs" 22 14 22 18] _9 <- ([#"../01.rs" 22 14 22 18] Slice.length a);
+    [#"../01.rs" 22 14 22 18] _10 <- ([#"../01.rs" 22 14 22 18] _8 < _9);
     assert { [@expl:index in bounds] [#"../01.rs" 22 14 22 18] _10 };
     goto BB3
   }
@@ -279,7 +288,7 @@ module C01_SliceFirst
     assume { resolve0 a };
     assert { [@expl:type invariant] inv1 _7 };
     assume { resolve1 _7 };
-    [#"../01.rs" 22 8 22 19] _0 <- ([#"../01.rs" 22 8 22 19] Core_Option_Option_Type.C_Some ([#"../01.rs" 22 13 22 18] _7));
+    [#"../01.rs" 22 8 22 19] _0 <- ([#"../01.rs" 22 8 22 19] Core_Option_Option_Type.C_Some _7);
     goto BB5
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/slices/01/why3session.xml b/creusot/tests/should_succeed/slices/01/why3session.xml
index 41fb5e6c61..c13a3cf1fb 100644
--- a/creusot/tests/should_succeed/slices/01/why3session.xml
+++ b/creusot/tests/should_succeed/slices/01/why3session.xml
@@ -8,17 +8,17 @@
 <path name=".."/><path name="01.mlcfg"/>
 <theory name="C01_IndexSlice" proved="true">
  <goal name="index_slice&#39;vc" expl="VC for index_slice" proved="true">
- <proof prover="1"><result status="valid" time="0.014857" steps="54086"/></proof>
+ <proof prover="1"><result status="valid" time="0.014857" steps="54240"/></proof>
  </goal>
 </theory>
 <theory name="C01_IndexMutSlice" proved="true">
  <goal name="index_mut_slice&#39;vc" expl="VC for index_mut_slice" proved="true">
- <proof prover="3"><result status="valid" time="0.017381" steps="268"/></proof>
+ <proof prover="3"><result status="valid" time="0.017381" steps="286"/></proof>
  </goal>
 </theory>
 <theory name="C01_SliceFirst" proved="true">
  <goal name="slice_first&#39;vc" expl="VC for slice_first" proved="true">
- <proof prover="3"><result status="valid" time="0.014152" steps="129"/></proof>
+ <proof prover="3"><result status="valid" time="0.014152" steps="159"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/slices/01/why3shapes.gz b/creusot/tests/should_succeed/slices/01/why3shapes.gz
index a9470216956977865a5e1748042159ee3e849287..88d5b3d07790f5cfcb2f2ae7e7c05b810515539f 100644
GIT binary patch
literal 676
zcmV;V0$cqbiwFP!00000|E*L_kDM?Jz0a@U)^<;E5&~2^mC$MtNY!3i<=Bx2!Y(QU
zEwCRyzb0Y%*zHU&y-Z@~`58ak^YO~-AMlsyy(iQ4Roi^_ly~)MH~hw`c>>Ln>B=-D
zJG|awZJPVx0V%4k+vmfnEldrX<Io<eX227^uo(C6->X9N*pj|`%Ul9JCcsBxQSt-*
zYWbSX)I+aDhI_5>d-rJK`DT3;CRq2zI^Hs@3_lss{zM8|SX<`6=yFZRUu$E8+vyvx
zY&)-N3iER4>nb;Awc!8If?v>rZ?xD?Jb*55-QHI@!yj7YJQvxJVQ2cbelko)V<izD
z+pcS$P4VIMQ-@eq4c1yvwy9QhLWY`3b=QEd*&W4_XDwTd*Lu;zLCLqzX$)8rFI1bT
zT#PU4pm0k;krx^~W!M0|;?;j|{75;qo?BVYv_1FVH2(BBOwD&YA(!<K<9fI&ADj2O
zKVsP*d47L5eca`l@yD6*?aat`Z<+f7`dpVkh;OL6a5FYqk+L_3Z|%wGvn4ysUE3HP
zWFto~nej4eDt6_lNqYyfyx`9`u!faj<y}ROodh56&7hSAers(xHyPyl-U8oP!o`Yt
zua$G~oZZ@J4PYIxq5QHTVFb1y+NIn0yg*Z%2$Yb>8zF45oUgW0WplCa9EXnc*P^4h
z>j2Sa9~>NJO{S~!UXUkRTb$WZ=WLP3Iv~nfGRYHKM|eS=Aa^uCe;De*&dmA{YAM>C
z^D@~LI+Rt{54&9y$bu`$jW9kOODqDV!lN=JR|+C9o=io`Q%Kpa6w;R>R03HMm0Ti&
zTn5LGfC7uc_kvWVzJ+oDhN#LiEDea_h{p*1vhaP3Oo=&oKscF#NP)N^1(rr>xcdWO
KAyE7d2LJ$9<x!6S

literal 643
zcmV-}0(|`+iwFP!00000|E*I^kDM?Jz4I%$ZM&y92?<m?mC$MtNY!3i<=Bx4VHcHw
z7TAxU-w+s>kDckI7ZS(zGtYkhbnExe_}ldUtLgfxZNB)zzy0hDf3Rv^L6Ky>5(SBe
zcN?rt^E5o8&8qA6ZM$m=Q-h*7wA-o~aEI?C#?86EDin<!=$S8@3ed3tzE~8&Z|qm`
zeKAuHy<!<|RDeIa7ZWcx_f}zob#L6mDZ*;ZV4zqsW^oO~UheGiAtz$vJazAvZRb}_
zVcxfWU1@W%2lO93pjUc8k9x3~aR8^fb^BClf<G10RI_ZzurqyIzZ#;#kx7Vo+jZ@m
zDQ<SZl*F=XuvW}go4MlDK&hhnCRCI?+RW&vS25n%m&29|`?S$SMM=D(9OY;>dJc2s
zF@nv!GSj)hQNTC6{cp1#q2_5**NF?0*1^fFcQ3;{?@9iA-2^sn!gQtMy!NZY)>Yw`
zSA|+K*JTonG6|ea_?a)8{=ok3RA0vTP63BXQNnige*3-M8Fi8J6!X|NM#-$Q7;-k_
zRb3*U=!n_v5P>Zb;0#Cp;PoJHoE<QHGJ};Iz=N~tGFG6MrwQ=U>WT>hG<m?UN8v;h
z=dxmbh%d9AdvAl1xZ1Ou7=#CVC9;LVbdDN=aL?pS)gX>#?ZV|sR4xJrd4;q1kh2po
z*nuS{oC8gqD^S3%sCyx8qgFoCxyas$eOp#tKX{&IJSRvHSs;Q4LRLg!kQ)|It~o~F
z^OU7Dg_L*(%3MPsNmOWLVI*^mc*#SlrOnmo%T%O+3$-SMWu6O8tq7th2uel?VI>$&
dG|PRkaXbZ<g2jduNE)S~_ZPa#;2@(0007BkKDYn?

diff --git a/creusot/tests/should_succeed/slices/02_std.mlcfg b/creusot/tests/should_succeed/slices/02_std.mlcfg
index d5d0845dd9..45e95c27e8 100644
--- a/creusot/tests/should_succeed/slices/02_std.mlcfg
+++ b/creusot/tests/should_succeed/slices/02_std.mlcfg
@@ -165,7 +165,7 @@ module C02Std_BinarySearch
     ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 309 8 310 99] forall i : usize . result = Core_Result_Result_Type.C_Err i -> (forall j : usize . i <= j /\ UIntSize.to_int j < Seq.length (shallow_model1 self) -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) }
     
   let constant promoted0 [#"../02_std.rs" 8 0 8 40]  : uint32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../02_std.rs" 9 30 9 31] [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
+    let _1 = [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
   let rec cfg binary_search [#"../02_std.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (s : slice uint32) : usize
     requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s) -> UInt32.to_int (index_logic0 s i) = i}
     requires {[#"../02_std.rs" 7 11 7 24] Seq.length (shallow_model1 s) = 5}
@@ -181,9 +181,9 @@ module C02Std_BinarySearch
     goto BB0
   }
   BB0 {
-    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] [#"../02_std.rs" 9 29 9 31] promoted0);
+    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] promoted0);
     [#"../02_std.rs" 9 29 9 31] _8 <- ([#"../02_std.rs" 9 29 9 31] _12);
-    [#"../02_std.rs" 9 13 9 32] _5 <- ([#"../02_std.rs" 9 13 9 32] binary_search0 ([#"../02_std.rs" 9 13 9 14] s) ([#"../02_std.rs" 9 29 9 31] _8));
+    [#"../02_std.rs" 9 13 9 32] _5 <- ([#"../02_std.rs" 9 13 9 32] binary_search0 s _8);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 05784a95c2..9c7fab2f30 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -335,6 +335,8 @@ module SparseArray_Impl2_Get
   var i : usize = i;
   var index : usize;
   var _7 : usize;
+  var _10 : bool;
+  var _13 : bool;
   var _15 : usize;
   var _20 : t;
   var _21 : t;
@@ -342,22 +344,24 @@ module SparseArray_Impl2_Get
     goto BB0
   }
   BB0 {
-    [#"../sparse_array.rs" 90 28 90 31] _7 <- ([#"../sparse_array.rs" 90 28 90 31] index0 ([#"../sparse_array.rs" 90 20 90 28] SparseArray_Sparse_Type.sparse_idx self) ([#"../sparse_array.rs" 90 29 90 30] i));
+    [#"../sparse_array.rs" 90 28 90 31] _7 <- ([#"../sparse_array.rs" 90 28 90 31] index0 (SparseArray_Sparse_Type.sparse_idx self) i);
     goto BB1
   }
   BB1 {
     [#"../sparse_array.rs" 90 20 90 31] index <- ([#"../sparse_array.rs" 90 20 90 31] _7);
-    switch ([#"../sparse_array.rs" 91 11 91 25] ([#"../sparse_array.rs" 91 11 91 16] index) < ([#"../sparse_array.rs" 91 19 91 25] SparseArray_Sparse_Type.sparse_n self))
+    [#"../sparse_array.rs" 91 11 91 25] _10 <- ([#"../sparse_array.rs" 91 11 91 25] index < SparseArray_Sparse_Type.sparse_n self);
+    switch (_10)
       | False -> goto BB7
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../sparse_array.rs" 91 38 91 45] _15 <- ([#"../sparse_array.rs" 91 38 91 45] index0 ([#"../sparse_array.rs" 91 29 91 38] SparseArray_Sparse_Type.sparse_back self) ([#"../sparse_array.rs" 91 39 91 44] index));
+    [#"../sparse_array.rs" 91 38 91 45] _15 <- ([#"../sparse_array.rs" 91 38 91 45] index0 (SparseArray_Sparse_Type.sparse_back self) index);
     goto BB3
   }
   BB3 {
-    switch ([#"../sparse_array.rs" 91 29 91 50] ([#"../sparse_array.rs" 91 29 91 45] _15) = ([#"../sparse_array.rs" 91 49 91 50] i))
+    [#"../sparse_array.rs" 91 29 91 50] _13 <- ([#"../sparse_array.rs" 91 29 91 50] _15 = i);
+    switch (_13)
       | False -> goto BB6
       | True -> goto BB4
       end
@@ -365,7 +369,7 @@ module SparseArray_Impl2_Get
   BB4 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../sparse_array.rs" 92 29 92 32] _21 <- ([#"../sparse_array.rs" 92 29 92 32] index1 ([#"../sparse_array.rs" 92 18 92 29] SparseArray_Sparse_Type.sparse_values self) ([#"../sparse_array.rs" 92 30 92 31] i));
+    [#"../sparse_array.rs" 92 29 92 32] _21 <- ([#"../sparse_array.rs" 92 29 92 32] index1 (SparseArray_Sparse_Type.sparse_values self) i);
     goto BB5
   }
   BB5 {
@@ -374,7 +378,7 @@ module SparseArray_Impl2_Get
     assume { resolve1 _21 };
     assert { [@expl:type invariant] inv1 _20 };
     assume { resolve1 _20 };
-    [#"../sparse_array.rs" 92 12 92 33] _0 <- ([#"../sparse_array.rs" 92 12 92 33] Core_Option_Option_Type.C_Some ([#"../sparse_array.rs" 92 17 92 32] _20));
+    [#"../sparse_array.rs" 92 12 92 33] _0 <- ([#"../sparse_array.rs" 92 12 92 33] Core_Option_Option_Type.C_Some _20);
     goto BB9
   }
   BB6 {
@@ -858,6 +862,8 @@ module SparseArray_Impl2_Set
   var _10 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
   var index : usize;
   var _13 : usize;
+  var _16 : bool;
+  var _19 : bool;
   var _21 : usize;
   var _25 : Snapshot.snap_ty ();
   var _30 : borrowed usize;
@@ -874,7 +880,7 @@ module SparseArray_Impl2_Set
     [#"../sparse_array.rs" 113 8 113 19] _10 <- Borrow.borrow_final (SparseArray_Sparse_Type.sparse_values ( * self)) (Borrow.inherit_id (Borrow.get_id self) 3);
     [#"../sparse_array.rs" 113 8 113 19] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 x1 ( ^ _10) x3 x4) ; };
     assume { inv0 ( ^ _10) };
-    [#"../sparse_array.rs" 113 19 113 22] _9 <- ([#"../sparse_array.rs" 113 19 113 22] index_mut0 _10 ([#"../sparse_array.rs" 113 20 113 21] i));
+    [#"../sparse_array.rs" 113 19 113 22] _9 <- ([#"../sparse_array.rs" 113 19 113 22] index_mut0 _10 i);
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB2
   }
@@ -882,8 +888,8 @@ module SparseArray_Impl2_Set
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = ([#"../sparse_array.rs" 113 25 113 26] v) ; };
-    [#"../sparse_array.rs" 113 25 113 26] v <- any t;
+    [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = ([#"../sparse_array.rs" 113 8 113 22] v) ; };
+    v <- any t;
     assert { [@expl:type invariant] inv1 ( * _9) };
     assume { resolve0 ( * _9) };
     assert { [@expl:type invariant] inv2 _9 };
@@ -891,22 +897,24 @@ module SparseArray_Impl2_Set
     goto BB5
   }
   BB5 {
-    [#"../sparse_array.rs" 114 28 114 31] _13 <- ([#"../sparse_array.rs" 114 28 114 31] index0 ([#"../sparse_array.rs" 114 20 114 28] SparseArray_Sparse_Type.sparse_idx ( * self)) ([#"../sparse_array.rs" 114 29 114 30] i));
+    [#"../sparse_array.rs" 114 28 114 31] _13 <- ([#"../sparse_array.rs" 114 28 114 31] index0 (SparseArray_Sparse_Type.sparse_idx ( * self)) i);
     goto BB6
   }
   BB6 {
     [#"../sparse_array.rs" 114 20 114 31] index <- ([#"../sparse_array.rs" 114 20 114 31] _13);
-    switch ([#"../sparse_array.rs" 115 13 115 27] ([#"../sparse_array.rs" 115 13 115 18] index) < ([#"../sparse_array.rs" 115 21 115 27] SparseArray_Sparse_Type.sparse_n ( * self)))
+    [#"../sparse_array.rs" 115 13 115 27] _16 <- ([#"../sparse_array.rs" 115 13 115 27] index < SparseArray_Sparse_Type.sparse_n ( * self));
+    switch (_16)
       | False -> goto BB11
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../sparse_array.rs" 115 40 115 47] _21 <- ([#"../sparse_array.rs" 115 40 115 47] index0 ([#"../sparse_array.rs" 115 31 115 40] SparseArray_Sparse_Type.sparse_back ( * self)) ([#"../sparse_array.rs" 115 41 115 46] index));
+    [#"../sparse_array.rs" 115 40 115 47] _21 <- ([#"../sparse_array.rs" 115 40 115 47] index0 (SparseArray_Sparse_Type.sparse_back ( * self)) index);
     goto BB8
   }
   BB8 {
-    switch ([#"../sparse_array.rs" 115 31 115 52] ([#"../sparse_array.rs" 115 31 115 47] _21) = ([#"../sparse_array.rs" 115 51 115 52] i))
+    [#"../sparse_array.rs" 115 31 115 52] _19 <- ([#"../sparse_array.rs" 115 31 115 52] _21 = i);
+    switch (_19)
       | False -> goto BB10
       | True -> goto BB9
       end
@@ -932,23 +940,23 @@ module SparseArray_Impl2_Set
     assert { [@expl:assertion] [#"../sparse_array.rs" 118 26 118 46] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n ( * self)) < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size ( * self)) };
     [#"../sparse_array.rs" 120 12 120 20] _31 <- Borrow.borrow_final (SparseArray_Sparse_Type.sparse_idx ( * self)) (Borrow.inherit_id (Borrow.get_id self) 4);
     [#"../sparse_array.rs" 120 12 120 20] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 x1 x2 ( ^ _31) x4) ; };
-    [#"../sparse_array.rs" 120 20 120 23] _30 <- ([#"../sparse_array.rs" 120 20 120 23] index_mut1 _31 ([#"../sparse_array.rs" 120 21 120 22] i));
+    [#"../sparse_array.rs" 120 20 120 23] _30 <- ([#"../sparse_array.rs" 120 20 120 23] index_mut1 _31 i);
     _31 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     goto BB14
   }
   BB14 {
-    [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = ([#"../sparse_array.rs" 120 26 120 32] SparseArray_Sparse_Type.sparse_n ( * self)) ; };
+    [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = ([#"../sparse_array.rs" 120 12 120 32] SparseArray_Sparse_Type.sparse_n ( * self)) ; };
     assume { resolve3 _30 };
     [#"../sparse_array.rs" 121 12 121 21] _35 <- Borrow.borrow_final (SparseArray_Sparse_Type.sparse_back ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5);
     [#"../sparse_array.rs" 121 12 121 21] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 ( ^ _35)) ; };
-    [#"../sparse_array.rs" 121 21 121 29] _34 <- ([#"../sparse_array.rs" 121 21 121 29] index_mut1 _35 ([#"../sparse_array.rs" 121 22 121 28] SparseArray_Sparse_Type.sparse_n ( * self)));
+    [#"../sparse_array.rs" 121 21 121 29] _34 <- ([#"../sparse_array.rs" 121 21 121 29] index_mut1 _35 (SparseArray_Sparse_Type.sparse_n ( * self)));
     _35 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     goto BB15
   }
   BB15 {
-    [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = ([#"../sparse_array.rs" 121 32 121 33] i) ; };
+    [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = ([#"../sparse_array.rs" 121 12 121 33] i) ; };
     assume { resolve3 _34 };
-    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + ([#"../sparse_array.rs" 122 22 122 23] [#"../sparse_array.rs" 122 22 122 23] (1 : usize))) x2 x3 x4) ; };
+    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + (1 : usize)) x2 x3 x4) ; };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve4 self };
     [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] ());
@@ -1132,19 +1140,19 @@ module SparseArray_Create
   BB0 {
     assert { [@expl:type invariant] inv0 dummy };
     assume { resolve0 dummy };
-    [#"../sparse_array.rs" 135 37 135 52] _6 <- ([#"../sparse_array.rs" 135 37 135 52] from_elem0 ([#"../sparse_array.rs" 135 42 135 47] dummy) ([#"../sparse_array.rs" 135 49 135 51] sz));
+    [#"../sparse_array.rs" 135 37 135 52] _6 <- ([#"../sparse_array.rs" 135 37 135 52] from_elem0 dummy sz);
     goto BB1
   }
   BB1 {
-    [#"../sparse_array.rs" 135 59 135 70] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 ([#"../sparse_array.rs" 135 64 135 65] [#"../sparse_array.rs" 135 64 135 65] (0 : usize)) ([#"../sparse_array.rs" 135 67 135 69] sz));
+    [#"../sparse_array.rs" 135 59 135 70] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 (0 : usize) sz);
     goto BB2
   }
   BB2 {
-    [#"../sparse_array.rs" 135 78 135 89] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 ([#"../sparse_array.rs" 135 83 135 84] [#"../sparse_array.rs" 135 83 135 84] (0 : usize)) ([#"../sparse_array.rs" 135 86 135 88] sz));
+    [#"../sparse_array.rs" 135 78 135 89] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 (0 : usize) sz);
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse ([#"../sparse_array.rs" 135 19 135 21] sz) ([#"../sparse_array.rs" 135 26 135 27] [#"../sparse_array.rs" 135 26 135 27] (0 : usize)) _6 _9 _11);
+    [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse sz (0 : usize) _6 _9 _11);
     _6 <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     _9 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     _11 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -1390,20 +1398,20 @@ module SparseArray_F
     goto BB0
   }
   BB0 {
-    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] [#"../sparse_array.rs" 141 18 141 19] (0 : int32));
-    [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 ([#"../sparse_array.rs" 142 23 142 25] [#"../sparse_array.rs" 142 23 142 25] (10 : usize)) ([#"../sparse_array.rs" 142 27 142 34] default));
+    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] (0 : int32));
+    [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 (10 : usize) default);
     goto BB1
   }
   BB1 {
-    [#"../sparse_array.rs" 143 16 143 35] b <- ([#"../sparse_array.rs" 143 16 143 35] create0 ([#"../sparse_array.rs" 143 23 143 25] [#"../sparse_array.rs" 143 23 143 25] (20 : usize)) ([#"../sparse_array.rs" 143 27 143 34] default));
+    [#"../sparse_array.rs" 143 16 143 35] b <- ([#"../sparse_array.rs" 143 16 143 35] create0 (20 : usize) default);
     goto BB2
   }
   BB2 {
-    [#"../sparse_array.rs" 144 16 144 24] x <- ([#"../sparse_array.rs" 144 16 144 24] get0 ([#"../sparse_array.rs" 144 16 144 17] a) ([#"../sparse_array.rs" 144 22 144 23] [#"../sparse_array.rs" 144 22 144 23] (5 : usize)));
+    [#"../sparse_array.rs" 144 16 144 24] x <- ([#"../sparse_array.rs" 144 16 144 24] get0 a (5 : usize));
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 145 16 145 24] y <- ([#"../sparse_array.rs" 145 16 145 24] get0 ([#"../sparse_array.rs" 145 16 145 17] b) ([#"../sparse_array.rs" 145 22 145 23] [#"../sparse_array.rs" 145 22 145 23] (7 : usize)));
+    [#"../sparse_array.rs" 145 16 145 24] y <- ([#"../sparse_array.rs" 145 16 145 24] get0 b (7 : usize));
     goto BB4
   }
   BB4 {
@@ -1411,7 +1419,7 @@ module SparseArray_F
     [#"../sparse_array.rs" 148 4 148 5] _13 <- Borrow.borrow_mut a;
     [#"../sparse_array.rs" 148 4 148 5] a <-  ^ _13;
     assume { inv0 ( ^ _13) };
-    [#"../sparse_array.rs" 148 4 148 15] _12 <- ([#"../sparse_array.rs" 148 4 148 15] set0 _13 ([#"../sparse_array.rs" 148 10 148 11] [#"../sparse_array.rs" 148 10 148 11] (5 : usize)) ([#"../sparse_array.rs" 148 13 148 14] [#"../sparse_array.rs" 148 13 148 14] (1 : int32)));
+    [#"../sparse_array.rs" 148 4 148 15] _12 <- ([#"../sparse_array.rs" 148 4 148 15] set0 _13 (5 : usize) (1 : int32));
     _13 <- any borrowed (SparseArray_Sparse_Type.t_sparse int32);
     goto BB5
   }
@@ -1419,23 +1427,23 @@ module SparseArray_F
     [#"../sparse_array.rs" 149 4 149 5] _15 <- Borrow.borrow_mut b;
     [#"../sparse_array.rs" 149 4 149 5] b <-  ^ _15;
     assume { inv0 ( ^ _15) };
-    [#"../sparse_array.rs" 149 4 149 15] _14 <- ([#"../sparse_array.rs" 149 4 149 15] set0 _15 ([#"../sparse_array.rs" 149 10 149 11] [#"../sparse_array.rs" 149 10 149 11] (7 : usize)) ([#"../sparse_array.rs" 149 13 149 14] [#"../sparse_array.rs" 149 13 149 14] (2 : int32)));
+    [#"../sparse_array.rs" 149 4 149 15] _14 <- ([#"../sparse_array.rs" 149 4 149 15] set0 _15 (7 : usize) (2 : int32));
     _15 <- any borrowed (SparseArray_Sparse_Type.t_sparse int32);
     goto BB6
   }
   BB6 {
-    [#"../sparse_array.rs" 150 8 150 16] _16 <- ([#"../sparse_array.rs" 150 8 150 16] get0 ([#"../sparse_array.rs" 150 8 150 9] a) ([#"../sparse_array.rs" 150 14 150 15] [#"../sparse_array.rs" 150 14 150 15] (5 : usize)));
+    [#"../sparse_array.rs" 150 8 150 16] _16 <- ([#"../sparse_array.rs" 150 8 150 16] get0 a (5 : usize));
     goto BB7
   }
   BB7 {
     [#"../sparse_array.rs" 150 4 150 16] x <- ([#"../sparse_array.rs" 150 4 150 16] _16);
-    [#"../sparse_array.rs" 150 4 150 16] _16 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 ([#"../sparse_array.rs" 151 8 151 9] b) ([#"../sparse_array.rs" 151 14 151 15] [#"../sparse_array.rs" 151 14 151 15] (7 : usize)));
+    _16 <- any Core_Option_Option_Type.t_option int32;
+    [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 b (7 : usize));
     goto BB8
   }
   BB8 {
     [#"../sparse_array.rs" 151 4 151 16] y <- ([#"../sparse_array.rs" 151 4 151 16] _18);
-    [#"../sparse_array.rs" 151 4 151 16] _18 <- any Core_Option_Option_Type.t_option int32;
+    _18 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 152 18 155 5] match x with
       | Core_Option_Option_Type.C_None -> false
       | Core_Option_Option_Type.C_Some z -> shallow_model0 z = 1
@@ -1444,44 +1452,44 @@ module SparseArray_F
       | Core_Option_Option_Type.C_None -> false
       | Core_Option_Option_Type.C_Some z -> shallow_model0 z = 2
       end };
-    [#"../sparse_array.rs" 161 8 161 16] _24 <- ([#"../sparse_array.rs" 161 8 161 16] get0 ([#"../sparse_array.rs" 161 8 161 9] a) ([#"../sparse_array.rs" 161 14 161 15] [#"../sparse_array.rs" 161 14 161 15] (7 : usize)));
+    [#"../sparse_array.rs" 161 8 161 16] _24 <- ([#"../sparse_array.rs" 161 8 161 16] get0 a (7 : usize));
     goto BB9
   }
   BB9 {
     [#"../sparse_array.rs" 161 4 161 16] x <- ([#"../sparse_array.rs" 161 4 161 16] _24);
-    [#"../sparse_array.rs" 161 4 161 16] _24 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 ([#"../sparse_array.rs" 162 8 162 9] b) ([#"../sparse_array.rs" 162 14 162 15] [#"../sparse_array.rs" 162 14 162 15] (5 : usize)));
+    _24 <- any Core_Option_Option_Type.t_option int32;
+    [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 b (5 : usize));
     goto BB10
   }
   BB10 {
     [#"../sparse_array.rs" 162 4 162 16] y <- ([#"../sparse_array.rs" 162 4 162 16] _26);
-    [#"../sparse_array.rs" 162 4 162 16] _26 <- any Core_Option_Option_Type.t_option int32;
+    _26 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 163 18 163 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 ([#"../sparse_array.rs" 165 8 165 9] a) ([#"../sparse_array.rs" 165 14 165 15] [#"../sparse_array.rs" 165 14 165 15] (0 : usize)));
+    [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 a (0 : usize));
     goto BB11
   }
   BB11 {
     [#"../sparse_array.rs" 165 4 165 16] x <- ([#"../sparse_array.rs" 165 4 165 16] _30);
-    [#"../sparse_array.rs" 165 4 165 16] _30 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 ([#"../sparse_array.rs" 166 8 166 9] b) ([#"../sparse_array.rs" 166 14 166 15] [#"../sparse_array.rs" 166 14 166 15] (0 : usize)));
+    _30 <- any Core_Option_Option_Type.t_option int32;
+    [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 b (0 : usize));
     goto BB12
   }
   BB12 {
     [#"../sparse_array.rs" 166 4 166 16] y <- ([#"../sparse_array.rs" 166 4 166 16] _32);
-    [#"../sparse_array.rs" 166 4 166 16] _32 <- any Core_Option_Option_Type.t_option int32;
+    _32 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 167 18 167 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 ([#"../sparse_array.rs" 169 8 169 9] a) ([#"../sparse_array.rs" 169 14 169 15] [#"../sparse_array.rs" 169 14 169 15] (9 : usize)));
+    [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 a (9 : usize));
     goto BB13
   }
   BB13 {
     [#"../sparse_array.rs" 169 4 169 16] x <- ([#"../sparse_array.rs" 169 4 169 16] _36);
-    [#"../sparse_array.rs" 169 4 169 16] _36 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 ([#"../sparse_array.rs" 170 8 170 9] b) ([#"../sparse_array.rs" 170 14 170 15] [#"../sparse_array.rs" 170 14 170 15] (9 : usize)));
+    _36 <- any Core_Option_Option_Type.t_option int32;
+    [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 b (9 : usize));
     goto BB14
   }
   BB14 {
     [#"../sparse_array.rs" 170 4 170 16] y <- ([#"../sparse_array.rs" 170 4 170 16] _38);
-    [#"../sparse_array.rs" 170 4 170 16] _38 <- any Core_Option_Option_Type.t_option int32;
+    _38 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 171 18 171 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
     [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] ());
     goto BB15
diff --git a/creusot/tests/should_succeed/sparse_array/why3session.xml b/creusot/tests/should_succeed/sparse_array/why3session.xml
index e28360c26e..beee7ce2f0 100644
--- a/creusot/tests/should_succeed/sparse_array/why3session.xml
+++ b/creusot/tests/should_succeed/sparse_array/why3session.xml
@@ -9,7 +9,7 @@
 <path name=".."/><path name="sparse_array.mlcfg"/>
 <theory name="SparseArray_Impl2_Get" proved="true">
  <goal name="get&#39;vc" expl="VC for get" proved="true">
- <proof prover="3"><result status="valid" time="0.119879" steps="23726"/></proof>
+ <proof prover="3"><result status="valid" time="0.119879" steps="24111"/></proof>
  </goal>
 </theory>
 <theory name="SparseArray_Impl2_LemmaPermutation_Impl" proved="true">
@@ -82,74 +82,74 @@
   <proof prover="4"><result status="valid" time="0.021630" steps="55"/></proof>
   </goal>
   <goal name="set&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.038147" steps="358"/></proof>
+  <proof prover="4"><result status="valid" time="0.038147" steps="359"/></proof>
   </goal>
   <goal name="set&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.109230" steps="19111"/></proof>
-  <proof prover="4"><result status="valid" time="0.016175" steps="63"/></proof>
+  <proof prover="3"><result status="valid" time="0.109230" steps="19135"/></proof>
+  <proof prover="4"><result status="valid" time="0.016175" steps="65"/></proof>
   </goal>
   <goal name="set&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.108040" steps="19117"/></proof>
-  <proof prover="4"><result status="valid" time="0.016050" steps="65"/></proof>
+  <proof prover="3"><result status="valid" time="0.108040" steps="19141"/></proof>
+  <proof prover="4"><result status="valid" time="0.016050" steps="66"/></proof>
   </goal>
   <goal name="set&#39;vc.11" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.151516" steps="698662"/></proof>
+  <proof prover="0"><result status="valid" time="0.151516" steps="698756"/></proof>
   </goal>
   <goal name="set&#39;vc.12" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.224840" steps="27215"/></proof>
+  <proof prover="3"><result status="valid" time="0.224840" steps="27373"/></proof>
   </goal>
   <goal name="set&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.041721" steps="168846"/></proof>
-  <proof prover="3"><result status="valid" time="0.186530" steps="23097"/></proof>
+  <proof prover="0"><result status="valid" time="0.041721" steps="180027"/></proof>
+  <proof prover="3"><result status="valid" time="0.186530" steps="22948"/></proof>
   </goal>
   <goal name="set&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.048217" steps="20037"/></proof>
+  <proof prover="3"><result status="valid" time="0.048217" steps="19914"/></proof>
   <proof prover="4"><result status="valid" time="0.026925" steps="69"/></proof>
   </goal>
   <goal name="set&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.036540" steps="20042"/></proof>
+  <proof prover="3"><result status="valid" time="0.036540" steps="19919"/></proof>
   </goal>
   <goal name="set&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.041598" steps="174879"/></proof>
-  <proof prover="3"><result status="valid" time="0.198549" steps="24595"/></proof>
+  <proof prover="0"><result status="valid" time="0.041598" steps="186243"/></proof>
+  <proof prover="3"><result status="valid" time="0.198549" steps="24450"/></proof>
   </goal>
   <goal name="set&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.093846" steps="20612"/></proof>
-  <proof prover="4"><result status="valid" time="0.028049" steps="133"/></proof>
+  <proof prover="3"><result status="valid" time="0.093846" steps="20489"/></proof>
+  <proof prover="4"><result status="valid" time="0.028049" steps="134"/></proof>
   </goal>
   <goal name="set&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.039638" steps="162641"/></proof>
-  <proof prover="3"><result status="valid" time="0.160266" steps="20627"/></proof>
+  <proof prover="0"><result status="valid" time="0.039638" steps="174100"/></proof>
+  <proof prover="3"><result status="valid" time="0.160266" steps="20504"/></proof>
   </goal>
   <goal name="set&#39;vc.19" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.239162" steps="29183"/></proof>
+  <proof prover="3"><result status="valid" time="0.239162" steps="29063"/></proof>
   <proof prover="4"><result status="valid" time="0.042526" steps="321"/></proof>
   </goal>
   <goal name="set&#39;vc.20" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.333334" steps="916003"/></proof>
+  <proof prover="0"><result status="valid" time="0.333334" steps="1022200"/></proof>
   </goal>
   <goal name="set&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.259022" steps="35981"/></proof>
+  <proof prover="3"><result status="valid" time="0.259022" steps="36407"/></proof>
   </goal>
   <goal name="set&#39;vc.22" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="set&#39;vc.22.0" expl="postcondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.307527" steps="36103"/></proof>
+   <proof prover="3"><result status="valid" time="0.307527" steps="36151"/></proof>
    </goal>
    <goal name="set&#39;vc.22.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.702967" steps="2656564"/></proof>
+   <proof prover="0"><result status="valid" time="0.702967" steps="2111549"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="set&#39;vc.23" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="set&#39;vc.23.0" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.048344" steps="470944"/></proof>
-   <proof prover="3"><result status="valid" time="0.206222" steps="24462"/></proof>
+   <proof prover="0"><result status="valid" time="0.048344" steps="471100"/></proof>
+   <proof prover="3"><result status="valid" time="0.206222" steps="24510"/></proof>
    </goal>
    <goal name="set&#39;vc.23.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.146411" steps="551224"/></proof>
-   <proof prover="3"><result status="valid" time="0.288166" steps="34838"/></proof>
+   <proof prover="0"><result status="valid" time="0.146411" steps="547616"/></proof>
+   <proof prover="3"><result status="valid" time="0.288166" steps="36336"/></proof>
    </goal>
   </transf>
   </goal>
diff --git a/creusot/tests/should_succeed/sparse_array/why3shapes.gz b/creusot/tests/should_succeed/sparse_array/why3shapes.gz
index e61ca48563f4bd55de36446d7f55d6f31b2e3f4e..6411368d4b4b4314e8e851204af6b3840086d3ce 100644
GIT binary patch
literal 4259
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
F002}`OFaMp

literal 4259
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
F0064{W|jZ|

diff --git a/creusot/tests/should_succeed/specification/division.mlcfg b/creusot/tests/should_succeed/specification/division.mlcfg
index 55664b635c..09d2b1353a 100644
--- a/creusot/tests/should_succeed/specification/division.mlcfg
+++ b/creusot/tests/should_succeed/specification/division.mlcfg
@@ -16,12 +16,12 @@ module Division_Divide
   }
   BB0 {
     [#"../division.rs" 7 8 7 9] _5 <- ([#"../division.rs" 7 8 7 9] x);
-    [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = ([#"../division.rs" 7 4 7 9] [#"../division.rs" 7 4 7 9] (0 : uint32)));
+    [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = (0 : uint32));
     assert { [@expl:division by zero] [#"../division.rs" 7 4 7 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../division.rs" 7 4 7 9] _0 <- ([#"../division.rs" 7 4 7 9] ([#"../division.rs" 7 4 7 5] y) / _5);
+    [#"../division.rs" 7 4 7 9] _0 <- ([#"../division.rs" 7 4 7 9] y / _5);
     _5 <- any uint32;
     return _0
   }
diff --git a/creusot/tests/should_succeed/specification/logic_call.mlcfg b/creusot/tests/should_succeed/specification/logic_call.mlcfg
index 9f18d949a6..90835dd6b0 100644
--- a/creusot/tests/should_succeed/specification/logic_call.mlcfg
+++ b/creusot/tests/should_succeed/specification/logic_call.mlcfg
@@ -16,7 +16,7 @@ module LogicCall_Dummy
     goto BB0
   }
   BB0 {
-    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] [#"../logic_call.rs" 12 4 12 5] (0 : uint32));
+    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] (0 : uint32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/loops.mlcfg b/creusot/tests/should_succeed/specification/loops.mlcfg
index b94afea8f7..bdf5f2abd2 100644
--- a/creusot/tests/should_succeed/specification/loops.mlcfg
+++ b/creusot/tests/should_succeed/specification/loops.mlcfg
@@ -15,7 +15,7 @@ module Loops_WhileLoopVariant
     goto BB2
   }
   BB2 {
-    switch ([#"../loops.rs" 6 10 6 11] x)
+    switch (x)
       | False -> goto BB4
       | True -> goto BB3
       end
diff --git a/creusot/tests/should_succeed/split_borrow.mlcfg b/creusot/tests/should_succeed/split_borrow.mlcfg
index 1ae2f34de1..ee3c4ab203 100644
--- a/creusot/tests/should_succeed/split_borrow.mlcfg
+++ b/creusot/tests/should_succeed/split_borrow.mlcfg
@@ -7,7 +7,7 @@ module SplitBorrow_Z
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] [#"../split_borrow.rs" 6 4 6 8] true);
+    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] true);
     return _0
   }
   
@@ -44,14 +44,22 @@ module SplitBorrow_F
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var x : (SplitBorrow_MyInt_Type.t_myint, SplitBorrow_MyInt_Type.t_myint);
+  var _2 : SplitBorrow_MyInt_Type.t_myint;
+  var _3 : SplitBorrow_MyInt_Type.t_myint;
   var y : borrowed (SplitBorrow_MyInt_Type.t_myint, SplitBorrow_MyInt_Type.t_myint);
   var _5 : ();
   var _6 : bool;
+  var _7 : SplitBorrow_MyInt_Type.t_myint;
+  var _8 : SplitBorrow_MyInt_Type.t_myint;
   {
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 10 16 10 36] x <- ([#"../split_borrow.rs" 10 16 10 36] (([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 23 10 24] [#"../split_borrow.rs" 10 23 10 24] (1 : usize))), ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 33 10 34] [#"../split_borrow.rs" 10 33 10 34] (2 : usize)))));
+    [#"../split_borrow.rs" 10 17 10 25] _2 <- ([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize));
+    [#"../split_borrow.rs" 10 27 10 35] _3 <- ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize));
+    [#"../split_borrow.rs" 10 16 10 36] x <- ([#"../split_borrow.rs" 10 16 10 36] (_2, _3));
+    _2 <- any SplitBorrow_MyInt_Type.t_myint;
+    _3 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 11 12 11 18] y <- Borrow.borrow_mut x;
     [#"../split_borrow.rs" 11 12 11 18] x <-  ^ y;
     [#"../split_borrow.rs" 13 7 13 10] _6 <- ([#"../split_borrow.rs" 13 7 13 10] z0 ());
@@ -64,12 +72,16 @@ module SplitBorrow_F
       end
   }
   BB2 {
-    [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) =  * y in (x0, ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 14 23 14 24] [#"../split_borrow.rs" 14 23 14 24] (4 : usize))))) ; };
+    [#"../split_borrow.rs" 14 17 14 25] _7 <- ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt (4 : usize));
+    [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) =  * y in (x0, ([#"../split_borrow.rs" 14 8 14 25] _7))) ; };
+    _7 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] ());
     goto BB4
   }
   BB3 {
-    [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) =  * y in (([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 16 23 16 25] [#"../split_borrow.rs" 16 23 16 25] (10 : usize))), x1)) ; };
+    [#"../split_borrow.rs" 16 17 16 26] _8 <- ([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt (10 : usize));
+    [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) =  * y in (([#"../split_borrow.rs" 16 8 16 26] _8), x1)) ; };
+    _8 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] ());
     goto BB4
   }
@@ -110,19 +122,28 @@ module SplitBorrow_G
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var a : (SplitBorrow_MyInt_Type.t_myint, SplitBorrow_MyInt_Type.t_myint);
+  var _2 : SplitBorrow_MyInt_Type.t_myint;
+  var _3 : SplitBorrow_MyInt_Type.t_myint;
   var x : borrowed (SplitBorrow_MyInt_Type.t_myint, SplitBorrow_MyInt_Type.t_myint);
   var _z : borrowed (SplitBorrow_MyInt_Type.t_myint);
+  var _6 : SplitBorrow_MyInt_Type.t_myint;
   {
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 24 16 24 36] a <- ([#"../split_borrow.rs" 24 16 24 36] (([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 23 24 24] [#"../split_borrow.rs" 24 23 24 24] (1 : usize))), ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 33 24 34] [#"../split_borrow.rs" 24 33 24 34] (2 : usize)))));
+    [#"../split_borrow.rs" 24 17 24 25] _2 <- ([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize));
+    [#"../split_borrow.rs" 24 27 24 35] _3 <- ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize));
+    [#"../split_borrow.rs" 24 16 24 36] a <- ([#"../split_borrow.rs" 24 16 24 36] (_2, _3));
+    _2 <- any SplitBorrow_MyInt_Type.t_myint;
+    _3 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 25 12 25 18] x <- Borrow.borrow_mut a;
     [#"../split_borrow.rs" 25 12 25 18] a <-  ^ x;
     [#"../split_borrow.rs" 27 13 27 21] _z <- Borrow.borrow_final (let (_, a) =  * x in a) (Borrow.inherit_id (Borrow.get_id x) 2);
     [#"../split_borrow.rs" 27 13 27 21] x <- { x with current = (let (x0, x1) =  * x in (x0,  ^ _z)) ; };
     assume { resolve0 _z };
-    [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) =  * x in (([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 29 19 29 20] [#"../split_borrow.rs" 29 19 29 20] (3 : usize))), x1)) ; };
+    [#"../split_borrow.rs" 29 13 29 21] _6 <- ([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt (3 : usize));
+    [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) =  * x in (([#"../split_borrow.rs" 29 4 29 21] _6), x1)) ; };
+    _6 <- any SplitBorrow_MyInt_Type.t_myint;
     assume { resolve1 x };
     assume { resolve2 a };
     [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] ());
diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg
index f2f32e7f16..b17661743f 100644
--- a/creusot/tests/should_succeed/sum.mlcfg
+++ b/creusot/tests/should_succeed/sum.mlcfg
@@ -218,8 +218,8 @@ module Sum_SumFirstN
     goto BB0
   }
   BB0 {
-    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] [#"../sum.rs" 7 18 7 19] (0 : uint32));
-    [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 ([#"../sum.rs" 9 13 9 14] [#"../sum.rs" 9 13 9 14] (1 : uint32)) ([#"../sum.rs" 9 17 9 18] n));
+    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] (0 : uint32));
+    [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 (1 : uint32) n);
     goto BB1
   }
   BB1 {
@@ -278,9 +278,9 @@ module Sum_SumFirstN
   }
   BB12 {
     [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] _22);
-    [#"../sum.rs" 8 4 8 67] _22 <- any Snapshot.snap_ty (Seq.seq uint32);
+    _22 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../sum.rs" 10 8 10 16] sum <- ([#"../sum.rs" 10 8 10 16] sum + ([#"../sum.rs" 10 15 10 16] i));
+    [#"../sum.rs" 10 8 10 16] sum <- ([#"../sum.rs" 10 8 10 16] sum + i);
     goto BB5
   }
   
diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index 06a4f1687d..4932dfaf12 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -216,6 +216,7 @@ module SumOfOdds_ComputeSumOfOdd
   var x : uint32 = x;
   var s : uint32;
   var iter : Core_Ops_Range_Range_Type.t_range uint32;
+  var _8 : Core_Ops_Range_Range_Type.t_range uint32;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range uint32);
   var produced : Snapshot.snap_ty (Seq.seq uint32);
   var _18 : Core_Option_Option_Type.t_option uint32;
@@ -224,12 +225,16 @@ module SumOfOdds_ComputeSumOfOdd
   var __creusot_proc_iter_elem : uint32;
   var _23 : Snapshot.snap_ty (Seq.seq uint32);
   var i : uint32;
+  var _28 : uint32;
+  var _29 : uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] [#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
-    [#"../sum_of_odds.rs" 38 4 38 50] iter <- ([#"../sum_of_odds.rs" 38 4 38 50] into_iter0 ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range ([#"../sum_of_odds.rs" 39 13 39 14] [#"../sum_of_odds.rs" 39 13 39 14] (0 : uint32)) ([#"../sum_of_odds.rs" 39 16 39 17] x)));
+    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
+    [#"../sum_of_odds.rs" 39 13 39 17] _8 <- ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) x);
+    [#"../sum_of_odds.rs" 38 4 38 50] iter <- ([#"../sum_of_odds.rs" 38 4 38 50] into_iter0 _8);
+    _8 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
   }
   BB1 {
@@ -283,10 +288,14 @@ module SumOfOdds_ComputeSumOfOdd
   }
   BB11 {
     [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] _23);
-    [#"../sum_of_odds.rs" 38 4 38 50] _23 <- any Snapshot.snap_ty (Seq.seq uint32);
+    _23 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 41 12 41 33] let _ = sum_of_odd_is_sqr0 (UInt32.to_int i) in true };
-    [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + ([#"../sum_of_odds.rs" 44 13 44 22] ([#"../sum_of_odds.rs" 44 13 44 18] ([#"../sum_of_odds.rs" 44 13 44 14] [#"../sum_of_odds.rs" 44 13 44 14] (2 : uint32)) * ([#"../sum_of_odds.rs" 44 17 44 18] i)) + ([#"../sum_of_odds.rs" 44 21 44 22] [#"../sum_of_odds.rs" 44 21 44 22] (1 : uint32))));
+    [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 18] (2 : uint32) * i);
+    [#"../sum_of_odds.rs" 44 13 44 22] _28 <- ([#"../sum_of_odds.rs" 44 13 44 22] _29 + (1 : uint32));
+    _29 <- any uint32;
+    [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + _28);
+    _28 <- any uint32;
     goto BB4
   }
   
@@ -340,7 +349,7 @@ module SumOfOdds_Test
     goto BB0
   }
   BB0 {
-    [#"../sum_of_odds.rs" 51 12 51 33] y <- ([#"../sum_of_odds.rs" 51 12 51 33] compute_sum_of_odd0 ([#"../sum_of_odds.rs" 51 31 51 32] x));
+    [#"../sum_of_odds.rs" 51 12 51 33] y <- ([#"../sum_of_odds.rs" 51 12 51 33] compute_sum_of_odd0 x);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/sum_of_odds/why3session.xml b/creusot/tests/should_succeed/sum_of_odds/why3session.xml
index 19cd4f6545..4644e4ffc6 100644
--- a/creusot/tests/should_succeed/sum_of_odds/why3session.xml
+++ b/creusot/tests/should_succeed/sum_of_odds/why3session.xml
@@ -20,46 +20,46 @@
  <goal name="compute_sum_of_odd&#39;vc" expl="VC for compute_sum_of_odd" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="compute_sum_of_odd&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.009885" steps="8"/></proof>
+  <proof prover="3"><result status="valid" time="0.009885" steps="10"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.1" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.019646" steps="15"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.2" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.011411" steps="16"/></proof>
+  <proof prover="3"><result status="valid" time="0.011411" steps="18"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.3" expl="loop invariant init" proved="true">
   <proof prover="3"><result status="valid" time="0.014429" steps="25"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.4" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.018927" steps="95"/></proof>
+  <proof prover="3"><result status="valid" time="0.018927" steps="96"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010425" steps="51"/></proof>
+  <proof prover="3"><result status="valid" time="0.010425" steps="52"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.6" expl="postcondition" proved="true">
   <proof prover="3"><result status="valid" time="0.048413" steps="442"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.7" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.007018" steps="50"/></proof>
+  <proof prover="3"><result status="valid" time="0.007018" steps="52"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.8" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.093643" steps="1076"/></proof>
+  <proof prover="3"><result status="valid" time="0.093643" steps="1077"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.9" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.027777" steps="221"/></proof>
+  <proof prover="3"><result status="valid" time="0.027777" steps="224"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.10" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.113176" steps="2954"/></proof>
+  <proof prover="3"><result status="valid" time="0.113176" steps="2968"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.11" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.037591" steps="97"/></proof>
+  <proof prover="3"><result status="valid" time="0.037591" steps="99"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.12" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.158851" steps="4026"/></proof>
+  <proof prover="3"><result status="valid" time="0.158851" steps="4033"/></proof>
   </goal>
   <goal name="compute_sum_of_odd&#39;vc.13" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.070890" steps="577"/></proof>
+  <proof prover="3"><result status="valid" time="0.070890" steps="581"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/sum_of_odds/why3shapes.gz b/creusot/tests/should_succeed/sum_of_odds/why3shapes.gz
index 0950c89fd2d39c7d67f326a048cf9756cf33cffc..189ce8519b1966de8fbfcc5c7cd7fa1fc3eef6e1 100644
GIT binary patch
literal 1712
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
G6#xKr#aK=N

literal 1706
zcmV;b237eViwFP!00000|HW5ZZ|gP^e)q4?Tek@caEA9qQXmKr&_L0L-GYxbD2hsr
zCRS=I=bZibJESB>cI*?k1x{bY%glWII2;Z~|GKJnzlE2yt3IXeZryGEU8(Bo`$f13
zKX?|wv%7F}8<}UzpQ%Gr>|x>WtG3%#yVvJc*RHyzS%lm0HX`M9_#s@+rv|ie6*0Gw
z?Xiw5A?*IxQnOt5M-m()_!B_^LH$TyBKPC1=efP{+{4HfMxEuLw9HCylK5)9TM_J{
z|0Aq7pSUNTp^F}-E_fuGFWatpjcLa`57*aTc;)pni`m$6ug0+)$6_4w<;+?RhBG+A
zk_QWzke*-q|9Laon~4eY_PxVS`Whx@!`|EQ-reKw2?W;Rm)Do4#7;;v+~{yPbz<Ye
z01ke}qH`1aZnfU@;Y(Cfa#gG%ThKPLpikS?%a)eAU;QU+9uragvY?6BZJKpYVYn#!
zJrK`LyIp@E40(FA8M?QnU3E`Q*rd<<$<fQhWO4K2sq0=UvJBgG*!0v}_p{R=%uU+9
zfephw%!E7cc6V?NPigbm|8`_D*M^VPVcgYKSRuQZ7fkwt8zB5T4QU?iOxl$3W9nDA
zJ4{joq3*WZ?sICsd;UFJlTy3hgr_VFlWM*lS+uwhv3sWY=@acE>)x+^?lx&gcUX6~
z-aL|4xADM7)ce(cyXWMoZwep|y=~fcPoF44GMPdO%!oSk;EG-3!E^dkj4pCO&0=p_
zEi(&WhUHgrn_hQaPjTDDAq>+~dJa3%S+Rli?ZjZe&$D*1pkAWL&WdIWUSGe9fRCXm
zZJhSl<=ZHm_)Cj>5aHO2=9ZMnNphOkl;6d}-&t2);`W^N<QW=;qx@U0&pSDTPS6j-
zE#xIj{U!W)uEPvfF8g_PN_o3o+D@r=Rd=tOW|yCk@Jd&N<9GR@tQYi6k7-+VR4%kn
z-RBHDQ|R7X%+Rh6REHZdpMet^XRIl89#|eh?eHV@{Zj$Q4*)$w<cUvV@Wq7*7e}mF
za>tKT6H?-w3_OPuxry@RGEj*_MF@MCvg+PMoL|FpeRoXWQ&O9R9_8IoQ=rT%2=oFT
zmIrR6nFBWxhXW~lxI1$`?=+8r*`YeO5zd2U=@9_8N0H{aIRJPkUG{f<ai#GbA4*Sq
zu7;k<H_dZd96+rXoElC^fI5R)JukUwHkPwXOi~gNgV9`sGBcQnH>ELy2~kw{Nc&7o
zD*GP)DOZ{VlY7ItAr1to<fUEAA$X*!_w9M*SoVeE^W=Gnp8THCHt95`=hdSriqx?W
z%c1f`dpCd2J?azBd7gb+PRQ`<pjRIA40box&N}0xIjkqLZYd``3aTdPTh0L~EX#?M
zIW?9gB+Wa$$}?Ac)w1H)7an;rBQf_l#PN7X@O+6t?)=IfLGlDlcLd6LO?Oh9hXnf-
zNU$FC2noe8(=SPO_iLY4=l-eQO7#ya_36*(U7bGtKb0zdDAJ4BYshu@xU-T9D17G*
z6sOWs4)vS;V5sqz?`HOYTz%U0i$xvUx~)MQko1Vzz|bh8DT(pepw+4Z#}-W0mdjYz
z2DsE*GG-|Vb+SS;!4$8A;|>?8;VnoDZBwT}AY9d8MG}ll!9<Fcl1>Q++yOcO2h3S#
zoOa5|g%Fk@h**o3NyRZXO;C+6($c!BfeN$(<v=<(2VtPmT(nwBD??)$pdot58A#R`
z93ad`C~Y8PVTF{s=9*g+HW(GHtrG}jO@*{q<`5l1?tuL&oQMLN*3>4p(zN6ni>9I9
z$yT<(>L3c7_%nzt9R})XSpo%&Xi6OzaEM6fRI>q5{z*`crqv)?0b22z8*UIa(^}RN
zkq$EZj&sM+ad4b)twZBbJ5(315n2vXi9lQ}A!}X>gDgd%b!wvxm0*rr$BpB(m~vb?
zE>10Z;d*F+;u%^@MztbH6*z!xbZdh^dW$NFPJ)xn3G0M$LOY?HkWL6ExD)6Ee3i%L
zTQ@vu0X0gcd6QC1H6+WFZHx{9WLrt$B>z@yqEU?wm?8kzwG=io3sD-&ObF3HVMB`Y
zTM??;Rw)*B(<-B|j%^bSZ-b6ClUmiG5He2cZ^%gpz=pLLYh`#N8>}hW8A@bzn<y8s
zN`X_%N&9VS8H;U0(ab_jDb!8mnu41P0g|q7u!R=>6U-<f(eII>vtyJyT1LsOR+KbN
z;weOH3N!u>k>f_zq7Fe4N2_h96Q?Agklr}K8dg`zI%S+9Z312VAB28Jb%YfF01df9
AlK=n!

diff --git a/creusot/tests/should_succeed/swap_borrows.mlcfg b/creusot/tests/should_succeed/swap_borrows.mlcfg
index 1d97767b47..1dfaf453a0 100644
--- a/creusot/tests/should_succeed/swap_borrows.mlcfg
+++ b/creusot/tests/should_succeed/swap_borrows.mlcfg
@@ -36,9 +36,9 @@ module SwapBorrows_Swap
   BB1 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../swap_borrows.rs" 6 4 6 14] _0 <- ([#"../swap_borrows.rs" 6 4 6 14] (([#"../swap_borrows.rs" 6 5 6 8] let (_, a) = x in a), ([#"../swap_borrows.rs" 6 10 6 13] let (a, _) = x in a)));
-    [#"../swap_borrows.rs" 6 5 6 8] x <- (let (x0, x1) = x in (x0, any t));
-    [#"../swap_borrows.rs" 6 10 6 13] x <- (let (x0, x1) = x in (any t, x1));
+    [#"../swap_borrows.rs" 6 4 6 14] _0 <- ([#"../swap_borrows.rs" 6 4 6 14] ((let (_, a) = x in a), (let (a, _) = x in a)));
+    x <- (let (x0, x1) = x in (x0, any t));
+    x <- (let (x0, x1) = x in (any t, x1));
     goto BB2
   }
   BB2 {
@@ -98,6 +98,7 @@ module SwapBorrows_F
   var b : uint32;
   var _3 : (uint32, uint32);
   var p : (borrowed uint32, borrowed uint32);
+  var _5 : (borrowed uint32, borrowed uint32);
   var _6 : borrowed uint32;
   var _7 : borrowed uint32;
   var _8 : borrowed uint32;
@@ -105,7 +106,7 @@ module SwapBorrows_F
     goto BB0
   }
   BB0 {
-    [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] (([#"../swap_borrows.rs" 11 26 11 27] [#"../swap_borrows.rs" 11 26 11 27] (0 : uint32)), ([#"../swap_borrows.rs" 11 29 11 30] [#"../swap_borrows.rs" 11 29 11 30] (0 : uint32))));
+    [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] ((0 : uint32), (0 : uint32)));
     [#"../swap_borrows.rs" 11 9 11 14] a <- ([#"../swap_borrows.rs" 11 9 11 14] let (a, _) = _3 in a);
     [#"../swap_borrows.rs" 11 16 11 21] b <- ([#"../swap_borrows.rs" 11 16 11 21] let (_, a) = _3 in a);
     assume { resolve0 _3 };
@@ -115,14 +116,16 @@ module SwapBorrows_F
     [#"../swap_borrows.rs" 12 26 12 32] b <-  ^ _8;
     [#"../swap_borrows.rs" 12 26 12 32] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../swap_borrows.rs" 12 26 12 32] _8 <- { _8 with current = ( ^ _7) ; };
-    [#"../swap_borrows.rs" 12 12 12 34] p <- ([#"../swap_borrows.rs" 12 12 12 34] swap0 ([#"../swap_borrows.rs" 12 17 12 33] (_6, _7)));
+    [#"../swap_borrows.rs" 12 17 12 33] _5 <- ([#"../swap_borrows.rs" 12 17 12 33] (_6, _7));
     _6 <- any borrowed uint32;
     _7 <- any borrowed uint32;
+    [#"../swap_borrows.rs" 12 12 12 34] p <- ([#"../swap_borrows.rs" 12 12 12 34] swap0 _5);
+    _5 <- any (borrowed uint32, borrowed uint32);
     goto BB1
   }
   BB1 {
     assume { resolve1 _8 };
-    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] [#"../swap_borrows.rs" 13 11 13 13] (10 : uint32)) ; }, x1));
+    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] (10 : uint32)) ; }, x1));
     assume { resolve2 p };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 15 20 15 30] b = (10 : uint32) };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 16 20 16 29] a = (0 : uint32) };
diff --git a/creusot/tests/should_succeed/swap_borrows/why3session.xml b/creusot/tests/should_succeed/swap_borrows/why3session.xml
index a20fa9420b..59893a90fe 100644
--- a/creusot/tests/should_succeed/swap_borrows/why3session.xml
+++ b/creusot/tests/should_succeed/swap_borrows/why3session.xml
@@ -12,7 +12,7 @@
 </theory>
 <theory name="SwapBorrows_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="0"><result status="valid" time="0.017480" steps="109"/></proof>
+ <proof prover="0"><result status="valid" time="0.017480" steps="115"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/swap_borrows/why3shapes.gz b/creusot/tests/should_succeed/swap_borrows/why3shapes.gz
index 861ff8bfcef8535686f71a117cc0c34c4d3ad11f..52b7f61adc704c8b5ab2d18e63d7d4c72cd6379c 100644
GIT binary patch
literal 347
zcmV-h0i^yPiwFP!00000|5Z`TPQx$|yyq)&19I~E6&tCC3MpzNj%bgdO=3etX-ZPc
z?_)bnXfNK!?9AHZ`y!t{=;)^W?8d1d4v)Fci-+v=P5t4_kX2bq=;i0QcN`_EEp1RC
z#2}H^AsE!LDiNxxzClAdx@p*-9Yayil45&_OZ~ivLm*`Ml>1@Kr(Zf|QM6@I5?Bjt
zyCkbBU#SMcra_BPra?o^Fpk5o>+Zfj1BrZppgn@7z6<C7)c`>xYIuN5RE?mj`sU%F
z5_r>+p__;S<B2FyCkH@WFQ?alU)I~W-OfWn0%Ddf1oZAsZxIYiRK!NH46>jwrxs0O
z6v1?vI%UA-r5e=*Qz)*Szp}Spzh#30({kkPY;4O`^L>^X@>Xcqn376Mty04KrsGa<
t1`V?&=R4T3jDaGht+WAZnobL2M9UOwytSTdk;|P3V}I1~!wqKw004Tzr~v=~

literal 340
zcmV-a0jvHWiwFP!00000|5Z`TZi6royz>>lwdLfsv9T-V5LJqT)MK^BRtwlIY8p~V
zli#mx0;L!B<(b(X?sGPN(8-PL;)b#7kB>~V{2@DkQ+K>@<hv{-^zw5$IDrMKEp1RC
z#89B9LNKUfRU+(m)xT*d2RHVIi{mJ(iBfKFaju_datMG7pP26lHeTtJMbd^xO5hFf
z?VK#EVu5OeGCd4iq!mF^-48>5b?x2PX8@7!j&wjMsB6RbZ#6)W396<$pg@S5ukQvC
zXX{Q7Ovi&<>(Fax-;`_=vdNJE2Z&kH26}hrw>S)Pl*dLsKjeX7N-dg%$b-K{>Xc!o
zQ>IbfW(wuX<du`v@&`63F^QvSCJ!6F`0TUHkhfC1+LTmUYLt@R*R60;aHzR8OzdIL
mGt+7#8*V|?veZ^c0UnGJLUU)dFIcgc;n^>{tm3&+0ssKkeWa5B

diff --git a/creusot/tests/should_succeed/switch.mlcfg b/creusot/tests/should_succeed/switch.mlcfg
index 700e0cee03..589df93f59 100644
--- a/creusot/tests/should_succeed/switch.mlcfg
+++ b/creusot/tests/should_succeed/switch.mlcfg
@@ -33,7 +33,7 @@ module Switch_Test
     goto BB4
   }
   BB2 {
-    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] [#"../switch.rs" 12 16 12 21] false);
+    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] false);
     goto BB5
   }
   BB3 {
@@ -42,7 +42,7 @@ module Switch_Test
   }
   BB4 {
     [#"../switch.rs" 11 13 11 14] x <- ([#"../switch.rs" 11 13 11 14] Switch_Option_Type.some_0 o);
-    [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] ([#"../switch.rs" 11 19 11 20] x) > ([#"../switch.rs" 11 23 11 24] [#"../switch.rs" 11 23 11 24] (0 : uint32)));
+    [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] x > (0 : uint32));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/switch_struct.mlcfg b/creusot/tests/should_succeed/switch_struct.mlcfg
index 49ec529774..dceefd3ca6 100644
--- a/creusot/tests/should_succeed/switch_struct.mlcfg
+++ b/creusot/tests/should_succeed/switch_struct.mlcfg
@@ -42,7 +42,7 @@ module SwitchStruct_Test
   }
   BB2 {
     [#"../switch_struct.rs" 12 12 12 18] field2 <- ([#"../switch_struct.rs" 12 12 12 18] SwitchStruct_M_Type.g_field2 o);
-    [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] ([#"../switch_struct.rs" 12 24 12 30] field2) = ([#"../switch_struct.rs" 12 34 12 35] [#"../switch_struct.rs" 12 34 12 35] (0 : uint32)));
+    [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] field2 = (0 : uint32));
     goto BB5
   }
   BB3 {
@@ -51,7 +51,7 @@ module SwitchStruct_Test
   }
   BB4 {
     [#"../switch_struct.rs" 11 12 11 18] field1 <- ([#"../switch_struct.rs" 11 12 11 18] SwitchStruct_M_Type.f_field1 o);
-    [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] ([#"../switch_struct.rs" 11 24 11 30] field1) > ([#"../switch_struct.rs" 11 33 11 34] [#"../switch_struct.rs" 11 33 11 34] (0 : uint32)));
+    [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] field1 > (0 : uint32));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
index 1417306221..6ff5206ef7 100644
--- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg
+++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
@@ -17,12 +17,12 @@ module C02Operators_Division
   }
   BB0 {
     [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y);
-    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = ([#"../02_operators.rs" 9 4 9 9] [#"../02_operators.rs" 9 4 9 9] (0 : usize)));
+    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] ([#"../02_operators.rs" 9 4 9 5] x) / _5);
+    [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] x / _5);
     _5 <- any usize;
     return _0
   }
@@ -46,12 +46,12 @@ module C02Operators_Modulus
   }
   BB0 {
     [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y);
-    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = ([#"../02_operators.rs" 24 4 24 9] [#"../02_operators.rs" 24 4 24 9] (0 : usize)));
+    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = (0 : usize));
     assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] ([#"../02_operators.rs" 24 4 24 5] x) % _5);
+    [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] x % _5);
     _5 <- any usize;
     return _0
   }
@@ -74,7 +74,7 @@ module C02Operators_Multiply
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] ([#"../02_operators.rs" 39 4 39 5] x) * ([#"../02_operators.rs" 39 8 39 9] y));
+    [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] x * y);
     return _0
   }
   
@@ -96,7 +96,7 @@ module C02Operators_Add
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] ([#"../02_operators.rs" 49 4 49 5] x) + ([#"../02_operators.rs" 49 8 49 9] y));
+    [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] x + y);
     return _0
   }
   
@@ -116,7 +116,7 @@ module C02Operators_Sub
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] ([#"../02_operators.rs" 64 4 64 5] x) - ([#"../02_operators.rs" 64 8 64 9] y));
+    [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] x - y);
     return _0
   }
   
@@ -137,8 +137,12 @@ module C02Operators_Expression
   var x : usize = x;
   var y : usize = y;
   var z : usize = z;
+  var _7 : usize;
+  var _8 : usize;
   var _10 : usize;
   var _11 : bool;
+  var _13 : usize;
+  var _14 : usize;
   var _16 : usize;
   var _17 : bool;
   {
@@ -146,20 +150,28 @@ module C02Operators_Expression
   }
   BB0 {
     [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y);
-    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = ([#"../02_operators.rs" 78 4 78 9] [#"../02_operators.rs" 78 4 78 9] (0 : usize)));
+    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 };
     goto BB1
   }
   BB1 {
+    [#"../02_operators.rs" 78 4 78 9] _8 <- ([#"../02_operators.rs" 78 4 78 9] x / _10);
+    _10 <- any usize;
+    [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z);
+    _8 <- any usize;
     [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y);
-    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = ([#"../02_operators.rs" 78 17 78 24] [#"../02_operators.rs" 78 17 78 24] (0 : usize)));
+    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 };
     goto BB2
   }
   BB2 {
-    [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] ([#"../02_operators.rs" 78 4 78 13] ([#"../02_operators.rs" 78 4 78 9] ([#"../02_operators.rs" 78 4 78 5] x) / _10) * ([#"../02_operators.rs" 78 12 78 13] z)) = ([#"../02_operators.rs" 78 17 78 28] ([#"../02_operators.rs" 78 17 78 24] ([#"../02_operators.rs" 78 18 78 19] x) / _16) * ([#"../02_operators.rs" 78 27 78 28] z)));
-    _10 <- any usize;
+    [#"../02_operators.rs" 78 17 78 24] _14 <- ([#"../02_operators.rs" 78 17 78 24] x / _16);
     _16 <- any usize;
+    [#"../02_operators.rs" 78 17 78 28] _13 <- ([#"../02_operators.rs" 78 17 78 28] _14 * z);
+    _14 <- any usize;
+    [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] _7 = _13);
+    _7 <- any usize;
+    _13 <- any usize;
     return _0
   }
   
@@ -214,7 +226,7 @@ module C02Operators_BoolEq
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb ([#"../02_operators.rs" 96 4 96 5] a) ([#"../02_operators.rs" 96 9 96 10] b));
+    [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb a b);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/02_operators/why3session.xml b/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
index f6a9daf9e0..5c5f974fe6 100644
--- a/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
+++ b/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
@@ -34,7 +34,7 @@
 </theory>
 <theory name="C02Operators_Expression" proved="true">
  <goal name="expression&#39;vc" expl="VC for expression" proved="true">
- <proof prover="2"><result status="valid" time="0.159217" steps="23261"/></proof>
+ <proof prover="2"><result status="valid" time="0.159217" steps="23548"/></proof>
  </goal>
 </theory>
 <theory name="C02Operators_ExpressionLogic_Impl" proved="true">
diff --git a/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz b/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz
index baeb8793d955ac25b3fbebe3c0d972fb8a09f29d..0c910d3b7bcb710d14daf3c18e388bb729088b53 100644
GIT binary patch
literal 693
zcmV;m0!sZKiwFP!00000|IL)kZre%>hWGOn+VwO=fuYE`9W(`k0*1Wls?gTp+|Ci;
zM6M+V?b~;x7>+GBX_nncBM$YG{Dz!=ZmQvb-ld^>O#7khAO5X$b@N_u_ptH(;UNwj
zyGK5B52L1c<=M*fkNWN_-(DDkTo+S|{B3_ochAf9wCZ@p+ab+{@?D%)>!<hnT4vg4
zp*VczvENKqDE^}TQssVMm8`lc-}6lG`}h}TTCzH955sw)H!r3MYyNaw_K!O9BzRo#
zJ^wh9K5WNsxBYpp{oxPVAKs|VF`mnQd`<TAZP~w)J!3E&yeO1Fod|<kAhs>g%y?QX
zAlr+0H2+U6;A-Iqc!?J3i=$fIy>tc($2mYbQn(5Lua1Mei14cCvK`&A9YH?#<8eJ_
zBNw>bu_N78M?P6vH+STO(=4knm&NNhLef`^bgP!y>eaIG&46$T2#<j1nGc=t(1H#g
z>EIQeCrgVnoq5!zEM6LkwmzSYyWbCZ`mx)mVZMyUYujeq|JMaE#d@h$xgJkqyM1@x
zjoo9~g#LcV`)-)-xZ75?@O`>xP9@iil8eLYq~iO2yGh^0xISgnZ{uc6!ze@qqdZwt
zTadv919f)VCAONQ0kRb|QaCA7G%f^Zy)nsnNro5#C5Z%5SJ>1dg@ojs%1|c{3Yd{%
z;xbK^6FR6=LxN1KQ<ODpbQV?4?CJm}VL&z^LS-5)Kq;r#`>YH}oh>^|8Zh~kr3uMZ
zuCam<j8xuBmnArdfl3Vl9WuF0*;D`xNP*f!AB?vu)FhE3dXoV)QmM$xPysej3xepB
z%gK{rj*?O+#i0vS<m!@V1*!oO8cRfwF=%ULh@?!WU;&ME3<;qE(|{JnX)FkcqKlMM
b%<Lf>R3KBvx-L*%16KS3(n~{Pa0dVY=66&u

literal 670
zcmV;P0%83hiwFP!00000|IL(5kJ>O0hVT9rxwYM@lE>rEs;q=6t-__JDpxfANE-<V
zOTudV@9VIL4Pl{s>;;_h=<z$RXZ-Q5=zh~Sb;VQKbxphZTIk~L6QgFc^zD8VJBrN{
z?VC-n<%j%R@$rY4|Df4fAn-*FRY*T~`!s)DE{0V@547siA&|dw^26fge{qQ!HY&&o
z_tdw`AqqL4Ro{!c-4$6?Gw2;FUAOT+RGL-oSNm=(^zN!mSkSjw-am5q33y!4nx04K
z{i<)at3PA*=YOz2zmrWdj<H{EVee;o{{lPmpxb+vT>>~c3^1`6cx4YB4~vP(aCYDu
zyJv>Fv-^3NUo-wZZvu5U`yS7zH#4VwhZikm&t;i+$~U*<o13E4yXC8?e03Zf{W>=K
zbg6oBr|LL1>Z0bCNTr6c85r^vCr>yz!Ql~iY2izx!ow6E252biTBBED-0}0b$2L80
zcd0u(G5uw1xoUqkfemL}vyLzN6KuO{)=l3$rDbT>TiP|<@N&&6Ucuw=dYnoYlah17
z!-?YCcC}28tY4fIwX3-7Q`a*V!6+}S5f*r`!GNfpc8RQ}Xh7NmO3obTDH<1ov)-6w
zJeNii1erKW;JUz4uoMzX=Tr?Mc~C%vGA05+mJ&KBR4JJ>QKZNPX>=A<U6T_5Ou~R<
zLWIJUnt@VIk@vMSlIz-%!=wR|Pc=6oxx$r}DTz=gX|2z1sf3_|bHW4*&e@103V;$g
zLv5lD##<GH<VX>{sR1?0T#@IY04zZ;3DGH6Coc_A<T8a^9J(Npq{uo8P$fvFQF#wM
z25l`5Q7Ti*d?Xs~2ogd8rUcE5)0i!gGP)@16l?NO8&tqkjY4EoT?v-`1-!y)2Sx_~
E0LUvqg8%>k

diff --git a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
index c1687a288a..bf420021a7 100644
--- a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
@@ -9,7 +9,7 @@ module C07ExternSpec_Impl0_Func
     goto BB0
   }
   BB0 {
-    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] [#"../07_extern_spec.rs" 12 8 12 12] true);
+    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] true);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
index 215afe36ae..d3af288582 100644
--- a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
@@ -118,7 +118,7 @@ module C10MutualRecTypes_Impl0_Height
   }
   BB2 {
     [#"../10_mutual_rec_types.rs" 19 22 19 23] n <- ([#"../10_mutual_rec_types.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C10MutualRecTypes_Tree_Type.tree_0 self));
-    [#"../10_mutual_rec_types.rs" 19 29 19 44] _5 <- ([#"../10_mutual_rec_types.rs" 19 29 19 44] height ([#"../10_mutual_rec_types.rs" 19 29 19 35] C10MutualRecTypes_Node_Type.node_left n));
+    [#"../10_mutual_rec_types.rs" 19 29 19 44] _5 <- ([#"../10_mutual_rec_types.rs" 19 29 19 44] height (C10MutualRecTypes_Node_Type.node_left n));
     goto BB5
   }
   BB3 {
@@ -126,11 +126,11 @@ module C10MutualRecTypes_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] [#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
+    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
-    [#"../10_mutual_rec_types.rs" 19 49 19 65] _7 <- ([#"../10_mutual_rec_types.rs" 19 49 19 65] height ([#"../10_mutual_rec_types.rs" 19 49 19 56] C10MutualRecTypes_Node_Type.node_right n));
+    [#"../10_mutual_rec_types.rs" 19 49 19 65] _7 <- ([#"../10_mutual_rec_types.rs" 19 49 19 65] height (C10MutualRecTypes_Node_Type.node_right n));
     goto BB6
   }
   BB6 {
@@ -140,7 +140,7 @@ module C10MutualRecTypes_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + ([#"../10_mutual_rec_types.rs" 19 69 19 70] [#"../10_mutual_rec_types.rs" 19 69 19 70] (1 : uint64)));
+    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + (1 : uint64));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
index 395084c784..1c35d39d16 100644
--- a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
@@ -36,18 +36,20 @@ module C11ArrayTypes_Omg
   var _0 : ();
   var x : C11ArrayTypes_UsesArray_Type.t_usesarray = x;
   var _3 : usize;
+  var _4 : usize;
   var _5 : bool;
   {
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] [#"../11_array_types.rs" 9 8 9 9] (0 : usize));
-    [#"../11_array_types.rs" 9 4 9 10] _5 <- ([#"../11_array_types.rs" 9 4 9 10] _3 < ([#"../11_array_types.rs" 9 4 9 10] Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x)));
+    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] (0 : usize));
+    [#"../11_array_types.rs" 9 4 9 10] _4 <- ([#"../11_array_types.rs" 9 4 9 10] Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x));
+    [#"../11_array_types.rs" 9 4 9 10] _5 <- ([#"../11_array_types.rs" 9 4 9 10] _3 < _4);
     assert { [@expl:index in bounds] [#"../11_array_types.rs" 9 4 9 10] _5 };
     goto BB1
   }
   BB1 {
-    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] [#"../11_array_types.rs" 9 13 9 14] (5 : int64))));
+    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] (5 : int64))));
     assert { [@expl:assertion] [#"../11_array_types.rs" 11 20 11 32] Int64.to_int (index_logic0 (C11ArrayTypes_UsesArray_Type.usesarray_0 x) 0) = 5 };
     [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] ());
     return _0
@@ -72,12 +74,15 @@ module C11ArrayTypes_CallOmg
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var arr : array int64;
+  var _2 : C11ArrayTypes_UsesArray_Type.t_usesarray;
   {
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create ([#"../11_array_types.rs" 15 14 15 24] [#"../11_array_types.rs" 15 14 15 24] (5 : usize)) (fun _ -> [#"../11_array_types.rs" 15 15 15 20] [#"../11_array_types.rs" 15 15 15 20] (3 : int64)));
-    [#"../11_array_types.rs" 16 4 16 23] _0 <- ([#"../11_array_types.rs" 16 4 16 23] omg0 ([#"../11_array_types.rs" 16 8 16 22] C11ArrayTypes_UsesArray_Type.C_UsesArray ([#"../11_array_types.rs" 16 18 16 21] arr)));
+    [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create (5 : usize) (fun _ -> (3 : int64)));
+    [#"../11_array_types.rs" 16 8 16 22] _2 <- ([#"../11_array_types.rs" 16 8 16 22] C11ArrayTypes_UsesArray_Type.C_UsesArray arr);
+    [#"../11_array_types.rs" 16 4 16 23] _0 <- ([#"../11_array_types.rs" 16 4 16 23] omg0 _2);
+    _2 <- any C11ArrayTypes_UsesArray_Type.t_usesarray;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/syntax/11_array_types/why3session.xml b/creusot/tests/should_succeed/syntax/11_array_types/why3session.xml
index 6e22e2d924..dd4d2d99d3 100644
--- a/creusot/tests/should_succeed/syntax/11_array_types/why3session.xml
+++ b/creusot/tests/should_succeed/syntax/11_array_types/why3session.xml
@@ -7,12 +7,12 @@
 <path name=".."/><path name="11_array_types.mlcfg"/>
 <theory name="C11ArrayTypes_Omg" proved="true">
  <goal name="omg&#39;vc" expl="VC for omg" proved="true">
- <proof prover="1"><result status="valid" time="0.007404" steps="55"/></proof>
+ <proof prover="1"><result status="valid" time="0.007404" steps="57"/></proof>
  </goal>
 </theory>
 <theory name="C11ArrayTypes_CallOmg" proved="true">
  <goal name="call_omg&#39;vc" expl="VC for call_omg" proved="true">
- <proof prover="1"><result status="valid" time="0.007545" steps="29"/></proof>
+ <proof prover="1"><result status="valid" time="0.007545" steps="31"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/syntax/11_array_types/why3shapes.gz b/creusot/tests/should_succeed/syntax/11_array_types/why3shapes.gz
index 7bdaf6147c459a3287c90a2dcdd02c8b9773a767..725cf157bd145b242e245d8faa8b4fa74f62a294 100644
GIT binary patch
literal 310
zcmV-60m=R!iwFP!00000|7}pqZo)teyyq+S)|S)0Nh_#|Dn)SVsqz(>jTa(?q)I}?
z=huNiNy}xu9(!hNKTbru!!K&ZH#KchS1-bg$y0)J?CNz<by!q69oJ>OErJ9WWN<5-
zg9Dp!M5MB7!Ga%t68!3e>mCnG_V$5aPz#(fQc|_;c0(USa~Aa3;#XzF39hf)a_m@v
znX?h&p24W0AKc()bD+ibcftzHux#lB{1v@PbiXp_!AJ23eXc?uXBYP(2RYnM;U14X
z$m?y5yAya9v2H}Y-zFoXz8w8OPX~E22X!_*n-9BUXb3wBju?6a12&lKY7?+5*S%Nb
zFyC0E^d^;&Y;IHOoUs_qluVrZT&Sf?h;@|44WSG+5B@m~J~h!tBDB*Og<0z42QWt{
IjW_}T04Pn3+W-In

literal 303
zcmV+~0nq**iwFP!00000|80=VPQx$|Mfdp%?|`m6ezl+!Q6WX`h86O*8pci<DNRt4
zqJBP;l0E`#JocSA_u9UniEf9Vu@hgh?aHQp5>Ct>5?o^6Y|FaGvJUaMt(u}F=?zJ;
z8(ezhb;cDjR(<ESx8qKFyLscj#RJ36-0|vRg()jltc!j(&at#)Lz}IxE)$0A(79#w
z)Pc!#Li`sn85l0E@V!06)n#|mO3bk8;z{^zdOeK(z|jK*G}QE*S_Uu2KLgz3kuUIk
z+vDlPzlywRMYAuG2?*!U{>yR7DeNb7d>c|5v5#aUOD|q|O**^S6IRuB$Vg<6i{KXe
zBSd3lnCI~592oY@ty>rpu$Bn`=ol0c1Rzl8w1qipt+XO0rO<1Yd;_D}0!%0Z0051Z
Blkfll

diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index f9dfc6f983..62fe4c7f44 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -169,7 +169,7 @@ module C12GhostCode_GhostCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] [#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
+    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
     [#"../12_ghost_code.rs" 19 17 19 52] _s <- ([#"../12_ghost_code.rs" 19 17 19 52] Snapshot.new (Seq.snoc (Seq.empty ) (0 : int32)));
     goto BB1
   }
@@ -179,7 +179,7 @@ module C12GhostCode_GhostCopy
   }
   BB2 {
     [#"../12_ghost_code.rs" 20 4 20 33] _s <- ([#"../12_ghost_code.rs" 20 4 20 33] _4);
-    [#"../12_ghost_code.rs" 20 4 20 33] _4 <- any Snapshot.snap_ty (Seq.seq int32);
+    _4 <- any Snapshot.snap_ty (Seq.seq int32);
     [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] ());
     return _0
   }
@@ -208,7 +208,7 @@ module C12GhostCode_GhostIsCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] [#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
+    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
     [#"../12_ghost_code.rs" 25 12 25 18] r <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 25 12 25 18] x <-  ^ r;
     assume { resolve0 r };
@@ -352,6 +352,7 @@ module C12GhostCode_GhostCheck
   var _2 : Snapshot.snap_ty ();
   var _4 : ();
   var _5 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
+  var _7 : bool;
   var _8 : usize;
   {
     goto BB0
@@ -367,17 +368,19 @@ module C12GhostCode_GhostCheck
   BB2 {
     [#"../12_ghost_code.rs" 41 4 41 5] _5 <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 41 4 41 5] x <-  ^ _5;
-    [#"../12_ghost_code.rs" 41 4 41 13] _4 <- ([#"../12_ghost_code.rs" 41 4 41 13] push0 _5 ([#"../12_ghost_code.rs" 41 11 41 12] [#"../12_ghost_code.rs" 41 11 41 12] (0 : int32)));
+    [#"../12_ghost_code.rs" 41 4 41 13] _4 <- ([#"../12_ghost_code.rs" 41 4 41 13] push0 _5 (0 : int32));
     _5 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB3
   }
   BB3 {
-    [#"../12_ghost_code.rs" 43 12 43 19] _8 <- ([#"../12_ghost_code.rs" 43 12 43 19] len0 ([#"../12_ghost_code.rs" 43 12 43 13] x));
+    [#"../12_ghost_code.rs" 43 12 43 19] _8 <- ([#"../12_ghost_code.rs" 43 12 43 19] len0 x);
     goto BB4
   }
   BB4 {
     assume { resolve0 x };
-    switch ([#"../12_ghost_code.rs" 43 12 43 24] _8 = ([#"../12_ghost_code.rs" 43 23 43 24] [#"../12_ghost_code.rs" 43 23 43 24] (1 : usize)))
+    [#"../12_ghost_code.rs" 43 12 43 24] _7 <- ([#"../12_ghost_code.rs" 43 12 43 24] _8 = (1 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB6
       | True -> goto BB5
       end
@@ -447,7 +450,7 @@ module C12GhostCode_TakesStruct
   }
   BB1 {
     [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 27] _3));
-    [#"../12_ghost_code.rs" 53 4 53 27] _3 <- any Snapshot.snap_ty uint32;
+    _3 <- any Snapshot.snap_ty uint32;
     [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code/why3shapes.gz b/creusot/tests/should_succeed/syntax/12_ghost_code/why3shapes.gz
index 4d445d9041dc1f2022b5c0b6c74ae95a2e51387a..5a543707039391ec3e2c95e1d528fe648e52be73 100644
GIT binary patch
literal 362
zcmV-w0hRtAiwFP!00000|8-HxZi6roz56S;wav*Ji>u~<A|bd}b8Ivi6Hp0Gfh6tU
z*BDx<O?&aoJkRpp%>5=98$6jYxR_yVZT}cV!RCSB79@m)Ga-nq@Zn+w_T~!Q`GXm4
zcQF+BjB{Y~KW=~l^_f)DjKD6a?GPLqJ5Kv{+-rOKAk!PR{YARG)fKLIb-C-ky3CCv
z__W2&^oOZI$F%G0b$_&#=_p8??7r<MJmNb|eaD-WVuqdlYDpo?$gVExw8jj((M<R}
zoDDEBGiIV)P!G-k*It!(W_4#bFOqleU7_zKFuLRcTlTPUbJ3sdonV@!tMs|@7jt|8
zg=25^Pn?0$i&VZ^hxoa^!c$d{tcOS-_DBp-wk{${@xOIOH|Nrg(XWJPl~hcWJd`3y
zVnJnD30a~pg^G;}1C~?bj?L#pDkRrsScRH#Wmv^jEs{#9K;=mu=TRQ!G8Z`~pG2|;
I;Ccc80Hx!yPyhe`

literal 346
zcmV-g0j2&QiwFP!00000|8-GKQ-d%Nz2{eOQ+vuM5XT-EXBfD6+@qZ(gu+NkE!gV6
zH$c?!>%!Z8*?qfjx!y!$i$^;~XL}kuH{3>Xw7DU;1qrJ3pg`p1lCCIluovJyKH1Ur
zXG?+4JO?(v;|3VerIH$&6S$8WcZ&9{8>d}2?u<LWk?9$`;VgY!2!(GBA@|xLWPT*U
zyDj#1*iS9`P5a(mb_ZA6o`S^5?Yd#Y1HRI1QT$a>&a}r5NeU__P1$5k`QTS%+_3Ts
z@x{x<^2&b$_34q(wGP;7a~<uoKbP}<Xr2XUbLWr6@DVhQgEQZG2HLDnctFoAbC-_g
zsv6R8=M<8KNg&RH&p5;Xt`-0K8>Y49i4ddHnu&@lDbh3%R93Z+6`D%u#QHR11tl6a
sjkU6haTcp86<pP_t}5E7N(jaxU8F@)#DywkAqr030hpRwQ&|E40I&3@M*si-

diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index 9a00153f23..d3c48b6e7b 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -209,6 +209,7 @@ module C13VecMacro_X
   var v0 : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global);
   var v1 : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
   var v2 : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
+  var _10 : array int32;
   {
     goto BB0
   }
@@ -222,7 +223,7 @@ module C13VecMacro_X
     goto BB2
   }
   BB2 {
-    [#"../13_vec_macro.rs" 9 13 9 23] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 ([#"../13_vec_macro.rs" 9 18 9 19] [#"../13_vec_macro.rs" 9 18 9 19] (0 : int32)) ([#"../13_vec_macro.rs" 9 21 9 22] [#"../13_vec_macro.rs" 9 21 9 22] (2 : usize)));
+    [#"../13_vec_macro.rs" 9 13 9 23] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 (0 : int32) (2 : usize));
     goto BB3
   }
   BB3 {
@@ -231,13 +232,15 @@ module C13VecMacro_X
     goto BB4
   }
   BB4 {
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB5
   }
   BB5 {
     goto BB6
   }
   BB6 {
-    [#"../13_vec_macro.rs" 12 13 12 26] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] [#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] [#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] [#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp));
+    [#"../13_vec_macro.rs" 12 13 12 26] v2 <- ([#"../13_vec_macro.rs" 12 13 12 26] into_vec0 _10);
+    _10 <- any array int32;
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro/why3shapes.gz b/creusot/tests/should_succeed/syntax/13_vec_macro/why3shapes.gz
index b3e68613da9285286fa7997d2394d1aae9d31b74..2f1ed159900b8c9a264bb8ae45b679dabf7ad349 100644
GIT binary patch
delta 366
zcmV-!0g?Xr0{sGz7=KPe2va#!lTi2rxmI49wn!AV!n*$anXhUcqnE_7pWm~c<are~
zNBr<jc=6|^sH@jdg{zmK{lucWD9f_Zj4Vv1v^)!Nonq;$LwiIbD9ieLd#ZQ71S_zu
zw?)<B39oF^C(Iyu=N48>l)}o%<Tjd2uxeR|*?1-dGe|E)`+r2qtX`&+Ho2!v=ka1^
zlmD8cSU!v_A%UgYK<udZvv2D1;=5yxDXkV%HjV_;OqOu!-b1h`+l<!|^&DhK;z;p}
z%2)EKYhtK@(q*Tb;=#A*%eLtpeC`6r|GJoio^+ub;rQlZ^mnhKuaipWw_f|~qT2cE
zwyY0@BNVrw9cRmNP5XEmoya<Mj6B%`Ievo=qv0LR(%S)WY>8`#-b(L|ed(mZvhhK|
zqip8r+t{~oU!TKk5J0jMOea3k@2I6xTts^<QA3PgYo<d01I#2wo7gB58EJ&!1`G>+
M06g53DxU)Y0E2<RmjD0&

delta 361
zcmV-v0ha##0{8-u7=O+Ol&Ku5Nhth*Tq`$ZEfR&Tu&zIU4j<JzMlXqDKfh-?$@3~~
zkNDx*@Z!#G+0?IL6s}%^?i0)U5*e0_rZO;@((o+6O^TJP58V-opsJeh-Ki;D1x8@k
z?8>^s6JFW2Pnbb+?-oW(l)}i#<VH;<m}psunRq4yGe|E)`+r2q%zBwpn&h4`oyW_<
zB>y!<v3wX=LIO*(fyh$tXV*5>#rb27DXj)nHjV_;OqOu!-a{~%ZO3bo#DQN_bR?gA
z>4P#QNw1aS!FA}WuJsN+cY)=9UCct3FZUoU-#(1~?ojj{Qo;PzVV_;rg}d&m=1^Kf
zaRaesIc{hluVTQ9Y*Nd}lRc2*H~26R?rD}@41i@zTtoC$x<B@%lLpJiX9SP3nWfKS
z-op3h9A1OKCTqDCtWZv&vH~NEg^HDQ$v!IfT!jD{m`?Os$2!tVOD#0lpjq$(zNOn8
Hl>-0(K25ZY

diff --git a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
index cc11542340..cf4c6cc585 100644
--- a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
+++ b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
@@ -13,7 +13,7 @@ module C14ConstFns_Omg
     goto BB0
   }
   BB0 {
-    [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] ([#"../14_const_fns.rs" 6 4 6 5] x) - ([#"../14_const_fns.rs" 6 8 6 9] [#"../14_const_fns.rs" 6 8 6 9] (1 : int32)));
+    [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] x - (1 : int32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
index e1ef4d7a89..48f558447b 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
+++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
@@ -112,7 +112,7 @@ module DeriveMacros_Impl2_Clone
     [#"../derive_macros.rs" 10 4 10 8] _5 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a self);
     assert { [@expl:type invariant] inv0 _5 };
     assume { resolve0 _5 };
-    [#"../derive_macros.rs" 10 4 10 8] _3 <- ([#"../derive_macros.rs" 10 4 10 8] clone0 ([#"../derive_macros.rs" 10 4 10 8] _5));
+    [#"../derive_macros.rs" 10 4 10 8] _3 <- ([#"../derive_macros.rs" 10 4 10 8] clone0 _5);
     goto BB1
   }
   BB1 {
@@ -121,7 +121,7 @@ module DeriveMacros_Impl2_Clone
     assume { resolve1 self };
     assert { [@expl:type invariant] inv2 _8 };
     assume { resolve2 _8 };
-    [#"../derive_macros.rs" 11 4 11 8] _6 <- ([#"../derive_macros.rs" 11 4 11 8] clone1 ([#"../derive_macros.rs" 11 4 11 8] _8));
+    [#"../derive_macros.rs" 11 4 11 8] _6 <- ([#"../derive_macros.rs" 11 4 11 8] clone1 _8);
     goto BB2
   }
   BB2 {
@@ -245,7 +245,7 @@ module DeriveMacros_Impl3_Eq
     [#"../derive_macros.rs" 10 4 10 8] _7 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a rhs);
     assert { [@expl:type invariant] inv0 _7 };
     assume { resolve0 _7 };
-    [#"../derive_macros.rs" 10 4 10 8] _4 <- ([#"../derive_macros.rs" 10 4 10 8] eq0 ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a self) ([#"../derive_macros.rs" 10 4 10 8] _7));
+    [#"../derive_macros.rs" 10 4 10 8] _4 <- ([#"../derive_macros.rs" 10 4 10 8] eq0 (DeriveMacros_Product_Type.product_a self) _7);
     goto BB1
   }
   BB1 {
@@ -262,7 +262,7 @@ module DeriveMacros_Impl3_Eq
     assume { resolve1 rhs };
     assert { [@expl:type invariant] inv2 _10 };
     assume { resolve2 _10 };
-    [#"../derive_macros.rs" 11 4 11 8] _0 <- ([#"../derive_macros.rs" 11 4 11 8] eq1 ([#"../derive_macros.rs" 11 4 11 8] DeriveMacros_Product_Type.product_b self) ([#"../derive_macros.rs" 11 4 11 8] _10));
+    [#"../derive_macros.rs" 11 4 11 8] _0 <- ([#"../derive_macros.rs" 11 4 11 8] eq1 (DeriveMacros_Product_Type.product_b self) _10);
     goto BB4
   }
   BB3 {
@@ -270,7 +270,7 @@ module DeriveMacros_Impl3_Eq
     assume { resolve1 rhs };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] [#"../derive_macros.rs" 10 4 11 8] false);
+    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] false);
     goto BB5
   }
   BB4 {
@@ -437,7 +437,7 @@ module DeriveMacros_Impl4_Clone
     [#"../derive_macros.rs" 28 9 28 14] _11 <- ([#"../derive_macros.rs" 28 9 28 14] v0_11);
     assert { [@expl:type invariant] inv3 _11 };
     assume { resolve3 _11 };
-    [#"../derive_macros.rs" 28 9 28 14] _9 <- ([#"../derive_macros.rs" 28 9 28 14] clone1 ([#"../derive_macros.rs" 28 9 28 14] _11));
+    [#"../derive_macros.rs" 28 9 28 14] _9 <- ([#"../derive_macros.rs" 28 9 28 14] clone1 _11);
     goto BB7
   }
   BB3 {
@@ -453,7 +453,7 @@ module DeriveMacros_Impl4_Clone
     [#"../derive_macros.rs" 28 9 28 14] _7 <- ([#"../derive_macros.rs" 28 9 28 14] v0_1);
     assert { [@expl:type invariant] inv1 _7 };
     assume { resolve1 _7 };
-    [#"../derive_macros.rs" 28 9 28 14] _5 <- ([#"../derive_macros.rs" 28 9 28 14] clone0 ([#"../derive_macros.rs" 28 9 28 14] _7));
+    [#"../derive_macros.rs" 28 9 28 14] _5 <- ([#"../derive_macros.rs" 28 9 28 14] clone0 _7);
     goto BB5
   }
   BB5 {
@@ -610,7 +610,7 @@ module DeriveMacros_Impl5_Eq
     assume { resolve0 self };
     assert { [@expl:type invariant] inv0 rhs };
     assume { resolve0 rhs };
-    [#"../derive_macros.rs" 28 16 28 25] _4 <- ([#"../derive_macros.rs" 28 16 28 25] (([#"../derive_macros.rs" 28 16 28 25] self), ([#"../derive_macros.rs" 28 16 28 25] rhs)));
+    [#"../derive_macros.rs" 28 16 28 25] _4 <- ([#"../derive_macros.rs" 28 16 28 25] (self, rhs));
     switch (let (a, _) = _4 in a)
       | DeriveMacros_Sum_Type.C_A _ -> goto BB1
       | DeriveMacros_Sum_Type.C_B _ -> goto BB4
@@ -628,7 +628,7 @@ module DeriveMacros_Impl5_Eq
   BB3 {
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve1 _4 };
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB16
   }
   BB4 {
@@ -649,7 +649,7 @@ module DeriveMacros_Impl5_Eq
     assume { resolve2 v0_1 };
     assert { [@expl:type invariant] inv2 v0_2 };
     assume { resolve2 v0_2 };
-    [#"../derive_macros.rs" 28 16 28 25] _12 <- ([#"../derive_macros.rs" 28 16 28 25] eq0 ([#"../derive_macros.rs" 28 16 28 25] v0_1) ([#"../derive_macros.rs" 28 16 28 25] v0_2));
+    [#"../derive_macros.rs" 28 16 28 25] _12 <- ([#"../derive_macros.rs" 28 16 28 25] eq0 v0_1 v0_2);
     goto BB7
   }
   BB7 {
@@ -659,11 +659,11 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB8 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
     goto BB10
   }
   BB9 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB10
   }
   BB10 {
@@ -678,7 +678,7 @@ module DeriveMacros_Impl5_Eq
     assume { resolve3 v0_11 };
     assert { [@expl:type invariant] inv3 v0_21 };
     assume { resolve3 v0_21 };
-    [#"../derive_macros.rs" 28 16 28 25] _17 <- ([#"../derive_macros.rs" 28 16 28 25] eq1 ([#"../derive_macros.rs" 28 16 28 25] v0_11) ([#"../derive_macros.rs" 28 16 28 25] v0_21));
+    [#"../derive_macros.rs" 28 16 28 25] _17 <- ([#"../derive_macros.rs" 28 16 28 25] eq1 v0_11 v0_21);
     goto BB12
   }
   BB12 {
@@ -688,11 +688,11 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB13 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
     goto BB15
   }
   BB14 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/take_first_mut.mlcfg b/creusot/tests/should_succeed/take_first_mut.mlcfg
index 1f6c4962dc..8c80823cf2 100644
--- a/creusot/tests/should_succeed/take_first_mut.mlcfg
+++ b/creusot/tests/should_succeed/take_first_mut.mlcfg
@@ -206,16 +206,16 @@ module TakeFirstMut_TakeFirstMut
   }
   BB4 {
     [#"../take_first_mut.rs" 17 14 17 19] first <- ([#"../take_first_mut.rs" 17 14 17 19] let (a, _) = Core_Option_Option_Type.some_0 _3 in a);
-    [#"../take_first_mut.rs" 17 14 17 19] _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (any borrowed t, x1)));
+    _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (any borrowed t, x1)));
     [#"../take_first_mut.rs" 17 21 17 24] rem <- ([#"../take_first_mut.rs" 17 21 17 24] let (_, a) = Core_Option_Option_Type.some_0 _3 in a);
-    [#"../take_first_mut.rs" 17 21 17 24] _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (x0, any borrowed (slice t))));
+    _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (x0, any borrowed (slice t))));
     assert { [@expl:type invariant] inv2 _3 };
     assume { resolve0 _3 };
     [#"../take_first_mut.rs" 18 21 18 24] _11 <- Borrow.borrow_final ( * rem) (Borrow.get_id rem);
     [#"../take_first_mut.rs" 18 21 18 24] rem <- { rem with current = ( ^ _11) ; };
     assume { inv1 ( ^ _11) };
     [#"../take_first_mut.rs" 18 12 18 24] self_ <- { self_ with current = ([#"../take_first_mut.rs" 18 12 18 24] _11) ; };
-    [#"../take_first_mut.rs" 18 12 18 24] _11 <- any borrowed (slice t);
+    _11 <- any borrowed (slice t);
     assert { [@expl:type invariant] inv0 ( * self_) };
     assume { resolve2 ( * self_) };
     assert { [@expl:type invariant] inv3 self_ };
diff --git a/creusot/tests/should_succeed/traits/01.mlcfg b/creusot/tests/should_succeed/traits/01.mlcfg
index 2aa032fa9e..cbf4812629 100644
--- a/creusot/tests/should_succeed/traits/01.mlcfg
+++ b/creusot/tests/should_succeed/traits/01.mlcfg
@@ -36,8 +36,8 @@ module C01_UsesGeneric
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 9 4 9 16] _0 <- ([#"../01.rs" 9 4 9 16] from_b0 ([#"../01.rs" 9 14 9 15] b));
-    [#"../01.rs" 9 14 9 15] b <- any t;
+    [#"../01.rs" 9 4 9 16] _0 <- ([#"../01.rs" 9 4 9 16] from_b0 b);
+    b <- any t;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/02.mlcfg b/creusot/tests/should_succeed/traits/02.mlcfg
index 0df90390e3..12dce51990 100644
--- a/creusot/tests/should_succeed/traits/02.mlcfg
+++ b/creusot/tests/should_succeed/traits/02.mlcfg
@@ -39,7 +39,7 @@ module C02_Omg
     goto BB0
   }
   BB0 {
-    [#"../02.rs" 12 4 12 15] _0 <- ([#"../02.rs" 12 4 12 15] is_true0 ([#"../02.rs" 12 4 12 5] a));
+    [#"../02.rs" 12 4 12 15] _0 <- ([#"../02.rs" 12 4 12 15] is_true0 a);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/03.mlcfg b/creusot/tests/should_succeed/traits/03.mlcfg
index fecedca641..76415daf96 100644
--- a/creusot/tests/should_succeed/traits/03.mlcfg
+++ b/creusot/tests/should_succeed/traits/03.mlcfg
@@ -10,7 +10,7 @@ module C03_Impl0_F
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] [#"../03.rs" 10 8 10 9] (0 : int32));
+    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] (0 : int32));
     return _0
   }
   
@@ -26,7 +26,7 @@ module C03_Impl1_G
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] [#"../03.rs" 21 8 21 9] (1 : uint32));
+    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] (1 : uint32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/04.mlcfg b/creusot/tests/should_succeed/traits/04.mlcfg
index 0bf0c30aef..f29b5ed62e 100644
--- a/creusot/tests/should_succeed/traits/04.mlcfg
+++ b/creusot/tests/should_succeed/traits/04.mlcfg
@@ -42,7 +42,7 @@ module C04_User
     goto BB0
   }
   BB0 {
-    [#"../04.rs" 13 4 13 14] _4 <- ([#"../04.rs" 13 4 13 14] func10 ([#"../04.rs" 13 4 13 5] a) ([#"../04.rs" 13 12 13 13] b));
+    [#"../04.rs" 13 4 13 14] _4 <- ([#"../04.rs" 13 4 13 14] func10 a b);
     goto BB1
   }
   BB1 {
@@ -52,7 +52,7 @@ module C04_User
       end
   }
   BB2 {
-    [#"../04.rs" 13 18 13 28] _7 <- ([#"../04.rs" 13 18 13 28] func20 ([#"../04.rs" 13 18 13 19] b) ([#"../04.rs" 13 26 13 27] a));
+    [#"../04.rs" 13 18 13 28] _7 <- ([#"../04.rs" 13 18 13 28] func20 b a);
     goto BB3
   }
   BB3 {
@@ -66,7 +66,7 @@ module C04_User
     assume { resolve0 a };
     assert { [@expl:type invariant] inv0 b };
     assume { resolve0 b };
-    [#"../04.rs" 13 32 13 42] _0 <- ([#"../04.rs" 13 32 13 42] func30 ([#"../04.rs" 13 32 13 33] a) ([#"../04.rs" 13 40 13 41] b));
+    [#"../04.rs" 13 32 13 42] _0 <- ([#"../04.rs" 13 32 13 42] func30 a b);
     goto BB8
   }
   BB5 {
@@ -84,7 +84,7 @@ module C04_User
     goto BB7
   }
   BB7 {
-    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] [#"../04.rs" 13 4 13 42] false);
+    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] false);
     goto BB9
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/traits/06.mlcfg b/creusot/tests/should_succeed/traits/06.mlcfg
index 460eeb1ee1..e1f7551ba1 100644
--- a/creusot/tests/should_succeed/traits/06.mlcfg
+++ b/creusot/tests/should_succeed/traits/06.mlcfg
@@ -44,7 +44,7 @@ module C06_Test
   BB0 {
     assert { [@expl:type invariant] inv0 a };
     assume { resolve0 a };
-    [#"../06.rs" 13 4 13 11] _0 <- ([#"../06.rs" 13 4 13 11] ix0 ([#"../06.rs" 13 4 13 5] a) ([#"../06.rs" 13 9 13 10] [#"../06.rs" 13 9 13 10] (0 : usize)));
+    [#"../06.rs" 13 4 13 11] _0 <- ([#"../06.rs" 13 4 13 11] ix0 a (0 : usize));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/07.mlcfg b/creusot/tests/should_succeed/traits/07.mlcfg
index 1fbeef35ac..5b1ef00955 100644
--- a/creusot/tests/should_succeed/traits/07.mlcfg
+++ b/creusot/tests/should_succeed/traits/07.mlcfg
@@ -29,7 +29,7 @@ module C07_Test
     goto BB0
   }
   BB0 {
-    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] [#"../07.rs" 17 4 17 8] true);
+    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] true);
     return _0
   }
   
@@ -47,7 +47,7 @@ module C07_Test2
     goto BB0
   }
   BB0 {
-    [#"../07.rs" 21 4 21 10] _0 <- ([#"../07.rs" 21 4 21 10] ix0 ([#"../07.rs" 21 4 21 5] a));
+    [#"../07.rs" 21 4 21 10] _0 <- ([#"../07.rs" 21 4 21 10] ix0 a);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/09.mlcfg b/creusot/tests/should_succeed/traits/09.mlcfg
index e808e87016..df092dc7c1 100644
--- a/creusot/tests/should_succeed/traits/09.mlcfg
+++ b/creusot/tests/should_succeed/traits/09.mlcfg
@@ -11,7 +11,7 @@ module C09_Test
     goto BB0
   }
   BB0 {
-    [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] ([#"../09.rs" 8 4 8 5] t) + ([#"../09.rs" 8 8 8 9] [#"../09.rs" 8 8 8 9] (0 : uint32)));
+    [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] t + (0 : uint32));
     return _0
   }
   
@@ -41,7 +41,7 @@ module C09_Test2
   }
   BB0 {
     [#"../09.rs" 12 4 12 5] _0 <- ([#"../09.rs" 12 4 12 5] t);
-    [#"../09.rs" 12 4 12 5] t <- any x0;
+    t <- any x0;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/12_default_method.mlcfg b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
index 255d6e4713..d57d1dff80 100644
--- a/creusot/tests/should_succeed/traits/12_default_method.mlcfg
+++ b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
@@ -27,7 +27,7 @@ module C12DefaultMethod_T_Default
     goto BB0
   }
   BB0 {
-    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] [#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
+    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     return _0
@@ -67,7 +67,7 @@ module C12DefaultMethod_ShouldUseImpl
     goto BB0
   }
   BB0 {
-    [#"../12_default_method.rs" 21 4 21 15] _3 <- ([#"../12_default_method.rs" 21 4 21 15] default0 ([#"../12_default_method.rs" 21 4 21 5] x));
+    [#"../12_default_method.rs" 21 4 21 15] _3 <- ([#"../12_default_method.rs" 21 4 21 15] default0 x);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg b/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
index 6d7855ec6e..93b5b4cce1 100644
--- a/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
+++ b/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
@@ -38,7 +38,7 @@ module C13AssocTypes_Impl0_Model
   BB0 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../13_assoc_types.rs" 14 8 14 22] _0 <- ([#"../13_assoc_types.rs" 14 8 14 22] model ([#"../13_assoc_types.rs" 14 8 14 14] self));
+    [#"../13_assoc_types.rs" 14 8 14 22] _0 <- ([#"../13_assoc_types.rs" 14 8 14 22] model self);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/two_modules.mlcfg b/creusot/tests/should_succeed/two_modules.mlcfg
index c461c70677..3852cf68b6 100644
--- a/creusot/tests/should_succeed/two_modules.mlcfg
+++ b/creusot/tests/should_succeed/two_modules.mlcfg
@@ -16,7 +16,7 @@ module TwoModules_Mod2_X
     goto BB0
   }
   BB0 {
-    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] [#"../two_modules.rs" 16 8 16 12] true);
+    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] true);
     return _0
   }
   
@@ -28,11 +28,14 @@ module TwoModules_F
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
   var _1 : bool;
+  var _2 : TwoModules_Mod1_T_Type.t_t;
   {
     goto BB0
   }
   BB0 {
-    [#"../two_modules.rs" 23 4 23 14] _1 <- ([#"../two_modules.rs" 23 4 23 14] x0 ([#"../two_modules.rs" 23 12 23 13] TwoModules_Mod1_T_Type.C_B));
+    [#"../two_modules.rs" 23 12 23 13] _2 <- ([#"../two_modules.rs" 23 12 23 13] TwoModules_Mod1_T_Type.C_B);
+    [#"../two_modules.rs" 23 4 23 14] _1 <- ([#"../two_modules.rs" 23 4 23 14] x0 _2);
+    _2 <- any TwoModules_Mod1_T_Type.t_t;
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/type_constructors.mlcfg b/creusot/tests/should_succeed/type_constructors.mlcfg
index ac9d580983..7951a68f35 100644
--- a/creusot/tests/should_succeed/type_constructors.mlcfg
+++ b/creusot/tests/should_succeed/type_constructors.mlcfg
@@ -1,12 +1,22 @@
 
+module TypeConstructors_B_X_Type
+  type t_x  =
+    | C_A
+    | C_B
+    | C_C
+    
+end
 module TypeConstructors_F
+  use TypeConstructors_B_X_Type as TypeConstructors_B_X_Type
   let rec cfg f [#"../type_constructors.rs" 16 0 16 10] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
+  var _3 : TypeConstructors_B_X_Type.t_x;
   {
     goto BB0
   }
   BB0 {
+    [#"../type_constructors.rs" 18 17 18 24] _3 <- ([#"../type_constructors.rs" 18 17 18 24] TypeConstructors_B_X_Type.C_B);
     [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] ());
     return _0
   }
diff --git a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
index c1d0615fad..71892e8b47 100644
--- a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
@@ -39,7 +39,7 @@ module Borrows_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 18 8 18 15] _0 <- ([#"../borrows.rs" 18 8 18 15] Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 18 13 18 14] n));
+    [#"../borrows.rs" 18 8 18 15] _0 <- ([#"../borrows.rs" 18 8 18 15] Borrows_NonZero_Type.C_NonZero n);
     return _0
   }
   
@@ -139,7 +139,7 @@ module Borrows_Inc
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11]  * x + ([#"../borrows.rs" 102 10 102 11] [#"../borrows.rs" 102 10 102 11] (1 : int32))) ; };
+    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11]  * x + (1 : int32)) ; };
     assume { resolve0 x };
     [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] ());
     return _0
@@ -407,7 +407,7 @@ module Borrows_Tuple
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] [#"../borrows.rs" 46 13 46 14] (0 : int32))), x1));
+    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] (0 : int32))), x1));
     [#"../borrows.rs" 47 8 47 19] _6 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1);
     [#"../borrows.rs" 47 8 47 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _6)) ; }));
     [#"../borrows.rs" 47 8 47 19] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -512,7 +512,7 @@ module Borrows_PartialMove
   }
   BB0 {
     [#"../borrows.rs" 54 16 54 19] a <- ([#"../borrows.rs" 54 16 54 19] let (a, _) = x in a);
-    [#"../borrows.rs" 54 16 54 19] x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
+    x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
     [#"../borrows.rs" 55 8 55 19] _7 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1);
     [#"../borrows.rs" 55 8 55 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _7)) ; }));
     [#"../borrows.rs" 55 8 55 19] _6 <- Borrow.borrow_final ( * _7) (Borrow.get_id _7);
@@ -525,7 +525,7 @@ module Borrows_PartialMove
     assume { resolve0 _7 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] [#"../borrows.rs" 56 10 56 11] (0 : int32)));
+    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] (0 : int32)));
     [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] ());
     return _0
   }
@@ -619,12 +619,12 @@ module Borrows_Destruct
   }
   BB0 {
     [#"../borrows.rs" 62 9 62 14] a <- ([#"../borrows.rs" 62 9 62 14] let (a, _) = x in a);
-    [#"../borrows.rs" 62 9 62 14] x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
+    x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
     [#"../borrows.rs" 62 16 62 17] b <- ([#"../borrows.rs" 62 16 62 17] let (_, a) = x in a);
-    [#"../borrows.rs" 62 16 62 17] x <- (let (x0, x1) = x in (x0, any borrowed (Borrows_NonZero_Type.t_nonzero)));
+    x <- (let (x0, x1) = x in (x0, any borrowed (Borrows_NonZero_Type.t_nonzero)));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] [#"../borrows.rs" 63 10 63 11] (0 : int32)));
+    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] (0 : int32)));
     [#"../borrows.rs" 64 8 64 16] _8 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * b)) (Borrow.inherit_id (Borrow.get_id b) 1);
     [#"../borrows.rs" 64 8 64 16] b <- { b with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * b in Borrows_NonZero_Type.C_NonZero ( ^ _8)) ; };
     [#"../borrows.rs" 64 8 64 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
@@ -718,7 +718,7 @@ module Borrows_FrozenDead
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
     [#"../borrows.rs" 73 4 74 9] x <- ([#"../borrows.rs" 73 4 74 9] _6);
-    [#"../borrows.rs" 73 4 74 9] _6 <- any borrowed (Borrows_NonZero_Type.t_nonzero);
+    _6 <- any borrowed (Borrows_NonZero_Type.t_nonzero);
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
     [#"../borrows.rs" 75 8 75 10] _8 <- Borrow.borrow_final ( * _a) (Borrow.get_id _a);
@@ -780,7 +780,7 @@ module Borrows_Dec
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11]  * x - ([#"../borrows.rs" 108 10 108 11] [#"../borrows.rs" 108 10 108 11] (1 : int32))) ; };
+    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11]  * x - (1 : int32)) ; };
     assume { resolve0 x };
     [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] ());
     return _0
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
index b2658f8554..1b3b40db52 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
@@ -38,7 +38,7 @@ module NonZero_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 17 8 17 15] _0 <- ([#"../non_zero.rs" 17 8 17 15] NonZero_NonZeroU32_Type.C_NonZeroU32 ([#"../non_zero.rs" 17 13 17 14] n));
+    [#"../non_zero.rs" 17 8 17 15] _0 <- ([#"../non_zero.rs" 17 8 17 15] NonZero_NonZeroU32_Type.C_NonZeroU32 n);
     return _0
   }
   
@@ -72,11 +72,14 @@ module NonZero_Impl1_Add
   var _0 : NonZero_NonZeroU32_Type.t_nonzerou32;
   var self : NonZero_NonZeroU32_Type.t_nonzerou32 = self;
   var rhs : NonZero_NonZeroU32_Type.t_nonzerou32 = rhs;
+  var _4 : uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 22 8 22 28] _0 <- ([#"../non_zero.rs" 22 8 22 28] NonZero_NonZeroU32_Type.C_NonZeroU32 ([#"../non_zero.rs" 22 13 22 27] ([#"../non_zero.rs" 22 13 22 19] NonZero_NonZeroU32_Type.nonzerou32_0 self) + ([#"../non_zero.rs" 22 22 22 27] NonZero_NonZeroU32_Type.nonzerou32_0 rhs)));
+    [#"../non_zero.rs" 22 13 22 27] _4 <- ([#"../non_zero.rs" 22 13 22 27] NonZero_NonZeroU32_Type.nonzerou32_0 self + NonZero_NonZeroU32_Type.nonzerou32_0 rhs);
+    [#"../non_zero.rs" 22 8 22 28] _0 <- ([#"../non_zero.rs" 22 8 22 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4);
+    _4 <- any uint32;
     return _0
   }
   
@@ -149,11 +152,14 @@ module NonZero_Impl1_Sub
   var _0 : NonZero_NonZeroU32_Type.t_nonzerou32;
   var self : NonZero_NonZeroU32_Type.t_nonzerou32 = self;
   var rhs : NonZero_NonZeroU32_Type.t_nonzerou32 = rhs;
+  var _4 : uint32;
   {
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 41 8 41 28] _0 <- ([#"../non_zero.rs" 41 8 41 28] NonZero_NonZeroU32_Type.C_NonZeroU32 ([#"../non_zero.rs" 41 13 41 27] ([#"../non_zero.rs" 41 13 41 19] NonZero_NonZeroU32_Type.nonzerou32_0 self) - ([#"../non_zero.rs" 41 22 41 27] NonZero_NonZeroU32_Type.nonzerou32_0 rhs)));
+    [#"../non_zero.rs" 41 13 41 27] _4 <- ([#"../non_zero.rs" 41 13 41 27] NonZero_NonZeroU32_Type.nonzerou32_0 self - NonZero_NonZeroU32_Type.nonzerou32_0 rhs);
+    [#"../non_zero.rs" 41 8 41 28] _0 <- ([#"../non_zero.rs" 41 8 41 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4);
+    _4 <- any uint32;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml b/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
index d303e5e495..4a34826995 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
+++ b/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
@@ -23,7 +23,7 @@
 </theory>
 <theory name="NonZero_Impl1_Sub" proved="true">
  <goal name="sub&#39;vc" expl="VC for sub" proved="true">
- <proof prover="3"><result status="valid" time="0.016281" steps="183"/></proof>
+ <proof prover="3"><result status="valid" time="0.016281" steps="184"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero/why3shapes.gz b/creusot/tests/should_succeed/type_invariants/non_zero/why3shapes.gz
index 4b83edb2081354e1d6e33ef789bc842cbdd6f77a..e69dd91a18b6dcc7c707bb67de58831cb4af4e19 100644
GIT binary patch
literal 378
zcmV-=0fqh_iwFP!00000|BX>iPlG@Zz4I&frq-A&`;D<CqzR#k@#Y@9kl7C+2cZJ3
z{(RY%)=EhAH1n1>Z{|I&7pQxKjqlLTw_VlL_eh|{O|<G^RXjKKt8beZO0>o)RP_$p
z3hEwf{1MPlvuNM^Cet-6HPs|r!z1)fQPsUBcHrt2Dw`J7{&Q|jgfXFc7An^)RM-x~
zlw1V~2Dj&soCBJL`wG)+Yu8=kt>^AdXC6rk56eO6c>l4XV*~H-^<xQ~i=f+@V$*u8
zrRIk{njfUK7^_TwSR#Bqn-Ncw3nrLOFgtA@MT)+Kx|@qug-Df_`)G$v(`W_U{WIDN
zywNgCPu5T7hQIljxpOm7M2L4pIWG<2F*Z0UnPsfBEJ=*#r9~u<a~#DMTdHDjZR{Ph
zC6^Y1jd9{7W4=rf%jrNXy)uFmp9qSr0RfB|!@(quuox1BM9u@v0Cmi8OP#UGNN%wr
YQUM{Hmx_9%ayihx0nxTqr!)fq0P-}ldjJ3c

literal 371
zcmV-(0gV11iwFP!00000|BX@0PQx$|yyq)?1B#Fwd+o%CB1M&|R6^YFflIVb)*=Uz
zlB9*t$0>bLRfUsx?3vx2@%4oDZ@8qMt*Ptlwz+4TO>UyufV1McZC<HsU!<^>XIM9D
z>}qTVZu!TE!a0vN#c#4);M7Vh<_mnpp)KlWu%ZlHJ7d1>SVN!ZWNMTt3qdx;RS-#W
zHA(?*kD)jQaz5@=xOUZ4{UzSw+@9H)OOfHjG<4eSy({Flz<2yQSi!1_uwS`i*%7zN
z=wTC#`e|+T_Dr$^OOLNd8vS&#!3mZp81~b*O^Ttzrau>HGDaFEoJOkg?w^rf;BBo!
zwzs@D6@KwAQ^zKvNC>J#T2bPJin-&)LkZwZFvgMcB@=m^^GI?7#F1R89i;?`;~ID(
zyjLX&gA8&RXr5B1l^~-fFCA(Ga898!m4Fyc%5<&*4NBuMm7Hr&RTyS41*MdvGVwAN
Rj-`1LXx~@yYl|cU000w|vitx5

diff --git a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
index c9c565eed0..cd9bd4371a 100644
--- a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
@@ -30,7 +30,7 @@ module TypeInvariants_Id
   }
   BB0 {
     [#"../type_invariants.rs" 15 4 15 5] _0 <- ([#"../type_invariants.rs" 15 4 15 5] x);
-    [#"../type_invariants.rs" 15 4 15 5] x <- any TypeInvariants_WithInvariant_Type.t_withinvariant;
+    x <- any TypeInvariants_WithInvariant_Type.t_withinvariant;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/unused_in_loop.mlcfg b/creusot/tests/should_succeed/unused_in_loop.mlcfg
index 83cb0a9cd5..c8e939e91a 100644
--- a/creusot/tests/should_succeed/unused_in_loop.mlcfg
+++ b/creusot/tests/should_succeed/unused_in_loop.mlcfg
@@ -13,7 +13,7 @@ module UnusedInLoop_UnusedInLoop
     goto BB0
   }
   BB0 {
-    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] [#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
+    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
     goto BB1
   }
   BB1 {
@@ -21,7 +21,7 @@ module UnusedInLoop_UnusedInLoop
     goto BB2
   }
   BB2 {
-    switch ([#"../unused_in_loop.rs" 9 11 9 12] b)
+    switch (b)
       | False -> goto BB4
       | True -> goto BB3
       end
diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg
index 3f9eee5c03..8405ef2b9c 100644
--- a/creusot/tests/should_succeed/vecdeque.mlcfg
+++ b/creusot/tests/should_succeed/vecdeque.mlcfg
@@ -231,10 +231,10 @@ module Vecdeque_TestDeque
     
   let constant promoted0 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 24 37 24 38] [#"../vecdeque.rs" 24 37 24 38] (3 : uint32)) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0
+    let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some (3 : uint32) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0
   let constant promoted1 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 23 38 23 39] [#"../vecdeque.rs" 23 38 23 39] (2 : uint32)) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0
+    let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some (2 : uint32) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0
   let constant promoted2 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
     let _1 = [#"../vecdeque.rs" 17 32 17 36] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 17 32 17 36] _1 in _0
@@ -246,9 +246,11 @@ module Vecdeque_TestDeque
   var _0 : ();
   var deque : Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global);
   var _3 : bool;
+  var _7 : bool;
   var _8 : usize;
   var deque1 : Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global);
   var _13 : bool;
+  var _17 : bool;
   var _18 : usize;
   var _22 : bool;
   var _24 : Core_Option_Option_Type.t_option uint32;
@@ -279,11 +281,11 @@ module Vecdeque_TestDeque
     goto BB0
   }
   BB0 {
-    [#"../vecdeque.rs" 6 31 6 57] deque <- ([#"../vecdeque.rs" 6 31 6 57] with_capacity0 ([#"../vecdeque.rs" 6 55 6 56] [#"../vecdeque.rs" 6 55 6 56] (5 : usize)));
+    [#"../vecdeque.rs" 6 31 6 57] deque <- ([#"../vecdeque.rs" 6 31 6 57] with_capacity0 (5 : usize));
     goto BB1
   }
   BB1 {
-    [#"../vecdeque.rs" 8 12 8 28] _3 <- ([#"../vecdeque.rs" 8 12 8 28] is_empty0 ([#"../vecdeque.rs" 8 12 8 17] deque));
+    [#"../vecdeque.rs" 8 12 8 28] _3 <- ([#"../vecdeque.rs" 8 12 8 28] is_empty0 deque);
     goto BB2
   }
   BB2 {
@@ -293,7 +295,7 @@ module Vecdeque_TestDeque
       end
   }
   BB3 {
-    [#"../vecdeque.rs" 9 12 9 23] _8 <- ([#"../vecdeque.rs" 9 12 9 23] len0 ([#"../vecdeque.rs" 9 12 9 17] deque));
+    [#"../vecdeque.rs" 9 12 9 23] _8 <- ([#"../vecdeque.rs" 9 12 9 23] len0 deque);
     goto BB5
   }
   BB4 {
@@ -301,7 +303,9 @@ module Vecdeque_TestDeque
     absurd
   }
   BB5 {
-    switch ([#"../vecdeque.rs" 9 12 9 28] _8 = ([#"../vecdeque.rs" 9 27 9 28] [#"../vecdeque.rs" 9 27 9 28] (0 : usize)))
+    [#"../vecdeque.rs" 9 12 9 28] _7 <- ([#"../vecdeque.rs" 9 12 9 28] _8 = (0 : usize));
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB7
       | True -> goto BB6
       end
@@ -315,7 +319,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB8 {
-    [#"../vecdeque.rs" 13 12 13 28] _13 <- ([#"../vecdeque.rs" 13 12 13 28] is_empty0 ([#"../vecdeque.rs" 13 12 13 17] deque1));
+    [#"../vecdeque.rs" 13 12 13 28] _13 <- ([#"../vecdeque.rs" 13 12 13 28] is_empty0 deque1);
     goto BB9
   }
   BB9 {
@@ -325,7 +329,7 @@ module Vecdeque_TestDeque
       end
   }
   BB10 {
-    [#"../vecdeque.rs" 14 12 14 23] _18 <- ([#"../vecdeque.rs" 14 12 14 23] len0 ([#"../vecdeque.rs" 14 12 14 17] deque1));
+    [#"../vecdeque.rs" 14 12 14 23] _18 <- ([#"../vecdeque.rs" 14 12 14 23] len0 deque1);
     goto BB12
   }
   BB11 {
@@ -333,7 +337,9 @@ module Vecdeque_TestDeque
     absurd
   }
   BB12 {
-    switch ([#"../vecdeque.rs" 14 12 14 28] _18 = ([#"../vecdeque.rs" 14 27 14 28] [#"../vecdeque.rs" 14 27 14 28] (0 : usize)))
+    [#"../vecdeque.rs" 14 12 14 28] _17 <- ([#"../vecdeque.rs" 14 12 14 28] _18 = (0 : usize));
+    _18 <- any usize;
+    switch (_17)
       | False -> goto BB14
       | True -> goto BB13
       end
@@ -350,8 +356,8 @@ module Vecdeque_TestDeque
     absurd
   }
   BB15 {
-    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] [#"../vecdeque.rs" 16 33 16 37] promoted3);
-    [#"../vecdeque.rs" 16 12 16 37] _22 <- ([#"../vecdeque.rs" 16 12 16 37] eq0 ([#"../vecdeque.rs" 16 12 16 29] _24) ([#"../vecdeque.rs" 16 33 16 37] _68));
+    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] promoted3);
+    [#"../vecdeque.rs" 16 12 16 37] _22 <- ([#"../vecdeque.rs" 16 12 16 37] eq0 _24 _68);
     goto BB16
   }
   BB16 {
@@ -372,8 +378,8 @@ module Vecdeque_TestDeque
     absurd
   }
   BB19 {
-    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] [#"../vecdeque.rs" 17 32 17 36] promoted2);
-    [#"../vecdeque.rs" 17 12 17 36] _30 <- ([#"../vecdeque.rs" 17 12 17 36] eq0 ([#"../vecdeque.rs" 17 12 17 28] _32) ([#"../vecdeque.rs" 17 32 17 36] _67));
+    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] promoted2);
+    [#"../vecdeque.rs" 17 12 17 36] _30 <- ([#"../vecdeque.rs" 17 12 17 36] eq0 _32 _67);
     goto BB20
   }
   BB20 {
@@ -385,7 +391,7 @@ module Vecdeque_TestDeque
   BB21 {
     [#"../vecdeque.rs" 19 4 19 9] _38 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 19 4 19 9] deque1 <-  ^ _38;
-    [#"../vecdeque.rs" 19 4 19 23] _37 <- ([#"../vecdeque.rs" 19 4 19 23] push_front0 _38 ([#"../vecdeque.rs" 19 21 19 22] [#"../vecdeque.rs" 19 21 19 22] (1 : uint32)));
+    [#"../vecdeque.rs" 19 4 19 23] _37 <- ([#"../vecdeque.rs" 19 4 19 23] push_front0 _38 (1 : uint32));
     _38 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB23
   }
@@ -396,14 +402,14 @@ module Vecdeque_TestDeque
   BB23 {
     [#"../vecdeque.rs" 20 4 20 9] _40 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 20 4 20 9] deque1 <-  ^ _40;
-    [#"../vecdeque.rs" 20 4 20 23] _39 <- ([#"../vecdeque.rs" 20 4 20 23] push_front0 _40 ([#"../vecdeque.rs" 20 21 20 22] [#"../vecdeque.rs" 20 21 20 22] (2 : uint32)));
+    [#"../vecdeque.rs" 20 4 20 23] _39 <- ([#"../vecdeque.rs" 20 4 20 23] push_front0 _40 (2 : uint32));
     _40 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB24
   }
   BB24 {
     [#"../vecdeque.rs" 21 4 21 9] _42 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 21 4 21 9] deque1 <-  ^ _42;
-    [#"../vecdeque.rs" 21 4 21 22] _41 <- ([#"../vecdeque.rs" 21 4 21 22] push_back0 _42 ([#"../vecdeque.rs" 21 20 21 21] [#"../vecdeque.rs" 21 20 21 21] (3 : uint32)));
+    [#"../vecdeque.rs" 21 4 21 22] _41 <- ([#"../vecdeque.rs" 21 4 21 22] push_back0 _42 (3 : uint32));
     _42 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB25
   }
@@ -415,8 +421,8 @@ module Vecdeque_TestDeque
     goto BB26
   }
   BB26 {
-    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] [#"../vecdeque.rs" 23 33 23 40] promoted1);
-    [#"../vecdeque.rs" 23 12 23 40] _44 <- ([#"../vecdeque.rs" 23 12 23 40] eq0 ([#"../vecdeque.rs" 23 12 23 29] _46) ([#"../vecdeque.rs" 23 33 23 40] _66));
+    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] promoted1);
+    [#"../vecdeque.rs" 23 12 23 40] _44 <- ([#"../vecdeque.rs" 23 12 23 40] eq0 _46 _66);
     goto BB27
   }
   BB27 {
@@ -437,8 +443,8 @@ module Vecdeque_TestDeque
     absurd
   }
   BB30 {
-    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] [#"../vecdeque.rs" 24 32 24 39] promoted0);
-    [#"../vecdeque.rs" 24 12 24 39] _52 <- ([#"../vecdeque.rs" 24 12 24 39] eq0 ([#"../vecdeque.rs" 24 12 24 28] _54) ([#"../vecdeque.rs" 24 32 24 39] _65));
+    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] promoted0);
+    [#"../vecdeque.rs" 24 12 24 39] _52 <- ([#"../vecdeque.rs" 24 12 24 39] eq0 _54 _65);
     goto BB31
   }
   BB31 {
@@ -459,7 +465,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB34 {
-    [#"../vecdeque.rs" 26 12 26 28] _62 <- ([#"../vecdeque.rs" 26 12 26 28] is_empty0 ([#"../vecdeque.rs" 26 12 26 17] deque1));
+    [#"../vecdeque.rs" 26 12 26 28] _62 <- ([#"../vecdeque.rs" 26 12 26 28] is_empty0 deque1);
     goto BB35
   }
   BB35 {
diff --git a/creusot/tests/should_succeed/vecdeque/why3session.xml b/creusot/tests/should_succeed/vecdeque/why3session.xml
index dc0909ad90..e57eda5377 100644
--- a/creusot/tests/should_succeed/vecdeque/why3session.xml
+++ b/creusot/tests/should_succeed/vecdeque/why3session.xml
@@ -21,119 +21,119 @@
   <goal name="test_deque&#39;vc.3" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.022440" steps="11"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.019733" steps="23"/></proof>
+  <goal name="test_deque&#39;vc.4" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.013994" steps="16"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.5" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.016911" steps="19"/></proof>
+  <goal name="test_deque&#39;vc.5" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.008724" steps="16"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.6" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.008515" steps="19"/></proof>
+  <goal name="test_deque&#39;vc.6" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.019733" steps="24"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.017564" steps="24"/></proof>
+  <goal name="test_deque&#39;vc.7" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.036262" steps="20"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041070" steps="32"/></proof>
+  <goal name="test_deque&#39;vc.8" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.009117" steps="20"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.016604" steps="38"/></proof>
+  <proof prover="3"><result status="valid" time="0.017564" steps="25"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.019949" steps="40"/></proof>
+  <goal name="test_deque&#39;vc.10" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.016911" steps="26"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.11" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.017351" steps="302"/></proof>
+  <goal name="test_deque&#39;vc.11" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.008515" steps="26"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.12" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.008909" steps="34"/></proof>
+  <goal name="test_deque&#39;vc.12" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.041070" steps="35"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026044" steps="44"/></proof>
+  <proof prover="3"><result status="valid" time="0.016604" steps="40"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.017203" steps="48"/></proof>
+  <proof prover="3"><result status="valid" time="0.019949" steps="41"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.020579" steps="49"/></proof>
+  <goal name="test_deque&#39;vc.15" expl="assertion" proved="true">
+  <proof prover="3"><result status="valid" time="0.013569" steps="303"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.16" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.053939" steps="510"/></proof>
+  <goal name="test_deque&#39;vc.16" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.013097" steps="38"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.17" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.009516" steps="46"/></proof>
+  <goal name="test_deque&#39;vc.17" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.026044" steps="46"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.030211" steps="57"/></proof>
+  <proof prover="3"><result status="valid" time="0.017203" steps="50"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.016907" steps="61"/></proof>
+  <proof prover="3"><result status="valid" time="0.020579" steps="52"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.006744" steps="77"/></proof>
+  <goal name="test_deque&#39;vc.20" expl="assertion" proved="true">
+  <proof prover="0"><result status="valid" time="0.086368" steps="210684"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010514" steps="83"/></proof>
+  <goal name="test_deque&#39;vc.21" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.012610" steps="50"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.018384" steps="99"/></proof>
+  <proof prover="3"><result status="valid" time="0.030211" steps="58"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.043553" steps="105"/></proof>
+  <proof prover="3"><result status="valid" time="0.016907" steps="63"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.036039" steps="112"/></proof>
+  <proof prover="3"><result status="valid" time="0.006744" steps="79"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.038955" steps="117"/></proof>
+  <proof prover="3"><result status="valid" time="0.010514" steps="85"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.26" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029489" steps="118"/></proof>
+  <proof prover="3"><result status="valid" time="0.018384" steps="101"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.27" expl="assertion" proved="true">
-  <proof prover="0"><result status="valid" time="0.039880" steps="147255"/></proof>
+  <goal name="test_deque&#39;vc.27" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.043553" steps="107"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.28" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.010661" steps="86"/></proof>
+  <goal name="test_deque&#39;vc.28" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.036039" steps="114"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.016260" steps="124"/></proof>
+  <proof prover="3"><result status="valid" time="0.038955" steps="120"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026337" steps="130"/></proof>
+  <proof prover="3"><result status="valid" time="0.029489" steps="121"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.031166" steps="132"/></proof>
+  <goal name="test_deque&#39;vc.31" expl="assertion" proved="true">
+  <proof prover="0"><result status="valid" time="0.039880" steps="147317"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.32" expl="assertion" proved="true">
-  <proof prover="0"><result status="valid" time="0.086368" steps="494633"/></proof>
+  <goal name="test_deque&#39;vc.32" expl="unreachable point" proved="true">
+  <proof prover="3"><result status="valid" time="0.010661" steps="90"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.33" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.012610" steps="98"/></proof>
+  <goal name="test_deque&#39;vc.33" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.016260" steps="125"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.014104" steps="136"/></proof>
+  <proof prover="3"><result status="valid" time="0.026337" steps="132"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.015340" steps="141"/></proof>
+  <proof prover="3"><result status="valid" time="0.031166" steps="133"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.36" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.013569" steps="107"/></proof>
+  <proof prover="3"><result status="valid" time="0.208192" steps="4298"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.37" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.013097" steps="107"/></proof>
+  <proof prover="3"><result status="valid" time="0.009516" steps="102"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.38" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.036262" steps="22"/></proof>
+  <goal name="test_deque&#39;vc.38" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.014104" steps="138"/></proof>
   </goal>
-  <goal name="test_deque&#39;vc.39" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.009117" steps="22"/></proof>
+  <goal name="test_deque&#39;vc.39" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.015340" steps="142"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.40" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.013994" steps="14"/></proof>
+  <proof prover="3"><result status="valid" time="0.017351" steps="111"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.41" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.008724" steps="14"/></proof>
+  <proof prover="3"><result status="valid" time="0.008909" steps="111"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vecdeque/why3shapes.gz b/creusot/tests/should_succeed/vecdeque/why3shapes.gz
index 45d982724d8c6be5b5263ee9efac743c1ecc6dfe..b344746472c9425d8c3c2c33306aecbaeece04ff 100644
GIT binary patch
literal 2260
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

literal 2253
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
biP6$H{wL0rx$T2|%GCb=2lCBHh9v+1boEV_

diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index 3312b54666..3a44f0ec81 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -346,6 +346,7 @@ module C01_AllZero
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) = v;
   var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _7 : Core_Ops_Range_Range_Type.t_range usize;
   var _8 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
@@ -365,12 +366,14 @@ module C01_AllZero
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 11 16 11 23] _8 <- ([#"../01.rs" 11 16 11 23] len0 ([#"../01.rs" 11 16 11 17]  * v));
+    [#"../01.rs" 11 16 11 23] _8 <- ([#"../01.rs" 11 16 11 23] len0 ( * v));
     goto BB2
   }
   BB2 {
-    [#"../01.rs" 9 4 9 42] iter <- ([#"../01.rs" 9 4 9 42] into_iter0 ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range ([#"../01.rs" 11 13 11 14] [#"../01.rs" 11 13 11 14] (0 : usize)) _8));
+    [#"../01.rs" 11 13 11 23] _7 <- ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8);
     _8 <- any usize;
+    [#"../01.rs" 9 4 9 42] iter <- ([#"../01.rs" 9 4 9 42] into_iter0 _7);
+    _7 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB3
   }
   BB3 {
@@ -427,16 +430,16 @@ module C01_AllZero
   }
   BB13 {
     [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] _24);
-    [#"../01.rs" 9 4 9 42] _24 <- any Snapshot.snap_ty (Seq.seq usize);
+    _24 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../01.rs" 12 8 12 9] _28 <- Borrow.borrow_mut ( * v);
     [#"../01.rs" 12 8 12 9] v <- { v with current = ( ^ _28) ; };
-    [#"../01.rs" 12 9 12 12] _27 <- ([#"../01.rs" 12 9 12 12] index_mut0 _28 ([#"../01.rs" 12 10 12 11] i));
+    [#"../01.rs" 12 9 12 12] _27 <- ([#"../01.rs" 12 9 12 12] index_mut0 _28 i);
     _28 <- any borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB14
   }
   BB14 {
-    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] [#"../01.rs" 12 15 12 16] (0 : uint32)) ; };
+    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] (0 : uint32)) ; };
     assume { resolve1 _27 };
     goto BB6
   }
diff --git a/creusot/tests/should_succeed/vector/01/why3session.xml b/creusot/tests/should_succeed/vector/01/why3session.xml
index 6f49181aae..84847aa25e 100644
--- a/creusot/tests/should_succeed/vector/01/why3session.xml
+++ b/creusot/tests/should_succeed/vector/01/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="01.mlcfg"/>
 <theory name="C01_AllZero" proved="true">
  <goal name="all_zero&#39;vc" expl="VC for all_zero" proved="true">
- <proof prover="0"><result status="valid" time="0.244759" steps="61929"/></proof>
+ <proof prover="0"><result status="valid" time="0.244759" steps="64199"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/01/why3shapes.gz b/creusot/tests/should_succeed/vector/01/why3shapes.gz
index 5dd4c5002dd83ee031709c1cb5ab5e00f7fb3580..9dc0c3f35e487785410751a470228078df5cd6aa 100644
GIT binary patch
literal 648
zcmV;30(bo%iwFP!00000|9w<TZ<|06zWY~jYwM`eK6zBh0a-#=ih8Lu$DlE65>(8(
zK<u=?zQf`*ZbNd}{g}r$v)|70c^&l6crbl%G+kfY_FE7J>o2R}7uM}D0hXO%3_M%m
z?Hx9zeHxyTvYN)8ioLB&BS7F_i@F_fkFP9s32#ESqd5ZMDI<^`hM+vupgmL&dMF|C
zP(bV<hlH9sbhdgaP0xTcytx6+flJ`Z)ngtcWb_u{E!<n!_L@d`f@^BWEB>vg(d-Yy
zZvvj^(mY}6euK-3kvCeF5+BHwQd-?s=Cx?-Q(ZD=1R0mq=Pm6YrrzF_jAF9wu*J^w
zwmBM7Kf+D%-L~d`<~67ow3wK+@XU4FnhumY(`k{V?;b@h_d{~U>8#e7Qs@geNRdub
zNpWeFgQi=#qZN0y>+H!?pY}hg(Z{;Q1~l<hv}P`bYA4zDJVD8O9gf1NWx0uf6g!tL
zOw*s9O=rle-^MMGrbvXv5u2BVq;uT|*V+ehj(j~HC7oV?(&;q+V}ZIYcJ`&M`sKt?
z2fBbOt){AzTy*Uumx!EPDgqUbXe<`e;_Vt_G9fA{CnT{oCs4x0(+*nF#_;P1CMiL2
zH#GCNNatS!dCBF*#-%HC7UfdZ9ONfVT}>Dz;LRLzLF|5f;6yW`^E@R}gKQl7<eGw&
z{2u$deQL~LTXK%)k_q;9Zwd;IGI|m}=;K8AGJoXIE|A_^IL($Mly0!J`vXy#ib9ls
zP4jrKN9$ZpYq|%iR<H>kZ5Pn36@N@;SF2F(s<7IbP$W?#9$8#5jKwZg74ERaB;YFN
iGUp=aJm)M=@;Hz3FxR=tWlq+dt^NXX^-FKJ1poj^K0<c@

literal 647
zcmV;20(ku&iwFP!00000|9w<TkDD+MzUNnPYnxRiKY3Ky1B!%*wCbhO92Ys@-JlXX
z1vc6C*LN^Dq+NC|_QyQF8Gj!0c^z~Ib<$mM)@@f?^DPL2^_NxuOV#F_0Ldm81I<=y
zbFUh0p8JEstfsM-;%F<~Fkq^;MQwU@RIem;32#DngE<1`DI?$>h9EqYAUzZiddMO2
zkU{Jrg#?>AwYGXGbw_{_b$17p0_8x3t4BOY(C979Td22?-7O9C1h>?Vm;GB$Dt$cl
zzY%z%Yx9V)`>k454875^l<E;(DW=t?(yv8hpX-u1Bk;JyJ~z03n7X+y3C3i*ey3X9
z+2*WK{YY(#@7C!5nb#m<kZfd@%rn=<=oW;S=p@V1caI{L`$4(lbXIGkWb(=loTZ~w
zoLyU`An{i2aaDWUw)Uc{Psg9w=u>S}0}^>ETr(GgwUcZ&O;GY)hl4O;S#Bgi#ir7Q
zZo11sw;HYTZQK%Rs*tcatL9}PX{!6^TKgc*k*|lNq~i+^G9BlCC{UYXZ(mH+Ehi2-
z;04@hHC7$v!fQvlSmfjq5r}X=L$MGSZ<oN65n)L_BCd?SfM6~jcaR)6qP`AbloAAW
zLo<J~bpA!47hP^_T)I%sB3z1?gZzYvn+d}NbvK7x5qTIMIMNJgnx|xJkPJhg+)|K|
zKB%rX&yDV_LFaHTo~X_qb%DWAhEL)Leq0b==MNpy1>$=P$JyeD(yc1(@q|>m!VuwK
z(>&hm!8(_d67PYF6>Nhi+Xi@R#UI_;)r#-qy^d+TCr>Ia_hn3|;*tqYbyCSV4yec}
h&ne3(%_+%~JkFy$%w;Zeo})D<tG_a5A-A^$002CHH$?yd

diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index 92097f2ad8..1070d41b2e 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -412,15 +412,19 @@ module C02Gnome_GnomeSort
   var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var i : usize;
   var _9 : ();
+  var _10 : bool;
   var _12 : usize;
+  var _14 : bool;
   var _16 : bool;
   var _18 : t;
+  var _20 : usize;
   var _23 : t;
   var _24 : t;
   var _27 : ();
   var _28 : borrowed (slice t);
   var _29 : borrowed (slice t);
   var _30 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
+  var _31 : usize;
   {
     goto BB0
   }
@@ -431,7 +435,7 @@ module C02Gnome_GnomeSort
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] [#"../02_gnome.rs" 27 16 27 17] (0 : usize));
+    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -440,17 +444,20 @@ module C02Gnome_GnomeSort
     goto BB3
   }
   BB3 {
-    [#"../02_gnome.rs" 30 14 30 21] _12 <- ([#"../02_gnome.rs" 30 14 30 21] len0 ([#"../02_gnome.rs" 30 14 30 15]  * v));
+    [#"../02_gnome.rs" 30 14 30 21] _12 <- ([#"../02_gnome.rs" 30 14 30 21] len0 ( * v));
     goto BB4
   }
   BB4 {
-    switch ([#"../02_gnome.rs" 30 10 30 21] ([#"../02_gnome.rs" 30 10 30 11] i) < _12)
+    [#"../02_gnome.rs" 30 10 30 21] _10 <- ([#"../02_gnome.rs" 30 10 30 21] i < _12);
+    _12 <- any usize;
+    switch (_10)
       | False -> goto BB16
       | True -> goto BB5
       end
   }
   BB5 {
-    switch ([#"../02_gnome.rs" 31 11 31 17] ([#"../02_gnome.rs" 31 11 31 12] i) = ([#"../02_gnome.rs" 31 16 31 17] [#"../02_gnome.rs" 31 16 31 17] (0 : usize)))
+    [#"../02_gnome.rs" 31 11 31 17] _14 <- ([#"../02_gnome.rs" 31 11 31 17] i = (0 : usize));
+    switch (_14)
       | False -> goto BB7
       | True -> goto BB6
       end
@@ -459,13 +466,15 @@ module C02Gnome_GnomeSort
     goto BB11
   }
   BB7 {
-    [#"../02_gnome.rs" 31 22 31 29] _18 <- ([#"../02_gnome.rs" 31 22 31 29] index0 ([#"../02_gnome.rs" 31 21 31 22]  * v) ([#"../02_gnome.rs" 31 23 31 28] ([#"../02_gnome.rs" 31 23 31 24] i) - ([#"../02_gnome.rs" 31 27 31 28] [#"../02_gnome.rs" 31 27 31 28] (1 : usize))));
+    [#"../02_gnome.rs" 31 23 31 28] _20 <- ([#"../02_gnome.rs" 31 23 31 28] i - (1 : usize));
+    [#"../02_gnome.rs" 31 22 31 29] _18 <- ([#"../02_gnome.rs" 31 22 31 29] index0 ( * v) _20);
+    _20 <- any usize;
     goto BB8
   }
   BB8 {
     assert { [@expl:type invariant] inv2 _18 };
     assume { resolve2 _18 };
-    [#"../02_gnome.rs" 31 35 31 38] _24 <- ([#"../02_gnome.rs" 31 35 31 38] index0 ([#"../02_gnome.rs" 31 34 31 35]  * v) ([#"../02_gnome.rs" 31 36 31 37] i));
+    [#"../02_gnome.rs" 31 35 31 38] _24 <- ([#"../02_gnome.rs" 31 35 31 38] index0 ( * v) i);
     goto BB9
   }
   BB9 {
@@ -474,7 +483,7 @@ module C02Gnome_GnomeSort
     assume { resolve2 _24 };
     assert { [@expl:type invariant] inv2 _23 };
     assume { resolve2 _23 };
-    [#"../02_gnome.rs" 31 21 31 39] _16 <- ([#"../02_gnome.rs" 31 21 31 39] le0 ([#"../02_gnome.rs" 31 21 31 29] _18) ([#"../02_gnome.rs" 31 33 31 38] _23));
+    [#"../02_gnome.rs" 31 21 31 39] _16 <- ([#"../02_gnome.rs" 31 21 31 39] le0 _18 _23);
     goto BB10
   }
   BB10 {
@@ -484,7 +493,7 @@ module C02Gnome_GnomeSort
       end
   }
   BB11 {
-    [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + ([#"../02_gnome.rs" 32 17 32 18] [#"../02_gnome.rs" 32 17 32 18] (1 : usize)));
+    [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + (1 : usize));
     [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] ());
     goto BB15
   }
@@ -500,14 +509,16 @@ module C02Gnome_GnomeSort
     [#"../02_gnome.rs" 34 12 34 13] _28 <- Borrow.borrow_final ( * _29) (Borrow.get_id _29);
     [#"../02_gnome.rs" 34 12 34 13] _29 <- { _29 with current = ( ^ _28) ; };
     assume { inv4 ( ^ _28) };
-    [#"../02_gnome.rs" 34 12 34 28] _27 <- ([#"../02_gnome.rs" 34 12 34 28] swap0 _28 ([#"../02_gnome.rs" 34 19 34 24] ([#"../02_gnome.rs" 34 19 34 20] i) - ([#"../02_gnome.rs" 34 23 34 24] [#"../02_gnome.rs" 34 23 34 24] (1 : usize))) ([#"../02_gnome.rs" 34 26 34 27] i));
+    [#"../02_gnome.rs" 34 19 34 24] _31 <- ([#"../02_gnome.rs" 34 19 34 24] i - (1 : usize));
+    [#"../02_gnome.rs" 34 12 34 28] _27 <- ([#"../02_gnome.rs" 34 12 34 28] swap0 _28 _31 i);
     _28 <- any borrowed (slice t);
+    _31 <- any usize;
     goto BB14
   }
   BB14 {
     assert { [@expl:type invariant] inv5 _29 };
     assume { resolve3 _29 };
-    [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - ([#"../02_gnome.rs" 35 17 35 18] [#"../02_gnome.rs" 35 17 35 18] (1 : usize)));
+    [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - (1 : usize));
     [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] ());
     goto BB15
   }
diff --git a/creusot/tests/should_succeed/vector/02_gnome/why3session.xml b/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
index ecaea744fe..14778d7a1f 100644
--- a/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
+++ b/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
@@ -23,87 +23,87 @@
   <goal name="gnome_sort&#39;vc.3" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.014145" steps="25"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.4" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.012470" steps="73"/></proof>
+  <goal name="gnome_sort&#39;vc.4" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.016869" steps="35"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010845" steps="32"/></proof>
+  <goal name="gnome_sort&#39;vc.5" expl="postcondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.016845" steps="200"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.028757" steps="132654"/></proof>
+  <goal name="gnome_sort&#39;vc.6" expl="postcondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.027288" steps="131252"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.015968" steps="43"/></proof>
+  <goal name="gnome_sort&#39;vc.7" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.012470" steps="77"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.8" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.024696" steps="36"/></proof>
+  <goal name="gnome_sort&#39;vc.8" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.010845" steps="36"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027521" steps="65637"/></proof>
+  <proof prover="0"><result status="valid" time="0.028757" steps="132719"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010591" steps="46"/></proof>
+  <proof prover="3"><result status="valid" time="0.015968" steps="46"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029629" steps="47"/></proof>
+  <goal name="gnome_sort&#39;vc.11" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.024696" steps="40"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.12" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.010559" steps="44"/></proof>
+  <goal name="gnome_sort&#39;vc.12" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.027521" steps="65720"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.13" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.010624" steps="46"/></proof>
+  <goal name="gnome_sort&#39;vc.13" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.010591" steps="49"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.014700" steps="48"/></proof>
+  <proof prover="3"><result status="valid" time="0.029629" steps="49"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.028250" steps="10634"/></proof>
+  <goal name="gnome_sort&#39;vc.15" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.010559" steps="48"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.012033" steps="64"/></proof>
+  <goal name="gnome_sort&#39;vc.16" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.010624" steps="50"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.17" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.014728" steps="81"/></proof>
+  <goal name="gnome_sort&#39;vc.17" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.014700" steps="52"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.014839" steps="91"/></proof>
+  <proof prover="0"><result status="valid" time="0.028250" steps="10664"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.014869" steps="96"/></proof>
+  <proof prover="3"><result status="valid" time="0.012033" steps="66"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.016746" steps="90"/></proof>
+  <goal name="gnome_sort&#39;vc.20" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.014728" steps="84"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.21" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.010592" steps="91"/></proof>
+  <goal name="gnome_sort&#39;vc.21" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.014839" steps="93"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.22" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.014222" steps="96"/></proof>
+  <goal name="gnome_sort&#39;vc.22" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.014869" steps="98"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.23" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.016869" steps="34"/></proof>
+  <goal name="gnome_sort&#39;vc.23" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.016746" steps="92"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.24" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.016845" steps="199"/></proof>
+  <goal name="gnome_sort&#39;vc.24" expl="type invariant" proved="true">
+  <proof prover="3"><result status="valid" time="0.010592" steps="94"/></proof>
   </goal>
-  <goal name="gnome_sort&#39;vc.25" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027288" steps="126744"/></proof>
+  <goal name="gnome_sort&#39;vc.25" expl="integer overflow" proved="true">
+  <proof prover="3"><result status="valid" time="0.014222" steps="99"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.26" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.028493" steps="129985"/></proof>
+  <proof prover="0"><result status="valid" time="0.028493" steps="144333"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.27" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="gnome_sort&#39;vc.27.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.234617" steps="3213"/></proof>
+   <proof prover="3"><result status="valid" time="0.234617" steps="3468"/></proof>
    </goal>
    <goal name="gnome_sort&#39;vc.27.1" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.325622" steps="74549"/></proof>
+   <proof prover="1"><result status="valid" time="0.325622" steps="73584"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="gnome_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.210595" steps="28484"/></proof>
+  <proof prover="2"><result status="valid" time="0.210595" steps="29259"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/02_gnome/why3shapes.gz b/creusot/tests/should_succeed/vector/02_gnome/why3shapes.gz
index 1767762b706cc76759256987226de14975ef819f..286c8469c90bc830fc24fd45f78b96e34d974543 100644
GIT binary patch
literal 2635
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

literal 2578
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

diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index 727bb57ea0..4ecfba6223 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -355,6 +355,7 @@ module C03KnuthShuffle_KnuthShuffle
   var v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) = v;
   var old_v : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)));
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _6 : Core_Ops_Range_Range_Type.t_range usize;
   var _7 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
@@ -371,6 +372,7 @@ module C03KnuthShuffle_KnuthShuffle
   var _32 : borrowed (slice t);
   var _33 : borrowed (slice t);
   var _34 : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
+  var _36 : usize;
   {
     goto BB0
   }
@@ -381,12 +383,14 @@ module C03KnuthShuffle_KnuthShuffle
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../03_knuth_shuffle.rs" 17 16 17 23] _7 <- ([#"../03_knuth_shuffle.rs" 17 16 17 23] len0 ([#"../03_knuth_shuffle.rs" 17 16 17 17]  * v));
+    [#"../03_knuth_shuffle.rs" 17 16 17 23] _7 <- ([#"../03_knuth_shuffle.rs" 17 16 17 23] len0 ( * v));
     goto BB2
   }
   BB2 {
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] iter <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] into_iter0 ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range ([#"../03_knuth_shuffle.rs" 17 13 17 14] [#"../03_knuth_shuffle.rs" 17 13 17 14] (0 : usize)) _7));
+    [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _7);
     _7 <- any usize;
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] iter <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] into_iter0 _6);
+    _6 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB3
   }
   BB3 {
@@ -444,15 +448,15 @@ module C03KnuthShuffle_KnuthShuffle
   }
   BB13 {
     [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] _22);
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- any Snapshot.snap_ty (Seq.seq usize);
+    _22 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../03_knuth_shuffle.rs" 20 20 20 27] _26 <- ([#"../03_knuth_shuffle.rs" 20 20 20 27] len0 ([#"../03_knuth_shuffle.rs" 20 20 20 21]  * v));
+    [#"../03_knuth_shuffle.rs" 20 20 20 27] _26 <- ([#"../03_knuth_shuffle.rs" 20 20 20 27] len0 ( * v));
     goto BB14
   }
   BB14 {
-    [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- ([#"../03_knuth_shuffle.rs" 20 20 20 31] _26 - ([#"../03_knuth_shuffle.rs" 20 30 20 31] n));
+    [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- ([#"../03_knuth_shuffle.rs" 20 20 20 31] _26 - n);
     _26 <- any usize;
-    [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 ([#"../03_knuth_shuffle.rs" 21 30 21 31] [#"../03_knuth_shuffle.rs" 21 30 21 31] (0 : usize)) ([#"../03_knuth_shuffle.rs" 21 33 21 38] upper));
+    [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 (0 : usize) upper);
     goto BB15
   }
   BB15 {
@@ -467,8 +471,10 @@ module C03KnuthShuffle_KnuthShuffle
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _32 <- Borrow.borrow_final ( * _33) (Borrow.get_id _33);
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _33 <- { _33 with current = ( ^ _32) ; };
     assume { inv3 ( ^ _32) };
-    [#"../03_knuth_shuffle.rs" 22 8 22 28] _31 <- ([#"../03_knuth_shuffle.rs" 22 8 22 28] swap0 _32 ([#"../03_knuth_shuffle.rs" 22 15 22 16] i) ([#"../03_knuth_shuffle.rs" 22 18 22 27] ([#"../03_knuth_shuffle.rs" 22 18 22 23] upper) - ([#"../03_knuth_shuffle.rs" 22 26 22 27] [#"../03_knuth_shuffle.rs" 22 26 22 27] (1 : usize))));
+    [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- ([#"../03_knuth_shuffle.rs" 22 18 22 27] upper - (1 : usize));
+    [#"../03_knuth_shuffle.rs" 22 8 22 28] _31 <- ([#"../03_knuth_shuffle.rs" 22 8 22 28] swap0 _32 i _36);
     _32 <- any borrowed (slice t);
+    _36 <- any usize;
     goto BB17
   }
   BB17 {
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
index 2052bd043d..bb575fb89c 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="03_knuth_shuffle.mlcfg"/>
 <theory name="C03KnuthShuffle_KnuthShuffle" proved="true">
  <goal name="knuth_shuffle&#39;vc" expl="VC for knuth_shuffle" proved="true">
- <proof prover="0"><result status="valid" time="0.554466" steps="103988"/></proof>
+ <proof prover="0"><result status="valid" time="0.796893" steps="106763"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3shapes.gz b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3shapes.gz
index ac07e7a229696bb5e266d266028fc0c56b4b9be6..ccf2f3182a8db4ba5d41d7fb99d69da220b3909c 100644
GIT binary patch
literal 651
zcmV;60(AW!iwFP!00000|9w<VZ=)~}z2{eO>u#z_jK6@YJw%m|kyd-0<06NcCMtn0
zkhc5pcQ7$&NZJd29*^J5yczRj8FX9oYP;agw%x9&?*kPqe=hpJW>>#Kh+%rf34(_)
zG7lr<9x4<bN|YW7R337S(uH|=G?lHN`>mnCRn@%b`(|S+hOz0Jd{_5oZ$8463why^
z4Q5(BCBuX$U)yGLC~OxZgy!}Z0T4KXaNaNhI_BQQCKGs5n0+Q<p5imPV`k?OrLp_h
z{vQEPG}TUcDxN&QsXjuOmH&9fVYi|0HD!j=Y?K&Cn<r{$yFc`%r-tTD8P0Sxe-LI2
zlwOkcnQ3j;RBx6eOR}+(ELnMAp7P&KZNFy^QL1wbAftjN$%w7CEwbncghVb@qh4H0
zDKJ!HYiNRC<w0ibN3k{avz;kGHK|!9YOsu=qU0Va?#U>rhm-YcU(~sm{Msusk3@os
zrG(6Zyp_0d%*@<<-b*MT9a6~G&7t0Om#1SVT|tf&%(`jY=G|^?_Ag_d<*qgr%3&mc
zmel!?@`;P?jEQ-+eNH1I<6)YXgJtP`WsEXPkMhdsa@;74j4sDU$_rO@;YfMN^f)wf
zd==we7g^1!k@8p#&DW4POU4Z8u5i^*(t<wT&QT5;pL)V3L}NnlYupv5*0c1w9ULD?
z70!Dm!}G3)<ZP$D?%&*V2q6*_PIezz#8<~ipom7@=vNy3ay7gAv~?*CPeq6k2~*p5
z6x{LBib~J|=8nJupMtV!gO~cyZ}V<@D9g$&7Lsvm60?a5#*(stQgI7Vh;<xCtX#7I
llm@9mXy6){2G9`dM8`VPN=q#?*JRb<;y)W8Ch;}~002-%JHh|}

literal 651
zcmV;60(AW!iwFP!00000|9w<VZ<|06z57>iOY17q&VB(^a<C$yMXGw7W39DWVk;O@
zz)AY=JFs37V<#8y+hKS!@6F(E%c$GgXV*n9uI=_s{WH?h^82FyYxngFFl5;Yrw9Qi
z$ODW~1gKF4s89tcQ3oh6&KCCW-d3)D?01$5S5@=6J~V}^I3~7l*894*2m8iWW66t@
zd<fGSC^@D?`P??eaqBvU!0eA72!J3E<d_W;pvNMF_!NQ=V);iR9w<JNkIekMqO$Jr
z-2WpGh$iiXC-Ic|h58s_Cjb6Q!oHy2Yt9T$b8j(_HxD$>_HgWNPXk>yC7bzZ{~*j5
zsJ%4rbKAPEsa~8wp5}g%JY5A~AJ)H{+I`K=Q0emsASXeSWyDsy7I}OEQlXG5@0XBM
z3mml{4Q&vt0?4g<+wN@r=w=R(COzv!4-s!FDiM(8fsC5Edyih7i$2dHmd~<sn%I$Y
zw7fa--G00)*g`fGUT>OXU38aE{rpB5#6?o=rfJ*e)fG2~C$FyD*S116ECSGxjd|pE
zIv^iR?W610v?wYWc4#?7mLXRqsN(Eos){d{jLN9^a#@tRNYxjK)Q8GWtD^k3;NKl9
z>zNv*PHJeYhQ@j7JEV8zsD_%B^b_I&6({sQ2|giO4*IJ6ZTmiOo?VZ_$VXPOY&J8+
z&Zi>Nvzz{We)G(sgiKM6wuj0xxw<?OW$b;UKhXHssCj&!u49YC2O_0M($?-3r5JhX
zL@nq5dpiKnj*>6%Au5|Tda958Zr$yUWm&n!BH3)TiVM&i#|l<#H#(IGlaQ25mO_gN
lv;k#68W0A!0WiQ!Y7!G0ZIqEl7>XLU_z(MQ3Hmk$002KKKLY>&

diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
index b7a25db7fd..4356c7b205 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
+++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
@@ -169,39 +169,47 @@ module C04BinarySearch_BinarySearch
   var _0 : Core_Result_Result_Type.t_result usize usize;
   var arr : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) = arr;
   var elem : uint32 = elem;
+  var _9 : bool;
   var _10 : usize;
   var size : usize;
   var base : usize;
+  var _21 : bool;
   var half : usize;
   var _25 : bool;
   var mid : usize;
   var _29 : usize;
+  var _30 : bool;
   var _32 : uint32;
   var cmp : uint32;
   var _41 : uint32;
+  var _44 : bool;
+  var _48 : bool;
+  var _51 : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../04_binary_search.rs" 27 7 27 16] _10 <- ([#"../04_binary_search.rs" 27 7 27 16] len0 ([#"../04_binary_search.rs" 27 7 27 10] arr));
+    [#"../04_binary_search.rs" 27 7 27 16] _10 <- ([#"../04_binary_search.rs" 27 7 27 16] len0 arr);
     goto BB1
   }
   BB1 {
-    switch ([#"../04_binary_search.rs" 27 7 27 21] _10 = ([#"../04_binary_search.rs" 27 20 27 21] [#"../04_binary_search.rs" 27 20 27 21] (0 : usize)))
+    [#"../04_binary_search.rs" 27 7 27 21] _9 <- ([#"../04_binary_search.rs" 27 7 27 21] _10 = (0 : usize));
+    _10 <- any usize;
+    switch (_9)
       | False -> goto BB3
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 28 19 28 20] [#"../04_binary_search.rs" 28 19 28 20] (0 : usize)));
+    [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err (0 : usize));
     goto BB21
   }
   BB3 {
-    [#"../04_binary_search.rs" 30 19 30 28] size <- ([#"../04_binary_search.rs" 30 19 30 28] len0 ([#"../04_binary_search.rs" 30 19 30 22] arr));
+    [#"../04_binary_search.rs" 30 19 30 28] size <- ([#"../04_binary_search.rs" 30 19 30 28] len0 arr);
     goto BB4
   }
   BB4 {
-    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] [#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
+    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -211,24 +219,26 @@ module C04BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    switch ([#"../04_binary_search.rs" 36 10 36 18] ([#"../04_binary_search.rs" 36 10 36 14] size) > ([#"../04_binary_search.rs" 36 17 36 18] [#"../04_binary_search.rs" 36 17 36 18] (1 : usize)))
+    [#"../04_binary_search.rs" 36 10 36 18] _21 <- ([#"../04_binary_search.rs" 36 10 36 18] size > (1 : usize));
+    switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] ([#"../04_binary_search.rs" 37 26 37 27] [#"../04_binary_search.rs" 37 26 37 27] (2 : usize)) = ([#"../04_binary_search.rs" 37 19 37 27] [#"../04_binary_search.rs" 37 19 37 27] (0 : usize)));
+    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../04_binary_search.rs" 37 19 37 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] ([#"../04_binary_search.rs" 37 19 37 23] size) / ([#"../04_binary_search.rs" 37 26 37 27] [#"../04_binary_search.rs" 37 26 37 27] (2 : usize)));
-    [#"../04_binary_search.rs" 38 18 38 29] mid <- ([#"../04_binary_search.rs" 38 18 38 29] ([#"../04_binary_search.rs" 38 18 38 22] base) + ([#"../04_binary_search.rs" 38 25 38 29] half));
-    [#"../04_binary_search.rs" 40 21 40 26] _32 <- ([#"../04_binary_search.rs" 40 21 40 26] index0 ([#"../04_binary_search.rs" 40 18 40 21] arr) ([#"../04_binary_search.rs" 40 22 40 25] mid));
+    [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] size / (2 : usize));
+    [#"../04_binary_search.rs" 38 18 38 29] mid <- ([#"../04_binary_search.rs" 38 18 38 29] base + half);
+    [#"../04_binary_search.rs" 40 21 40 26] _32 <- ([#"../04_binary_search.rs" 40 21 40 26] index0 arr mid);
     goto BB9
   }
   BB9 {
-    switch ([#"../04_binary_search.rs" 40 18 40 33] ([#"../04_binary_search.rs" 40 18 40 26] _32) > ([#"../04_binary_search.rs" 40 29 40 33] elem))
+    [#"../04_binary_search.rs" 40 18 40 33] _30 <- ([#"../04_binary_search.rs" 40 18 40 33] _32 > elem);
+    switch (_30)
       | False -> goto BB11
       | True -> goto BB10
       end
@@ -243,37 +253,41 @@ module C04BinarySearch_BinarySearch
   }
   BB12 {
     [#"../04_binary_search.rs" 40 8 40 55] base <- ([#"../04_binary_search.rs" 40 8 40 55] _29);
-    [#"../04_binary_search.rs" 40 8 40 55] _29 <- any usize;
-    [#"../04_binary_search.rs" 41 8 41 20] size <- ([#"../04_binary_search.rs" 41 8 41 20] size - ([#"../04_binary_search.rs" 41 16 41 20] half));
+    _29 <- any usize;
+    [#"../04_binary_search.rs" 41 8 41 20] size <- ([#"../04_binary_search.rs" 41 8 41 20] size - half);
     goto BB5
   }
   BB13 {
-    [#"../04_binary_search.rs" 44 17 44 23] _41 <- ([#"../04_binary_search.rs" 44 17 44 23] index0 ([#"../04_binary_search.rs" 44 14 44 17] arr) ([#"../04_binary_search.rs" 44 18 44 22] base));
+    [#"../04_binary_search.rs" 44 17 44 23] _41 <- ([#"../04_binary_search.rs" 44 17 44 23] index0 arr base);
     goto BB14
   }
   BB14 {
     [#"../04_binary_search.rs" 44 14 44 23] cmp <- ([#"../04_binary_search.rs" 44 14 44 23] _41);
-    switch ([#"../04_binary_search.rs" 45 7 45 18] ([#"../04_binary_search.rs" 45 7 45 10] cmp) = ([#"../04_binary_search.rs" 45 14 45 18] elem))
+    [#"../04_binary_search.rs" 45 7 45 18] _44 <- ([#"../04_binary_search.rs" 45 7 45 18] cmp = elem);
+    switch (_44)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../04_binary_search.rs" 46 8 46 16] _0 <- ([#"../04_binary_search.rs" 46 8 46 16] Core_Result_Result_Type.C_Ok ([#"../04_binary_search.rs" 46 11 46 15] base));
+    [#"../04_binary_search.rs" 46 8 46 16] _0 <- ([#"../04_binary_search.rs" 46 8 46 16] Core_Result_Result_Type.C_Ok base);
     goto BB20
   }
   BB16 {
-    switch ([#"../04_binary_search.rs" 47 14 47 24] ([#"../04_binary_search.rs" 47 14 47 17] cmp) < ([#"../04_binary_search.rs" 47 20 47 24] elem))
+    [#"../04_binary_search.rs" 47 14 47 24] _48 <- ([#"../04_binary_search.rs" 47 14 47 24] cmp < elem);
+    switch (_48)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../04_binary_search.rs" 48 8 48 21] _0 <- ([#"../04_binary_search.rs" 48 8 48 21] Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 48 12 48 20] ([#"../04_binary_search.rs" 48 12 48 16] base) + ([#"../04_binary_search.rs" 48 19 48 20] [#"../04_binary_search.rs" 48 19 48 20] (1 : usize))));
+    [#"../04_binary_search.rs" 48 12 48 20] _51 <- ([#"../04_binary_search.rs" 48 12 48 20] base + (1 : usize));
+    [#"../04_binary_search.rs" 48 8 48 21] _0 <- ([#"../04_binary_search.rs" 48 8 48 21] Core_Result_Result_Type.C_Err _51);
+    _51 <- any usize;
     goto BB19
   }
   BB18 {
-    [#"../04_binary_search.rs" 50 8 50 17] _0 <- ([#"../04_binary_search.rs" 50 8 50 17] Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 50 12 50 16] base));
+    [#"../04_binary_search.rs" 50 8 50 17] _0 <- ([#"../04_binary_search.rs" 50 8 50 17] Core_Result_Result_Type.C_Err base);
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml b/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
index 32032521f5..b7f40b7f4c 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
+++ b/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="04_binary_search.mlcfg"/>
 <theory name="C04BinarySearch_BinarySearch" proved="true">
  <goal name="binary_search&#39;vc" expl="VC for binary_search" proved="true">
- <proof prover="1"><result status="valid" time="0.043744" steps="203870"/></proof>
+ <proof prover="1"><result status="valid" time="0.043744" steps="252301"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/04_binary_search/why3shapes.gz b/creusot/tests/should_succeed/vector/04_binary_search/why3shapes.gz
index a9085a3afd52153cd776dbbda8579ba0c169b26b..60fe18e3929a7ec21dad323ba9edb028ba4a5bf6 100644
GIT binary patch
literal 467
zcmV;^0WAI>iwFP!00000|CLfrbDKa6z4I%$wT&;U-369Tof*ah1E*d(x-tsJF%tqU
z{%HE|y9<lMCbir8z)0Hno+Rsiyz>ux`d%OWb3GiIzWeNl{@o|<_=B46ERkg%eOXgm
zcaO(CX=vN_Kg;KSTelp6j(yp5M|!3gmW+gVkiwJ&LS`ie@;T%v<`7WMA;ZA*q>~mF
z{Db~tv`92$TfdZT|JYOvLpuQiD>Ubl{BdBwFtNg+9EIa$0xT<Njfys9It&<RiP`+`
zow+k=;dZdEa|TWeohG!trYnrt1pfM@)2!I&--6D8GHMU?vJ`7U{Y9=)BfaR&6|I~c
zDoE+uaH^3<BP(jGo+-K);DNJbIstc<9**?Tq3c4Rfr$+YTHnyKC@v?wL@v@~vIrLm
z={uHZYELyYJHNfD0lV|?QH4A6+&jB7y?gTCCKF4OiJK-{%`gs^h`mz((OUv;dCR_D
z?m3CB-uKfpTpzW1g|YGPhq$tVLKrW2v1D{j$2|ayhJd$*fM6EZLE*a7l%^*H?E()s
z{;nVVho+<9SE)6IYVUbKibE7LNugp)1wsWX77sfq#cs<8{3s9eAeXtwc@8=Aegn%8
JKbhYI004oS;EDhM

literal 460
zcmV;-0W<y|iwFP!00000|CLfrbDJ;_z4I%$wT&;*t`MP9cSe(eflG4JmDzwCGbPYs
z$4&oz#g~no*iA2J7rlLNwfjEb_`5CrG&}!bx?R;aUw!G{eDU_bsA>*Ev&5rsYpPB2
zwBM42)^+<ke{M@tgXXkv^Qzg?Grcl36ug0C{cqGfnJ7`i9D>F<<XX%j(?PFEFP0eL
zll|&&kyuD+Uh}$rstTs%)Pd$Kvo*)$-G;fAY9f|mAdZ#^XGunDeM@(F+;uuiRR8jS
zD}&Q&<|<6LbH*JBn<`pg;>Dh91V8++X_8foT42jW^gIh85VUe~R`A#zDxlN1y0?5_
zHPv)xw7v!(Q2_A}fd(F{ajC!+*~#Yzs$UH28$I8`0KTX1&S;{7tN&g*1dFvpaBc0Y
zBa9tK9Gyx(xNVTvwmsb*hdz?7-qE|}&|=ZxFkXIJurUZVmwj{u$V)u&uuvWpOigFz
zTI6)4xo|keMb3wl9})Xvl%o~;^UN?P-x$WCFc=<!fkrVK28Cl7#4}+}-}#%i^B=2*
zx<C2OP*-d{kC_mSiHc2Gz@r2f@=b)SERkUt0c`v*m1&TQ6jMlf%Dlf@9#xI(1ONaX
CXyIr8

diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
index 132d22b767..1d05338f16 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
@@ -337,9 +337,11 @@ module C05BinarySearchGeneric_BinarySearch
   var _0 : Core_Result_Result_Type.t_result usize usize;
   var arr : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) = arr;
   var elem : t = elem;
+  var _9 : bool;
   var _10 : usize;
   var size : usize;
   var base : usize;
+  var _21 : bool;
   var half : usize;
   var _25 : bool;
   var mid : usize;
@@ -350,6 +352,7 @@ module C05BinarySearchGeneric_BinarySearch
   var _41 : t;
   var _44 : Core_Cmp_Ordering_Type.t_ordering;
   var _47 : t;
+  var _50 : usize;
   {
     goto BB0
   }
@@ -363,11 +366,13 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB3
   }
   BB3 {
-    [#"../05_binary_search_generic.rs" 31 7 31 16] _10 <- ([#"../05_binary_search_generic.rs" 31 7 31 16] len0 ([#"../05_binary_search_generic.rs" 31 7 31 10] arr));
+    [#"../05_binary_search_generic.rs" 31 7 31 16] _10 <- ([#"../05_binary_search_generic.rs" 31 7 31 16] len0 arr);
     goto BB4
   }
   BB4 {
-    switch ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = ([#"../05_binary_search_generic.rs" 31 20 31 21] [#"../05_binary_search_generic.rs" 31 20 31 21] (0 : usize)))
+    [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = (0 : usize));
+    _10 <- any usize;
+    switch (_9)
       | False -> goto BB7
       | True -> goto BB5
       end
@@ -377,7 +382,7 @@ module C05BinarySearchGeneric_BinarySearch
     assume { resolve2 elem };
     assert { [@expl:type invariant] inv0 arr };
     assume { resolve0 arr };
-    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 32 19 32 20] [#"../05_binary_search_generic.rs" 32 19 32 20] (0 : usize)));
+    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err (0 : usize));
     goto BB29
   }
   BB6 {
@@ -385,11 +390,11 @@ module C05BinarySearchGeneric_BinarySearch
     absurd
   }
   BB7 {
-    [#"../05_binary_search_generic.rs" 34 26 34 35] size <- ([#"../05_binary_search_generic.rs" 34 26 34 35] len0 ([#"../05_binary_search_generic.rs" 34 26 34 29] arr));
+    [#"../05_binary_search_generic.rs" 34 26 34 35] size <- ([#"../05_binary_search_generic.rs" 34 26 34 35] len0 arr);
     goto BB8
   }
   BB8 {
-    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] [#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
+    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
     goto BB9
   }
   BB9 {
@@ -405,26 +410,27 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB12
   }
   BB12 {
-    switch ([#"../05_binary_search_generic.rs" 40 10 40 18] ([#"../05_binary_search_generic.rs" 40 10 40 14] size) > ([#"../05_binary_search_generic.rs" 40 17 40 18] [#"../05_binary_search_generic.rs" 40 17 40 18] (1 : usize)))
+    [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- ([#"../05_binary_search_generic.rs" 40 10 40 18] size > (1 : usize));
+    switch (_21)
       | False -> goto BB20
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] ([#"../05_binary_search_generic.rs" 41 26 41 27] [#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)) = ([#"../05_binary_search_generic.rs" 41 19 41 27] [#"../05_binary_search_generic.rs" 41 19 41 27] (0 : usize)));
+    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] (2 : usize) = (0 : usize));
     assert { [@expl:division by zero] [#"../05_binary_search_generic.rs" 41 19 41 27] not _25 };
     goto BB14
   }
   BB14 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] ([#"../05_binary_search_generic.rs" 41 19 41 23] size) / ([#"../05_binary_search_generic.rs" 41 26 41 27] [#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)));
-    [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- ([#"../05_binary_search_generic.rs" 42 18 42 29] ([#"../05_binary_search_generic.rs" 42 18 42 22] base) + ([#"../05_binary_search_generic.rs" 42 25 42 29] half));
-    [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 ([#"../05_binary_search_generic.rs" 44 18 44 21] arr) ([#"../05_binary_search_generic.rs" 44 22 44 25] mid));
+    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] size / (2 : usize));
+    [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- ([#"../05_binary_search_generic.rs" 42 18 42 29] base + half);
+    [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 arr mid);
     goto BB15
   }
   BB15 {
     assert { [@expl:type invariant] inv1 _32 };
     assume { resolve1 _32 };
-    [#"../05_binary_search_generic.rs" 44 18 44 33] _30 <- ([#"../05_binary_search_generic.rs" 44 18 44 33] gt0 ([#"../05_binary_search_generic.rs" 44 18 44 26] _32) ([#"../05_binary_search_generic.rs" 44 29 44 33] elem));
+    [#"../05_binary_search_generic.rs" 44 18 44 33] _30 <- ([#"../05_binary_search_generic.rs" 44 18 44 33] gt0 _32 elem);
     goto BB16
   }
   BB16 {
@@ -443,14 +449,14 @@ module C05BinarySearchGeneric_BinarySearch
   }
   BB19 {
     [#"../05_binary_search_generic.rs" 44 8 44 55] base <- ([#"../05_binary_search_generic.rs" 44 8 44 55] _29);
-    [#"../05_binary_search_generic.rs" 44 8 44 55] _29 <- any usize;
-    [#"../05_binary_search_generic.rs" 46 8 46 20] size <- ([#"../05_binary_search_generic.rs" 46 8 46 20] size - ([#"../05_binary_search_generic.rs" 46 16 46 20] half));
+    _29 <- any usize;
+    [#"../05_binary_search_generic.rs" 46 8 46 20] size <- ([#"../05_binary_search_generic.rs" 46 8 46 20] size - half);
     goto BB11
   }
   BB20 {
     assert { [@expl:type invariant] inv0 arr };
     assume { resolve0 arr };
-    [#"../05_binary_search_generic.rs" 49 18 49 24] _41 <- ([#"../05_binary_search_generic.rs" 49 18 49 24] index0 ([#"../05_binary_search_generic.rs" 49 15 49 18] arr) ([#"../05_binary_search_generic.rs" 49 19 49 23] base));
+    [#"../05_binary_search_generic.rs" 49 18 49 24] _41 <- ([#"../05_binary_search_generic.rs" 49 18 49 24] index0 arr base);
     goto BB21
   }
   BB21 {
@@ -462,7 +468,7 @@ module C05BinarySearchGeneric_BinarySearch
     [#"../05_binary_search_generic.rs" 51 18 51 23] _47 <- ([#"../05_binary_search_generic.rs" 51 18 51 23] elem);
     assert { [@expl:type invariant] inv1 _47 };
     assume { resolve1 _47 };
-    [#"../05_binary_search_generic.rs" 51 10 51 24] _44 <- ([#"../05_binary_search_generic.rs" 51 10 51 24] cmp0 ([#"../05_binary_search_generic.rs" 51 10 51 13] cmp) ([#"../05_binary_search_generic.rs" 51 18 51 23] _47));
+    [#"../05_binary_search_generic.rs" 51 10 51 24] _44 <- ([#"../05_binary_search_generic.rs" 51 10 51 24] cmp0 cmp _47);
     goto BB22
   }
   BB22 {
@@ -481,15 +487,17 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB26
   }
   BB25 {
-    [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- ([#"../05_binary_search_generic.rs" 54 29 54 38] Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 54 33 54 37] base));
+    [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- ([#"../05_binary_search_generic.rs" 54 29 54 38] Core_Result_Result_Type.C_Err base);
     goto BB28
   }
   BB26 {
-    [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- ([#"../05_binary_search_generic.rs" 52 27 52 35] Core_Result_Result_Type.C_Ok ([#"../05_binary_search_generic.rs" 52 30 52 34] base));
+    [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- ([#"../05_binary_search_generic.rs" 52 27 52 35] Core_Result_Result_Type.C_Ok base);
     goto BB28
   }
   BB27 {
-    [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- ([#"../05_binary_search_generic.rs" 53 26 53 39] Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 53 30 53 38] ([#"../05_binary_search_generic.rs" 53 30 53 34] base) + ([#"../05_binary_search_generic.rs" 53 37 53 38] [#"../05_binary_search_generic.rs" 53 37 53 38] (1 : usize))));
+    [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- ([#"../05_binary_search_generic.rs" 53 30 53 38] base + (1 : usize));
+    [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- ([#"../05_binary_search_generic.rs" 53 26 53 39] Core_Result_Result_Type.C_Err _50);
+    _50 <- any usize;
     goto BB28
   }
   BB28 {
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
index a08f3afa12..42a6120b1e 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
@@ -13,107 +13,107 @@
   <goal name="binary_search&#39;vc.0" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.013170" steps="10"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.1" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.009512" steps="6007"/></proof>
+  <goal name="binary_search&#39;vc.1" expl="precondition" proved="true">
+  <proof prover="3"><result status="valid" time="0.069202" steps="9040"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.020246" steps="18"/></proof>
+  <goal name="binary_search&#39;vc.2" expl="loop invariant init" proved="true">
+  <proof prover="0"><result status="valid" time="0.017749" steps="75628"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.069202" steps="9029"/></proof>
+  <goal name="binary_search&#39;vc.3" expl="loop invariant init" proved="true">
+  <proof prover="0"><result status="valid" time="0.020032" steps="91671"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.4" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.017749" steps="75596"/></proof>
+  <proof prover="4"><result status="valid" time="0.008712" steps="29"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.5" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.020032" steps="91639"/></proof>
+  <goal name="binary_search&#39;vc.5" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.022533" steps="32"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.6" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.008712" steps="27"/></proof>
+  <goal name="binary_search&#39;vc.6" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.021647" steps="92535"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.7" expl="division by zero" proved="true">
-  <proof prover="4"><result status="valid" time="0.008926" steps="31"/></proof>
+  <goal name="binary_search&#39;vc.7" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.012406" steps="35"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.8" expl="division by zero" proved="true">
-  <proof prover="4"><result status="valid" time="0.008616" steps="35"/></proof>
+  <goal name="binary_search&#39;vc.8" expl="precondition" proved="true">
+  <proof prover="0"><result status="valid" time="0.019786" steps="93788"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.9" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.011959" steps="91"/></proof>
+  <goal name="binary_search&#39;vc.9" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.008573" steps="40"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.10" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.021739" steps="104875"/></proof>
+  <goal name="binary_search&#39;vc.10" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.008558" steps="42"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.008769" steps="120"/></proof>
+  <goal name="binary_search&#39;vc.11" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.010241" steps="52"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.008765" steps="41"/></proof>
+  <proof prover="4"><result status="valid" time="0.028871" steps="50"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.008900" steps="101"/></proof>
+  <proof prover="4"><result status="valid" time="0.011303" steps="50"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.14" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.008788" steps="43"/></proof>
+  <proof prover="4"><result status="valid" time="0.007496" steps="52"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.010248" steps="45"/></proof>
+  <goal name="binary_search&#39;vc.15" expl="integer overflow" proved="true">
+  <proof prover="0"><result status="valid" time="0.020319" steps="98532"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.009508" steps="105"/></proof>
+  <goal name="binary_search&#39;vc.16" expl="division by zero" proved="true">
+  <proof prover="4"><result status="valid" time="0.008926" steps="35"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.17" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.022533" steps="28"/></proof>
+  <goal name="binary_search&#39;vc.17" expl="division by zero" proved="true">
+  <proof prover="4"><result status="valid" time="0.008616" steps="39"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.021647" steps="92379"/></proof>
+  <goal name="binary_search&#39;vc.18" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.011959" steps="94"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.012406" steps="31"/></proof>
+  <goal name="binary_search&#39;vc.19" expl="integer overflow" proved="true">
+  <proof prover="0"><result status="valid" time="0.021739" steps="104941"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.019786" steps="93632"/></proof>
+  <proof prover="4"><result status="valid" time="0.008769" steps="123"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.21" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.008573" steps="36"/></proof>
+  <goal name="binary_search&#39;vc.21" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.008765" steps="45"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.22" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.008558" steps="38"/></proof>
+  <goal name="binary_search&#39;vc.22" expl="precondition" proved="true">
+  <proof prover="4"><result status="valid" time="0.008900" steps="103"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.23" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.010241" steps="50"/></proof>
+  <proof prover="4"><result status="valid" time="0.008788" steps="47"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.028871" steps="46"/></proof>
+  <proof prover="4"><result status="valid" time="0.010248" steps="49"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.011303" steps="46"/></proof>
+  <proof prover="4"><result status="valid" time="0.009508" steps="107"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.26" expl="type invariant" proved="true">
-  <proof prover="4"><result status="valid" time="0.007496" steps="48"/></proof>
+  <goal name="binary_search&#39;vc.26" expl="integer overflow" proved="true">
+  <proof prover="4"><result status="valid" time="0.026441" steps="530"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.27" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.020319" steps="98450"/></proof>
+  <goal name="binary_search&#39;vc.27" expl="loop invariant preservation" proved="true">
+  <proof prover="4"><result status="valid" time="0.018221" steps="259"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.28" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.026441" steps="456"/></proof>
+  <goal name="binary_search&#39;vc.28" expl="loop invariant preservation" proved="true">
+  <proof prover="3"><result status="valid" time="0.305670" steps="46303"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.018221" steps="218"/></proof>
+  <proof prover="3"><result status="valid" time="0.354482" steps="48615"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.305670" steps="49597"/></proof>
+  <goal name="binary_search&#39;vc.30" expl="type invariant" proved="true">
+  <proof prover="0"><result status="valid" time="0.009512" steps="6018"/></proof>
   </goal>
-  <goal name="binary_search&#39;vc.31" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.148233" steps="36553"/></proof>
+  <goal name="binary_search&#39;vc.31" expl="type invariant" proved="true">
+  <proof prover="4"><result status="valid" time="0.020246" steps="20"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.32" expl="postcondition" proved="true">
   <proof prover="4"><result status="valid" time="0.028855" steps="413"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.33" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.076317" steps="1426"/></proof>
+  <proof prover="4"><result status="valid" time="0.076317" steps="1440"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.34" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.296167" steps="126899"/></proof>
+  <proof prover="0"><result status="valid" time="0.034645" steps="124223"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3shapes.gz b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3shapes.gz
index d3fe3766c33e4533ef103ff53a5b5e7187447b6e..3969b8deb4a329251aa1341000080cb4dfcfbd1f 100644
GIT binary patch
literal 2603
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
N{{i$1!RMVS006>s`UC&~

literal 2488
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
CQLNqo

diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index b59ce41797..9ac2e093bb 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -37,12 +37,12 @@ module C06KnightsTour_Impl3_Clone
   }
   BB0 {
     [#"../06_knights_tour.rs" 6 4 6 12] _5 <- ([#"../06_knights_tour.rs" 6 4 6 12] C06KnightsTour_Point_Type.point_x self);
-    [#"../06_knights_tour.rs" 6 4 6 12] _3 <- ([#"../06_knights_tour.rs" 6 4 6 12] clone0 ([#"../06_knights_tour.rs" 6 4 6 12] _5));
+    [#"../06_knights_tour.rs" 6 4 6 12] _3 <- ([#"../06_knights_tour.rs" 6 4 6 12] clone0 _5);
     goto BB1
   }
   BB1 {
     [#"../06_knights_tour.rs" 7 4 7 12] _8 <- ([#"../06_knights_tour.rs" 7 4 7 12] C06KnightsTour_Point_Type.point_y self);
-    [#"../06_knights_tour.rs" 7 4 7 12] _6 <- ([#"../06_knights_tour.rs" 7 4 7 12] clone0 ([#"../06_knights_tour.rs" 7 4 7 12] _8));
+    [#"../06_knights_tour.rs" 7 4 7 12] _6 <- ([#"../06_knights_tour.rs" 7 4 7 12] clone0 _8);
     goto BB2
   }
   BB2 {
@@ -71,11 +71,17 @@ module C06KnightsTour_Impl0_Mov
   var _0 : C06KnightsTour_Point_Type.t_point;
   var self : C06KnightsTour_Point_Type.t_point = self;
   var p : (isize, isize) = p;
+  var _9 : isize;
+  var _12 : isize;
   {
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 19 8 19 53] _0 <- ([#"../06_knights_tour.rs" 19 8 19 53] C06KnightsTour_Point_Type.C_Point ([#"../06_knights_tour.rs" 19 18 19 32] ([#"../06_knights_tour.rs" 19 19 19 25] C06KnightsTour_Point_Type.point_x self) + ([#"../06_knights_tour.rs" 19 28 19 31] let (a, _) = p in a)) ([#"../06_knights_tour.rs" 19 37 19 51] ([#"../06_knights_tour.rs" 19 38 19 44] C06KnightsTour_Point_Type.point_y self) + ([#"../06_knights_tour.rs" 19 47 19 50] let (_, a) = p in a)));
+    [#"../06_knights_tour.rs" 19 18 19 32] _9 <- ([#"../06_knights_tour.rs" 19 18 19 32] C06KnightsTour_Point_Type.point_x self + (let (a, _) = p in a));
+    [#"../06_knights_tour.rs" 19 37 19 51] _12 <- ([#"../06_knights_tour.rs" 19 37 19 51] C06KnightsTour_Point_Type.point_y self + (let (_, a) = p in a));
+    [#"../06_knights_tour.rs" 19 8 19 53] _0 <- ([#"../06_knights_tour.rs" 19 8 19 53] C06KnightsTour_Point_Type.C_Point _9 _12);
+    _9 <- any isize;
+    _12 <- any isize;
     return _0
   }
   
@@ -138,26 +144,6 @@ module C06KnightsTour_Board_Type
       | C_Board _ a -> a
       end
 end
-module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
-  use seq.Seq
-  use prelude.Snapshot
-  type t_mapinv 'i 'b 'f =
-    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
-    
-  let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv a _ _ -> a
-      end
-  let function mapinv_func (self : t_mapinv 'i 'b 'f) : 'f = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv _ a _ -> a
-      end
-  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_MapInv _ _ a -> a
-      end
-end
 module Core_Ops_Range_Range_Type
   type t_range 'idx =
     | C_Range 'idx 'idx
@@ -277,7 +263,7 @@ module C06KnightsTour_Impl1_New_Closure3
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../06_knights_tour.rs" 44 23 44 36] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 ([#"../06_knights_tour.rs" 44 28 44 29] [#"../06_knights_tour.rs" 44 28 44 29] (0 : usize)) ([#"../06_knights_tour.rs" 44 31 44 35] field_00 ( * _1)));
+    [#"../06_knights_tour.rs" 44 23 44 36] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 (0 : usize) (field_00 ( * _1)));
     goto BB1
   }
   BB1 {
@@ -285,7 +271,7 @@ module C06KnightsTour_Impl1_New_Closure3
   }
   BB2 {
     [#"../06_knights_tour.rs" 43 16 43 50] _0 <- ([#"../06_knights_tour.rs" 43 16 43 50] res);
-    [#"../06_knights_tour.rs" 43 16 43 50] res <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+    res <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     goto BB3
   }
   BB3 {
@@ -293,6 +279,26 @@ module C06KnightsTour_Impl1_New_Closure3
   }
   
 end
+module CreusotContracts_Std1_Iter_MapInv_MapInv_Type
+  use seq.Seq
+  use prelude.Snapshot
+  type t_mapinv 'i 'b 'f =
+    | C_MapInv 'i 'f (Snapshot.snap_ty (Seq.seq 'b))
+    
+  let function mapinv_iter (self : t_mapinv 'i 'b 'f) : 'i = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv a _ _ -> a
+      end
+  let function mapinv_func (self : t_mapinv 'i 'b 'f) : 'f = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv _ a _ -> a
+      end
+  let function mapinv_produced (self : t_mapinv 'i 'b 'f) : Snapshot.snap_ty (Seq.seq 'b)
+   = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_MapInv _ _ a -> a
+      end
+end
 module C06KnightsTour_Impl1_New
   use prelude.UIntSize
   use seq.Seq
@@ -683,11 +689,17 @@ module C06KnightsTour_Impl1_New
   var size : usize = size;
   var rows : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
   var _6 : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3;
+  var _7 : Core_Ops_Range_Range_Type.t_range usize;
+  var _9 : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3;
   {
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 41 19 45 13] _6 <- ([#"../06_knights_tour.rs" 41 19 45 13] map_inv0 ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 41 20 41 21] [#"../06_knights_tour.rs" 41 20 41 21] (0 : usize)) ([#"../06_knights_tour.rs" 41 23 41 27] size)) ([#"../06_knights_tour.rs" 43 16 43 50] C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 ([#"../06_knights_tour.rs" 43 16 43 50] size)));
+    [#"../06_knights_tour.rs" 41 19 41 28] _7 <- ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) size);
+    [#"../06_knights_tour.rs" 43 16 43 50] _9 <- ([#"../06_knights_tour.rs" 43 16 43 50] C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size);
+    [#"../06_knights_tour.rs" 41 19 45 13] _6 <- ([#"../06_knights_tour.rs" 41 19 45 13] map_inv0 _7 _9);
+    _7 <- any Core_Ops_Range_Range_Type.t_range usize;
+    _9 <- any C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3;
     goto BB1
   }
   BB1 {
@@ -696,8 +708,8 @@ module C06KnightsTour_Impl1_New
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 47 8 47 34] _0 <- ([#"../06_knights_tour.rs" 47 8 47 34] C06KnightsTour_Board_Type.C_Board ([#"../06_knights_tour.rs" 47 15 47 19] size) ([#"../06_knights_tour.rs" 47 28 47 32] rows));
-    [#"../06_knights_tour.rs" 47 28 47 32] rows <- any Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
+    [#"../06_knights_tour.rs" 47 8 47 34] _0 <- ([#"../06_knights_tour.rs" 47 8 47 34] C06KnightsTour_Board_Type.C_Board size rows);
+    rows <- any Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
     goto BB3
   }
   BB3 {
@@ -903,37 +915,55 @@ module C06KnightsTour_Impl1_Available
   var _0 : bool;
   var self : C06KnightsTour_Board_Type.t_board = self;
   var p : C06KnightsTour_Point_Type.t_point = p;
+  var _5 : bool;
+  var _7 : bool;
+  var _8 : usize;
+  var _11 : bool;
+  var _13 : bool;
+  var _14 : usize;
   var _18 : usize;
   var _20 : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
+  var _22 : usize;
+  var _24 : usize;
   {
     goto BB0
   }
   BB0 {
-    switch ([#"../06_knights_tour.rs" 53 8 53 16] ([#"../06_knights_tour.rs" 53 8 53 9] [#"../06_knights_tour.rs" 53 8 53 9] (0 : isize)) <= ([#"../06_knights_tour.rs" 53 13 53 16] C06KnightsTour_Point_Type.point_x p))
+    [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 16] (0 : isize) <= C06KnightsTour_Point_Type.point_x p);
+    switch (_5)
       | False -> goto BB8
       | True -> goto BB1
       end
   }
   BB1 {
-    switch ([#"../06_knights_tour.rs" 54 15 54 41] ([#"../06_knights_tour.rs" 54 15 54 29] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 54 16 54 19] C06KnightsTour_Point_Type.point_x p))) < ([#"../06_knights_tour.rs" 54 32 54 41] C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 54 15 54 29] _8 <- ([#"../06_knights_tour.rs" 54 15 54 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
+    [#"../06_knights_tour.rs" 54 15 54 41] _7 <- ([#"../06_knights_tour.rs" 54 15 54 41] _8 < C06KnightsTour_Board_Type.board_size self);
+    _8 <- any usize;
+    switch (_7)
       | False -> goto BB7
       | True -> goto BB2
       end
   }
   BB2 {
-    switch ([#"../06_knights_tour.rs" 55 15 55 23] ([#"../06_knights_tour.rs" 55 15 55 16] [#"../06_knights_tour.rs" 55 15 55 16] (0 : isize)) <= ([#"../06_knights_tour.rs" 55 20 55 23] C06KnightsTour_Point_Type.point_y p))
+    [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 23] (0 : isize) <= C06KnightsTour_Point_Type.point_y p);
+    switch (_11)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
-    switch ([#"../06_knights_tour.rs" 56 15 56 41] ([#"../06_knights_tour.rs" 56 15 56 29] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 56 16 56 19] C06KnightsTour_Point_Type.point_y p))) < ([#"../06_knights_tour.rs" 56 32 56 41] C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 56 15 56 29] _14 <- ([#"../06_knights_tour.rs" 56 15 56 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
+    [#"../06_knights_tour.rs" 56 15 56 41] _13 <- ([#"../06_knights_tour.rs" 56 15 56 41] _14 < C06KnightsTour_Board_Type.board_size self);
+    _14 <- any usize;
+    switch (_13)
       | False -> goto BB5
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../06_knights_tour.rs" 57 25 57 39] _20 <- ([#"../06_knights_tour.rs" 57 25 57 39] index0 ([#"../06_knights_tour.rs" 57 15 57 25] C06KnightsTour_Board_Type.board_field self) ([#"../06_knights_tour.rs" 57 26 57 38] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 57 26 57 29] C06KnightsTour_Point_Type.point_x p))));
+    [#"../06_knights_tour.rs" 57 26 57 38] _22 <- ([#"../06_knights_tour.rs" 57 26 57 38] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
+    [#"../06_knights_tour.rs" 57 25 57 39] _20 <- ([#"../06_knights_tour.rs" 57 25 57 39] index0 (C06KnightsTour_Board_Type.board_field self) _22);
+    _22 <- any usize;
     goto BB10
   }
   BB5 {
@@ -949,15 +979,17 @@ module C06KnightsTour_Impl1_Available
     goto BB9
   }
   BB9 {
-    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] [#"../06_knights_tour.rs" 53 8 57 58] false);
+    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] false);
     goto BB12
   }
   BB10 {
-    [#"../06_knights_tour.rs" 57 39 57 53] _18 <- ([#"../06_knights_tour.rs" 57 39 57 53] index1 ([#"../06_knights_tour.rs" 57 15 57 39] _20) ([#"../06_knights_tour.rs" 57 40 57 52] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 57 40 57 43] C06KnightsTour_Point_Type.point_y p))));
+    [#"../06_knights_tour.rs" 57 40 57 52] _24 <- ([#"../06_knights_tour.rs" 57 40 57 52] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
+    [#"../06_knights_tour.rs" 57 39 57 53] _18 <- ([#"../06_knights_tour.rs" 57 39 57 53] index1 _20 _24);
+    _24 <- any usize;
     goto BB11
   }
   BB11 {
-    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] ([#"../06_knights_tour.rs" 57 15 57 53] _18) = ([#"../06_knights_tour.rs" 57 57 57 58] [#"../06_knights_tour.rs" 57 57 57 58] (0 : usize)));
+    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] _18 = (0 : usize));
     goto BB12
   }
   BB12 {
@@ -1309,7 +1341,7 @@ module C06KnightsTour_Impl1_CountDegree
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] [#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
+    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
     [#"../06_knights_tour.rs" 74 17 74 24] _8 <- ([#"../06_knights_tour.rs" 74 17 74 24] moves0 ());
     goto BB1
   }
@@ -1376,16 +1408,16 @@ module C06KnightsTour_Impl1_CountDegree
   }
   BB14 {
     [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] _22);
-    [#"../06_knights_tour.rs" 73 8 73 46] _22 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
+    _22 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assume { resolve1 __creusot_proc_iter_elem };
     [#"../06_knights_tour.rs" 75 29 75 31] _28 <- ([#"../06_knights_tour.rs" 75 29 75 31] m);
-    [#"../06_knights_tour.rs" 75 23 75 32] next <- ([#"../06_knights_tour.rs" 75 23 75 32] mov0 ([#"../06_knights_tour.rs" 75 23 75 24] p) ([#"../06_knights_tour.rs" 75 29 75 31] _28));
+    [#"../06_knights_tour.rs" 75 23 75 32] next <- ([#"../06_knights_tour.rs" 75 23 75 32] mov0 p _28);
     goto BB15
   }
   BB15 {
     assume { resolve1 m };
-    [#"../06_knights_tour.rs" 76 15 76 35] _29 <- ([#"../06_knights_tour.rs" 76 15 76 35] available0 ([#"../06_knights_tour.rs" 76 15 76 19] self) ([#"../06_knights_tour.rs" 76 30 76 34] next));
+    [#"../06_knights_tour.rs" 76 15 76 35] _29 <- ([#"../06_knights_tour.rs" 76 15 76 35] available0 self next);
     goto BB16
   }
   BB16 {
@@ -1395,7 +1427,7 @@ module C06KnightsTour_Impl1_CountDegree
       end
   }
   BB17 {
-    [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + ([#"../06_knights_tour.rs" 77 25 77 26] [#"../06_knights_tour.rs" 77 25 77 26] (1 : usize)));
+    [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + (1 : usize));
     [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] ());
     goto BB19
   }
@@ -1649,25 +1681,31 @@ module C06KnightsTour_Impl1_Set
   var _10 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _11 : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
   var _12 : borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+  var _13 : usize;
+  var _15 : usize;
   {
     goto BB0
   }
   BB0 {
     [#"../06_knights_tour.rs" 88 8 88 18] _12 <- Borrow.borrow_final (C06KnightsTour_Board_Type.board_field ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../06_knights_tour.rs" 88 8 88 18] self <- { self with current = (let C06KnightsTour_Board_Type.C_Board x0 x1 =  * self in C06KnightsTour_Board_Type.C_Board x0 ( ^ _12)) ; };
-    [#"../06_knights_tour.rs" 88 18 88 32] _11 <- ([#"../06_knights_tour.rs" 88 18 88 32] index_mut0 _12 ([#"../06_knights_tour.rs" 88 19 88 31] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 88 19 88 22] C06KnightsTour_Point_Type.point_x p))));
+    [#"../06_knights_tour.rs" 88 19 88 31] _13 <- ([#"../06_knights_tour.rs" 88 19 88 31] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
+    [#"../06_knights_tour.rs" 88 18 88 32] _11 <- ([#"../06_knights_tour.rs" 88 18 88 32] index_mut0 _12 _13);
     _12 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
+    _13 <- any usize;
     goto BB1
   }
   BB1 {
     [#"../06_knights_tour.rs" 88 8 88 32] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11);
     [#"../06_knights_tour.rs" 88 8 88 32] _11 <- { _11 with current = ( ^ _10) ; };
-    [#"../06_knights_tour.rs" 88 32 88 46] _9 <- ([#"../06_knights_tour.rs" 88 32 88 46] index_mut1 _10 ([#"../06_knights_tour.rs" 88 33 88 45] UIntSize.of_int (IntSize.to_int ([#"../06_knights_tour.rs" 88 33 88 36] C06KnightsTour_Point_Type.point_y p))));
+    [#"../06_knights_tour.rs" 88 33 88 45] _15 <- ([#"../06_knights_tour.rs" 88 33 88 45] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
+    [#"../06_knights_tour.rs" 88 32 88 46] _9 <- ([#"../06_knights_tour.rs" 88 32 88 46] index_mut1 _10 _15);
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
+    _15 <- any usize;
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = ([#"../06_knights_tour.rs" 88 49 88 50] v) ; };
+    [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = ([#"../06_knights_tour.rs" 88 8 88 50] v) ; };
     assume { resolve0 _9 };
     [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] ());
     assume { resolve1 _11 };
@@ -1938,13 +1976,16 @@ module C06KnightsTour_Min
   var _20 : Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
   var x : (usize, C06KnightsTour_Point_Type.t_point);
   var _23 : ();
+  var _25 : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
   var m : (usize, C06KnightsTour_Point_Type.t_point);
+  var _28 : bool;
+  var _31 : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
   {
     goto BB0
   }
   BB0 {
     [#"../06_knights_tour.rs" 112 18 112 22] min <- ([#"../06_knights_tour.rs" 112 18 112 22] Core_Option_Option_Type.C_None);
-    [#"../06_knights_tour.rs" 113 4 114 74] iter <- ([#"../06_knights_tour.rs" 113 4 114 74] into_iter0 ([#"../06_knights_tour.rs" 115 13 115 14] v));
+    [#"../06_knights_tour.rs" 113 4 114 74] iter <- ([#"../06_knights_tour.rs" 113 4 114 74] into_iter0 v);
     goto BB1
   }
   BB1 {
@@ -1998,7 +2039,7 @@ module C06KnightsTour_Min
   }
   BB11 {
     [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] _20);
-    [#"../06_knights_tour.rs" 113 4 114 74] _20 <- any Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
+    _20 <- any Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     switch (min)
       | Core_Option_Option_Type.C_None -> goto BB12
@@ -2010,18 +2051,23 @@ module C06KnightsTour_Min
   }
   BB13 {
     [#"../06_knights_tour.rs" 118 17 118 18] m <- ([#"../06_knights_tour.rs" 118 17 118 18] Core_Option_Option_Type.some_0 min);
-    switch ([#"../06_knights_tour.rs" 119 19 119 28] ([#"../06_knights_tour.rs" 119 19 119 22] let (a, _) = x in a) < ([#"../06_knights_tour.rs" 119 25 119 28] let (a, _) = m in a))
+    [#"../06_knights_tour.rs" 119 19 119 28] _28 <- ([#"../06_knights_tour.rs" 119 19 119 28] (let (a, _) = x in a) < (let (a, _) = m in a));
+    switch (_28)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB14 {
-    [#"../06_knights_tour.rs" 117 20 117 33] min <- ([#"../06_knights_tour.rs" 117 26 117 33] Core_Option_Option_Type.C_Some ([#"../06_knights_tour.rs" 117 31 117 32] x));
+    [#"../06_knights_tour.rs" 117 26 117 33] _25 <- ([#"../06_knights_tour.rs" 117 26 117 33] Core_Option_Option_Type.C_Some x);
+    [#"../06_knights_tour.rs" 117 20 117 33] min <- ([#"../06_knights_tour.rs" 117 20 117 33] _25);
+    _25 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
     [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] ());
     goto BB18
   }
   BB15 {
-    [#"../06_knights_tour.rs" 120 20 120 33] min <- ([#"../06_knights_tour.rs" 120 26 120 33] Core_Option_Option_Type.C_Some ([#"../06_knights_tour.rs" 120 31 120 32] x));
+    [#"../06_knights_tour.rs" 120 26 120 33] _31 <- ([#"../06_knights_tour.rs" 120 26 120 33] Core_Option_Option_Type.C_Some x);
+    [#"../06_knights_tour.rs" 120 20 120 33] min <- ([#"../06_knights_tour.rs" 120 20 120 33] _31);
+    _31 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
     [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] ());
     goto BB17
   }
@@ -2596,10 +2642,14 @@ module C06KnightsTour_KnightsTour
   var y : usize = y;
   var board : C06KnightsTour_Board_Type.t_board;
   var p : C06KnightsTour_Point_Type.t_point;
+  var _10 : isize;
+  var _12 : isize;
   var _14 : ();
   var _15 : borrowed (C06KnightsTour_Board_Type.t_board);
   var _17 : Snapshot.snap_ty ();
   var iter : Core_Ops_Range_Range_Type.t_range usize;
+  var _21 : Core_Ops_Range_Range_Type.t_range usize;
+  var _22 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced : Snapshot.snap_ty (Seq.seq usize);
   var _34 : ();
@@ -2626,6 +2676,7 @@ module C06KnightsTour_KnightsTour
   var degree : usize;
   var _72 : ();
   var _73 : borrowed (Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global));
+  var _74 : (usize, C06KnightsTour_Point_Type.t_point);
   var _79 : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
   var _81 : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global);
   var adj1 : C06KnightsTour_Point_Type.t_point;
@@ -2635,14 +2686,18 @@ module C06KnightsTour_KnightsTour
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 137 20 137 36] board <- ([#"../06_knights_tour.rs" 137 20 137 36] new0 ([#"../06_knights_tour.rs" 137 31 137 35] size));
+    [#"../06_knights_tour.rs" 137 20 137 36] board <- ([#"../06_knights_tour.rs" 137 20 137 36] new0 size);
     goto BB1
   }
   BB1 {
-    [#"../06_knights_tour.rs" 138 16 138 54] p <- ([#"../06_knights_tour.rs" 138 16 138 54] C06KnightsTour_Point_Type.C_Point ([#"../06_knights_tour.rs" 138 27 138 37] IntSize.of_int (UIntSize.to_int ([#"../06_knights_tour.rs" 138 27 138 28] x))) ([#"../06_knights_tour.rs" 138 42 138 52] IntSize.of_int (UIntSize.to_int ([#"../06_knights_tour.rs" 138 42 138 43] y))));
+    [#"../06_knights_tour.rs" 138 27 138 37] _10 <- ([#"../06_knights_tour.rs" 138 27 138 37] IntSize.of_int (UIntSize.to_int x));
+    [#"../06_knights_tour.rs" 138 42 138 52] _12 <- ([#"../06_knights_tour.rs" 138 42 138 52] IntSize.of_int (UIntSize.to_int y));
+    [#"../06_knights_tour.rs" 138 16 138 54] p <- ([#"../06_knights_tour.rs" 138 16 138 54] C06KnightsTour_Point_Type.C_Point _10 _12);
+    _10 <- any isize;
+    _12 <- any isize;
     [#"../06_knights_tour.rs" 139 4 139 9] _15 <- Borrow.borrow_mut board;
     [#"../06_knights_tour.rs" 139 4 139 9] board <-  ^ _15;
-    [#"../06_knights_tour.rs" 139 4 139 19] _14 <- ([#"../06_knights_tour.rs" 139 4 139 19] set0 _15 ([#"../06_knights_tour.rs" 139 14 139 15] p) ([#"../06_knights_tour.rs" 139 17 139 18] [#"../06_knights_tour.rs" 139 17 139 18] (1 : usize)));
+    [#"../06_knights_tour.rs" 139 4 139 19] _14 <- ([#"../06_knights_tour.rs" 139 4 139 19] set0 _15 p (1 : usize));
     _15 <- any borrowed (C06KnightsTour_Board_Type.t_board);
     goto BB2
   }
@@ -2651,7 +2706,11 @@ module C06KnightsTour_KnightsTour
     goto BB3
   }
   BB3 {
-    [#"../06_knights_tour.rs" 142 4 142 36] iter <- ([#"../06_knights_tour.rs" 142 4 142 36] into_iter0 ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 145 16 145 17] [#"../06_knights_tour.rs" 145 16 145 17] (2 : usize)) ([#"../06_knights_tour.rs" 145 19 145 32] ([#"../06_knights_tour.rs" 145 20 145 24] size) * ([#"../06_knights_tour.rs" 145 27 145 31] size))));
+    [#"../06_knights_tour.rs" 145 19 145 32] _22 <- ([#"../06_knights_tour.rs" 145 19 145 32] size * size);
+    [#"../06_knights_tour.rs" 145 16 145 32] _21 <- ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range (2 : usize) _22);
+    _22 <- any usize;
+    [#"../06_knights_tour.rs" 142 4 142 36] iter <- ([#"../06_knights_tour.rs" 142 4 142 36] into_iter0 _21);
+    _21 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB4
   }
   BB4 {
@@ -2696,8 +2755,8 @@ module C06KnightsTour_KnightsTour
       end
   }
   BB12 {
-    [#"../06_knights_tour.rs" 163 4 163 15] _0 <- ([#"../06_knights_tour.rs" 163 4 163 15] Core_Option_Option_Type.C_Some ([#"../06_knights_tour.rs" 163 9 163 14] board));
-    [#"../06_knights_tour.rs" 163 9 163 14] board <- any C06KnightsTour_Board_Type.t_board;
+    [#"../06_knights_tour.rs" 163 4 163 15] _0 <- ([#"../06_knights_tour.rs" 163 4 163 15] Core_Option_Option_Type.C_Some board);
+    board <- any C06KnightsTour_Board_Type.t_board;
     goto BB46
   }
   BB13 {
@@ -2714,7 +2773,7 @@ module C06KnightsTour_KnightsTour
   }
   BB16 {
     [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] _40);
-    [#"../06_knights_tour.rs" 142 4 142 36] _40 <- any Snapshot.snap_ty (Seq.seq usize);
+    _40 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ());
     goto BB17
@@ -2784,16 +2843,16 @@ module C06KnightsTour_KnightsTour
   }
   BB31 {
     [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] _59);
-    [#"../06_knights_tour.rs" 148 8 149 54] _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
+    _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
     assume { resolve2 __creusot_proc_iter_elem1 };
     [#"../06_knights_tour.rs" 151 28 151 30] _65 <- ([#"../06_knights_tour.rs" 151 28 151 30] m);
-    [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 ([#"../06_knights_tour.rs" 151 22 151 23] p) ([#"../06_knights_tour.rs" 151 28 151 30] _65));
+    [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 p _65);
     goto BB32
   }
   BB32 {
     assume { resolve2 m };
-    [#"../06_knights_tour.rs" 152 15 152 35] _66 <- ([#"../06_knights_tour.rs" 152 15 152 35] available0 ([#"../06_knights_tour.rs" 152 15 152 20] board) ([#"../06_knights_tour.rs" 152 31 152 34] adj));
+    [#"../06_knights_tour.rs" 152 15 152 35] _66 <- ([#"../06_knights_tour.rs" 152 15 152 35] available0 board adj);
     goto BB33
   }
   BB33 {
@@ -2803,14 +2862,16 @@ module C06KnightsTour_KnightsTour
       end
   }
   BB34 {
-    [#"../06_knights_tour.rs" 153 29 153 52] degree <- ([#"../06_knights_tour.rs" 153 29 153 52] count_degree0 ([#"../06_knights_tour.rs" 153 29 153 34] board) ([#"../06_knights_tour.rs" 153 48 153 51] adj));
+    [#"../06_knights_tour.rs" 153 29 153 52] degree <- ([#"../06_knights_tour.rs" 153 29 153 52] count_degree0 board adj);
     goto BB35
   }
   BB35 {
     [#"../06_knights_tour.rs" 154 16 154 26] _73 <- Borrow.borrow_mut candidates;
     [#"../06_knights_tour.rs" 154 16 154 26] candidates <-  ^ _73;
-    [#"../06_knights_tour.rs" 154 16 154 46] _72 <- ([#"../06_knights_tour.rs" 154 16 154 46] push0 _73 ([#"../06_knights_tour.rs" 154 32 154 45] (([#"../06_knights_tour.rs" 154 33 154 39] degree), ([#"../06_knights_tour.rs" 154 41 154 44] adj))));
+    [#"../06_knights_tour.rs" 154 32 154 45] _74 <- ([#"../06_knights_tour.rs" 154 32 154 45] (degree, adj));
+    [#"../06_knights_tour.rs" 154 16 154 46] _72 <- ([#"../06_knights_tour.rs" 154 16 154 46] push0 _73 _74);
     _73 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global));
+    _74 <- any (usize, C06KnightsTour_Point_Type.t_point);
     goto BB36
   }
   BB36 {
@@ -2826,7 +2887,7 @@ module C06KnightsTour_KnightsTour
   }
   BB39 {
     [#"../06_knights_tour.rs" 157 18 157 29] _81 <- ([#"../06_knights_tour.rs" 157 18 157 29] candidates);
-    [#"../06_knights_tour.rs" 157 14 157 30] _79 <- ([#"../06_knights_tour.rs" 157 14 157 30] min0 ([#"../06_knights_tour.rs" 157 18 157 29] _81));
+    [#"../06_knights_tour.rs" 157 14 157 30] _79 <- ([#"../06_knights_tour.rs" 157 14 157 30] min0 _81);
     goto BB40
   }
   BB40 {
@@ -2846,10 +2907,10 @@ module C06KnightsTour_KnightsTour
   BB43 {
     [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- ([#"../06_knights_tour.rs" 158 22 158 25] let (_, a) = Core_Option_Option_Type.some_0 _79 in a);
     assume { resolve4 candidates };
-    [#"../06_knights_tour.rs" 158 31 158 38] p <- ([#"../06_knights_tour.rs" 158 35 158 38] adj1);
+    [#"../06_knights_tour.rs" 158 31 158 38] p <- ([#"../06_knights_tour.rs" 158 31 158 38] adj1);
     [#"../06_knights_tour.rs" 161 8 161 13] _87 <- Borrow.borrow_mut board;
     [#"../06_knights_tour.rs" 161 8 161 13] board <-  ^ _87;
-    [#"../06_knights_tour.rs" 161 8 161 26] _86 <- ([#"../06_knights_tour.rs" 161 8 161 26] set0 _87 ([#"../06_knights_tour.rs" 161 18 161 19] p) ([#"../06_knights_tour.rs" 161 21 161 25] step));
+    [#"../06_knights_tour.rs" 161 8 161 26] _86 <- ([#"../06_knights_tour.rs" 161 8 161 26] set0 _87 p step);
     _87 <- any borrowed (C06KnightsTour_Board_Type.t_board);
     goto BB44
   }
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
index 08fc5c9d89..e4acf26148 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
+++ b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
@@ -14,7 +14,7 @@
 </theory>
 <theory name="C06KnightsTour_Impl0_Mov" proved="true">
  <goal name="mov&#39;vc" expl="VC for mov" proved="true">
- <proof prover="3"><result status="valid" time="0.020000" steps="310"/></proof>
+ <proof prover="3"><result status="valid" time="0.020000" steps="297"/></proof>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Impl1_New_Closure3" proved="true">
@@ -26,35 +26,35 @@
  <goal name="new&#39;vc" expl="VC for new" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="new&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041075" steps="23"/></proof>
+  <proof prover="3"><result status="valid" time="0.041075" steps="24"/></proof>
   </goal>
   <goal name="new&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.079378" steps="173"/></proof>
+  <proof prover="3"><result status="valid" time="0.079378" steps="178"/></proof>
   </goal>
   <goal name="new&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.048165" steps="62"/></proof>
+  <proof prover="3"><result status="valid" time="0.048165" steps="64"/></proof>
   </goal>
   <goal name="new&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.032098" steps="17"/></proof>
+  <proof prover="3"><result status="valid" time="0.032098" steps="19"/></proof>
   </goal>
   <goal name="new&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029300" steps="18"/></proof>
+  <proof prover="3"><result status="valid" time="0.029300" steps="20"/></proof>
   </goal>
   <goal name="new&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026648" steps="15"/></proof>
+  <proof prover="3"><result status="valid" time="0.026648" steps="16"/></proof>
   </goal>
   <goal name="new&#39;vc.6" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.041395" steps="63"/></proof>
+  <proof prover="3"><result status="valid" time="0.041395" steps="65"/></proof>
   </goal>
   <goal name="new&#39;vc.7" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.100977" steps="430492"/></proof>
+  <proof prover="2"><result status="valid" time="0.100977" steps="671703"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Impl1_Available" proved="true">
  <goal name="available&#39;vc" expl="VC for available" proved="true">
- <proof prover="3"><result status="valid" time="0.030000" steps="1043"/></proof>
+ <proof prover="3"><result status="valid" time="0.030000" steps="1050"/></proof>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Impl1_CountDegree" proved="true">
@@ -188,7 +188,7 @@
 </theory>
 <theory name="C06KnightsTour_Impl1_Set" proved="true">
  <goal name="set&#39;vc" expl="VC for set" proved="true">
- <proof prover="3"><result status="valid" time="1.181595" steps="5371"/></proof>
+ <proof prover="3"><result status="valid" time="0.429232" steps="5671"/></proof>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Min" proved="true">
@@ -218,7 +218,7 @@
    <proof prover="3"><result status="valid" time="0.010000" steps="17"/></proof>
    </goal>
    <goal name="min&#39;vc.0.7" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.188149" steps="26494"/></proof>
+   <proof prover="1"><result status="valid" time="0.188149" steps="26665"/></proof>
    </goal>
    <goal name="min&#39;vc.0.8" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
@@ -227,9 +227,23 @@
      <goal name="min&#39;vc.0.8.0.0" expl="loop invariant preservation" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="min&#39;vc.0.8.0.0.0" expl="loop invariant preservation" proved="true">
+      <proof prover="3"><result status="valid" time="0.631991" steps="13452"/></proof>
+      </goal>
+     </transf>
+     </goal>
+    </transf>
+    </goal>
+    <goal name="min&#39;vc.0.8.1" expl="loop invariant preservation" proved="true">
+    <transf name="split_vc" proved="true" >
+     <goal name="min&#39;vc.0.8.1.0" expl="loop invariant preservation" proved="true">
+     <transf name="split_vc" proved="true" >
+      <goal name="min&#39;vc.0.8.1.0.0" expl="loop invariant preservation" proved="true">
       <transf name="split_vc" proved="true" >
-       <goal name="min&#39;vc.0.8.0.0.0.0" expl="loop invariant preservation" proved="true">
-       <proof prover="3"><result status="valid" time="1.946908" steps="13587"/></proof>
+       <goal name="min&#39;vc.0.8.1.0.0.0" expl="loop invariant preservation" proved="true">
+       <proof prover="3"><result status="valid" time="0.024120" steps="244"/></proof>
+       </goal>
+       <goal name="min&#39;vc.0.8.1.0.0.1" expl="loop invariant preservation" proved="true">
+       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.157785" steps="23017"/></proof>
        </goal>
       </transf>
       </goal>
@@ -237,6 +251,19 @@
      </goal>
     </transf>
     </goal>
+   </transf>
+   <transf name="split_vc" proved="true" >
+    <goal name="min&#39;vc.0.8.0" expl="loop invariant preservation" proved="true">
+    <transf name="split_vc" proved="true" >
+     <goal name="min&#39;vc.0.8.0.0" expl="loop invariant preservation" proved="true">
+     <transf name="split_vc" proved="true" >
+      <goal name="min&#39;vc.0.8.0.0.0" expl="loop invariant preservation" proved="true">
+      <proof prover="3"><result status="valid" time="0.584056" steps="13452"/></proof>
+      </goal>
+     </transf>
+     </goal>
+    </transf>
+    </goal>
     <goal name="min&#39;vc.0.8.1" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="min&#39;vc.0.8.1.0" expl="loop invariant preservation" proved="true">
@@ -244,10 +271,10 @@
       <goal name="min&#39;vc.0.8.1.0.0" expl="loop invariant preservation" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="min&#39;vc.0.8.1.0.0.0" expl="loop invariant preservation" proved="true">
-       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="3.661252" steps="23061"/></proof>
+       <proof prover="3"><result status="valid" time="0.024200" steps="244"/></proof>
        </goal>
        <goal name="min&#39;vc.0.8.1.0.0.1" expl="loop invariant preservation" proved="true">
-       <proof prover="3" timelimit="5"><result status="valid" time="0.019206" steps="242"/></proof>
+       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.152518" steps="23058"/></proof>
        </goal>
       </transf>
       </goal>
@@ -274,7 +301,7 @@
   <proof prover="3"><result status="valid" time="0.000000" steps="10"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.1" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="31"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="32"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.2" expl="integer overflow" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="37"/></proof>
@@ -283,7 +310,7 @@
   <proof prover="3"><result status="valid" time="0.020000" steps="30"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.173780" steps="769"/></proof>
+  <proof prover="3"><result status="valid" time="0.053344" steps="772"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.5" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="34"/></proof>
@@ -292,83 +319,83 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="61"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.030000" steps="41"/></proof>
+  <proof prover="3"><result status="valid" time="0.030000" steps="57"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.029820" steps="176"/></proof>
+  <proof prover="3"><result status="valid" time="0.029820" steps="180"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.9" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.030000" steps="71"/></proof>
+  <proof prover="3"><result status="valid" time="0.030000" steps="76"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.10" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.037720" steps="248"/></proof>
+  <proof prover="3"><result status="valid" time="0.037720" steps="253"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.11" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="77"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="82"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.12" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="81"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="85"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.685382" steps="5241"/></proof>
+  <proof prover="3"><result status="valid" time="0.198898" steps="5015"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.038473" steps="308"/></proof>
+  <proof prover="3"><result status="valid" time="0.038473" steps="314"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="208"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="213"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.086621" steps="426"/></proof>
+  <proof prover="3"><result status="valid" time="0.086621" steps="431"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="229"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="234"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.18" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.122769" steps="553"/></proof>
+  <proof prover="3"><result status="valid" time="0.122769" steps="558"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.19" expl="loop invariant init" proved="true">
-  <proof prover="3" timelimit="5"><result status="valid" time="0.128006" steps="237"/></proof>
+  <proof prover="3" timelimit="5"><result status="valid" time="0.128006" steps="241"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.050239" steps="521"/></proof>
+  <proof prover="3"><result status="valid" time="0.050239" steps="527"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="334"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="339"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.308253" steps="2026"/></proof>
+  <proof prover="3"><result status="valid" time="0.095998" steps="2030"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.23" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="knights_tour&#39;vc.23.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.030719" steps="641"/></proof>
+   <proof prover="3"><result status="valid" time="0.030719" steps="647"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="knights_tour&#39;vc.24" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="knights_tour&#39;vc.24.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="1.102987" steps="7800"/></proof>
+   <proof prover="3"><result status="valid" time="0.382463" steps="8287"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="knights_tour&#39;vc.25" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="358"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="363"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="0.130000" steps="21164"/></proof>
+  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="0.130000" steps="21181"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.569207" steps="39430"/></proof>
+  <proof prover="1"><result status="valid" time="0.325226" steps="39403"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.040000" steps="965"/></proof>
+  <proof prover="3"><result status="valid" time="0.040000" steps="972"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.29" expl="precondition" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
    <goal name="knights_tour&#39;vc.29.0" expl="precondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.050000" steps="1085"/></proof>
+   <proof prover="3"><result status="valid" time="0.050000" steps="1097"/></proof>
    </goal>
   </transf>
   </goal>
@@ -383,7 +410,7 @@
       <goal name="knights_tour&#39;vc.30.0.0.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.30.0.0.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="5.331987" steps="53021"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.655442" steps="53080"/></proof>
        </goal>
       </transf>
       </goal>
@@ -398,7 +425,7 @@
       <goal name="knights_tour&#39;vc.30.0.1.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.30.0.1.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="5.460148" steps="53146"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.660177" steps="53193"/></proof>
        </goal>
       </transf>
       </goal>
@@ -421,7 +448,7 @@
       <goal name="knights_tour&#39;vc.31.0.0.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.31.0.0.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="6.104377" steps="53644"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.713706" steps="53632"/></proof>
        </goal>
       </transf>
       </goal>
@@ -436,7 +463,7 @@
       <goal name="knights_tour&#39;vc.31.0.1.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.31.0.1.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="5.224801" steps="53630"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.720566" steps="53777"/></proof>
        </goal>
       </transf>
       </goal>
@@ -449,28 +476,28 @@
   </transf>
   </goal>
   <goal name="knights_tour&#39;vc.32" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="383"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="388"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.100000" steps="395"/></proof>
+  <proof prover="3"><result status="valid" time="0.100000" steps="401"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.037506" steps="395"/></proof>
+  <proof prover="3"><result status="valid" time="0.037506" steps="401"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.079357" steps="887"/></proof>
+  <proof prover="3"><result status="valid" time="0.079357" steps="907"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.118800" steps="898"/></proof>
+  <proof prover="3"><result status="valid" time="0.118800" steps="918"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.37" expl="loop invariant preservation" proved="true">
-  <proof prover="3" timelimit="5"><result status="valid" time="0.058954" steps="545"/></proof>
+  <proof prover="3" timelimit="5"><result status="valid" time="0.058954" steps="553"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.38" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.468388" steps="35410"/></proof>
+  <proof prover="1"><result status="valid" time="0.287290" steps="35562"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.39" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.955169" steps="77663"/></proof>
+  <proof prover="1"><result status="valid" time="0.663621" steps="78478"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz b/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz
index b1bd941858bb601550aea8f8ffd570cbc21aa0ea..2d6a58801383f436c450ea9cd8c27ef68364d191 100644
GIT binary patch
literal 11336
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
K5!~{V0s#Q#KOwgO

literal 11255
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

diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
index f6fca68923..4d411db624 100644
--- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg
+++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
@@ -229,23 +229,23 @@ module C07ReadWrite_ReadWrite
     [#"../07_read_write.rs" 7 4 7 5] _7 <- Borrow.borrow_final ( * a) (Borrow.get_id a);
     [#"../07_read_write.rs" 7 4 7 5] a <- { a with current = ( ^ _7) ; };
     assume { inv0 ( ^ _7) };
-    [#"../07_read_write.rs" 7 5 7 8] _6 <- ([#"../07_read_write.rs" 7 5 7 8] index_mut0 _7 ([#"../07_read_write.rs" 7 6 7 7] i));
+    [#"../07_read_write.rs" 7 5 7 8] _6 <- ([#"../07_read_write.rs" 7 5 7 8] index_mut0 _7 i);
     _7 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB1
   }
   BB1 {
-    [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = ([#"../07_read_write.rs" 7 11 7 12] x) ; };
+    [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = ([#"../07_read_write.rs" 7 4 7 12] x) ; };
     assert { [@expl:type invariant] inv1 ( * _6) };
     assume { resolve0 ( * _6) };
     assert { [@expl:type invariant] inv2 _6 };
     assume { resolve1 _6 };
-    [#"../07_read_write.rs" 8 13 8 16] _12 <- ([#"../07_read_write.rs" 8 13 8 16] index0 ([#"../07_read_write.rs" 8 12 8 13]  * a) ([#"../07_read_write.rs" 8 14 8 15] i));
+    [#"../07_read_write.rs" 8 13 8 16] _12 <- ([#"../07_read_write.rs" 8 13 8 16] index0 ( * a) i);
     goto BB2
   }
   BB2 {
     assert { [@expl:type invariant] inv3 _12 };
     assume { resolve2 _12 };
-    [#"../07_read_write.rs" 8 12 8 21] _10 <- ([#"../07_read_write.rs" 8 12 8 21] eq0 ([#"../07_read_write.rs" 8 12 8 16] _12) ([#"../07_read_write.rs" 8 20 8 21] x));
+    [#"../07_read_write.rs" 8 12 8 21] _10 <- ([#"../07_read_write.rs" 8 12 8 21] eq0 _12 x);
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index 406aaa9f4e..be73d8e1ee 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -439,6 +439,7 @@ module C08Haystack_Search
   var haystack : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global) = haystack;
   var iter : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize;
   var _10 : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize;
+  var _11 : usize;
   var _12 : usize;
   var _14 : usize;
   var iter_old : Snapshot.snap_ty (Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize);
@@ -450,6 +451,7 @@ module C08Haystack_Search
   var _29 : Snapshot.snap_ty (Seq.seq usize);
   var i : usize;
   var iter1 : Core_Ops_Range_Range_Type.t_range usize;
+  var _35 : Core_Ops_Range_Range_Type.t_range usize;
   var _36 : usize;
   var iter_old1 : Snapshot.snap_ty (Core_Ops_Range_Range_Type.t_range usize);
   var produced1 : Snapshot.snap_ty (Seq.seq usize);
@@ -459,23 +461,27 @@ module C08Haystack_Search
   var __creusot_proc_iter_elem1 : usize;
   var _50 : Snapshot.snap_ty (Seq.seq usize);
   var j : usize;
+  var _53 : bool;
   var _55 : uint8;
   var _59 : uint8;
+  var _61 : usize;
   {
     goto BB0
   }
   BB0 {
-    [#"../08_haystack.rs" 23 21 23 35] _12 <- ([#"../08_haystack.rs" 23 21 23 35] len0 ([#"../08_haystack.rs" 23 21 23 29] haystack));
+    [#"../08_haystack.rs" 23 21 23 35] _12 <- ([#"../08_haystack.rs" 23 21 23 35] len0 haystack);
     goto BB1
   }
   BB1 {
-    [#"../08_haystack.rs" 23 38 23 50] _14 <- ([#"../08_haystack.rs" 23 38 23 50] len0 ([#"../08_haystack.rs" 23 38 23 44] needle));
+    [#"../08_haystack.rs" 23 38 23 50] _14 <- ([#"../08_haystack.rs" 23 38 23 50] len0 needle);
     goto BB2
   }
   BB2 {
-    [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 ([#"../08_haystack.rs" 23 17 23 18] [#"../08_haystack.rs" 23 17 23 18] (0 : usize)) ([#"../08_haystack.rs" 23 21 23 50] _12 - _14));
+    [#"../08_haystack.rs" 23 21 23 50] _11 <- ([#"../08_haystack.rs" 23 21 23 50] _12 - _14);
     _12 <- any usize;
     _14 <- any usize;
+    [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 (0 : usize) _11);
+    _11 <- any usize;
     goto BB3
   }
   BB3 {
@@ -517,7 +523,7 @@ module C08Haystack_Search
       end
   }
   BB10 {
-    [#"../08_haystack.rs" 33 11 33 25] _0 <- ([#"../08_haystack.rs" 33 11 33 25] len0 ([#"../08_haystack.rs" 33 11 33 19] haystack));
+    [#"../08_haystack.rs" 33 11 33 25] _0 <- ([#"../08_haystack.rs" 33 11 33 25] len0 haystack);
     goto BB30
   }
   BB11 {
@@ -534,14 +540,16 @@ module C08Haystack_Search
   }
   BB14 {
     [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] _29);
-    [#"../08_haystack.rs" 22 4 22 112] _29 <- any Snapshot.snap_ty (Seq.seq usize);
+    _29 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../08_haystack.rs" 25 20 25 32] _36 <- ([#"../08_haystack.rs" 25 20 25 32] len0 ([#"../08_haystack.rs" 25 20 25 26] needle));
+    [#"../08_haystack.rs" 25 20 25 32] _36 <- ([#"../08_haystack.rs" 25 20 25 32] len0 needle);
     goto BB15
   }
   BB15 {
-    [#"../08_haystack.rs" 24 8 24 68] iter1 <- ([#"../08_haystack.rs" 24 8 24 68] into_iter1 ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range ([#"../08_haystack.rs" 25 17 25 18] [#"../08_haystack.rs" 25 17 25 18] (0 : usize)) _36));
+    [#"../08_haystack.rs" 25 17 25 32] _35 <- ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range (0 : usize) _36);
     _36 <- any usize;
+    [#"../08_haystack.rs" 24 8 24 68] iter1 <- ([#"../08_haystack.rs" 24 8 24 68] into_iter1 _35);
+    _35 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB16
   }
   BB16 {
@@ -591,17 +599,20 @@ module C08Haystack_Search
   }
   BB25 {
     [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] _50);
-    [#"../08_haystack.rs" 24 8 24 68] _50 <- any Snapshot.snap_ty (Seq.seq usize);
+    _50 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 ([#"../08_haystack.rs" 26 15 26 21] needle) ([#"../08_haystack.rs" 26 22 26 23] j));
+    [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 needle j);
     goto BB26
   }
   BB26 {
-    [#"../08_haystack.rs" 26 36 26 43] _59 <- ([#"../08_haystack.rs" 26 36 26 43] index0 ([#"../08_haystack.rs" 26 28 26 36] haystack) ([#"../08_haystack.rs" 26 37 26 42] ([#"../08_haystack.rs" 26 37 26 38] i) + ([#"../08_haystack.rs" 26 41 26 42] j)));
+    [#"../08_haystack.rs" 26 37 26 42] _61 <- ([#"../08_haystack.rs" 26 37 26 42] i + j);
+    [#"../08_haystack.rs" 26 36 26 43] _59 <- ([#"../08_haystack.rs" 26 36 26 43] index0 haystack _61);
+    _61 <- any usize;
     goto BB27
   }
   BB27 {
-    switch ([#"../08_haystack.rs" 26 15 26 43] ([#"../08_haystack.rs" 26 15 26 24] _55) <> ([#"../08_haystack.rs" 26 28 26 43] _59))
+    [#"../08_haystack.rs" 26 15 26 43] _53 <- ([#"../08_haystack.rs" 26 15 26 43] _55 <> _59);
+    switch (_53)
       | False -> goto BB29
       | True -> goto BB28
       end
diff --git a/creusot/tests/should_succeed/vector/08_haystack/why3session.xml b/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
index 95fccb047c..2e26adc058 100644
--- a/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
+++ b/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
@@ -27,94 +27,94 @@
   <proof prover="4"><result status="valid" time="0.009715" steps="32"/></proof>
   </goal>
   <goal name="search&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.008654" steps="20"/></proof>
+  <proof prover="4"><result status="valid" time="0.008654" steps="22"/></proof>
   </goal>
   <goal name="search&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.086810" steps="20"/></proof>
+  <proof prover="4"><result status="valid" time="0.086810" steps="22"/></proof>
   </goal>
   <goal name="search&#39;vc.7" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.008849" steps="27"/></proof>
+  <proof prover="4"><result status="valid" time="0.008849" steps="29"/></proof>
   </goal>
   <goal name="search&#39;vc.8" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.013109" steps="45"/></proof>
+  <proof prover="4"><result status="valid" time="0.013109" steps="48"/></proof>
   </goal>
   <goal name="search&#39;vc.9" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.025817" steps="114896"/></proof>
+  <proof prover="0"><result status="valid" time="0.025817" steps="114917"/></proof>
   </goal>
   <goal name="search&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027203" steps="115062"/></proof>
+  <proof prover="0"><result status="valid" time="0.027203" steps="115083"/></proof>
   </goal>
   <goal name="search&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027197" steps="122466"/></proof>
+  <proof prover="4"><result status="valid" time="0.020785" steps="62"/></proof>
   </goal>
   <goal name="search&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.009833" steps="75"/></proof>
+  <proof prover="4"><result status="valid" time="0.009833" steps="77"/></proof>
   </goal>
   <goal name="search&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.012903" steps="9834"/></proof>
+  <proof prover="0"><result status="valid" time="0.012903" steps="9912"/></proof>
   </goal>
   <goal name="search&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.011722" steps="123043"/></proof>
+  <proof prover="0"><result status="valid" time="0.011722" steps="123093"/></proof>
   </goal>
   <goal name="search&#39;vc.15" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010443" steps="69"/></proof>
+  <proof prover="4"><result status="valid" time="0.010443" steps="73"/></proof>
   </goal>
   <goal name="search&#39;vc.16" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.010430" steps="97"/></proof>
+  <proof prover="4"><result status="valid" time="0.010430" steps="101"/></proof>
   </goal>
   <goal name="search&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.110319" steps="521202"/></proof>
+  <proof prover="0"><result status="valid" time="0.110319" steps="521237"/></proof>
   </goal>
   <goal name="search&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.030444" steps="114"/></proof>
+  <proof prover="4"><result status="valid" time="0.030444" steps="117"/></proof>
   </goal>
   <goal name="search&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.040830" steps="158790"/></proof>
+  <proof prover="0"><result status="valid" time="0.040830" steps="158847"/></proof>
   </goal>
   <goal name="search&#39;vc.20" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.008926" steps="140"/></proof>
+  <proof prover="4"><result status="valid" time="0.008926" steps="143"/></proof>
   </goal>
   <goal name="search&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.016841" steps="142"/></proof>
+  <proof prover="4"><result status="valid" time="0.016841" steps="143"/></proof>
   </goal>
   <goal name="search&#39;vc.22" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.034007" steps="163687"/></proof>
+  <proof prover="0"><result status="valid" time="0.034007" steps="163736"/></proof>
   </goal>
   <goal name="search&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.448854" steps="2915"/></proof>
+  <proof prover="4"><result status="valid" time="0.184656" steps="2510"/></proof>
   </goal>
   <goal name="search&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.020785" steps="151"/></proof>
+  <proof prover="0"><result status="valid" time="0.027197" steps="133843"/></proof>
   </goal>
   <goal name="search&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.021902" steps="133869"/></proof>
+  <proof prover="0"><result status="valid" time="0.021902" steps="133918"/></proof>
   </goal>
   <goal name="search&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.028925" steps="139017"/></proof>
+  <proof prover="0"><result status="valid" time="0.028925" steps="139120"/></proof>
   </goal>
   <goal name="search&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.444287" steps="2327"/></proof>
+  <proof prover="4"><result status="valid" time="0.172712" steps="2420"/></proof>
   </goal>
   <goal name="search&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.522973" steps="42481"/></proof>
+  <proof prover="3"><result status="valid" time="0.356437" steps="42545"/></proof>
   </goal>
   <goal name="search&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.049810" steps="18028"/></proof>
+  <proof prover="3"><result status="valid" time="0.049810" steps="18083"/></proof>
   </goal>
   <goal name="search&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.657053" steps="1157207"/></proof>
+  <proof prover="0"><result status="valid" time="0.288665" steps="1157238"/></proof>
   </goal>
   <goal name="search&#39;vc.31" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.918432" steps="118843"/></proof>
+  <proof prover="1"><result status="valid" time="0.667284" steps="119833"/></proof>
   </goal>
   <goal name="search&#39;vc.32" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.139861" steps="22013"/></proof>
+  <proof prover="3"><result status="valid" time="0.139861" steps="22034"/></proof>
   </goal>
   <goal name="search&#39;vc.33" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.795641" steps="1301282"/></proof>
+  <proof prover="0"><result status="valid" time="0.171700" steps="617325"/></proof>
   </goal>
   <goal name="search&#39;vc.34" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.138599" steps="268937"/></proof>
+  <proof prover="0"><result status="valid" time="0.138599" steps="269178"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/08_haystack/why3shapes.gz b/creusot/tests/should_succeed/vector/08_haystack/why3shapes.gz
index a6b9967caaab931a9cce81e7592a32ff16c13a36..27247e78f752725780ea05c532b0d0115fb1acb5 100644
GIT binary patch
literal 2920
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
S0rKC^;{O9$szxxuHvj<1bJD8-

literal 2877
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
bQ96Yz2{+|pIafu0iMjs+oKOEP1~&izQn`_&

diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
index 0dac7152e5..d4206d382b 100644
--- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg
+++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
@@ -142,7 +142,7 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 7 4 7 5] _5 <- Borrow.borrow_mut ( * v);
     [#"../09_capacity.rs" 7 4 7 5] v <- { v with current = ( ^ _5) ; };
     assume { inv0 ( ^ _5) };
-    [#"../09_capacity.rs" 7 4 7 18] _4 <- ([#"../09_capacity.rs" 7 4 7 18] reserve0 _5 ([#"../09_capacity.rs" 7 14 7 17] [#"../09_capacity.rs" 7 14 7 17] (100 : usize)));
+    [#"../09_capacity.rs" 7 4 7 18] _4 <- ([#"../09_capacity.rs" 7 4 7 18] reserve0 _5 (100 : usize));
     _5 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB1
   }
@@ -150,7 +150,7 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 8 4 8 5] _7 <- Borrow.borrow_mut ( * v);
     [#"../09_capacity.rs" 8 4 8 5] v <- { v with current = ( ^ _7) ; };
     assume { inv0 ( ^ _7) };
-    [#"../09_capacity.rs" 8 4 8 24] _6 <- ([#"../09_capacity.rs" 8 4 8 24] reserve_exact0 _7 ([#"../09_capacity.rs" 8 20 8 23] [#"../09_capacity.rs" 8 20 8 23] (200 : usize)));
+    [#"../09_capacity.rs" 8 4 8 24] _6 <- ([#"../09_capacity.rs" 8 4 8 24] reserve_exact0 _7 (200 : usize));
     _7 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB2
   }
@@ -166,7 +166,7 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 10 4 10 5] _11 <- Borrow.borrow_final ( * v) (Borrow.get_id v);
     [#"../09_capacity.rs" 10 4 10 5] v <- { v with current = ( ^ _11) ; };
     assume { inv0 ( ^ _11) };
-    [#"../09_capacity.rs" 10 4 10 18] _10 <- ([#"../09_capacity.rs" 10 4 10 18] shrink_to0 _11 ([#"../09_capacity.rs" 10 16 10 17] [#"../09_capacity.rs" 10 16 10 17] (1 : usize)));
+    [#"../09_capacity.rs" 10 4 10 18] _10 <- ([#"../09_capacity.rs" 10 4 10 18] shrink_to0 _11 (1 : usize));
     _11 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB4
   }

From 9b15290f1ed4ee8300e54794eb01d2a94e504299 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 13:15:34 +0100
Subject: [PATCH 28/66] fix warnings

---
 creusot/src/backend/clone_map/elaborator.rs | 1 -
 creusot/src/backend/term.rs                 | 2 --
 2 files changed, 3 deletions(-)

diff --git a/creusot/src/backend/clone_map/elaborator.rs b/creusot/src/backend/clone_map/elaborator.rs
index 1f705477a9..bc5982c441 100644
--- a/creusot/src/backend/clone_map/elaborator.rs
+++ b/creusot/src/backend/clone_map/elaborator.rs
@@ -24,7 +24,6 @@ use crate::{
     },
     ctx::*,
     translation::{
-        fmir::LocalDecls,
         pearlite::{normalize, Term},
         specification::PreContract,
     },
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index 00e64398ca..7aabc5f5f7 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -30,11 +30,9 @@ pub(crate) fn lower_impure<'tcx, N: Namer<'tcx>>(
     names: &mut N,
     term: &Term<'tcx>,
 ) -> Exp {
-    let span = term.span;
     let mut term = Lower { ctx, names, pure: Purity::Program }.lower_term(term);
     term.reassociate();
     term
-    // ctx.attach_span(span, term)
 }
 
 pub(super) struct Lower<'a, 'tcx, N: Namer<'tcx>> {

From 13d5f3677ddc615cd2d440219a5ebcf9f0778e5a Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 13:40:59 +0100
Subject: [PATCH 29/66] Fix sessions

---
 .../should_succeed/cell/02/why3session.xml    |  55 ++++++++----------
 .../should_succeed/cell/02/why3shapes.gz      | Bin 2032 -> 2154 bytes
 .../ghost_ptr_token/why3session.xml           |   2 +-
 .../ghost_ptr_token/why3shapes.gz             | Bin 775 -> 766 bytes
 .../vector/06_knights_tour/why3session.xml    |  31 ----------
 .../vector/06_knights_tour/why3shapes.gz      | Bin 11336 -> 11330 bytes
 6 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/creusot/tests/should_succeed/cell/02/why3session.xml b/creusot/tests/should_succeed/cell/02/why3session.xml
index c3d695a13c..abd75c4f6b 100644
--- a/creusot/tests/should_succeed/cell/02/why3session.xml
+++ b/creusot/tests/should_succeed/cell/02/why3session.xml
@@ -35,55 +35,50 @@
   <proof prover="5"><result status="valid" time="0.005338" steps="14"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.4" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.010993" steps="51"/></proof>
+  <proof prover="5"><result status="valid" time="0.010993" steps="53"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009887" steps="34"/></proof>
+  <proof prover="5"><result status="valid" time="0.009451" steps="38"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009296" steps="34"/></proof>
+  <proof prover="5"><result status="valid" time="0.009296" steps="38"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009368" steps="35"/></proof>
+  <proof prover="5"><result status="valid" time="0.009368" steps="39"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.8" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.011951" steps="75"/></proof>
+  <proof prover="5"><result status="valid" time="0.011951" steps="78"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009451" steps="38"/></proof>
+  <proof prover="5"><result status="valid" time="0.009887" steps="42"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009582" steps="38"/></proof>
+  <proof prover="5"><result status="valid" time="0.009582" steps="42"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009606" steps="39"/></proof>
+  <proof prover="5"><result status="valid" time="0.009606" steps="43"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.12" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.103941" steps="1029"/></proof>
+  <proof prover="5"><result status="valid" time="0.103941" steps="1041"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.13" expl="assertion" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="fib_memo&#39;vc.13.0" expl="assertion" proved="true">
-   <transf name="split_vc" proved="true" >
-    <goal name="fib_memo&#39;vc.13.0.0" expl="assertion" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="fib_memo&#39;vc.13.0.0.0" expl="assertion" proved="true">
-     <proof prover="1"><result status="valid" time="0.108316" steps="13046"/></proof>
-     </goal>
-    </transf>
-    </goal>
-   </transf>
+   <proof prover="0"><result status="valid" time="0.027155" steps="95086"/></proof>
    </goal>
    <goal name="fib_memo&#39;vc.13.1" expl="assertion" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="fib_memo&#39;vc.13.1.0" expl="assertion" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="fib_memo&#39;vc.13.1.0.0" expl="assertion" proved="true">
-     <proof prover="0"><result status="valid" time="0.024054" steps="95398"/></proof>
-     <proof prover="5"><result status="valid" time="0.116927" steps="1840"/></proof>
-     </goal>
-     <goal name="fib_memo&#39;vc.13.1.0.1" expl="assertion" proved="true">
-     <proof prover="5"><result status="valid" time="0.022096" steps="249"/></proof>
+     <transf name="split_vc" proved="true" >
+      <goal name="fib_memo&#39;vc.13.1.0.0.0" expl="assertion" proved="true">
+      <proof prover="5"><result status="valid" time="0.023083" steps="251"/></proof>
+      </goal>
+      <goal name="fib_memo&#39;vc.13.1.0.0.1" expl="assertion" proved="true">
+      <proof prover="5"><result status="valid" time="0.123145" steps="1848"/></proof>
+      </goal>
+     </transf>
      </goal>
     </transf>
     </goal>
@@ -98,22 +93,22 @@
   <proof prover="5"><result status="valid" time="0.009702" steps="55"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.068972" steps="13910"/></proof>
+  <proof prover="1"><result status="valid" time="0.068972" steps="14515"/></proof>
   <proof prover="5"><result status="valid" time="0.029729" steps="56"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.008697" steps="333"/></proof>
+  <proof prover="5"><result status="valid" time="0.008697" steps="339"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.023987" steps="9036"/></proof>
-  <proof prover="5"><result status="valid" time="0.022739" steps="23"/></proof>
+  <proof prover="0"><result status="valid" time="0.023987" steps="9599"/></proof>
+  <proof prover="5"><result status="valid" time="0.022739" steps="25"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.021326" steps="96081"/></proof>
-  <proof prover="5"><result status="valid" time="0.012298" steps="60"/></proof>
+  <proof prover="0"><result status="valid" time="0.021326" steps="96666"/></proof>
+  <proof prover="5"><result status="valid" time="0.012298" steps="61"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.20" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.107580" steps="16500"/></proof>
+  <proof prover="1"><result status="valid" time="0.107580" steps="17148"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/cell/02/why3shapes.gz b/creusot/tests/should_succeed/cell/02/why3shapes.gz
index 8c9f7ec2e6675fd522d42cb9ac297e5f177ebb98..6dbc9f005fd6a05eb13f345ed64be946c480a4e3 100644
GIT binary patch
literal 2154
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

literal 2032
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
OwLbw6kLo>B9RL6qQ|Y(>

diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
index 5692257551..6dc293cec8 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
+++ b/creusot/tests/should_succeed/ghost_ptr_token/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="ghost_ptr_token.mlcfg"/>
 <theory name="GhostPtrToken_Test" proved="true">
  <goal name="test&#39;vc" expl="VC for test" proved="true">
- <proof prover="0"><result status="valid" time="0.031281" steps="93422"/></proof>
+ <proof prover="0"><result status="valid" time="0.031281" steps="116371"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz b/creusot/tests/should_succeed/ghost_ptr_token/why3shapes.gz
index 9971c808685c2af25d79de29a05bb20364d21df4..8c53fe111a71848e47b6cb092d0f897bf071b42e 100644
GIT binary patch
literal 766
zcmV<a0s;LWiwFP!00000|BY0^irX*{z2_@(+cu>j*&4|%q!1Q@4P`Gab8OH$a@WMM
zQ`<>szrG_W@;XVE7J_+tnt3zNGx58{ynoRL)6Y+)>#Mf;G?(+m``PeQSItQwTVJ3=
z9w1;8pujl57)5{)LVz4)fDF}oR<0b>$EGv7c+t<bVVLCQdZw59ar3p^8@fAp`oJ*7
zbd0_*x$i2?pY#$_N_c7;<8t>qrcaeQGvxN?66MI`zC%uS^yj6nO+zd%MxJ{Oy)&D>
z`fav!8`1Al{+iFdMIN~vSAm$`bOYUzmOu`=H$y0HsbK9&30B&-a-Z%SjB^So+Gel;
zLFrp}G;b$<2&o0P@92$eYx*uX_p`kKVnld5@x*Co_U(yg#%Uqc)TTT8fsE~41y`5W
zr2ZIC!LM6%8j}{U@<UrHv?X0zu8`RuhF=ty6l^uNI+C_TKa9;e>G5(sdo1&ERpwN!
zZ|jqZP=H?Rx;OV1Y<h8z2iH6*+S4UHE6+O85(-ta&I7W;t(qZ@9_UHb^pK22x&C%M
z)KpsmD(R9F0;3FgBvFZ#1r!x~O6Wt^?%RQO%@Z-IXnomU6@Afl+wP8s&9U(dsp&&d
z*X?<;Z?~rA7{?g9w>b{zuMysz_sv}$e&buFsC)|!UHg{l)Hl2LEfvbd=`sRAMk<dI
zl+yaPQT|m(Ir`?F0F)y5mg0YWNANG-5jb~~-H>d0aDUzJC?mZ<NLTIvDIKK$sPI<+
zZd+umpWCi$&u06u-}%(CYIJS4vD(tpn;~sy%W{(IA7<FNTU%mbnZ+2&ZWO8hMUgp0
zKNCn1lAs95sK~q`F$){&Ck)D^sGA7`Ao!JZ=z78c(}TR9FvJMLB})RMj9+6A2$7vI
z#IM#M8fP4Z&fM<7?d}P3=Y2YK-I<u|-V7h-W!udM(+{&*l7LAH4he%;$U?9}fl773
wwgo)1sGM_^ahY+*xX5^%@hIaw<19<FBvYBpAQM@f5u35u9~8sDH)IC@0BEOucmMzZ

literal 775
zcmV+i1Ni(OiwFP!00000|BX~pYuhjoe$TJSTepmXWa%Vp&_O5|8%AF??r}j)lr_|e
zGuuhoe*I38<vL5t1|od=bobqT(#7u<^X}0eT{l0ww%av_PjfY2yr1<y?e1{a$ch0f
z<Ou?12}%?R3X}<E2nljj2{P2hY`YB5o(`?E>qq-gJBE3+EoS!C-mShidq-!_tvxa{
zXvXM)sbW{Ay0^DzDB-?2xRASlV)ndq&kVU=AyJJ?6+7f)$9}%GwL1{Y*CWrPhJA9Y
zZui@5=rp4>l)vPwXpv_jCsZJ&b8Szjq$QDq?OdOVdn#GGP=ck6tz4(a21P{y>*mn=
zfTZ-TJ-N3NKcv((_jmM0wl{s1TgA5>05LM%j+i)Y-M%@~n{gTlJ+&G3@j=G+E`oPM
zYs!91Xw5HM3>uRbFY;4cI<=)jTcMEKANyYvm#^7!Y;`1kiLM`;3)16ZG23mc?Q&aD
zwXUhpE<*{|6pK{k{q$*xny%^vkZv!s8~P<`x`9!L+i$01O>&x+2+2U8NHSSO0ySTH
zKv67G+#cIz-}E#%kzlAyF^r-zUu@kpPp9MRbcoYs>0e#f&GTyCY+TJz2o&LJ#@l{1
zB3wSnD~&3zCSc-6>FFlFHm3lU3duQvBFR8R3YGNcd{lI<<Y<mZLZHe<bJ_ox%iv$;
zG6?1-ZwmQjqqukZ9Tl?+1icI!(6mwUW5Qnm=+Gs%4^7)P&u(+Ge~PKw-NDv0KX$jF
z-)M#*_?No%92on<^{a5|ODsIINTHDbrAYM$MHUp}+k-|>qoNuW*`TPrA}f5PL<lpQ
zz~tp%I-~H)i~_ANqW}boBok*81VWfm$R_>2OljuJOM}3w37AxrW?G(ImzNr47(rkJ
zia|!|h;o$5mzO%44Wt^&`*sIG$__3hpp<c_IHBdm*Kvk-^KH}4d)M`|nb0N|Mz28_
z1!kRFV;&4-dIS2w!bZ-yF1ac>lw6ivlsqdrFF7ksnU}g$C6uxhC9x%&{Q>RDQ6gdo
F005N8cJu%M

diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
index e4acf26148..6f7baff70d 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
+++ b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
@@ -221,37 +221,6 @@
    <proof prover="1"><result status="valid" time="0.188149" steps="26665"/></proof>
    </goal>
    <goal name="min&#39;vc.0.8" expl="loop invariant preservation" proved="true">
-   <transf name="split_vc" proved="true" >
-    <goal name="min&#39;vc.0.8.0" expl="loop invariant preservation" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="min&#39;vc.0.8.0.0" expl="loop invariant preservation" proved="true">
-     <transf name="split_vc" proved="true" >
-      <goal name="min&#39;vc.0.8.0.0.0" expl="loop invariant preservation" proved="true">
-      <proof prover="3"><result status="valid" time="0.631991" steps="13452"/></proof>
-      </goal>
-     </transf>
-     </goal>
-    </transf>
-    </goal>
-    <goal name="min&#39;vc.0.8.1" expl="loop invariant preservation" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="min&#39;vc.0.8.1.0" expl="loop invariant preservation" proved="true">
-     <transf name="split_vc" proved="true" >
-      <goal name="min&#39;vc.0.8.1.0.0" expl="loop invariant preservation" proved="true">
-      <transf name="split_vc" proved="true" >
-       <goal name="min&#39;vc.0.8.1.0.0.0" expl="loop invariant preservation" proved="true">
-       <proof prover="3"><result status="valid" time="0.024120" steps="244"/></proof>
-       </goal>
-       <goal name="min&#39;vc.0.8.1.0.0.1" expl="loop invariant preservation" proved="true">
-       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.157785" steps="23017"/></proof>
-       </goal>
-      </transf>
-      </goal>
-     </transf>
-     </goal>
-    </transf>
-    </goal>
-   </transf>
    <transf name="split_vc" proved="true" >
     <goal name="min&#39;vc.0.8.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz b/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz
index 2d6a58801383f436c450ea9cd8c27ef68364d191..a185e4dae05f3fcbacb248dd4bd90b85ac0ba024 100644
GIT binary patch
literal 11330
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
E04bh*`2YX_

literal 11336
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
K5!~{V0s#Q#KOwgO


From 1836f540e62785429c0fbd7fb24787a4c532c038 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 17:15:30 +0100
Subject: [PATCH 30/66] Merge `BorrowFinal` and `Borrow`.

---
 creusot/src/backend/optimization.rs |  4 ++--
 creusot/src/backend/program.rs      | 10 +++++++---
 creusot/src/translation/fmir.rs     | 20 +++++++++++++-------
 creusot/src/translation/function.rs |  4 ++--
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index ae41d4efd2..d28a62db39 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -109,7 +109,7 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
     fn visit_rvalue(&mut self, r: &RValue<'tcx>) {
         match r {
             RValue::Ghost(t) => self.visit_term(t),
-            RValue::FinalBorrow(p, _) | RValue::Borrow(p) => {
+            RValue::Borrow(_, p) => {
                 self.read_place(p);
                 self.read_place(p)
             }
@@ -291,7 +291,7 @@ impl<'tcx> SimplePropagator<'tcx> {
     fn visit_rvalue(&mut self, r: &mut RValue<'tcx>) {
         match r {
             RValue::Ghost(t) => self.visit_term(t),
-            RValue::FinalBorrow(p, _) | RValue::Borrow(p) => {
+            RValue::Borrow(_, p) => {
                 assert!(self.prop.get(&p.local).is_none(), "Trying to propagate borrowed variable")
             }
             RValue::Expr(e) => self.visit_expr(e),
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index cbe7bd951f..1094aeb126 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -12,7 +12,7 @@ use crate::{
         ty::{self, translate_closure_ty, translate_ty},
     },
     ctx::{BodyId, CloneMap, TranslationCtx},
-    fmir::Operand,
+    fmir::{BorrowKind, Operand},
     translation::{
         binop_to_binop,
         fmir::{
@@ -674,7 +674,7 @@ impl<'tcx> Statement<'tcx> {
         locals: &LocalDecls<'tcx>,
     ) -> Vec<mlcfg::Statement> {
         match self {
-            Statement::Assignment(lhs, RValue::Borrow(rhs), span) => {
+            Statement::Assignment(lhs, RValue::Borrow(BorrowKind::Mut, rhs), span) => {
                 let borrow = Exp::Call(
                     Box::new(Exp::impure_qvar(QName::from_string("Borrow.borrow_mut").unwrap())),
                     vec![rhs.as_rplace(ctx, names, locals)],
@@ -686,7 +686,11 @@ impl<'tcx> Statement<'tcx> {
                     place::create_assign_inner(ctx, names, locals, &rhs, reassign, span),
                 ]
             }
-            Statement::Assignment(lhs, RValue::FinalBorrow(rhs, deref_index), span) => {
+            Statement::Assignment(
+                lhs,
+                RValue::Borrow(BorrowKind::Final(deref_index), rhs),
+                span,
+            ) => {
                 let original_borrow = Place {
                     local: rhs.local.clone(),
                     projection: rhs.projection[..deref_index].to_vec(),
diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index 7bb1471d20..2153be361a 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -47,21 +47,27 @@ pub enum Statement<'tcx> {
     Call(Place<'tcx>, DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>, Span),
 }
 
-// Re-organize this completely
-// Get rid of Expr and reimpose a more traditional statement-rvalue-operand setup
-#[derive(Clone, Debug)]
-pub enum RValue<'tcx> {
-    Ghost(Term<'tcx>),
-    Borrow(Place<'tcx>),
+// TODO: Add shared borrows?
+#[derive(Clone, Copy, Debug)]
+pub enum BorrowKind {
+    /// Ordinary mutable borrows
+    Mut,
     /// The source of this borrow is not used after the reborrow, and thus we can
     /// inherit the prophecy identifier.
     ///
     /// The second field is an index in `place.projection`: see
     /// [`NotFinalPlaces::is_final_at`](crate::analysis::NotFinalPlaces::is_final_at).
-    FinalBorrow(Place<'tcx>, usize),
+    Final(usize),
+}
+
+#[derive(Clone, Debug)]
+pub enum RValue<'tcx> {
+    Ghost(Term<'tcx>),
+    Borrow(BorrowKind, Place<'tcx>),
     Expr(Expr<'tcx>),
 }
 
+// TODO Inline `Expr` in to `RValue`
 #[derive(Clone, Debug)]
 pub struct Expr<'tcx> {
     pub kind: ExprKind<'tcx>,
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index a19d85916f..69e4a9b9d9 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -263,9 +263,9 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
         self.emit_assignment(
             lhs,
             if let Some(deref_index) = is_final {
-                fmir::RValue::FinalBorrow(p, deref_index)
+                fmir::RValue::Borrow(fmir::BorrowKind::Final(deref_index), p)
             } else {
-                fmir::RValue::Borrow(p)
+                fmir::RValue::Borrow(fmir::BorrowKind::Mut, p)
             },
             span,
         );

From 1d09ccf2f9b25181b591f15f625a680d8bfe7896 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Wed, 6 Mar 2024 11:14:29 +0100
Subject: [PATCH 31/66] Simplify `Term::Call`

The `Term::Call` node was always this weird hybrid between first-order
and higher-order. This just commits to being first-order making our
lives way simpler.
---
 creusot/src/backend/term.rs                   |  8 +--
 creusot/src/translation/function.rs           |  7 +--
 creusot/src/translation/pearlite.rs           | 49 +++----------------
 creusot/src/translation/pearlite/normalize.rs | 20 ++++----
 4 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index 7aabc5f5f7..4af3058768 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -128,13 +128,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                 };
                 Exp::UnaryOp(op, Box::new(self.lower_term(arg)))
             }
-            TermKind::Call {
-                id,
-                subst,
-                // fun: box Term { kind: TermKind::Item(id, subst), .. },
-                args,
-                ..
-            } => {
+            TermKind::Call { id, subst, args, .. } => {
                 let mut args: Vec<_> = args.into_iter().map(|arg| self.lower_term(arg)).collect();
 
                 if args.is_empty() {
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index 69e4a9b9d9..127f643d80 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -677,12 +677,7 @@ fn closure_resolve<'tcx>(
         if let Some((id, subst)) = resolve_predicate_of(ctx, param_env, ty) {
             resolve = Term {
                 ty: ctx.types.bool,
-                kind: TermKind::Call {
-                    id: id.into(),
-                    subst,
-                    fun: Box::new(Term::item(ctx.tcx, id, subst)),
-                    args: vec![proj],
-                },
+                kind: TermKind::Call { id: id.into(), subst, args: vec![proj] },
                 span: DUMMY_SP,
             }
             .conj(resolve);
diff --git a/creusot/src/translation/pearlite.rs b/creusot/src/translation/pearlite.rs
index ac32907cfe..5b8dedb97d 100644
--- a/creusot/src/translation/pearlite.rs
+++ b/creusot/src/translation/pearlite.rs
@@ -104,7 +104,6 @@ pub enum TermKind<'tcx> {
     Call {
         id: DefId,
         subst: GenericArgsRef<'tcx>,
-        fun: Box<Term<'tcx>>,
         args: Vec<Term<'tcx>>,
     },
     Constructor {
@@ -388,7 +387,7 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
                 };
                 Ok(Term { ty, span, kind: TermKind::Lit(lit) })
             }
-            ExprKind::Call { ty: f_ty, fun, ref args, .. } => {
+            ExprKind::Call { ty: f_ty, ref args, .. } => {
                 use Stub::*;
                 match pearlite_stub(self.ctx.tcx, f_ty) {
                     Some(Forall) => {
@@ -473,7 +472,6 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
                     }
                     Some(Absurd) => Ok(Term { ty, span, kind: TermKind::Absurd }),
                     None => {
-                        let fun = self.expr_term(fun)?;
                         let args = args
                             .iter()
                             .map(|arg| self.expr_term(*arg))
@@ -484,11 +482,7 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
                             unreachable!("Call on non-function type");
                         };
 
-                        Ok(Term {
-                            ty,
-                            span,
-                            kind: TermKind::Call { id, subst, fun: Box::new(fun), args },
-                        })
+                        Ok(Term { ty, span, kind: TermKind::Call { id, subst, args } })
                     }
                 }
             }
@@ -1004,16 +998,10 @@ pub(crate) fn type_invariant_term<'tcx>(
     let inv_fn_ty = ctx.type_of(inv_fn_did).instantiate(ctx.tcx, inv_fn_substs);
     assert!(matches!(inv_fn_ty.kind(), TyKind::FnDef(id, _) if id == &inv_fn_did));
 
-    let fun = Term { ty: inv_fn_ty, span, kind: TermKind::Item(inv_fn_did, inv_fn_substs) };
     Some(Term {
         ty: ctx.fn_sig(inv_fn_did).skip_binder().output().skip_binder(),
         span,
-        kind: TermKind::Call {
-            id: inv_fn_did,
-            subst: inv_fn_substs,
-            fun: Box::new(fun),
-            args: vec![arg],
-        },
+        kind: TermKind::Call { id: inv_fn_did, subst: inv_fn_substs, args: vec![arg] },
     })
 }
 
@@ -1153,8 +1141,7 @@ pub fn super_visit_term<'tcx, V: TermVisitor<'tcx>>(term: &Term<'tcx>, visitor:
         TermKind::Unary { op: _, arg } => visitor.visit_term(&*arg),
         TermKind::Forall { binder: _, body } => visitor.visit_term(&*body),
         TermKind::Exists { binder: _, body } => visitor.visit_term(&*body),
-        TermKind::Call { id: _, subst: _, fun, args } => {
-            visitor.visit_term(&*fun);
+        TermKind::Call { id: _, subst: _, args } => {
             args.iter().for_each(|a| visitor.visit_term(&*a))
         }
         TermKind::Constructor { typ: _, variant: _, fields } => {
@@ -1208,8 +1195,7 @@ pub(crate) fn super_visit_mut_term<'tcx, V: TermVisitorMut<'tcx>>(
         TermKind::Unary { op: _, arg } => visitor.visit_mut_term(&mut *arg),
         TermKind::Forall { binder: _, body } => visitor.visit_mut_term(&mut *body),
         TermKind::Exists { binder: _, body } => visitor.visit_mut_term(&mut *body),
-        TermKind::Call { id: _, subst: _, fun, args } => {
-            visitor.visit_mut_term(&mut *fun);
+        TermKind::Call { id: _, subst: _, args } => {
             args.iter_mut().for_each(|a| visitor.visit_mut_term(&mut *a))
         }
         TermKind::Constructor { typ: _, variant: _, fields } => {
@@ -1263,17 +1249,8 @@ impl<'tcx> Term<'tcx> {
     ) -> Self {
         let ty = tcx.type_of(def_id).instantiate(tcx, subst);
         let result = ty.fn_sig(tcx).skip_binder().output();
-        let fun = Term {
-            ty: tcx.type_of(def_id).instantiate(tcx, subst),
-            kind: TermKind::Item(def_id, subst),
-            span: DUMMY_SP,
-        };
 
-        Term {
-            ty: result,
-            span: DUMMY_SP,
-            kind: TermKind::Call { id: def_id, subst, fun: Box::new(fun.clone()), args },
-        }
+        Term { ty: result, span: DUMMY_SP, kind: TermKind::Call { id: def_id, subst, args } }
     }
 
     pub(crate) fn var(sym: Symbol, ty: Ty<'tcx>) -> Self {
@@ -1324,14 +1301,6 @@ impl<'tcx> Term<'tcx> {
         }
     }
 
-    pub(crate) fn item(tcx: TyCtxt<'tcx>, id: DefId, subst: GenericArgsRef<'tcx>) -> Self {
-        Term {
-            ty: tcx.type_of(id).instantiate(tcx, subst),
-            kind: TermKind::Item(id, subst),
-            span: DUMMY_SP,
-        }
-    }
-
     pub(crate) fn bin_op(self, tcx: TyCtxt<'tcx>, op: BinOp, rhs: Self) -> Self {
         Term {
             ty: tcx.types.bool,
@@ -1477,8 +1446,7 @@ impl<'tcx> Term<'tcx> {
 
                 body.subst_with_inner(&bound, inv_subst);
             }
-            TermKind::Call { fun, args, .. } => {
-                fun.subst_with_inner(bound, inv_subst);
+            TermKind::Call { args, .. } => {
                 args.iter_mut().for_each(|f| f.subst_with_inner(bound, inv_subst))
             }
             TermKind::Constructor { fields, .. } => {
@@ -1556,8 +1524,7 @@ impl<'tcx> Term<'tcx> {
 
                 body.free_vars_inner(&bound, free);
             }
-            TermKind::Call { fun, args, .. } => {
-                fun.free_vars_inner(bound, free);
+            TermKind::Call { args, .. } => {
                 for arg in args {
                     arg.free_vars_inner(bound, free);
                 }
diff --git a/creusot/src/translation/pearlite/normalize.rs b/creusot/src/translation/pearlite/normalize.rs
index 599b814e79..d448bf1ba0 100644
--- a/creusot/src/translation/pearlite/normalize.rs
+++ b/creusot/src/translation/pearlite/normalize.rs
@@ -22,15 +22,17 @@ impl<'tcx> TermVisitorMut<'tcx> for NormalizeTerm<'tcx> {
     fn visit_mut_term(&mut self, term: &mut Term<'tcx>) {
         super_visit_mut_term(term, self);
         match &mut term.kind {
-            TermKind::Call {
-                id,
-                subst,
-                fun: box Term { kind: TermKind::Item(fid, fsubst), .. },
-                args,
-            } => {
-                *id = *fid;
-                *subst = fsubst;
-
+            TermKind::Call { id, subst, args } => {
+                let method = if self.tcx.trait_of_item(*id).is_some() {
+                    resolve_opt(self.tcx, self.param_env, *id, subst).unwrap_or_else(|| {
+                        panic!("could not resolve trait instance {:?}", (*id, *subst))
+                    })
+                } else {
+                    // TODO dont' do this
+                    (*id, *subst)
+                };
+                *id = method.0;
+                *subst = method.1;
                 *subst = self.tcx.normalize_erasing_regions(self.param_env, *subst);
 
                 if self.tcx.def_path_str(*id) == "std::boxed::Box::<T>::new" {

From e3519295b66f6f9fc3cf43720ee44d04e8fc449d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Mon, 26 Feb 2024 14:29:55 +0100
Subject: [PATCH 32/66] Add 'cargo creusot setup' to manage creusot
 installations

The implementation follows the design outlined here:
https://github.com/creusot-rs/creusot/discussions/946

'cargo creusot setup' comes with the following subcommands:
- 'status': displays the state of the current installation
- 'install': sets up creusot in "managed" mode, downloading solver
  binaries at known-good versions and configuring why3 to use
  them. (Can also be invoked on an existing creusot installation to
  upgrade out-of-date solvers.)
- 'install-external': minimal setup of creusot in "external" mode,
  that assumes that the user manages the external tools (why3,
  solvers, etc) themselves.

For now, even the "managed mode" setup assumes that why3 and alt-ergo
have been installed separately (e.g. using opam), but the goal is to
later have 'creusot setup' download binaries when we have them.
---
 Cargo.lock                        | 1135 ++++++++++++++++++++++++++++-
 cargo-creusot/Cargo.toml          |    9 +-
 cargo-creusot/src/main.rs         |   45 +-
 cargo-creusot/src/setup/config.rs |  112 +++
 cargo-creusot/src/setup/mod.rs    |  311 ++++++++
 cargo-creusot/src/setup/tools.rs  |  327 +++++++++
 creusot-args/src/options.rs       |   85 ++-
 creusot-rustc/src/main.rs         |   36 +-
 creusot-rustc/src/options.rs      |   31 +-
 creusot/src/options.rs            |    2 +
 creusot/src/run_why3.rs           |    6 +-
 11 files changed, 2019 insertions(+), 80 deletions(-)
 create mode 100644 cargo-creusot/src/setup/config.rs
 create mode 100644 cargo-creusot/src/setup/mod.rs
 create mode 100644 cargo-creusot/src/setup/tools.rs

diff --git a/Cargo.lock b/Cargo.lock
index 82a61e7c36..671c9ee21c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,32 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.0.1"
@@ -60,6 +86,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+
 [[package]]
 name = "arraydeque"
 version = "0.4.5"
@@ -92,6 +124,33 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -119,6 +178,15 @@ version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bstr"
 version = "0.2.17"
@@ -130,15 +198,61 @@ dependencies = [
  "regex-automata",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "cargo-creusot"
 version = "0.1.0"
 dependencies = [
+ "anyhow",
  "creusot-args",
+ "directories",
  "env_logger",
+ "hex",
+ "reqwest",
  "serde",
  "serde_json",
+ "sha2",
  "toml",
+ "which",
+ "zip",
 ]
 
 [[package]]
@@ -156,6 +270,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clap"
 version = "4.2.5"
@@ -216,6 +340,46 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "creusot"
 version = "0.2.0"
@@ -229,7 +393,7 @@ dependencies = [
  "glob",
  "heck",
  "include_dir",
- "indexmap",
+ "indexmap 1.9.3",
  "itertools",
  "lazy_static",
  "log",
@@ -282,7 +446,7 @@ dependencies = [
 name = "creusot-metadata"
 version = "0.2.0"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
@@ -297,12 +461,69 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "difflib"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -311,9 +532,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "encode_unicode"
@@ -321,6 +542,15 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.10.0"
@@ -334,6 +564,12 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "errno"
 version = "0.3.8"
@@ -368,12 +604,37 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "flate2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
@@ -389,6 +650,64 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.9"
@@ -400,6 +719,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
 [[package]]
 name = "git2"
 version = "0.14.4"
@@ -421,12 +746,37 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "h2"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 2.2.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -439,12 +789,107 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
 [[package]]
 name = "humantime"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -481,10 +926,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "insta"
 version = "1.29.0"
@@ -509,6 +973,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
 [[package]]
 name = "is-terminal"
 version = "0.4.7"
@@ -545,6 +1015,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -577,6 +1056,17 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall",
+]
+
 [[package]]
 name = "libssh2-sys"
 version = "0.2.23"
@@ -636,6 +1126,50 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "num"
 version = "0.4.0"
@@ -681,6 +1215,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -736,12 +1276,57 @@ dependencies = [
  "libm",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
+[[package]]
+name = "openssl"
+version = "0.10.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
@@ -750,9 +1335,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.87"
+version = "0.9.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e"
+checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
 dependencies = [
  "cc",
  "libc",
@@ -760,6 +1345,35 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "password-hash"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest",
+ "hmac",
+ "password-hash",
+ "sha2",
+]
+
 [[package]]
 name = "pearlite-syn"
 version = "0.2.0"
@@ -784,15 +1398,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -944,18 +1576,38 @@ dependencies = [
 name = "rand_xorshift"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+dependencies = [
+ "rand_core 0.3.1",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "rand_core 0.6.4",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
-name = "rdrand"
-version = "0.4.0"
+name = "redox_users"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "rand_core 0.3.1",
+ "getrandom",
+ "libredox",
+ "thiserror",
 ]
 
 [[package]]
@@ -1016,6 +1668,46 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.11.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
 [[package]]
 name = "roxmltree"
 version = "0.18.0"
@@ -1025,6 +1717,12 @@ dependencies = [
  "xmlparser",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustix"
 version = "0.37.18"
@@ -1052,6 +1750,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64",
+]
+
 [[package]]
 name = "rusty-fork"
 version = "0.3.0"
@@ -1070,6 +1777,38 @@ version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "serde"
 version = "1.0.195"
@@ -1101,18 +1840,77 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "similar"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
 
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
 [[package]]
 name = "syn"
 version = "2.0.48"
@@ -1124,6 +1922,33 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tempdir"
 version = "0.3.7"
@@ -1161,6 +1986,45 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
+[[package]]
+name = "thiserror"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -1176,21 +2040,99 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tokio"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
+ "indexmap 1.9.3",
  "serde",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
 [[package]]
 name = "typed-arena"
 version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
 [[package]]
 name = "unarray"
 version = "0.1.4"
@@ -1256,6 +2198,12 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
@@ -1265,17 +2213,115 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+
+[[package]]
+name = "web-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.31",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "why3"
 version = "0.2.0"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
  "itertools",
  "num",
  "pretty",
@@ -1517,6 +2563,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "xmlparser"
 version = "0.13.5"
@@ -1531,3 +2587,52 @@ checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
  "linked-hash-map",
 ]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "aes",
+ "byteorder",
+ "bzip2",
+ "constant_time_eq",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "hmac",
+ "pbkdf2",
+ "sha1",
+ "time",
+ "zstd",
+]
+
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "5.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.9+zstd.1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/cargo-creusot/Cargo.toml b/cargo-creusot/Cargo.toml
index ef6e1a25e4..a3a6af912a 100644
--- a/cargo-creusot/Cargo.toml
+++ b/cargo-creusot/Cargo.toml
@@ -7,7 +7,14 @@ edition = "2021"
 
 [dependencies]
 serde_json = { version = "1.0" }
-toml = "0.5.8"
+toml = { version = "0.5.8", features = ["preserve_order"] }
 env_logger = "*"
 serde = { version = "1.0", features = ["derive"] }
+directories = "5.0"
 creusot-args = {path = "../creusot-args"}
+which = "6.0"
+anyhow = "1.0"
+reqwest = { version = "0.11", features = ["blocking"] }
+zip = "0.6"
+hex = "0.4"
+sha2 = "0.10"
diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
index bdfaa07712..ea0ba64346 100644
--- a/cargo-creusot/src/main.rs
+++ b/cargo-creusot/src/main.rs
@@ -1,12 +1,47 @@
-use creusot_args::options::Args;
+use creusot_args::options::*;
 use std::{
     env,
     process::{exit, Command},
 };
 
-fn main() {
-    let args = Args::parse_from(std::env::args().skip(1));
+pub mod setup;
 
+enum Subcommand {
+    // subcommand to pass on to creusot-rustc
+    Creusot(Option<CreusotSubCommand>),
+    // subcommand to handle in cargo-creusot
+    Setup(SetupSubCommand),
+}
+use Subcommand::*;
+
+fn main() -> anyhow::Result<()> {
+    let cargs = CargoCreusotArgs::parse_from(std::env::args().skip(1));
+
+    let subcommand = match cargs.subcommand {
+        None => Creusot(None),
+        Some(CargoCreusotSubCommand::Creusot(cmd)) => Creusot(Some(cmd)),
+        Some(CargoCreusotSubCommand::Setup { command }) => Setup(command),
+    };
+
+    match subcommand {
+        Creusot(subcmd) => {
+            let config_args = setup::status_for_creusot()?;
+            let creusot_args = CreusotArgs {
+                options: cargs.options,
+                why3_path: config_args.why3_path,
+                why3_config_file: config_args.why3_config,
+                subcommand: subcmd,
+                rust_flags: cargs.rust_flags,
+            };
+            Ok(invoke_cargo(&creusot_args))
+        }
+        Setup(SetupSubCommand::Status) => setup::status(),
+        Setup(SetupSubCommand::Install) => setup::install(false),
+        Setup(SetupSubCommand::InstallExternal) => setup::install(true),
+    }
+}
+
+fn invoke_cargo(args: &CreusotArgs) {
     let creusot_rustc_path = std::env::current_exe()
         .expect("current executable path invalid")
         .with_file_name("creusot-rustc");
@@ -18,11 +53,11 @@ fn main() {
     let mut cmd = Command::new(cargo_path);
     cmd.arg(format!("+{toolchain}"))
         .arg(&cargo_cmd)
-        .args(args.rust_flags)
+        .args(args.rust_flags.clone())
         .env("RUSTC_WRAPPER", creusot_rustc_path)
         .env("CARGO_CREUSOT", "1");
 
-    cmd.env("CREUSOT_ARGS", serde_json::to_string(&args.creusot).unwrap());
+    cmd.env("CREUSOT_ARGS", serde_json::to_string(&args).unwrap());
 
     let exit_status = cmd.status().expect("could not run cargo");
     if !exit_status.success() {
diff --git a/cargo-creusot/src/setup/config.rs b/cargo-creusot/src/setup/config.rs
new file mode 100644
index 0000000000..f0207cedf8
--- /dev/null
+++ b/cargo-creusot/src/setup/config.rs
@@ -0,0 +1,112 @@
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt, fs,
+    path::{Path, PathBuf},
+};
+
+// identifies a version of the config file.
+// the goal is to avoid silently mis-interpreting a past or future version of
+// the config file whenever its format changes.
+pub const CURRENT_CONFIG_VERSION: i64 = 1;
+
+// bump CURRENT_CONFIG_VERSION if you change this definition
+#[derive(Serialize, Deserialize)]
+#[serde(tag = "mode")]
+pub enum ToolsConfig {
+    #[serde(rename = "managed")]
+    Managed {
+        why3_path: PathBuf,
+        altergo_path: PathBuf,
+        z3: String,   // version
+        cvc4: String, // version
+        cvc5: String, // version
+    },
+    #[serde(rename = "external")]
+    External { why3_path: PathBuf, altergo_path: PathBuf },
+}
+
+// bump CURRENT_CONFIG_VERSION if you change this definition
+#[derive(Serialize, Deserialize)]
+pub struct Config {
+    pub tools: ToolsConfig,
+}
+
+pub enum Error {
+    NotFound,
+    Invalid(String),
+    WrongVersion(i64),
+}
+
+fn get_config_version(cfg: &toml::Value) -> Result<i64, String> {
+    cfg.get("version")
+        .ok_or("'version' field not found".to_string())?
+        .as_integer()
+        .ok_or("'version' is not an integer".to_string())
+}
+
+impl Config {
+    pub fn read_from_file(p: &Path) -> Result<Self, Error> {
+        if !p.is_file() {
+            return Err(Error::NotFound);
+        };
+        let s = match fs::read_to_string(p) {
+            Err(e) => return Err(Error::Invalid(e.to_string())),
+            Ok(s) => s,
+        };
+        let toml: toml::Value = match toml::from_str(&s) {
+            Err(e) => return Err(Error::Invalid(e.to_string())),
+            Ok(config) => config,
+        };
+        let version = match get_config_version(&toml) {
+            Err(e) => return Err(Error::Invalid(e)),
+            Ok(v) => v,
+        };
+        if version != CURRENT_CONFIG_VERSION {
+            return Err(Error::WrongVersion(version));
+        }
+        toml.try_into().map_err(|e| Error::Invalid(e.to_string()))
+    }
+
+    pub fn write_to_file(&self, p: &Path) -> anyhow::Result<()> {
+        let mut toml = toml::Value::try_from(self)?;
+        let tbl = toml.as_table_mut().unwrap();
+        tbl.insert("version".to_owned(), toml::Value::Integer(CURRENT_CONFIG_VERSION));
+        fs::write(p, &toml::to_string(&toml)?)?;
+        Ok(())
+    }
+}
+
+impl fmt::Display for ToolsConfig {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ToolsConfig::Managed { why3_path, altergo_path, z3, cvc4, cvc5 } => {
+                writeln!(f, "mode: managed")?;
+                writeln!(f, "Path to Why3: {}", why3_path.display())?;
+                writeln!(f, "Path to Alt-Ergo: {}", altergo_path.display())?;
+                writeln!(f, "Z3 version: {z3}")?;
+                writeln!(f, "CVC4 version: {cvc4}")?;
+                writeln!(f, "CVC5 version: {cvc5}")
+            }
+            ToolsConfig::External { why3_path, altergo_path } => {
+                writeln!(f, "mode: external")?;
+                writeln!(f, "Path to Why3: {}", why3_path.display())?;
+                writeln!(f, "Path to Alt-Ergo: {}", altergo_path.display())
+            }
+        }
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Error::NotFound => write!(f, "No existing Creusot configuration found."),
+            Error::Invalid(reason) => write!(f, "Invalid Creusot configuration found: {reason}."),
+            Error::WrongVersion(v) => write!(
+                f,
+                "Existing Creusot configuration found, \
+                           but with a different version than expected ({v}, \
+                           expected {CURRENT_CONFIG_VERSION})."
+            ),
+        }
+    }
+}
diff --git a/cargo-creusot/src/setup/mod.rs b/cargo-creusot/src/setup/mod.rs
new file mode 100644
index 0000000000..ea0cb0ed2e
--- /dev/null
+++ b/cargo-creusot/src/setup/mod.rs
@@ -0,0 +1,311 @@
+use anyhow::{anyhow, bail, Context};
+use directories::ProjectDirs;
+use std::{
+    fmt, fs,
+    path::{Path, PathBuf},
+};
+
+mod config;
+mod tools;
+use config::{Error::*, *};
+use tools::*;
+use ToolsConfig::*;
+
+struct CfgPaths {
+    config_dir: PathBuf,
+    config_file: PathBuf,
+    data_dir: PathBuf,
+    bin_subdir: PathBuf,
+    cache_dir: PathBuf,
+}
+
+fn get_config_paths() -> anyhow::Result<CfgPaths> {
+    // arguments: qualifier, organization, application
+    let dirs = ProjectDirs::from("", "creusot", "creusot")
+        .context("failed to compute configuration paths")?;
+    Ok(CfgPaths {
+        config_dir: PathBuf::from(dirs.config_dir()),
+        config_file: dirs.config_dir().join("Config.toml"),
+        data_dir: PathBuf::from(dirs.data_dir()),
+        bin_subdir: dirs.data_dir().join("bin"),
+        cache_dir: PathBuf::from(dirs.cache_dir()),
+    })
+}
+
+// helpers for diagnostics of a creusot installation.
+// used by the implementation of the various subcommands.
+struct Issue {
+    tool: String,
+    cur_version: Option<String>,
+    expected_version: String,
+}
+
+impl fmt::Display for Issue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let Issue { tool, cur_version, expected_version } = self;
+        write!(
+            f,
+            "{tool} has version {}, but version {expected_version} is expected",
+            cur_version.as_deref().unwrap_or("(not detected)")
+        )
+    }
+}
+
+fn diagnostic_config(config: &Config) -> Vec<Issue> {
+    let mut issues: Vec<Issue> = Vec::new();
+
+    // check versions of the external binaries registered in the config (binary
+    // --version vs expected version)
+    let extbins = match &config.tools {
+        Managed { why3_path, altergo_path, .. } => [(WHY3, why3_path), (ALTERGO, altergo_path)],
+        External { why3_path, altergo_path, .. } => [(WHY3, why3_path), (ALTERGO, altergo_path)],
+    };
+    for (bin, path) in extbins {
+        if let DetectedVersion::Bad(ver) = detect_binary_version(&bin, &path) {
+            issues.push(Issue {
+                tool: bin.display_name.to_owned(),
+                cur_version: ver,
+                expected_version: bin.version.to_owned(),
+            })
+        }
+    }
+
+    // check versions of the managed binaries (version in the config file vs expected version)
+    if let Config { tools: Managed { z3, cvc4, cvc5, .. } } = &config {
+        for (cur_version, bin) in [(z3, Z3), (cvc4, CVC4), (cvc5, CVC5)] {
+            if cur_version != bin.version {
+                issues.push(Issue {
+                    tool: bin.display_name.to_owned(),
+                    cur_version: Some(cur_version.to_owned()),
+                    expected_version: bin.version.to_owned(),
+                })
+            }
+        }
+    };
+
+    issues
+}
+
+fn diagnostic_extbinary(bin: ExtBinary, issues: &mut Vec<Issue>) -> anyhow::Result<PathBuf> {
+    let path = detect_binary_path(&bin).ok_or(anyhow!(
+        "{} not found. Please install {} version {}",
+        &bin.display_name,
+        &bin.display_name,
+        &bin.version
+    ))?;
+    println!("Found {} at path: {}", &bin.display_name, &path.display());
+    if let DetectedVersion::Bad(ver) = detect_binary_version(&bin, &path) {
+        issues.push(Issue {
+            tool: bin.display_name.to_owned(),
+            cur_version: ver,
+            expected_version: bin.version.to_owned(),
+        })
+    }
+    Ok(path)
+}
+
+// display the status of the creusot installation to the user
+pub fn status() -> anyhow::Result<()> {
+    let paths = get_config_paths()?;
+    match Config::read_from_file(&paths.config_file) {
+        Err(err) => {
+            println!("{err}");
+            println!(
+                "Hint: run 'cargo creusot setup install' to setup Creusot,\n\
+                      or run 'cargo creusot setup' for more information."
+            );
+        }
+        Ok(cfg) => {
+            println!("Creusot installation found.");
+            print!("{}", cfg.tools);
+            let issues = diagnostic_config(&cfg);
+            if !issues.is_empty() {
+                let severity = match cfg.tools {
+                    External { .. } => "Warning",
+                    Managed { .. } => "Error",
+                };
+                println!("");
+                for issue in &issues {
+                    println!("{severity}: {issue}")
+                }
+                if let Managed { .. } = cfg.tools {
+                    println!(
+                        "Hint: for tools installed by Creusot, \
+                              re-run 'cargo creusot setup install' \n\
+                              to upgrade them to the expected version."
+                    )
+                }
+            }
+        }
+    };
+    Ok(())
+}
+
+pub struct CreusotFlags {
+    pub why3_path: PathBuf,
+    pub why3_config: Option<PathBuf>,
+}
+
+// compute the flags to pass to creusot-rustc.
+// fail if the installation is not in an acceptable state, which means we will
+// stop there and do not attempt launching creusot-rustc.
+pub fn status_for_creusot() -> anyhow::Result<CreusotFlags> {
+    let paths = get_config_paths()?;
+    match Config::read_from_file(&paths.config_file) {
+        Err(err) => bail!(
+            "{err}\n\
+                   Please run 'cargo creusot setup' for more information on \
+                   how to perform Creusot's initial setup."
+        ),
+        Ok(cfg) => {
+            match cfg.tools {
+                External { why3_path, .. } =>
+                // in external mode we assume that everything is setup correctly
+                {
+                    Ok(CreusotFlags { why3_path, why3_config: None })
+                }
+                Managed { ref why3_path, .. } => {
+                    let issues = diagnostic_config(&cfg);
+                    if !issues.is_empty() {
+                        for issue in &issues {
+                            println!("Error: {issue}")
+                        }
+                        bail!(
+                            "Please run 'cargo creusot setup status' \
+                               to diagnostic and fix the issue(s)"
+                        )
+                    }
+                    Ok(CreusotFlags {
+                        why3_path: why3_path.to_path_buf(),
+                        why3_config: Some(paths.config_dir.join(".why3.conf")),
+                    })
+                }
+            }
+        }
+    }
+}
+
+pub fn install(use_external_tools: bool) -> anyhow::Result<()> {
+    let paths = get_config_paths()?;
+
+    // figure out whether we're installing a new configuration from scratch, or
+    // updating an existing configuration
+    let previous_config = match Config::read_from_file(&paths.config_file) {
+        Err(NotFound) => None,
+        Err(Invalid(_) | WrongVersion(_)) => {
+            println!("Removing invalid or outdated config...");
+            None
+        }
+        Ok(cfg @ Config { tools: Managed { .. } }) => {
+            if use_external_tools {
+                println!(
+                    "Switching to an installation using external tools. \
+                          Erasing current installation..."
+                );
+                None
+            } else {
+                println!("Existing configuration found. Updating.");
+                Some(cfg)
+            }
+        }
+        Ok(cfg @ Config { tools: External { .. } }) => {
+            if !use_external_tools {
+                println!(
+                    "Switching to an installation using managed tools. \
+                          Erasing current installation..."
+                );
+                None
+            } else {
+                println!("Existing configuration found. Updating.");
+                Some(cfg)
+            }
+        }
+    };
+
+    // delete then (re)create the directories we need
+    if previous_config.is_none() {
+        let _ = fs::remove_dir_all(&paths.config_dir);
+        let _ = fs::remove_dir_all(&paths.data_dir);
+    }
+    fs::create_dir_all(&paths.config_dir)?;
+    fs::create_dir_all(&paths.data_dir)?;
+    fs::create_dir_all(&paths.bin_subdir)?;
+    fs::create_dir_all(&paths.cache_dir)?;
+
+    if use_external_tools {
+        install_external(&paths)?;
+    } else {
+        install_managed(&paths, previous_config)?;
+    }
+    Ok(println!("Done."))
+}
+
+fn install_external(paths: &CfgPaths) -> anyhow::Result<()> {
+    // in external mode, upgrades and fresh installs are equivalent: we
+    // rereading the paths of external binaries.
+    let mut issues = Vec::new();
+    let why3_path = diagnostic_extbinary(WHY3, &mut issues)?;
+    let altergo_path = diagnostic_extbinary(ALTERGO, &mut issues)?;
+    // in external mode, only warn about issues
+    for issue in issues {
+        println!("Warning: {issue}")
+    }
+    let config = Config { tools: External { why3_path, altergo_path } };
+    config.write_to_file(&paths.config_file)
+}
+
+fn install_managed(paths: &CfgPaths, previous_config: Option<Config>) -> anyhow::Result<()> {
+    // reread paths to external binaries
+    let mut issues = Vec::new();
+    let why3_path = diagnostic_extbinary(WHY3, &mut issues)?;
+    let altergo_path = diagnostic_extbinary(ALTERGO, &mut issues)?;
+    // in managed mode, issues are failures
+    if !issues.is_empty() {
+        for issue in issues {
+            println!("Error: {issue}")
+        }
+        bail!("Issues with external binaries.")
+    }
+    if let Some(Config { tools: Managed { z3, cvc4, cvc5, .. } }) = previous_config {
+        // we are upgrading an existing configuration
+        let to_upgrade: Vec<_> = [(z3, Z3), (cvc4, CVC4), (cvc5, CVC5)]
+            .into_iter()
+            .filter(|(cur_ver, bin)| cur_ver != bin.version)
+            .map(|(_, bin)| bin)
+            .collect();
+        managed_download_and_generate_config(paths, &why3_path, &altergo_path, &to_upgrade)
+    } else {
+        // otherwise this is a fresh install
+        managed_download_and_generate_config(paths, &why3_path, &altergo_path, &[Z3, CVC4, CVC5])
+    }
+}
+
+// in managed mode, download required binaries, then (re)generate configuration
+// files for why3 and creusot
+fn managed_download_and_generate_config(
+    paths: &CfgPaths,
+    why3_path: &Path,
+    altergo_path: &Path,
+    bins: &[Binary],
+) -> anyhow::Result<()> {
+    // download tool binaries
+    download_all(bins, &paths.cache_dir, &paths.bin_subdir)?;
+
+    // create a symbolic link for alt-ergo so that it why3 picks it up
+    symlink_file(altergo_path, &paths.bin_subdir.join(ALTERGO.binary_name))?;
+
+    // generate the corresponding .why3.conf
+    generate_why3_conf(why3_path, &paths.bin_subdir, &paths.config_dir)?;
+
+    // write the config file
+    let config = Config {
+        tools: Managed {
+            why3_path: why3_path.to_owned(),
+            altergo_path: altergo_path.to_owned(),
+            z3: Z3_VERSION.to_owned(),
+            cvc4: CVC4_VERSION.to_owned(),
+            cvc5: CVC5_VERSION.to_owned(),
+        },
+    };
+    config.write_to_file(&paths.config_file)
+}
diff --git a/cargo-creusot/src/setup/tools.rs b/cargo-creusot/src/setup/tools.rs
new file mode 100644
index 0000000000..804cdf70b5
--- /dev/null
+++ b/cargo-creusot/src/setup/tools.rs
@@ -0,0 +1,327 @@
+use anyhow::{anyhow, bail, Context};
+use reqwest::blocking::Client;
+use std::{
+    fs,
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+// "known good" versions and URLs for downloading binary releases
+
+// NOTE: when ugrading a binary to a newer version:
+// - update its [FOO_VERSION] below
+// - update its URL in each [URLS] block below
+// - update the SHA256 hash for each binary accordingly (use e.g. sha256sum to compute it)
+
+// tools without binary releases
+pub const WHY3_VERSION: &'static str = "1.7.1";
+pub const ALTERGO_VERSION: &'static str = "2.5.2";
+// tools with binary releases
+pub const Z3_VERSION: &'static str = "4.12.4";
+pub const CVC4_VERSION: &'static str = "1.8";
+pub const CVC5_VERSION: &'static str = "1.0.5";
+
+#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-glibc-2.35.zip",
+        sha256: "e23d3a5670dc83285f581c2610e9cf701bb22db09b5336d85a4df743253b2335",
+    },
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-x86_64-linux-opt",
+        sha256: "d38a79cf984592785eda41ec888d94ca107ac1f13058740238041e28c8472e51",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-Linux",
+        sha256: "57fa94b740e0827f655a731b97dae84fedf86e65fa897c3a56a01a83d283d15e",
+    }
+};
+
+#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
+const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-osx-11.7.10.zip",
+        sha256: "0e6da979dc6ec501ad878d962802d20aff465ac0c24e4c1234169f3e92a0e6a3",
+    },
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
+        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS",
+        sha256: "0e74e40a3db82f3ac4d8ea23308931bedbc6afbcf3ed484b8b000da17c75885c",
+    }
+};
+
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-arm64-osx-11.0.zip",
+        sha256: "ab6798a9a85f406d7db9eb1fe692ff3db78155c509f71d0cae5933f4c47b5a38",
+    },
+    // CVC4 only has a macos x86_64 binary; we rely on rosetta for compatibility
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
+        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS-arm64",
+        sha256: "f1fe16664d88f9549da3df00853b6ddabafa68b1dc1c62d6dad0c0549cf95a33",
+    }
+};
+
+// ----
+// we should only need to update the [Binary] definitions below whenever the
+// format of a tool binary releases change (unlikely)
+
+pub const WHY3: ExtBinary = ExtBinary {
+    display_name: "Why3",
+    binary_name: "why3",
+    version: WHY3_VERSION,
+    detect_version: detect_why3_version,
+};
+
+pub const ALTERGO: ExtBinary = ExtBinary {
+    display_name: "Alt-Ergo",
+    binary_name: "alt-ergo",
+    version: ALTERGO_VERSION,
+    detect_version: detect_altergo_version,
+};
+
+pub const Z3: Binary = Binary {
+    display_name: "Z3",
+    version: Z3_VERSION,
+    install_as: "z3",
+    url: &URLS.z3,
+    download_with: download_z3_from_url,
+};
+
+pub const CVC4: Binary = Binary {
+    display_name: "CVC4",
+    version: CVC4_VERSION,
+    install_as: "cvc4",
+    url: &URLS.cvc4,
+    download_with: download_from_url_with_cache,
+};
+
+pub const CVC5: Binary = Binary {
+    display_name: "CVC5",
+    version: CVC5_VERSION,
+    install_as: "cvc5",
+    url: &URLS.cvc5,
+    download_with: download_from_url_with_cache,
+};
+
+// ----
+
+#[derive(Clone, Copy)]
+pub struct Binary {
+    pub display_name: &'static str,
+    pub version: &'static str,
+    install_as: &'static str,
+    url: &'static Url,
+    download_with: fn(&Client, &Url, &Path, &Path) -> anyhow::Result<()>,
+}
+
+struct Urls {
+    z3: Url,
+    cvc4: Url,
+    cvc5: Url,
+}
+
+struct Url {
+    url: &'static str,
+    sha256: &'static str,
+}
+
+#[derive(Clone, Copy)]
+pub struct ExtBinary {
+    pub display_name: &'static str,
+    pub binary_name: &'static str,
+    pub version: &'static str,
+    detect_version: fn(&Path) -> Option<String>,
+}
+
+// download a list [Binary]s
+
+pub fn download_all(bins: &[Binary], cache_dir: &Path, dest_dir: &Path) -> anyhow::Result<()> {
+    let client = Client::new();
+    for bin in bins {
+        println!("Downloading {} {}...", bin.display_name, bin.version);
+        let path = dest_dir.join(bin.install_as);
+        let dl = bin.download_with;
+        dl(&client, bin.url, cache_dir, &path)?;
+        set_executable(&path)?;
+    }
+    Ok(())
+}
+
+// download helper
+
+fn sha256sum(file: &Path) -> anyhow::Result<String> {
+    use sha2::{Digest, Sha256};
+    let mut hasher = Sha256::new();
+    let mut f = fs::File::open(file).context("opening file to hash")?;
+    std::io::copy(&mut f, &mut hasher)?;
+    Ok(hex::encode(hasher.finalize()))
+}
+
+fn download_from_url(client: &Client, url: &Url, dest: &Path) -> anyhow::Result<()> {
+    const DOWNLOAD_RETRIES: u32 = 1;
+    let do_download = || -> anyhow::Result<()> {
+        let mut resp = client.get(url.url).send()?;
+        let mut file = fs::File::create(dest)?;
+        resp.copy_to(&mut file)?;
+        Ok(())
+    };
+    let mut success = false;
+    let mut tries: u32 = 0;
+    while !success && tries <= DOWNLOAD_RETRIES {
+        if tries > 0 {
+            eprintln!("Retrying...")
+        };
+        do_download().with_context(|| format!("downloading {} to {}", url.url, dest.display()))?;
+        let file_hash = sha256sum(dest)?;
+        if file_hash == url.sha256 {
+            success = true
+        } else {
+            eprintln!("Download failed (wrong hash)");
+            let _ = fs::remove_file(dest);
+        }
+        tries = tries + 1;
+    }
+    if !success {
+        bail!("Download failed after {DOWNLOAD_RETRIES} retries (wrong hash?)")
+    };
+    Ok(())
+}
+
+// looks up [cache_dir] to try to find a cached download; if not, stores the
+// result of the download in [cache_dir] (using the hash as the filename).
+fn download_from_url_with_cache(
+    client: &Client,
+    url: &Url,
+    cache_dir: &Path,
+    dest: &Path,
+) -> anyhow::Result<()> {
+    let cached_path = cache_dir.join(url.sha256);
+    if !(cached_path.is_file() && sha256sum(&cached_path)? == url.sha256) {
+        download_from_url(client, url, &cached_path)?;
+    }
+    if cached_path != dest {
+        fs::copy(cached_path, dest)?;
+    }
+    Ok(())
+}
+
+// helpers: external binaries
+
+pub enum DetectedVersion {
+    Good,
+    Bad(Option<String>),
+}
+
+pub fn detect_binary_path(bin: &ExtBinary) -> Option<PathBuf> {
+    use which::which;
+    which(bin.binary_name).ok()
+}
+
+pub fn detect_binary_version(bin: &ExtBinary, path: &Path) -> DetectedVersion {
+    let detect_version = bin.detect_version;
+    match detect_version(&path) {
+        None => DetectedVersion::Bad(None),
+        Some(ver) if ver != bin.version => DetectedVersion::Bad(Some(ver)),
+        Some(_) => DetectedVersion::Good,
+    }
+}
+
+// helpers: why3
+
+fn detect_why3_version(why3: &Path) -> Option<String> {
+    let output = Command::new(&why3).arg("--version").output().ok()?;
+    let version_full = String::from_utf8(output.stdout).ok()?;
+    let version = version_full.strip_prefix("Why3 platform, version ");
+    version.map(|ver| {
+        let parts: Vec<_> = ver.split(|c| c == '.' || c == '+').collect();
+        String::from(&parts[..3].join("."))
+    })
+}
+
+pub fn generate_why3_conf(why3_path: &Path, bin_dir: &Path, dest_dir: &Path) -> anyhow::Result<()> {
+    println!("Generating a fresh why3 configuration...");
+    let dest_file = dest_dir.join(".why3.conf");
+    let _ = fs::remove_file(dest_file);
+    let status = Command::new(why3_path)
+        .args(["config", "detect"])
+        .envs([("PATH", bin_dir), ("HOME", dest_dir)])
+        .status()
+        .context("launching 'why3 config detect' on downloaded solvers")?;
+    if !status.success() {
+        bail!("failed to generate why3's configuration")
+    };
+    Ok(())
+}
+
+// helpers: alt-ergo
+
+fn detect_altergo_version(altergo: &Path) -> Option<String> {
+    let output = Command::new(&altergo).arg("--version").output().ok()?;
+    let out_s = String::from_utf8(output.stdout).ok()?;
+    out_s.trim_end_matches(char::is_whitespace).strip_prefix("v").map(String::from)
+}
+
+// helpers: Z3
+
+// Z3 releases come as a .zip archive that includes many things. We are only
+// interested in the z3 binary, so we extract it from the archive and throw away
+// the rest.
+
+fn download_z3_from_url(
+    client: &Client,
+    url: &Url,
+    cache_dir: &Path,
+    dest: &Path,
+) -> anyhow::Result<()> {
+    use zip::read::ZipArchive;
+    // just use the zip file stored in the cache
+    let zip_path = cache_dir.join(url.sha256);
+    download_from_url_with_cache(client, url, cache_dir, &zip_path)?;
+    {
+        // extract the z3 binary from the .zip archive
+        let zipfile = std::fs::File::open(&zip_path)?;
+        let mut archive = ZipArchive::new(zipfile)?;
+        // find out the full path of the z3 binary in the archive
+        let z3_archive_path = archive
+            .file_names()
+            .find(|s| s.ends_with("/bin/z3"))
+            .map(String::from)
+            .ok_or(anyhow!("did not find a bin/z3 binary in the z3 release archive"))?;
+        let mut z3zipfile = archive.by_name(&z3_archive_path)?;
+        let mut z3file = fs::File::create(&dest)?;
+        std::io::copy(&mut z3zipfile, &mut z3file)?;
+    }
+    Ok(())
+}
+
+fn set_executable(dest: &Path) -> anyhow::Result<()> {
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        let mut perms = fs::metadata(&dest)?.permissions();
+        perms.set_mode(0o755);
+        fs::set_permissions(&dest, perms)?;
+    }
+    Ok(())
+}
+
+pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> std::io::Result<()> {
+    let _ = fs::remove_file(&link);
+    #[cfg(unix)]
+    {
+        std::os::unix::fs::symlink(original, link)
+    }
+    #[cfg(windows)]
+    {
+        std::os::windows::fs::symlink_file(original, link)
+    }
+}
diff --git a/creusot-args/src/options.rs b/creusot-args/src/options.rs
index b8e5090a69..cecc36ba5f 100644
--- a/creusot-args/src/options.rs
+++ b/creusot-args/src/options.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use std::{error::Error, ffi::OsString, path::PathBuf};
 
 #[derive(Parser, Serialize, Deserialize)]
-pub struct CreusotArgs {
+pub struct CommonOptions {
     /// Determines how to format the spans in generated code to loading in Why3.
     /// [Relative] is better if the generated code is meant to be checked into VCS.
     /// [Absolute] means the files can easily be moved around your system and still work.
@@ -34,15 +34,25 @@ pub struct CreusotArgs {
     /// Specify locations of metadata for external crates. The format is the same as rustc's `--extern` flag.
     #[clap(long = "creusot-extern", value_parser= parse_key_val::<String, String>, required=false)]
     pub extern_paths: Vec<(String, String)>,
-    /// Check the installed why3 version.
-    #[clap(long, default_value_t = true, action = clap::ArgAction::Set)]
-    pub check_why3: bool,
     /// Use `result` as the trigger of definition and specification axioms of logic/ghost/predicate functions
     #[clap(long, default_value_t = false, action = clap::ArgAction::Set)]
     pub simple_triggers: bool,
-    /// Run why3
+}
+
+#[derive(Parser, Serialize, Deserialize)]
+pub struct CreusotArgs {
+    #[clap(flatten)]
+    pub options: CommonOptions,
+    /// Path to the Why3 binary
+    #[arg(long, default_value_os_t = PathBuf::from("why3"))]
+    pub why3_path: PathBuf,
+    /// Specify an alternative location for Why3's configuration
+    #[arg(long)]
+    pub why3_config_file: Option<PathBuf>,
     #[command(subcommand)]
     pub subcommand: Option<CreusotSubCommand>,
+    #[clap(last = true)]
+    pub rust_flags: Vec<String>,
 }
 
 #[derive(Subcommand, Serialize, Deserialize)]
@@ -59,6 +69,29 @@ pub enum CreusotSubCommand {
     },
 }
 
+#[derive(Parser)]
+pub struct CargoCreusotArgs {
+    #[clap(flatten)]
+    pub options: CommonOptions,
+    /// Subcommand: why3, setup
+    #[command(subcommand)]
+    pub subcommand: Option<CargoCreusotSubCommand>,
+    #[clap(last = true)]
+    pub rust_flags: Vec<String>,
+}
+
+#[derive(Subcommand)]
+pub enum CargoCreusotSubCommand {
+    /// Setup and manage Creusot's installation
+    #[command(arg_required_else_help(true))]
+    Setup {
+        #[command(subcommand)]
+        command: SetupSubCommand,
+    },
+    #[command(flatten)]
+    Creusot(CreusotSubCommand),
+}
+
 #[derive(ValueEnum, Serialize, Deserialize, Clone)]
 pub enum Why3SubCommand {
     Prove,
@@ -66,6 +99,16 @@ pub enum Why3SubCommand {
     Replay,
 }
 
+#[derive(Parser, Clone)]
+pub enum SetupSubCommand {
+    /// Show the current status of the Creusot installation
+    Status,
+    /// Setup Creusot or update an existing installation
+    Install,
+    /// Setup Creusot but use external tools configured manually (not recommended, for experts)
+    InstallExternal,
+}
+
 /// Default relative path of the root project wrt the output.
 /// This corresponds to the default scenario where the user invokes "cargo creusot"
 /// which writes its output in target/debug/
@@ -85,17 +128,9 @@ where
     Ok((s[..pos].parse()?, s[pos + 1..].parse()?))
 }
 
-#[derive(Parser)]
-pub struct Args {
-    #[clap(flatten)]
-    pub creusot: CreusotArgs,
-    #[clap(last = true)]
-    pub rust_flags: Vec<String>,
-}
-
-impl Args {
+impl CreusotArgs {
     fn move_rust_flags(&mut self) {
-        let rust_flags = match &mut self.creusot.subcommand {
+        let rust_flags = match &mut self.subcommand {
             None => return,
             Some(CreusotSubCommand::Why3 { rust_flags, .. }) => rust_flags,
         };
@@ -111,6 +146,26 @@ impl Args {
     }
 }
 
+impl CargoCreusotArgs {
+    fn move_rust_flags(&mut self) {
+        let rust_flags = match &mut self.subcommand {
+            Some(CargoCreusotSubCommand::Creusot(CreusotSubCommand::Why3 {
+                rust_flags, ..
+            })) => rust_flags,
+            _ => return,
+        };
+        let rust_flags = std::mem::take(rust_flags);
+        assert!(self.rust_flags.is_empty());
+        self.rust_flags = rust_flags
+    }
+
+    pub fn parse_from<I: Into<OsString> + Clone>(it: impl IntoIterator<Item = I>) -> Self {
+        let mut res: Self = Parser::parse_from(it);
+        res.move_rust_flags();
+        res
+    }
+}
+
 #[derive(clap::ValueEnum, Clone, Deserialize, Serialize)]
 pub enum SpanMode {
     Relative,
diff --git a/creusot-rustc/src/main.rs b/creusot-rustc/src/main.rs
index f1a59a1a87..d8d3c4fb52 100644
--- a/creusot-rustc/src/main.rs
+++ b/creusot-rustc/src/main.rs
@@ -6,7 +6,7 @@ extern crate rustc_interface;
 extern crate rustc_session;
 
 mod options;
-use options::{Args, CreusotArgsExt as _};
+use options::CreusotArgsExt as _;
 
 #[macro_use]
 extern crate log;
@@ -20,7 +20,6 @@ use rustc_session::{config::ErrorOutputType, EarlyErrorHandler};
 use std::{env, panic, panic::PanicInfo, process::Command};
 
 const BUG_REPORT_URL: &'static str = &"https://github.com/xldenis/creusot/issues/new";
-const WHY3_VERSION: &[&'static str] = &["1", "7", "1"];
 
 lazy_static::lazy_static! {
     static ref ICE_HOOK: Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static> = {
@@ -79,25 +78,11 @@ fn setup_plugin() {
     let creusot: CreusotArgs = if is_wrapper {
         serde_json::from_str(&std::env::var("CREUSOT_ARGS").unwrap()).unwrap()
     } else {
-        let all_args = Args::parse_from(&args);
-        args = all_args.rust_flags;
-        all_args.creusot
+        let mut all_args = CreusotArgs::parse_from(&args);
+        args = std::mem::take(&mut all_args.rust_flags);
+        all_args
     };
 
-    if creusot.check_why3 {
-        if let Some(why3_vers) = why3_version() {
-            let parts: Vec<_> = why3_vers.split(|c| c == '.' || c == '+').collect();
-            if &parts[..3] < WHY3_VERSION {
-                emit_warning(format!(
-                    "the recommended version of why3 is at least {} (installed: {why3_vers})",
-                    WHY3_VERSION.join(".")
-                ));
-            }
-        } else {
-            emit_warning("could not determine installed why3 version".to_string());
-        }
-    }
-
     let sysroot = sysroot_path();
     args.push(format!("--sysroot={}", sysroot));
 
@@ -148,18 +133,7 @@ fn sysroot_path() -> String {
     String::from_utf8(output.stdout).unwrap().trim().to_owned()
 }
 
-fn why3_version() -> Option<String> {
-    let output = Command::new("why3").arg("--version").output().ok()?;
-
-    let version = String::from_utf8(output.stdout).ok()?;
-    if version.trim().starts_with("Why3 platform, version ") {
-        Some(version.trim()[23..].to_owned())
-    } else {
-        None
-    }
-}
-
-fn emit_warning(text: String) {
+fn _emit_warning(text: String) {
     let fallback_bundle =
         rustc_errors::fallback_fluent_bundle(DEFAULT_LOCALE_RESOURCES.to_vec(), false);
 
diff --git a/creusot-rustc/src/options.rs b/creusot-rustc/src/options.rs
index 9d2bae2079..8dd3371737 100644
--- a/creusot-rustc/src/options.rs
+++ b/creusot-rustc/src/options.rs
@@ -1,34 +1,39 @@
 use creusot::options::{self, Options, OutputFile};
 pub use creusot_args::options::*;
+use std::path::PathBuf;
 
 pub trait CreusotArgsExt {
     fn to_options(self) -> Options;
 }
 
-fn why3_command(cmd: CreusotSubCommand) -> options::Why3Command {
+fn why3_command(
+    path: PathBuf,
+    config_file: Option<PathBuf>,
+    cmd: CreusotSubCommand,
+) -> options::Why3Command {
     let CreusotSubCommand::Why3 { command, args, .. } = cmd;
     let sub = match command {
         Why3SubCommand::Prove => options::Why3Sub::Prove,
         Why3SubCommand::Ide => options::Why3Sub::Ide,
         Why3SubCommand::Replay => options::Why3Sub::Replay,
     };
-    options::Why3Command { sub, args }
+    options::Why3Command { path, config_file, sub, args }
 }
 impl CreusotArgsExt for CreusotArgs {
     fn to_options(self) -> Options {
-        let metadata_path = self.metadata_path;
-        let extern_paths = self.extern_paths.into_iter().collect();
+        let metadata_path = self.options.metadata_path;
+        let extern_paths = self.options.extern_paths.into_iter().collect();
 
         let cargo_creusot = std::env::var("CARGO_CREUSOT").is_ok();
         let should_output = !cargo_creusot || std::env::var("CARGO_PRIMARY_PACKAGE").is_ok();
 
-        let output_file = match (self.stdout, self.output_file) {
+        let output_file = match (self.options.stdout, self.options.output_file) {
             (true, _) => Some(OutputFile::Stdout),
             (_, Some(f)) => Some(OutputFile::File(f)),
             _ => None,
         };
 
-        let span_mode = match self.span_mode {
+        let span_mode = match self.options.span_mode {
             SpanMode::Relative => options::SpanMode::Relative,
             SpanMode::Absolute => options::SpanMode::Absolute,
             SpanMode::Off => options::SpanMode::Off,
@@ -37,15 +42,17 @@ impl CreusotArgsExt for CreusotArgs {
         Options {
             extern_paths,
             metadata_path,
-            export_metadata: self.export_metadata,
+            export_metadata: self.options.export_metadata,
             should_output,
             output_file,
             in_cargo: cargo_creusot,
-            span_mode: span_mode,
-            root_path_relative_from_output: self.root_path_relative_from_output,
-            match_str: self.focus_on,
-            simple_triggers: self.simple_triggers,
-            why3_cmd: self.subcommand.map(why3_command),
+            span_mode,
+            root_path_relative_from_output: self.options.root_path_relative_from_output,
+            match_str: self.options.focus_on,
+            simple_triggers: self.options.simple_triggers,
+            why3_cmd: self
+                .subcommand
+                .map(|cmd| why3_command(self.why3_path, self.why3_config_file, cmd)),
         }
     }
 }
diff --git a/creusot/src/options.rs b/creusot/src/options.rs
index bc0476dc3b..670b73c6a6 100644
--- a/creusot/src/options.rs
+++ b/creusot/src/options.rs
@@ -19,6 +19,8 @@ pub enum Why3Sub {
 
 #[derive(Clone)]
 pub struct Why3Command {
+    pub path: PathBuf,
+    pub config_file: Option<PathBuf>,
     pub sub: Why3Sub,
     pub args: String,
 }
diff --git a/creusot/src/run_why3.rs b/creusot/src/run_why3.rs
index a77b80b08f..ba5e04745f 100644
--- a/creusot/src/run_why3.rs
+++ b/creusot/src/run_why3.rs
@@ -47,7 +47,11 @@ pub(super) fn run_why3<'tcx>(ctx: &Why3Generator<'tcx>, file: Option<PathBuf>) {
     }
     let prelude_dir = TempDir::new("creusot_why3_prelude").expect("could not create temp dir");
     PRELUDE.extract(prelude_dir.path()).expect("could extract prelude into temp dir");
-    let mut command = Command::new("why3");
+    let mut command = Command::new(&why3_cmd.path);
+    let command = match &why3_cmd.config_file {
+        None => &mut command,
+        Some(cfg) => command.arg("-C").arg(cfg),
+    };
     command
         .args([
             "--warn-off=unused_variable",

From 12cc271ba68ab4de17c2c231681554e30dd7b238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 2 Mar 2024 11:01:11 +0100
Subject: [PATCH 33/66] testsuite: tweak

---
 creusot/tests/ui.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
index 70ce3c0275..b21d6578a7 100644
--- a/creusot/tests/ui.rs
+++ b/creusot/tests/ui.rs
@@ -92,7 +92,6 @@ fn run_creusot(
         "--export-metadata=false",
         "--span-mode=relative",
         "--root-path-relative-from-output=.",
-        "--check-why3=false",
     ]);
     cmd.args(&[
         "--creusot-extern",

From 1024647271a13401c14e032d241d5523f27750e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 16:53:10 +0100
Subject: [PATCH 34/66] setup: option to disable recording of absolute paths to
 binaries in external mode

---
 cargo-creusot/src/main.rs      |  6 ++-
 cargo-creusot/src/setup/mod.rs | 76 ++++++++++++++++++----------------
 creusot-args/src/options.rs    |  7 +++-
 3 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
index ea0ba64346..a88792a24b 100644
--- a/cargo-creusot/src/main.rs
+++ b/cargo-creusot/src/main.rs
@@ -36,8 +36,10 @@ fn main() -> anyhow::Result<()> {
             Ok(invoke_cargo(&creusot_args))
         }
         Setup(SetupSubCommand::Status) => setup::status(),
-        Setup(SetupSubCommand::Install) => setup::install(false),
-        Setup(SetupSubCommand::InstallExternal) => setup::install(true),
+        Setup(SetupSubCommand::Install) => setup::install(setup::InstallMode::Managed),
+        Setup(SetupSubCommand::InstallExternal { no_absolute_paths }) => {
+            setup::install(setup::InstallMode::External { no_absolute_paths })
+        }
     }
 }
 
diff --git a/cargo-creusot/src/setup/mod.rs b/cargo-creusot/src/setup/mod.rs
index ea0cb0ed2e..afaf747a55 100644
--- a/cargo-creusot/src/setup/mod.rs
+++ b/cargo-creusot/src/setup/mod.rs
@@ -185,40 +185,39 @@ pub fn status_for_creusot() -> anyhow::Result<CreusotFlags> {
     }
 }
 
-pub fn install(use_external_tools: bool) -> anyhow::Result<()> {
+pub enum InstallMode {
+    Managed,
+    External { no_absolute_paths: bool },
+}
+
+pub fn install(mode: InstallMode) -> anyhow::Result<()> {
     let paths = get_config_paths()?;
 
     // figure out whether we're installing a new configuration from scratch, or
     // updating an existing configuration
-    let previous_config = match Config::read_from_file(&paths.config_file) {
-        Err(NotFound) => None,
-        Err(Invalid(_) | WrongVersion(_)) => {
+    let previous_config = match (Config::read_from_file(&paths.config_file), &mode) {
+        (Err(NotFound), _) => None,
+        (Err(Invalid(_) | WrongVersion(_)), _) => {
             println!("Removing invalid or outdated config...");
             None
         }
-        Ok(cfg @ Config { tools: Managed { .. } }) => {
-            if use_external_tools {
-                println!(
-                    "Switching to an installation using external tools. \
-                          Erasing current installation..."
-                );
-                None
-            } else {
-                println!("Existing configuration found. Updating.");
-                Some(cfg)
-            }
+        (Ok(Config { tools: Managed { .. } }), InstallMode::External { .. }) => {
+            println!(
+                "Switching to an installation using external tools. \
+                 Erasing current installation..."
+            );
+            None
         }
-        Ok(cfg @ Config { tools: External { .. } }) => {
-            if !use_external_tools {
-                println!(
-                    "Switching to an installation using managed tools. \
-                          Erasing current installation..."
-                );
-                None
-            } else {
-                println!("Existing configuration found. Updating.");
-                Some(cfg)
-            }
+        (Ok(Config { tools: External { .. } }), InstallMode::Managed) => {
+            println!(
+                "Switching to an installation using managed tools. \
+                 Erasing current installation..."
+            );
+            None
+        }
+        (Ok(cfg), _) => {
+            println!("Existing configuration found. Updating.");
+            Some(cfg)
         }
     };
 
@@ -232,20 +231,27 @@ pub fn install(use_external_tools: bool) -> anyhow::Result<()> {
     fs::create_dir_all(&paths.bin_subdir)?;
     fs::create_dir_all(&paths.cache_dir)?;
 
-    if use_external_tools {
-        install_external(&paths)?;
-    } else {
-        install_managed(&paths, previous_config)?;
-    }
+    match mode {
+        InstallMode::Managed => install_managed(&paths, previous_config)?,
+        InstallMode::External { no_absolute_paths } => install_external(&paths, no_absolute_paths)?,
+    };
     Ok(println!("Done."))
 }
 
-fn install_external(paths: &CfgPaths) -> anyhow::Result<()> {
+fn install_external(paths: &CfgPaths, no_absolute_paths: bool) -> anyhow::Result<()> {
     // in external mode, upgrades and fresh installs are equivalent: we
-    // rereading the paths of external binaries.
+    // write the paths of external binaries.
     let mut issues = Vec::new();
-    let why3_path = diagnostic_extbinary(WHY3, &mut issues)?;
-    let altergo_path = diagnostic_extbinary(ALTERGO, &mut issues)?;
+    let why3_path = if no_absolute_paths {
+        PathBuf::from(WHY3.binary_name)
+    } else {
+        diagnostic_extbinary(WHY3, &mut issues)?
+    };
+    let altergo_path = if no_absolute_paths {
+        PathBuf::from(ALTERGO.binary_name)
+    } else {
+        diagnostic_extbinary(ALTERGO, &mut issues)?
+    };
     // in external mode, only warn about issues
     for issue in issues {
         println!("Warning: {issue}")
diff --git a/creusot-args/src/options.rs b/creusot-args/src/options.rs
index cecc36ba5f..ba91478318 100644
--- a/creusot-args/src/options.rs
+++ b/creusot-args/src/options.rs
@@ -106,7 +106,12 @@ pub enum SetupSubCommand {
     /// Setup Creusot or update an existing installation
     Install,
     /// Setup Creusot but use external tools configured manually (not recommended, for experts)
-    InstallExternal,
+    InstallExternal {
+        /// Do not record absolute paths to the external binaries (the binaries
+        /// will instead be looked up in PATH at each Creusot invocation)
+        #[arg(long, default_value_t = false)]
+        no_absolute_paths: bool,
+    },
 }
 
 /// Default relative path of the root project wrt the output.

From dccd2cf6352f812de0407e9da2b4165d871dfdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 18:06:32 +0100
Subject: [PATCH 35/66] setup: move implementation to a separate crate

---
 Cargo.lock                                    | 73 +++++++++++--------
 cargo-creusot/Cargo.toml                      |  9 +--
 cargo-creusot/src/main.rs                     |  3 +-
 creusot-setup/Cargo.toml                      | 16 ++++
 .../src/setup => creusot-setup/src}/config.rs |  0
 .../setup/mod.rs => creusot-setup/src/lib.rs  |  0
 .../src/setup => creusot-setup/src}/tools.rs  |  0
 7 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 creusot-setup/Cargo.toml
 rename {cargo-creusot/src/setup => creusot-setup/src}/config.rs (100%)
 rename cargo-creusot/src/setup/mod.rs => creusot-setup/src/lib.rs (100%)
 rename {cargo-creusot/src/setup => creusot-setup/src}/tools.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 671c9ee21c..e2da753b6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.3"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "byteorder"
@@ -243,16 +243,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "creusot-args",
- "directories",
+ "creusot-setup",
  "env_logger",
- "hex",
- "reqwest",
  "serde",
  "serde_json",
- "sha2",
  "toml",
- "which",
- "zip",
 ]
 
 [[package]]
@@ -461,6 +456,22 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "creusot-setup"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "creusot-args",
+ "directories",
+ "hex",
+ "reqwest",
+ "serde",
+ "sha2",
+ "toml",
+ "which",
+ "zip",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.19"
@@ -758,7 +769,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.2.3",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -815,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -932,9 +943,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.3"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -1017,9 +1028,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1143,9 +1154,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
@@ -2230,9 +2241,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -2240,9 +2251,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
@@ -2255,9 +2266,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2267,9 +2278,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2277,9 +2288,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2290,15 +2301,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/cargo-creusot/Cargo.toml b/cargo-creusot/Cargo.toml
index a3a6af912a..63ba85f38c 100644
--- a/cargo-creusot/Cargo.toml
+++ b/cargo-creusot/Cargo.toml
@@ -7,14 +7,9 @@ edition = "2021"
 
 [dependencies]
 serde_json = { version = "1.0" }
-toml = { version = "0.5.8", features = ["preserve_order"] }
+toml = { version = "0.5.8" }
 env_logger = "*"
 serde = { version = "1.0", features = ["derive"] }
-directories = "5.0"
 creusot-args = {path = "../creusot-args"}
-which = "6.0"
+creusot-setup = {path = "../creusot-setup"}
 anyhow = "1.0"
-reqwest = { version = "0.11", features = ["blocking"] }
-zip = "0.6"
-hex = "0.4"
-sha2 = "0.10"
diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
index a88792a24b..51fe73a122 100644
--- a/cargo-creusot/src/main.rs
+++ b/cargo-creusot/src/main.rs
@@ -1,11 +1,10 @@
 use creusot_args::options::*;
+use creusot_setup as setup;
 use std::{
     env,
     process::{exit, Command},
 };
 
-pub mod setup;
-
 enum Subcommand {
     // subcommand to pass on to creusot-rustc
     Creusot(Option<CreusotSubCommand>),
diff --git a/creusot-setup/Cargo.toml b/creusot-setup/Cargo.toml
new file mode 100644
index 0000000000..839a8ffdef
--- /dev/null
+++ b/creusot-setup/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "creusot-setup"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+creusot-args = {path = "../creusot-args"}
+serde = { version = "1.0", features = ["derive"] }
+toml = { version = "0.5.8", features = ["preserve_order"] }
+directories = "5.0"
+which = "6.0"
+anyhow = "1.0"
+reqwest = { version = "0.11", features = ["blocking"] }
+zip = "0.6"
+hex = "0.4"
+sha2 = "0.10"
diff --git a/cargo-creusot/src/setup/config.rs b/creusot-setup/src/config.rs
similarity index 100%
rename from cargo-creusot/src/setup/config.rs
rename to creusot-setup/src/config.rs
diff --git a/cargo-creusot/src/setup/mod.rs b/creusot-setup/src/lib.rs
similarity index 100%
rename from cargo-creusot/src/setup/mod.rs
rename to creusot-setup/src/lib.rs
diff --git a/cargo-creusot/src/setup/tools.rs b/creusot-setup/src/tools.rs
similarity index 100%
rename from cargo-creusot/src/setup/tools.rs
rename to creusot-setup/src/tools.rs

From 84da81954f183012b0b9deed1a1d21dd585d2fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 18:32:45 +0100
Subject: [PATCH 36/66] cargo creusot: allow specifying a custom directory for
 creusot's setup config

---
 cargo-creusot/src/main.rs   | 10 ++++++----
 creusot-args/src/options.rs |  3 +++
 creusot-setup/src/lib.rs    | 28 ++++++++++++++++------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
index 51fe73a122..00106468cc 100644
--- a/cargo-creusot/src/main.rs
+++ b/cargo-creusot/src/main.rs
@@ -24,7 +24,7 @@ fn main() -> anyhow::Result<()> {
 
     match subcommand {
         Creusot(subcmd) => {
-            let config_args = setup::status_for_creusot()?;
+            let config_args = setup::status_for_creusot(&cargs.config_dir)?;
             let creusot_args = CreusotArgs {
                 options: cargs.options,
                 why3_path: config_args.why3_path,
@@ -34,10 +34,12 @@ fn main() -> anyhow::Result<()> {
             };
             Ok(invoke_cargo(&creusot_args))
         }
-        Setup(SetupSubCommand::Status) => setup::status(),
-        Setup(SetupSubCommand::Install) => setup::install(setup::InstallMode::Managed),
+        Setup(SetupSubCommand::Status) => setup::status(&cargs.config_dir),
+        Setup(SetupSubCommand::Install) => {
+            setup::install(&cargs.config_dir, setup::InstallMode::Managed)
+        }
         Setup(SetupSubCommand::InstallExternal { no_absolute_paths }) => {
-            setup::install(setup::InstallMode::External { no_absolute_paths })
+            setup::install(&cargs.config_dir, setup::InstallMode::External { no_absolute_paths })
         }
     }
 }
diff --git a/creusot-args/src/options.rs b/creusot-args/src/options.rs
index ba91478318..bc46b96107 100644
--- a/creusot-args/src/options.rs
+++ b/creusot-args/src/options.rs
@@ -73,6 +73,9 @@ pub enum CreusotSubCommand {
 pub struct CargoCreusotArgs {
     #[clap(flatten)]
     pub options: CommonOptions,
+    /// Custom path for Creusot's config directory (managed by 'cargo creusot setup')
+    #[arg(long)]
+    pub config_dir: Option<PathBuf>,
     /// Subcommand: why3, setup
     #[command(subcommand)]
     pub subcommand: Option<CargoCreusotSubCommand>,
diff --git a/creusot-setup/src/lib.rs b/creusot-setup/src/lib.rs
index afaf747a55..1b285d4651 100644
--- a/creusot-setup/src/lib.rs
+++ b/creusot-setup/src/lib.rs
@@ -19,13 +19,17 @@ struct CfgPaths {
     cache_dir: PathBuf,
 }
 
-fn get_config_paths() -> anyhow::Result<CfgPaths> {
+fn get_config_paths(custom_config_dir: &Option<PathBuf>) -> anyhow::Result<CfgPaths> {
     // arguments: qualifier, organization, application
     let dirs = ProjectDirs::from("", "creusot", "creusot")
         .context("failed to compute configuration paths")?;
+    let config_dir = match custom_config_dir {
+        Some(dir) => dir,
+        None => dirs.config_dir(),
+    };
     Ok(CfgPaths {
-        config_dir: PathBuf::from(dirs.config_dir()),
-        config_file: dirs.config_dir().join("Config.toml"),
+        config_dir: PathBuf::from(config_dir),
+        config_file: config_dir.join("Config.toml"),
         data_dir: PathBuf::from(dirs.data_dir()),
         bin_subdir: dirs.data_dir().join("bin"),
         cache_dir: PathBuf::from(dirs.cache_dir()),
@@ -105,8 +109,8 @@ fn diagnostic_extbinary(bin: ExtBinary, issues: &mut Vec<Issue>) -> anyhow::Resu
 }
 
 // display the status of the creusot installation to the user
-pub fn status() -> anyhow::Result<()> {
-    let paths = get_config_paths()?;
+pub fn status(custom_config_dir: &Option<PathBuf>) -> anyhow::Result<()> {
+    let paths = get_config_paths(custom_config_dir)?;
     match Config::read_from_file(&paths.config_file) {
         Err(err) => {
             println!("{err}");
@@ -146,11 +150,11 @@ pub struct CreusotFlags {
     pub why3_config: Option<PathBuf>,
 }
 
-// compute the flags to pass to creusot-rustc.
-// fail if the installation is not in an acceptable state, which means we will
-// stop there and do not attempt launching creusot-rustc.
-pub fn status_for_creusot() -> anyhow::Result<CreusotFlags> {
-    let paths = get_config_paths()?;
+/// compute the flags to pass to creusot-rustc.
+/// fail if the installation is not in an acceptable state, which means we will
+/// stop there and do not attempt launching creusot-rustc.
+pub fn status_for_creusot(custom_config_dir: &Option<PathBuf>) -> anyhow::Result<CreusotFlags> {
+    let paths = get_config_paths(custom_config_dir)?;
     match Config::read_from_file(&paths.config_file) {
         Err(err) => bail!(
             "{err}\n\
@@ -190,8 +194,8 @@ pub enum InstallMode {
     External { no_absolute_paths: bool },
 }
 
-pub fn install(mode: InstallMode) -> anyhow::Result<()> {
-    let paths = get_config_paths()?;
+pub fn install(custom_config_dir: &Option<PathBuf>, mode: InstallMode) -> anyhow::Result<()> {
+    let paths = get_config_paths(custom_config_dir)?;
 
     // figure out whether we're installing a new configuration from scratch, or
     // updating an existing configuration

From afc4ce9bb2436604254b25fe25e3dc4ff5b0cdc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 19:30:15 +0100
Subject: [PATCH 37/66] testsuite: load paths from a creusot config directory

- either use a .creusot-config directory from the root of the git
  repository, if it exists
- or load the gloal creusot config directory (as setup by 'cargo
  creusot setup')
---
 .creusot-config.sample/Config.toml |  6 ++++++
 Cargo.lock                         |  2 ++
 creusot/Cargo.toml                 |  1 +
 creusot/src/run_why3.rs            |  7 +++----
 creusot/tests/ui.rs                | 24 +++++++++++++++++++++---
 why3tests/Cargo.toml               |  1 +
 why3tests/tests/why3.rs            | 25 +++++++++++++++++++++----
 7 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 .creusot-config.sample/Config.toml

diff --git a/.creusot-config.sample/Config.toml b/.creusot-config.sample/Config.toml
new file mode 100644
index 0000000000..5fdb1a34ac
--- /dev/null
+++ b/.creusot-config.sample/Config.toml
@@ -0,0 +1,6 @@
+version = 1
+
+[tools]
+mode = "external"
+why3_path = "why3"
+altergo_path = "alt-ergo"
diff --git a/Cargo.lock b/Cargo.lock
index e2da753b6d..e79372b8ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -384,6 +384,7 @@ dependencies = [
  "clap",
  "creusot-contracts",
  "creusot-metadata",
+ "creusot-setup",
  "escargot",
  "glob",
  "heck",
@@ -2348,6 +2349,7 @@ version = "0.1.0"
 dependencies = [
  "assert_cmd",
  "clap",
+ "creusot-setup",
  "git2",
  "glob",
  "roxmltree",
diff --git a/creusot/Cargo.toml b/creusot/Cargo.toml
index 34a4a5e0cc..c5f257088a 100644
--- a/creusot/Cargo.toml
+++ b/creusot/Cargo.toml
@@ -28,6 +28,7 @@ termcolor = "1.1"
 arraydeque = "0.4"
 creusot-contracts = { path = "../creusot-contracts", features = ["typechecker"] }
 escargot = { version = "0.5" }
+creusot-setup = { path = "../creusot-setup" }
 [[test]]
 name = "ui"
 harness = false
diff --git a/creusot/src/run_why3.rs b/creusot/src/run_why3.rs
index ba5e04745f..705c100d6a 100644
--- a/creusot/src/run_why3.rs
+++ b/creusot/src/run_why3.rs
@@ -48,10 +48,9 @@ pub(super) fn run_why3<'tcx>(ctx: &Why3Generator<'tcx>, file: Option<PathBuf>) {
     let prelude_dir = TempDir::new("creusot_why3_prelude").expect("could not create temp dir");
     PRELUDE.extract(prelude_dir.path()).expect("could extract prelude into temp dir");
     let mut command = Command::new(&why3_cmd.path);
-    let command = match &why3_cmd.config_file {
-        None => &mut command,
-        Some(cfg) => command.arg("-C").arg(cfg),
-    };
+    if let Some(cfg) = &why3_cmd.config_file {
+        command.arg("-C").arg(cfg);
+    }
     command
         .args([
             "--warn-off=unused_variable",
diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
index b21d6578a7..72d69225ae 100644
--- a/creusot/tests/ui.rs
+++ b/creusot/tests/ui.rs
@@ -32,6 +32,13 @@ fn main() {
         .unwrap()
         .command();
 
+    // load Creusot's config either from .creusot-config (at the root of the git
+    // repo) if it exists, or from the global config directory.
+    let custom_config_dir = {
+        let local_config = PathBuf::from("../.creusot-config");
+        if local_config.is_dir() { Some(std::fs::canonicalize(local_config).unwrap()) } else { None }
+    };
+
     let mut base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     base_path.pop();
 
@@ -48,7 +55,11 @@ fn main() {
             "--metadata-path".as_ref(),
             temp_file.as_os_str(),
             "--output-file=/dev/null".as_ref(),
-        ])
+        ]);
+    if let Some(ref dir) = custom_config_dir {
+        metadata_file.arg("--config-dir").arg(&dir);
+    }
+    metadata_file
         .args(&["--", "--package", "creusot-contracts"])
         .env("CREUSOT_CONTINUE", "true");
 
@@ -58,15 +69,16 @@ fn main() {
     }
 
     should_fail("tests/should_fail/**/*.rs", |p| {
-        run_creusot(creusot_rustc.path(), p, &temp_file.to_string_lossy())
+        run_creusot(creusot_rustc.path(), &custom_config_dir, p, &temp_file.to_string_lossy())
     });
     should_succeed("tests/should_succeed/**/*.rs", |p| {
-        run_creusot(creusot_rustc.path(), p, &temp_file.to_string_lossy())
+        run_creusot(creusot_rustc.path(), &custom_config_dir, p, &temp_file.to_string_lossy())
     });
 }
 
 fn run_creusot(
     creusot_rustc: &Path,
+    custom_config_dir: &Option<PathBuf>,
     file: &Path,
     contracts: &str,
 ) -> Option<std::process::Command> {
@@ -82,6 +94,8 @@ fn run_creusot(
     base_path.push("target");
     base_path.push("debug");
 
+    let creusot_args = creusot_setup::status_for_creusot(&custom_config_dir).unwrap();
+
     let creusot_contract_path = base_path.join("libcreusot_contracts.rlib");
     let creusot_contract_path =
         creusot_contract_path.to_str().expect("invalid utf-8 in contract path");
@@ -97,6 +111,10 @@ fn run_creusot(
         "--creusot-extern",
         &format!("creusot_contracts={}", normalize_file_path(contracts)),
     ]);
+    cmd.arg("--why3-path").arg(&creusot_args.why3_path);
+    if let Some(why3_config) = &creusot_args.why3_config {
+        cmd.arg("--why3-config-file").arg(why3_config);
+    }
 
     cmd.args(&["--", "-Zno-codegen", "--crate-type=lib"]);
     cmd.args(&["--extern", &format!("creusot_contracts={}", creusot_contract_path)]);
diff --git a/why3tests/Cargo.toml b/why3tests/Cargo.toml
index 8f178c96cb..dae7a1fa82 100644
--- a/why3tests/Cargo.toml
+++ b/why3tests/Cargo.toml
@@ -11,6 +11,7 @@ termcolor = "1.1"
 git2 = "0.14.4"
 clap = { version = "4.2", features = ["env", "derive"]}
 roxmltree = "0.18.0"
+creusot-setup = { path = "../creusot-setup" }
 
 [[test]]
 test = false
diff --git a/why3tests/tests/why3.rs b/why3tests/tests/why3.rs
index d2879f6069..92b48bd12c 100644
--- a/why3tests/tests/why3.rs
+++ b/why3tests/tests/why3.rs
@@ -37,8 +37,25 @@ struct Args {
 
 fn main() {
     let args = Args::parse();
-    let why3_path = std::env::var("WHY3_PATH").unwrap_or_else(|_| "why3".into());
-    let config_path = std::env::var("WHY3_CONFIG");
+
+    // load Why3 paths from Creusot's config, either from .creusot-config (at
+    // the root of the git repo) if it exists, or from the global config
+    // directory.
+    let custom_config_dir = {
+        let local_config = PathBuf::from("../.creusot-config");
+        if local_config.is_dir() { Some(std::fs::canonicalize(local_config).unwrap()) } else { None }
+    };
+    let (why3_path, config_path) = {
+        let paths = creusot_setup::status_for_creusot(&custom_config_dir).unwrap();
+        eprintln!("Using why3 (path: {}) with {}",
+                  paths.why3_path.display(),
+                  match paths.why3_config {
+                      Some(ref cfg) => format!("config file {}", cfg.display()),
+                      None => "its globally available config".to_owned()
+                  });
+        (paths.why3_path, paths.why3_config)
+    };
+
     let mut out = StandardStream::stdout(ColorChoice::Always);
     let orange = Color::Ansi256(214);
 
@@ -139,8 +156,8 @@ fn main() {
                 ReplayLevel::All => {}
             };
 
-            if let Ok(ref config) = config_path {
-                command.args(&["-C", config]);
+            if let Some(ref config) = config_path {
+                command.arg("-C").arg(config);
                 // command.arg(&format!("--extra-config={config}"));
             }
             command.arg(sessiondir);

From 823219f0dee3f9f875ae64fd6d8779900fc4662b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 19:38:23 +0100
Subject: [PATCH 38/66] setup: set known-good alt-ergo version to 2.4.3

(this is what the CI uses currently)
---
 creusot-setup/src/tools.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/creusot-setup/src/tools.rs b/creusot-setup/src/tools.rs
index 804cdf70b5..a1397e4b09 100644
--- a/creusot-setup/src/tools.rs
+++ b/creusot-setup/src/tools.rs
@@ -15,7 +15,7 @@ use std::{
 
 // tools without binary releases
 pub const WHY3_VERSION: &'static str = "1.7.1";
-pub const ALTERGO_VERSION: &'static str = "2.5.2";
+pub const ALTERGO_VERSION: &'static str = "2.4.3";
 // tools with binary releases
 pub const Z3_VERSION: &'static str = "4.12.4";
 pub const CVC4_VERSION: &'static str = "1.8";
@@ -267,7 +267,9 @@ pub fn generate_why3_conf(why3_path: &Path, bin_dir: &Path, dest_dir: &Path) ->
 fn detect_altergo_version(altergo: &Path) -> Option<String> {
     let output = Command::new(&altergo).arg("--version").output().ok()?;
     let out_s = String::from_utf8(output.stdout).ok()?;
-    out_s.trim_end_matches(char::is_whitespace).strip_prefix("v").map(String::from)
+    // will be needed for more recent altergo versions
+    // out_s.trim_end_matches(char::is_whitespace).strip_prefix("v").map(String::from)
+    Some(out_s.trim_end_matches(char::is_whitespace).to_owned())
 }
 
 // helpers: Z3

From 10e5484335c9028a52e6f53ee4373b5ac676a2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 20:46:48 +0100
Subject: [PATCH 39/66] fmt

---
 creusot/tests/ui.rs     | 22 +++++++++++-----------
 why3tests/tests/why3.rs | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
index 72d69225ae..20c3845609 100644
--- a/creusot/tests/ui.rs
+++ b/creusot/tests/ui.rs
@@ -36,7 +36,11 @@ fn main() {
     // repo) if it exists, or from the global config directory.
     let custom_config_dir = {
         let local_config = PathBuf::from("../.creusot-config");
-        if local_config.is_dir() { Some(std::fs::canonicalize(local_config).unwrap()) } else { None }
+        if local_config.is_dir() {
+            Some(std::fs::canonicalize(local_config).unwrap())
+        } else {
+            None
+        }
     };
 
     let mut base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -49,19 +53,15 @@ fn main() {
 
     let mut metadata_file = cargo_creusot;
     metadata_file.current_dir(base_path);
-    metadata_file
-        .arg("creusot")
-        .args(&[
-            "--metadata-path".as_ref(),
-            temp_file.as_os_str(),
-            "--output-file=/dev/null".as_ref(),
-        ]);
+    metadata_file.arg("creusot").args(&[
+        "--metadata-path".as_ref(),
+        temp_file.as_os_str(),
+        "--output-file=/dev/null".as_ref(),
+    ]);
     if let Some(ref dir) = custom_config_dir {
         metadata_file.arg("--config-dir").arg(&dir);
     }
-    metadata_file
-        .args(&["--", "--package", "creusot-contracts"])
-        .env("CREUSOT_CONTINUE", "true");
+    metadata_file.args(&["--", "--package", "creusot-contracts"]).env("CREUSOT_CONTINUE", "true");
 
     if !metadata_file.status().expect("could not dump metadata for `creusot_contracts`").success() {
         // eprintln!("{}", String::from_utf8_lossy(&metadata_file.output().unwrap().stderr));
diff --git a/why3tests/tests/why3.rs b/why3tests/tests/why3.rs
index 92b48bd12c..8ce1e9f05b 100644
--- a/why3tests/tests/why3.rs
+++ b/why3tests/tests/why3.rs
@@ -43,16 +43,22 @@ fn main() {
     // directory.
     let custom_config_dir = {
         let local_config = PathBuf::from("../.creusot-config");
-        if local_config.is_dir() { Some(std::fs::canonicalize(local_config).unwrap()) } else { None }
+        if local_config.is_dir() {
+            Some(std::fs::canonicalize(local_config).unwrap())
+        } else {
+            None
+        }
     };
     let (why3_path, config_path) = {
         let paths = creusot_setup::status_for_creusot(&custom_config_dir).unwrap();
-        eprintln!("Using why3 (path: {}) with {}",
-                  paths.why3_path.display(),
-                  match paths.why3_config {
-                      Some(ref cfg) => format!("config file {}", cfg.display()),
-                      None => "its globally available config".to_owned()
-                  });
+        eprintln!(
+            "Using why3 (path: {}) with {}",
+            paths.why3_path.display(),
+            match paths.why3_config {
+                Some(ref cfg) => format!("config file {}", cfg.display()),
+                None => "its globally available config".to_owned(),
+            }
+        );
         (paths.why3_path, paths.why3_config)
     };
 

From a01029943457f68ef5976305cd128f5954822535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 20:45:19 +0100
Subject: [PATCH 40/66] update CI script to use 'cargo creusot setup install'

---
 .github/workflows/rust.yml | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 14b4aac0be..252d62849d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -44,6 +44,8 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Build
       run: cargo build
+    - name: dummy creusot setup
+      run: cp -r .creusot-config.sample .creusot-config
     - name: Run tests
       run: cargo test
   why3:
@@ -55,20 +57,6 @@ jobs:
     - name: Fetch target branch
       if: github.base_ref
       run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${{github.base_ref}}:refs/remotes/origin/${{github.base_ref}}
-    - name: Install CVC4
-      run: sudo apt-get install -y cvc4=1.8-2
-    - name: Install CVC5
-      run: |
-        wget https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-Linux
-        sudo cp cvc5-Linux /usr/local/bin/cvc5
-        sudo chmod +x /usr/local/bin/cvc5
-    - name: Install Z3
-      run: |
-        wget https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-glibc-2.35.zip
-        unzip z3-4.12.4-x64-glibc-2.35.zip
-        sudo cp -rn z3-4.12.4-x64-glibc-2.35/bin /usr/local
-        sudo cp -rn z3-4.12.4-x64-glibc-2.35/include /usr/local
-        sudo chmod +x /usr/local/bin/z3
     - uses: actions/cache@v2
       with:
         path: |
@@ -81,21 +69,21 @@ jobs:
         workflow: why3.yml
         name: why3
         path: /home/runner/work/creusot/why3
-    - run: |
+    - name: setup paths for why3 and alt-ergo
+      run: |
         chmod -R +x ~/work/creusot/why3/bin
         chmod -R +x ~/work/creusot/why3/lib/why3/why3server
+        echo ~/work/creusot/why3/bin >> $GITHUB_PATH
 
         mv ~/work/creusot/why3/alt-ergo /usr/local/bin/alt-ergo
         chmod +x /usr/local/bin/alt-ergo
         echo $(/usr/local/bin/alt-ergo --version)
-
-        ~/work/creusot/why3/bin/why3 config detect
-        cat ~/.why3.conf
+    - name: run cargo creusot setup install
+      run: |
+        cargo run --bin cargo-creusot creusot setup install
+        echo -e "~/.config/creusot/Config.toml:\n"
+        cat ~/.config/creusot/Config.toml
+        echo -e "~/.config/creusot/.why3.conf:\n"
+        cat ~/.config/creusot/.why3.conf
     - run: cargo test --test why3 "" -- --replay=none --diff-from=origin/master
-      env:
-        WHY3_CONFIG: ${{ github.workspace }}/ci/why.conf
-        WHY3_PATH: ${{ github.workspace }}/../why3/bin/why3
     - run: cargo test --test why3 "" -- --skip-unstable
-      env:
-        WHY3_CONFIG: ${{ github.workspace }}/ci/why.conf
-        WHY3_PATH: ${{ github.workspace }}/../why3/bin/why3

From f3ea7ac35c7a8a0a2979fb3a345c75e037c55482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Fri, 8 Mar 2024 22:52:46 +0100
Subject: [PATCH 41/66] setup: move tools versions&urls to a separate file

as a bonus, cache solver binaries using this file as cache key
---
 .github/workflows/rust.yml               |  7 ++-
 creusot-setup/src/lib.rs                 |  2 +
 creusot-setup/src/tools.rs               | 76 +-----------------------
 creusot-setup/src/tools_versions_urls.rs | 74 +++++++++++++++++++++++
 4 files changed, 81 insertions(+), 78 deletions(-)
 create mode 100644 creusot-setup/src/tools_versions_urls.rs

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 252d62849d..2948aa9827 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -62,8 +62,9 @@ jobs:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
+          ~/.cache/creusot
           target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        key: ${{ runner.os }}-cargo-creusot-${{ hashFiles('**/Cargo.lock', 'creusot-setup/src/tools_versions_urls.rs') }}
     - uses: dawidd6/action-download-artifact@v2
       with:
         workflow: why3.yml
@@ -81,9 +82,9 @@ jobs:
     - name: run cargo creusot setup install
       run: |
         cargo run --bin cargo-creusot creusot setup install
-        echo -e "~/.config/creusot/Config.toml:\n"
+        echo -e "\n>> ~/.config/creusot/Config.toml:\n"
         cat ~/.config/creusot/Config.toml
-        echo -e "~/.config/creusot/.why3.conf:\n"
+        echo -e "\n>> ~/.config/creusot/.why3.conf:\n"
         cat ~/.config/creusot/.why3.conf
     - run: cargo test --test why3 "" -- --replay=none --diff-from=origin/master
     - run: cargo test --test why3 "" -- --skip-unstable
diff --git a/creusot-setup/src/lib.rs b/creusot-setup/src/lib.rs
index 1b285d4651..1a400a2e1f 100644
--- a/creusot-setup/src/lib.rs
+++ b/creusot-setup/src/lib.rs
@@ -7,8 +7,10 @@ use std::{
 
 mod config;
 mod tools;
+mod tools_versions_urls;
 use config::{Error::*, *};
 use tools::*;
+use tools_versions_urls::*;
 use ToolsConfig::*;
 
 struct CfgPaths {
diff --git a/creusot-setup/src/tools.rs b/creusot-setup/src/tools.rs
index a1397e4b09..693834beb3 100644
--- a/creusot-setup/src/tools.rs
+++ b/creusot-setup/src/tools.rs
@@ -1,3 +1,4 @@
+use crate::tools_versions_urls::*;
 use anyhow::{anyhow, bail, Context};
 use reqwest::blocking::Client;
 use std::{
@@ -6,70 +7,6 @@ use std::{
     process::Command,
 };
 
-// "known good" versions and URLs for downloading binary releases
-
-// NOTE: when ugrading a binary to a newer version:
-// - update its [FOO_VERSION] below
-// - update its URL in each [URLS] block below
-// - update the SHA256 hash for each binary accordingly (use e.g. sha256sum to compute it)
-
-// tools without binary releases
-pub const WHY3_VERSION: &'static str = "1.7.1";
-pub const ALTERGO_VERSION: &'static str = "2.4.3";
-// tools with binary releases
-pub const Z3_VERSION: &'static str = "4.12.4";
-pub const CVC4_VERSION: &'static str = "1.8";
-pub const CVC5_VERSION: &'static str = "1.0.5";
-
-#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
-const URLS: Urls = Urls {
-    z3: Url {
-        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-glibc-2.35.zip",
-        sha256: "e23d3a5670dc83285f581c2610e9cf701bb22db09b5336d85a4df743253b2335",
-    },
-    cvc4: Url {
-        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-x86_64-linux-opt",
-        sha256: "d38a79cf984592785eda41ec888d94ca107ac1f13058740238041e28c8472e51",
-    },
-    cvc5: Url {
-        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-Linux",
-        sha256: "57fa94b740e0827f655a731b97dae84fedf86e65fa897c3a56a01a83d283d15e",
-    }
-};
-
-#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
-const URLS: Urls = Urls {
-    z3: Url {
-        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-osx-11.7.10.zip",
-        sha256: "0e6da979dc6ec501ad878d962802d20aff465ac0c24e4c1234169f3e92a0e6a3",
-    },
-    cvc4: Url {
-        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
-        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
-    },
-    cvc5: Url {
-        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS",
-        sha256: "0e74e40a3db82f3ac4d8ea23308931bedbc6afbcf3ed484b8b000da17c75885c",
-    }
-};
-
-#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
-const URLS: Urls = Urls {
-    z3: Url {
-        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-arm64-osx-11.0.zip",
-        sha256: "ab6798a9a85f406d7db9eb1fe692ff3db78155c509f71d0cae5933f4c47b5a38",
-    },
-    // CVC4 only has a macos x86_64 binary; we rely on rosetta for compatibility
-    cvc4: Url {
-        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
-        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
-    },
-    cvc5: Url {
-        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS-arm64",
-        sha256: "f1fe16664d88f9549da3df00853b6ddabafa68b1dc1c62d6dad0c0549cf95a33",
-    }
-};
-
 // ----
 // we should only need to update the [Binary] definitions below whenever the
 // format of a tool binary releases change (unlikely)
@@ -123,17 +60,6 @@ pub struct Binary {
     download_with: fn(&Client, &Url, &Path, &Path) -> anyhow::Result<()>,
 }
 
-struct Urls {
-    z3: Url,
-    cvc4: Url,
-    cvc5: Url,
-}
-
-struct Url {
-    url: &'static str,
-    sha256: &'static str,
-}
-
 #[derive(Clone, Copy)]
 pub struct ExtBinary {
     pub display_name: &'static str,
diff --git a/creusot-setup/src/tools_versions_urls.rs b/creusot-setup/src/tools_versions_urls.rs
new file mode 100644
index 0000000000..3333a31a14
--- /dev/null
+++ b/creusot-setup/src/tools_versions_urls.rs
@@ -0,0 +1,74 @@
+// "known good" versions and URLs for downloading binary releases
+
+// NOTE: when ugrading a binary to a newer version:
+// - update its [FOO_VERSION] below
+// - update its URL in each [URLS] block below
+// - update the SHA256 hash for each binary accordingly (use e.g. sha256sum to compute it)
+
+// tools without binary releases
+pub const WHY3_VERSION: &'static str = "1.7.1";
+pub const ALTERGO_VERSION: &'static str = "2.4.3";
+// tools with binary releases
+pub const Z3_VERSION: &'static str = "4.12.4";
+pub const CVC4_VERSION: &'static str = "1.8";
+pub const CVC5_VERSION: &'static str = "1.0.5";
+
+#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
+pub const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-glibc-2.35.zip",
+        sha256: "e23d3a5670dc83285f581c2610e9cf701bb22db09b5336d85a4df743253b2335",
+    },
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-x86_64-linux-opt",
+        sha256: "d38a79cf984592785eda41ec888d94ca107ac1f13058740238041e28c8472e51",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-Linux",
+        sha256: "57fa94b740e0827f655a731b97dae84fedf86e65fa897c3a56a01a83d283d15e",
+    }
+};
+
+#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
+pub const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-x64-osx-11.7.10.zip",
+        sha256: "0e6da979dc6ec501ad878d962802d20aff465ac0c24e4c1234169f3e92a0e6a3",
+    },
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
+        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS",
+        sha256: "0e74e40a3db82f3ac4d8ea23308931bedbc6afbcf3ed484b8b000da17c75885c",
+    }
+};
+
+#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
+pub const URLS: Urls = Urls {
+    z3: Url {
+        url: "https://github.com/Z3Prover/z3/releases/download/z3-4.12.4/z3-4.12.4-arm64-osx-11.0.zip",
+        sha256: "ab6798a9a85f406d7db9eb1fe692ff3db78155c509f71d0cae5933f4c47b5a38",
+    },
+    // CVC4 only has a macos x86_64 binary; we rely on rosetta for compatibility
+    cvc4: Url {
+        url: "https://github.com/CVC4/CVC4-archived/releases/download/1.8/cvc4-1.8-macos-opt",
+        sha256: "b8a0b8714dd947aa46182402d9caba27d3d696041e17704884bc3d8510066527",
+    },
+    cvc5: Url {
+        url: "https://github.com/cvc5/cvc5/releases/download/cvc5-1.0.5/cvc5-macOS-arm64",
+        sha256: "f1fe16664d88f9549da3df00853b6ddabafa68b1dc1c62d6dad0c0549cf95a33",
+    }
+};
+
+pub struct Urls {
+    pub z3: Url,
+    pub cvc4: Url,
+    pub cvc5: Url,
+}
+
+pub struct Url {
+    pub url: &'static str,
+    pub sha256: &'static str,
+}

From 9d41fd5f991c9633ccda45aec682a7de57921598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 09:55:14 +0100
Subject: [PATCH 42/66] tweak

---
 cargo-creusot/src/main.rs   |  4 ++--
 creusot-args/src/options.rs |  6 +++---
 creusot-setup/src/lib.rs    | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cargo-creusot/src/main.rs b/cargo-creusot/src/main.rs
index 00106468cc..d28c94e874 100644
--- a/cargo-creusot/src/main.rs
+++ b/cargo-creusot/src/main.rs
@@ -38,8 +38,8 @@ fn main() -> anyhow::Result<()> {
         Setup(SetupSubCommand::Install) => {
             setup::install(&cargs.config_dir, setup::InstallMode::Managed)
         }
-        Setup(SetupSubCommand::InstallExternal { no_absolute_paths }) => {
-            setup::install(&cargs.config_dir, setup::InstallMode::External { no_absolute_paths })
+        Setup(SetupSubCommand::InstallExternal { no_resolve_paths }) => {
+            setup::install(&cargs.config_dir, setup::InstallMode::External { no_resolve_paths })
         }
     }
 }
diff --git a/creusot-args/src/options.rs b/creusot-args/src/options.rs
index bc46b96107..00a0d1f5fc 100644
--- a/creusot-args/src/options.rs
+++ b/creusot-args/src/options.rs
@@ -110,10 +110,10 @@ pub enum SetupSubCommand {
     Install,
     /// Setup Creusot but use external tools configured manually (not recommended, for experts)
     InstallExternal {
-        /// Do not record absolute paths to the external binaries (the binaries
-        /// will instead be looked up in PATH at each Creusot invocation)
+        /// Do not lookup and resolve paths to the external binaries (they will
+        /// instead be looked up in PATH at each Creusot invocation)
         #[arg(long, default_value_t = false)]
-        no_absolute_paths: bool,
+        no_resolve_paths: bool,
     },
 }
 
diff --git a/creusot-setup/src/lib.rs b/creusot-setup/src/lib.rs
index 1a400a2e1f..1471b9ae8b 100644
--- a/creusot-setup/src/lib.rs
+++ b/creusot-setup/src/lib.rs
@@ -193,7 +193,7 @@ pub fn status_for_creusot(custom_config_dir: &Option<PathBuf>) -> anyhow::Result
 
 pub enum InstallMode {
     Managed,
-    External { no_absolute_paths: bool },
+    External { no_resolve_paths: bool },
 }
 
 pub fn install(custom_config_dir: &Option<PathBuf>, mode: InstallMode) -> anyhow::Result<()> {
@@ -239,21 +239,21 @@ pub fn install(custom_config_dir: &Option<PathBuf>, mode: InstallMode) -> anyhow
 
     match mode {
         InstallMode::Managed => install_managed(&paths, previous_config)?,
-        InstallMode::External { no_absolute_paths } => install_external(&paths, no_absolute_paths)?,
+        InstallMode::External { no_resolve_paths } => install_external(&paths, no_resolve_paths)?,
     };
     Ok(println!("Done."))
 }
 
-fn install_external(paths: &CfgPaths, no_absolute_paths: bool) -> anyhow::Result<()> {
+fn install_external(paths: &CfgPaths, no_resolve_paths: bool) -> anyhow::Result<()> {
     // in external mode, upgrades and fresh installs are equivalent: we
     // write the paths of external binaries.
     let mut issues = Vec::new();
-    let why3_path = if no_absolute_paths {
+    let why3_path = if no_resolve_paths {
         PathBuf::from(WHY3.binary_name)
     } else {
         diagnostic_extbinary(WHY3, &mut issues)?
     };
-    let altergo_path = if no_absolute_paths {
+    let altergo_path = if no_resolve_paths {
         PathBuf::from(ALTERGO.binary_name)
     } else {
         diagnostic_extbinary(ALTERGO, &mut issues)?

From d3bacb3bb0a3df82f8d50ae2c786e820dee8766f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 12:58:00 +0100
Subject: [PATCH 43/66] documentation on Creusot's installation & developer
 workflow

---
 .gitignore |  3 +++
 HACKING.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md  | 49 ++++++++++++++++++++++++++++++++++---------------
 3 files changed, 91 insertions(+), 15 deletions(-)
 create mode 100644 HACKING.md

diff --git a/.gitignore b/.gitignore
index e952f9d1bc..2796032c7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 nll-facts/
 mir_dump/
 
+# Creusot local config for development
+/.creusot-config
+
 # Creusot files
 *.creusot
 *.cmeta
diff --git a/HACKING.md b/HACKING.md
new file mode 100644
index 0000000000..0ac52b5dfd
--- /dev/null
+++ b/HACKING.md
@@ -0,0 +1,54 @@
+# Hacking on Creusot: developer workflow
+
+This is a work-in-progress document describing the developer workflow for
+working on the Creusot codebase.
+
+## Setup
+
+On top of the usual Rust/Cargo workflow, running the Creusot testsuite requires
+a working Why3 setup. You have two choices:
+
+- **By default** the testsuite will use the global Creusot configuration managed
+  by `cargo creusot setup`. You first need to have successfully run `cargo
+  creusot setup install` (or `cargo creusot setup install-external`).
+- **Alternatively:** you can set a custom Creusot configuration for the
+  testsuite in `.creusot-config/` at the root of the git repo. Start by running
+  `cp -r .creusot-config.sample .creusot-config`. This will tell the testsuite
+  to use whichever `why3` binary is in the PATH, but you can also tweak
+  `.creusot-config/Config.toml` to point to a specific why3 binary.
+
+The first option is recommended if you simply want a working setup to run the
+testsuite.
+
+The second option is useful if you need to try custom versions of Why3 or the
+solvers.
+
+Notes:
+- to avoid first installing the `cargo-creusot` binary, one can directly run it
+  from the git repository: e.g. `cargo run --bin cargo-creusot creusot setup`
+- the format of the `.creusot-config/` directory is simply the same as
+  `~/.config/creusot` which is where `cargo creusot setup` writes its
+  configuration.
+
+## Running the testsuite
+
+- Test the output of creusot (mlcfg files) against reference files:
+```
+cargo test --test ui
+```
+
+TODO: how to update an out-of-date reference file?
+
+- Replay proofs:
+```
+cargo test --test why3
+```
+
+## Inspecting/fixing the proof of a test
+
+If the proof of a test is broken (e.g.
+`creusot/tests/should_succeed/cell/01.rs`), launch the why3 ide with `./ide`:
+```
+./ide creusot/tests/should_succeed/cell/01
+```
+
diff --git a/README.md b/README.md
index 657c4eaab8..148ebcd866 100644
--- a/README.md
+++ b/README.md
@@ -33,25 +33,44 @@ More examples are found in [creusot/tests/should_succeed](creusot/tests/should_s
 
 # Installing Creusot as a user
 
-. Set up **Rust**
+1. Set up **Rust**
     - [Install `rustup`](https://www.rust-lang.org/tools/install), to get the suitable Rust toolchain
-1. Set up **Why3**
+2. Set up **Why3** and **Alt-Ergo**
     - [Get `opam`](https://opam.ocaml.org/doc/Install.html), the package manager for OCaml
-    - Pin `why3` to `master` :
+    - Create an opam switch with OCaml 4.14.1:
     ```
-    $ opam pin add why3 https://gitlab.inria.fr/why3/why3.git
-    $ opam pin add why3-ide https://gitlab.inria.fr/why3/why3.git
+    $ opam switch create creusot ocaml.4.14.1
+    $ eval $(opam env --switch=creusot)
     ```
-    - Install `why3` and `why3-ide`: `$ opam install lablgtk3 lablgtk3-sourceview3 ocamlgraph why3 why3-ide`
-    - Get some SMT solvers: [Z3](https://github.com/Z3Prover/z3) (available by `brew`, `apt`, etc.), [CVC4](https://cvc4.github.io/) (`brew`, `apt`, etc.), [Alt-Ergo](https://alt-ergo.ocamlpro.com/) (`opam`, `apt`, etc.)
-    - Configure Why3: `$ why3 config detect`
-      * Troubleshoot:
-        When your `z3` is a bit too new (e.g., Why3 supports up to ver. 4.8.10 but yours is 4.8.12), Why3 refuses `z3`.
-        Then you can try hacking Why3 to make it consider your `z3` be of an older version (e.g., 4.8.10), by updating the relevant field of `~/.why3.conf`.
-2. Clone the [creusot](https://github.com/xldenis/creusot/) repo at any directory you like
-3. Build **Creusot**
-    - Enter the cloned directory and run `$ cargo install --path cargo-creusot`, and `$ cargo install --path creusot-rustc` this will build the `cargo-creusot` and `creusot-rustc` executables and place them in `~/.cargo/bin`.
-
+    - Pin `why3` to `master` and install it:
+    ```
+    $ opam pin -n why3 --dev-repo
+    $ opam pin -n why3-ide --dev-repo
+    $ opam install zarith ocamlgraph camlzip why3 why3-ide
+    ```
+    - Pin `alt-ergo` to version 2.4.3 and install it:
+    ```
+    $ opam pin alt-ergo 2.4.3
+    ```
+3. Clone the [creusot](https://github.com/xldenis/creusot/) repo at any directory you like
+4. Build **Creusot**
+    - Enter the cloned directory and run:
+    ```
+    $ cargo install --path creusot-rustc
+    $ cargo install --path cargo-creusot
+    ```
+    this will build the `cargo-creusot` and `creusot-rustc` executables and place them in `~/.cargo/bin`.
+5. Set up **Creusot**
+   Run:
+   ```
+   $ cargo creusot setup install
+   ```
+   This will download additional solvers (Z3, CVC4, CVC5) and configure Why3 to use them.
+
+# Hacking on Creusot
+
+See [HACKING.md](HACKING.md) for information on the developer workflow for
+hacking on the Creusot codebase.
 
 # Verifying with Creusot and Why3
 

From 0d7d198212ac104c63bafc52da0b09f7ff024036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 13:00:48 +0100
Subject: [PATCH 44/66] developer setup: move the logic for finding creusot
 config & why3 path to a library

and also provide a why3 wrapper binary to use in shell scripts
---
 Cargo.lock                             | 12 +++++--
 HACKING.md                             | 12 ++++++-
 creusot-dev-config/Cargo.toml          |  8 +++++
 creusot-dev-config/src/bin/dev-why3.rs |  8 +++++
 creusot-dev-config/src/lib.rs          | 43 ++++++++++++++++++++++++++
 creusot/Cargo.toml                     |  2 +-
 creusot/tests/ui.rs                    | 24 ++++----------
 ide                                    |  2 +-
 why3tests/Cargo.toml                   |  2 +-
 why3tests/tests/why3.rs                | 32 ++-----------------
 10 files changed, 91 insertions(+), 54 deletions(-)
 create mode 100644 creusot-dev-config/Cargo.toml
 create mode 100644 creusot-dev-config/src/bin/dev-why3.rs
 create mode 100644 creusot-dev-config/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index e79372b8ee..e5a97f4374 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -383,8 +383,8 @@ dependencies = [
  "assert_cmd",
  "clap",
  "creusot-contracts",
+ "creusot-dev-config",
  "creusot-metadata",
- "creusot-setup",
  "escargot",
  "glob",
  "heck",
@@ -438,6 +438,14 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "creusot-dev-config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "creusot-setup",
+]
+
 [[package]]
 name = "creusot-metadata"
 version = "0.2.0"
@@ -2349,7 +2357,7 @@ version = "0.1.0"
 dependencies = [
  "assert_cmd",
  "clap",
- "creusot-setup",
+ "creusot-dev-config",
  "git2",
  "glob",
  "roxmltree",
diff --git a/HACKING.md b/HACKING.md
index 0ac52b5dfd..028d70ff1d 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -11,7 +11,7 @@ a working Why3 setup. You have two choices:
 - **By default** the testsuite will use the global Creusot configuration managed
   by `cargo creusot setup`. You first need to have successfully run `cargo
   creusot setup install` (or `cargo creusot setup install-external`).
-- **Alternatively:** you can set a custom Creusot configuration for the
+- **Alternatively** you can set a custom Creusot configuration for the
   testsuite in `.creusot-config/` at the root of the git repo. Start by running
   `cp -r .creusot-config.sample .creusot-config`. This will tell the testsuite
   to use whichever `why3` binary is in the PATH, but you can also tweak
@@ -52,3 +52,13 @@ If the proof of a test is broken (e.g.
 ./ide creusot/tests/should_succeed/cell/01
 ```
 
+## Calling why3
+
+In order to invoke why3 robustly (manually or in scripts), we provide a wrapper
+that will lookup the why3 path and config according to the logic described in
+**Setup** above.
+
+To invoke why3 this way, run:
+```
+cargo run --bin dev-why3 -- <arguments_to_why3...>
+```
diff --git a/creusot-dev-config/Cargo.toml b/creusot-dev-config/Cargo.toml
new file mode 100644
index 0000000000..d736482384
--- /dev/null
+++ b/creusot-dev-config/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "creusot-dev-config"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+creusot-setup = { path = "../creusot-setup" }
+anyhow = "1.0"
diff --git a/creusot-dev-config/src/bin/dev-why3.rs b/creusot-dev-config/src/bin/dev-why3.rs
new file mode 100644
index 0000000000..e44d8de62f
--- /dev/null
+++ b/creusot-dev-config/src/bin/dev-why3.rs
@@ -0,0 +1,8 @@
+pub fn main() -> anyhow::Result<()> {
+    let mut cmd = creusot_dev_config::why3_command()?;
+    eprintln!("Using Why3 invocation: {:?}", cmd);
+    let args = std::env::args().skip(1);
+    cmd.args(args);
+    cmd.status()?;
+    Ok(())
+}
diff --git a/creusot-dev-config/src/lib.rs b/creusot-dev-config/src/lib.rs
new file mode 100644
index 0000000000..90dba83417
--- /dev/null
+++ b/creusot-dev-config/src/lib.rs
@@ -0,0 +1,43 @@
+use std::{path::PathBuf, process::Command};
+
+/// Helper library encapsulating the logic for looking up creusot's config and
+/// calling why3 in development workflows. This is used in particular by the
+/// testsuite.
+
+/// We look for configuration specifying Why3's path and configuration in the
+/// following places:
+/// - in the .creusot-config directory at the root of the git repo, if it exists
+/// - otherwise, in the global config repository used by creusot setup
+
+pub fn custom_config_dir() -> Option<PathBuf> {
+    let local_config = PathBuf::from("../.creusot-config");
+    if local_config.is_dir() {
+        Some(std::fs::canonicalize(local_config).unwrap())
+    } else {
+        None
+    }
+}
+
+pub struct Paths {
+    pub why3: PathBuf,
+    pub why3_config: Option<PathBuf>,
+}
+
+/// Fails if the config could not be loaded
+pub fn paths() -> anyhow::Result<Paths> {
+    let custom_config_dir = custom_config_dir();
+    let paths = creusot_setup::status_for_creusot(&custom_config_dir)?;
+    Ok(Paths { why3: paths.why3_path, why3_config: paths.why3_config })
+}
+
+/// Returns a command to invoke why3 (passing it the path to its configuration
+/// file if needed).
+/// Fails if the config could not be loaded
+pub fn why3_command() -> anyhow::Result<Command> {
+    let p = paths()?;
+    let mut cmd = Command::new(p.why3.clone());
+    if let Some(ref config) = p.why3_config {
+        cmd.arg("-C").arg(config);
+    }
+    Ok(cmd)
+}
diff --git a/creusot/Cargo.toml b/creusot/Cargo.toml
index c5f257088a..11192f87db 100644
--- a/creusot/Cargo.toml
+++ b/creusot/Cargo.toml
@@ -28,7 +28,7 @@ termcolor = "1.1"
 arraydeque = "0.4"
 creusot-contracts = { path = "../creusot-contracts", features = ["typechecker"] }
 escargot = { version = "0.5" }
-creusot-setup = { path = "../creusot-setup" }
+creusot-dev-config = { path = "../creusot-dev-config" }
 [[test]]
 name = "ui"
 harness = false
diff --git a/creusot/tests/ui.rs b/creusot/tests/ui.rs
index 20c3845609..680f0c2e17 100644
--- a/creusot/tests/ui.rs
+++ b/creusot/tests/ui.rs
@@ -32,17 +32,6 @@ fn main() {
         .unwrap()
         .command();
 
-    // load Creusot's config either from .creusot-config (at the root of the git
-    // repo) if it exists, or from the global config directory.
-    let custom_config_dir = {
-        let local_config = PathBuf::from("../.creusot-config");
-        if local_config.is_dir() {
-            Some(std::fs::canonicalize(local_config).unwrap())
-        } else {
-            None
-        }
-    };
-
     let mut base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     base_path.pop();
 
@@ -58,7 +47,7 @@ fn main() {
         temp_file.as_os_str(),
         "--output-file=/dev/null".as_ref(),
     ]);
-    if let Some(ref dir) = custom_config_dir {
+    if let Some(ref dir) = creusot_dev_config::custom_config_dir() {
         metadata_file.arg("--config-dir").arg(&dir);
     }
     metadata_file.args(&["--", "--package", "creusot-contracts"]).env("CREUSOT_CONTINUE", "true");
@@ -69,16 +58,15 @@ fn main() {
     }
 
     should_fail("tests/should_fail/**/*.rs", |p| {
-        run_creusot(creusot_rustc.path(), &custom_config_dir, p, &temp_file.to_string_lossy())
+        run_creusot(creusot_rustc.path(), p, &temp_file.to_string_lossy())
     });
     should_succeed("tests/should_succeed/**/*.rs", |p| {
-        run_creusot(creusot_rustc.path(), &custom_config_dir, p, &temp_file.to_string_lossy())
+        run_creusot(creusot_rustc.path(), p, &temp_file.to_string_lossy())
     });
 }
 
 fn run_creusot(
     creusot_rustc: &Path,
-    custom_config_dir: &Option<PathBuf>,
     file: &Path,
     contracts: &str,
 ) -> Option<std::process::Command> {
@@ -94,7 +82,7 @@ fn run_creusot(
     base_path.push("target");
     base_path.push("debug");
 
-    let creusot_args = creusot_setup::status_for_creusot(&custom_config_dir).unwrap();
+    let config_paths = creusot_dev_config::paths().unwrap();
 
     let creusot_contract_path = base_path.join("libcreusot_contracts.rlib");
     let creusot_contract_path =
@@ -111,8 +99,8 @@ fn run_creusot(
         "--creusot-extern",
         &format!("creusot_contracts={}", normalize_file_path(contracts)),
     ]);
-    cmd.arg("--why3-path").arg(&creusot_args.why3_path);
-    if let Some(why3_config) = &creusot_args.why3_config {
+    cmd.arg("--why3-path").arg(&config_paths.why3);
+    if let Some(why3_config) = &config_paths.why3_config {
         cmd.arg("--why3-config-file").arg(why3_config);
     }
 
diff --git a/ide b/ide
index 2f263cf60a..7c30817483 100755
--- a/ide
+++ b/ide
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 SCRIPTPATH=$(dirname "$BASH_SOURCE")
-why3 --warn-off=unused_variable --warn-off=clone_not_abstract --warn-off=axiom_abstract ide -L $SCRIPTPATH/prelude $@
+cargo run --bin dev-why3 -- --warn-off=unused_variable --warn-off=clone_not_abstract --warn-off=axiom_abstract ide -L $SCRIPTPATH/prelude $@
diff --git a/why3tests/Cargo.toml b/why3tests/Cargo.toml
index dae7a1fa82..0dee81ac7f 100644
--- a/why3tests/Cargo.toml
+++ b/why3tests/Cargo.toml
@@ -11,7 +11,7 @@ termcolor = "1.1"
 git2 = "0.14.4"
 clap = { version = "4.2", features = ["env", "derive"]}
 roxmltree = "0.18.0"
-creusot-setup = { path = "../creusot-setup" }
+creusot-dev-config = { path = "../creusot-dev-config" }
 
 [[test]]
 test = false
diff --git a/why3tests/tests/why3.rs b/why3tests/tests/why3.rs
index 8ce1e9f05b..0e0598c1a9 100644
--- a/why3tests/tests/why3.rs
+++ b/why3tests/tests/why3.rs
@@ -5,7 +5,7 @@ use std::{
     fs::File,
     io::{BufRead, BufReader, Write},
     path::PathBuf,
-    process::{exit, Command},
+    process::exit,
 };
 use termcolor::*;
 
@@ -38,30 +38,6 @@ struct Args {
 fn main() {
     let args = Args::parse();
 
-    // load Why3 paths from Creusot's config, either from .creusot-config (at
-    // the root of the git repo) if it exists, or from the global config
-    // directory.
-    let custom_config_dir = {
-        let local_config = PathBuf::from("../.creusot-config");
-        if local_config.is_dir() {
-            Some(std::fs::canonicalize(local_config).unwrap())
-        } else {
-            None
-        }
-    };
-    let (why3_path, config_path) = {
-        let paths = creusot_setup::status_for_creusot(&custom_config_dir).unwrap();
-        eprintln!(
-            "Using why3 (path: {}) with {}",
-            paths.why3_path.display(),
-            match paths.why3_config {
-                Some(ref cfg) => format!("config file {}", cfg.display()),
-                None => "its globally available config".to_owned(),
-            }
-        );
-        (paths.why3_path, paths.why3_config)
-    };
-
     let mut out = StandardStream::stdout(ColorChoice::Always);
     let orange = Color::Ansi256(214);
 
@@ -116,7 +92,7 @@ fn main() {
         sessionfile.push("why3session.xml");
 
         let output;
-        let mut command = Command::new(why3_path.clone());
+        let mut command = creusot_dev_config::why3_command().unwrap();
         command.arg("--warn-off=unused_variable");
         command.arg("--warn-off=clone_not_abstract");
 
@@ -162,10 +138,6 @@ fn main() {
                 ReplayLevel::All => {}
             };
 
-            if let Some(ref config) = config_path {
-                command.arg("-C").arg(config);
-                // command.arg(&format!("--extra-config={config}"));
-            }
             command.arg(sessiondir);
             output = command.ok();
             if output.is_ok() {

From e841afa3e33a390538f68fb55d48bed59b1f066b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 13:15:13 +0100
Subject: [PATCH 45/66] HACKING.md: tweaks

---
 HACKING.md | 28 +++++++++++++++-------------
 README.md  |  1 -
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/HACKING.md b/HACKING.md
index 028d70ff1d..79e2bb70d5 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -5,17 +5,18 @@ working on the Creusot codebase.
 
 ## Setup
 
-On top of the usual Rust/Cargo workflow, running the Creusot testsuite requires
-a working Why3 setup. You have two choices:
+On top of the usual Rust/Cargo workflow, the "Creusot developer setup" requires
+a working Why3 in order to run the testsuite and update tests proofs. You have
+two choices:
 
 - **By default** the testsuite will use the global Creusot configuration managed
   by `cargo creusot setup`. You first need to have successfully run `cargo
   creusot setup install` (or `cargo creusot setup install-external`).
-- **Alternatively** you can set a custom Creusot configuration for the
-  testsuite in `.creusot-config/` at the root of the git repo. Start by running
-  `cp -r .creusot-config.sample .creusot-config`. This will tell the testsuite
-  to use whichever `why3` binary is in the PATH, but you can also tweak
-  `.creusot-config/Config.toml` to point to a specific why3 binary.
+- **Alternatively** you can set a custom "developer" Creusot configuration in
+  `.creusot-config/` at the root of the git repo. Start by running `cp -r
+  .creusot-config.sample .creusot-config`. This will tell the testsuite to use
+  whichever `why3` binary is in the PATH, but you can also tweak
+  `.creusot-config/Config.toml` to point to a specific binary.
 
 The first option is recommended if you simply want a working setup to run the
 testsuite.
@@ -24,10 +25,11 @@ The second option is useful if you need to try custom versions of Why3 or the
 solvers.
 
 Notes:
-- to avoid first installing the `cargo-creusot` binary, one can directly run it
-  from the git repository: e.g. `cargo run --bin cargo-creusot creusot setup`
+- to avoid first installing the `cargo-creusot` binary before running `cargo
+  creusot setup`, one can directly call it from the git repository: `cargo run
+  --bin cargo-creusot creusot setup`
 - the format of the `.creusot-config/` directory is simply the same as
-  `~/.config/creusot` which is where `cargo creusot setup` writes its
+  `~/.config/creusot`, which is where `cargo creusot setup` writes its
   configuration.
 
 ## Running the testsuite
@@ -54,9 +56,9 @@ If the proof of a test is broken (e.g.
 
 ## Calling why3
 
-In order to invoke why3 robustly (manually or in scripts), we provide a wrapper
-that will lookup the why3 path and config according to the logic described in
-**Setup** above.
+To invoke why3 robustly (manually or in scripts), we provide a wrapper that will
+lookup the why3 path and config according to the logic described in **Setup**
+above.
 
 To invoke why3 this way, run:
 ```
diff --git a/README.md b/README.md
index 148ebcd866..89aa94c1ca 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,6 @@ More examples are found in [creusot/tests/should_succeed](creusot/tests/should_s
     ```
     this will build the `cargo-creusot` and `creusot-rustc` executables and place them in `~/.cargo/bin`.
 5. Set up **Creusot**
-   Run:
    ```
    $ cargo creusot setup install
    ```

From fa14af09922251aeb0efc685f8838c37258eeef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 13:52:59 +0100
Subject: [PATCH 46/66] HACKING.md: document command to update reference files

---
 HACKING.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/HACKING.md b/HACKING.md
index 79e2bb70d5..b3d7688b5e 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -39,7 +39,10 @@ Notes:
 cargo test --test ui
 ```
 
-TODO: how to update an out-of-date reference file?
+Then, to update an out-of-date reference file:
+```
+cargo test --test ui -- "optional-string" --bless
+```
 
 - Replay proofs:
 ```

From 37fe7ed6aba10369e56e139c296aa338ec6ca3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 14:06:49 +0100
Subject: [PATCH 47/66] HACKING.md: document parameters to selectively replay
 proofs

---
 HACKING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/HACKING.md b/HACKING.md
index b3d7688b5e..31a0eaa18a 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -49,6 +49,10 @@ cargo test --test ui -- "optional-string" --bless
 cargo test --test why3
 ```
 
+Additional useful parameters, to avoid replaying *every* proof in development:
+- `--diff-from=GIT_REF`
+- `--replay=<none|obsolete|all>`
+
 ## Inspecting/fixing the proof of a test
 
 If the proof of a test is broken (e.g.

From 297c52c948793627846bbadf8275bdc978d0a4c3 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 8 Mar 2024 18:31:07 +0100
Subject: [PATCH 48/66] Updates to Why3 API

1. Adds `Constant` declarations.
2. Reworks `fvs` to more generally count occurences.
3. Fixes a capture bug in substitution
4. Changes the crate edition to 2021.
---
 why3/Cargo.toml           |   2 +-
 why3/src/declaration.rs   |  10 ++-
 why3/src/exp.rs           | 132 +++++++++++++++++++++++++++++++-------
 why3/src/lib.rs           |   2 +-
 why3/src/mlcfg/printer.rs |  18 +++++-
 5 files changed, 137 insertions(+), 27 deletions(-)

diff --git a/why3/Cargo.toml b/why3/Cargo.toml
index ec6774f34c..5e6646944c 100644
--- a/why3/Cargo.toml
+++ b/why3/Cargo.toml
@@ -2,7 +2,7 @@
 name = "why3"
 version = "0.2.0"
 authors = ["Xavier Denis <xldenis@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/why3/src/declaration.rs b/why3/src/declaration.rs
index 3b1b61d676..586e31a41b 100644
--- a/why3/src/declaration.rs
+++ b/why3/src/declaration.rs
@@ -40,7 +40,7 @@ pub enum Decl {
     UseDecl(Use),
     Axiom(Axiom),
     Goal(Goal),
-    // ConstantDecl(Constant),
+    ConstantDecl(Constant),
 }
 
 impl Decl {
@@ -337,3 +337,11 @@ pub enum LetKind {
     Predicate,
     Constant,
 }
+
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+pub struct Constant {
+    pub name: Ident,
+    pub type_: Type,
+    pub body: Exp,
+}
diff --git a/why3/src/exp.rs b/why3/src/exp.rs
index 94005d19fd..309461d708 100644
--- a/why3/src/exp.rs
+++ b/why3/src/exp.rs
@@ -352,16 +352,26 @@ impl Exp {
         Exp::QVar(q, Purity::Logic)
     }
 
-    pub fn pure_var(v: Ident) -> Self {
-        Exp::Var(v, Purity::Logic)
+    pub fn pure_var(v: impl Into<Ident>) -> Self {
+        Exp::Var(v.into(), Purity::Logic)
     }
 
     pub fn lazy_conj(l: Exp, r: Exp) -> Self {
         l.lazy_and(r)
     }
 
+    pub fn not(self) -> Self {
+        Exp::UnaryOp(UnOp::Not, Box::new(self))
+    }
+
     pub fn eq(self, rhs: Self) -> Self {
-        Exp::BinaryOp(BinOp::Eq, Box::new(self), Box::new(rhs))
+        if self.is_true() {
+            rhs
+        } else if rhs.is_true() {
+            self
+        } else {
+            Exp::BinaryOp(BinOp::Eq, Box::new(self), Box::new(rhs))
+        }
     }
 
     pub fn neq(self, rhs: Self) -> Self {
@@ -394,9 +404,9 @@ impl Exp {
     }
 
     pub fn lazy_and(self, other: Self) -> Self {
-        if let Exp::Const(Constant::Bool(true)) = self {
+        if self.is_true() {
             other
-        } else if let Exp::Const(Constant::Bool(true)) = other {
+        } else if other.is_true() {
             self
         } else {
             Exp::BinaryOp(BinOp::LazyAnd, Box::new(self), Box::new(other))
@@ -404,15 +414,25 @@ impl Exp {
     }
 
     pub fn log_and(self, other: Self) -> Self {
-        if let Exp::Const(Constant::Bool(true)) = self {
+        if self.is_true() {
             other
-        } else if let Exp::Const(Constant::Bool(true)) = other {
+        } else if other.is_true() {
             self
         } else {
             Exp::BinaryOp(BinOp::LogAnd, Box::new(self), Box::new(other))
         }
     }
 
+    pub fn log_or(self, other: Self) -> Self {
+        if self.is_true() {
+            self
+        } else if other.is_true() {
+            other
+        } else {
+            Exp::BinaryOp(BinOp::LogOr, Box::new(self), Box::new(other))
+        }
+    }
+
     pub fn implies(self, other: Self) -> Self {
         if self.is_true() {
             other
@@ -442,6 +462,8 @@ impl Exp {
     pub fn is_true(&self) -> bool {
         if let Exp::Const(Constant::Bool(true)) = self {
             true
+        } else if let Exp::Attr(_, e) = self {
+            e.is_true()
         } else {
             false
         }
@@ -455,6 +477,29 @@ impl Exp {
         Exp::Const(Constant::const_false())
     }
 
+    pub fn int(i: i128) -> Self {
+        Exp::Const(Constant::Int(i, None))
+    }
+
+    pub fn let_(id: impl Into<Ident>, arg: Exp, mut body: Exp) -> Exp {
+        let ident = id.into();
+        let occurences = body.occurences();
+
+        if !occurences.contains_key(&ident) {
+            body
+        // Remove this if performance is a concern
+        } else if occurences[&ident] == 1 {
+            body.subst(&[(ident, arg)].into_iter().collect());
+            body
+        } else {
+            Exp::Let { pattern: Pattern::VarP(ident), arg: Box::new(arg), body: Box::new(body) }
+        }
+    }
+
+    pub fn ascribe(self, ty: Type) -> Self {
+        Exp::Ascribe(Box::new(self), ty)
+    }
+
     pub fn is_pure(&self) -> bool {
         struct IsPure {
             pure: bool,
@@ -655,50 +700,63 @@ impl Exp {
         }
     }
 
-    pub fn fvs(&self) -> IndexSet<Ident> {
-        struct Fvs {
-            fvs: IndexSet<Ident>,
+    pub fn occurs(&self, id: &Ident) -> bool {
+        let fvs = self.occurences();
+
+        fvs.contains_key(id)
+    }
+
+    pub fn occurences(&self) -> HashMap<Ident, u64> {
+        struct Occurs {
+            occurs: HashMap<Ident, u64>,
         }
 
-        impl ExpVisitor for Fvs {
+        impl ExpVisitor for Occurs {
             fn visit(&mut self, exp: &Exp) {
                 match exp {
                     Exp::Var(v, _) => {
-                        self.fvs.insert(v.clone());
+                        *self.occurs.entry(v.clone()).or_insert(0) += 1;
                     }
                     Exp::Let { pattern, arg, body } => {
-                        let fvs = std::mem::take(&mut self.fvs);
+                        let mut occurs = std::mem::take(&mut self.occurs);
                         self.visit(body);
-                        self.fvs = (&self.fvs) - &pattern.binders();
+                        pattern.binders().iter().for_each(|p| {
+                            self.occurs.remove(p);
+                        });
+
                         self.visit(arg);
-                        self.fvs.extend(fvs);
+                        occurs.drain().for_each(|(k, v)| *self.occurs.entry(k).or_insert(0) += v);
                     }
                     Exp::Forall(bnds, trig, exp) => {
-                        let fvs = std::mem::take(&mut self.fvs);
+                        let mut fvs = std::mem::take(&mut self.occurs);
                         self.visit(exp);
                         self.visit_trigger(trig);
                         bnds.iter().for_each(|(l, _)| {
-                            self.fvs.remove(l);
+                            self.occurs.remove(l);
                         });
-                        self.fvs.extend(fvs);
+                        fvs.drain().for_each(|(k, v)| *self.occurs.entry(k).or_insert(0) += v);
                     }
                     Exp::Exists(bnds, trig, exp) => {
-                        let fvs = std::mem::take(&mut self.fvs);
+                        let mut fvs = std::mem::take(&mut self.occurs);
                         self.visit(exp);
                         self.visit_trigger(trig);
                         bnds.iter().for_each(|(l, _)| {
-                            self.fvs.remove(l);
+                            self.occurs.remove(l);
                         });
-                        self.fvs.extend(fvs);
+                        fvs.drain().for_each(|(k, v)| *self.occurs.entry(k).or_insert(0) += v);
                     }
                     _ => super_visit(self, exp),
                 }
             }
         }
 
-        let mut fvs = Fvs { fvs: IndexSet::new() };
+        let mut fvs = Occurs { occurs: Default::default() };
         fvs.visit(self);
-        fvs.fvs
+        fvs.occurs
+    }
+
+    pub fn fvs(&self) -> IndexSet<Ident> {
+        self.occurences().into_keys().collect()
     }
 
     pub fn qfvs(&self) -> IndexSet<QName> {
@@ -775,6 +833,20 @@ impl Exp {
                         binders.iter().for_each(|k| {
                             subst.remove(&k.0);
                         });
+                        let bnds: IndexSet<_> = binders.iter().map(|b| &b.0).cloned().collect();
+                        let mut extended = HashMap::new();
+                        for (_, exp) in &mut subst {
+                            for id in &bnds & &exp.fvs() {
+                                extended.insert(id.clone(), Exp::pure_var(format!("{}'", &*id)));
+                            }
+                        }
+                        binders.iter_mut().for_each(|(id, _)| {
+                            if extended.contains_key(id) {
+                                *id = format!("{}'", &**id).into();
+                            }
+                        });
+                        subst.extend(extended);
+
                         let mut s = &subst;
                         s.visit_mut(exp);
                         s.visit_trigger_mut(trig);
@@ -784,6 +856,20 @@ impl Exp {
                         binders.iter().for_each(|k| {
                             subst.remove(&k.0);
                         });
+                        let bnds: IndexSet<_> = binders.iter().map(|b| &b.0).cloned().collect();
+                        let mut extended = HashMap::new();
+                        for (_, exp) in &mut subst {
+                            for id in &bnds & &exp.fvs() {
+                                extended.insert(id.clone(), Exp::pure_var(format!("{}'", &*id)));
+                            }
+                        }
+                        binders.iter_mut().for_each(|(id, _)| {
+                            if extended.contains_key(id) {
+                                *id = format!("{}'", &**id).into();
+                            }
+                        });
+                        subst.extend(extended);
+
                         let mut s = &subst;
                         s.visit_mut(exp);
                         s.visit_trigger_mut(trig);
diff --git a/why3/src/lib.rs b/why3/src/lib.rs
index 7972597489..c0e0223624 100644
--- a/why3/src/lib.rs
+++ b/why3/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(box_patterns)]
+#![feature(box_patterns, hash_extract_if)]
 pub mod ce_models;
 pub mod declaration;
 pub mod exp;
diff --git a/why3/src/mlcfg/printer.rs b/why3/src/mlcfg/printer.rs
index a4aaa1a9aa..e001e1da7c 100644
--- a/why3/src/mlcfg/printer.rs
+++ b/why3/src/mlcfg/printer.rs
@@ -2,7 +2,7 @@ use std::{fmt::Display, iter::once};
 
 use super::*;
 use crate::{
-    declaration::*,
+    declaration::{self, *},
     exp::{AssocDir, BinOp, Binder, Constant, Precedence, Trigger, UnOp},
 };
 use num::{Float, Zero};
@@ -81,6 +81,7 @@ impl Print for Decl {
             Decl::Axiom(a) => a.pretty(alloc),
             Decl::Goal(g) => g.pretty(alloc),
             Decl::Let(l) => l.pretty(alloc),
+            Decl::ConstantDecl(c) => c.pretty(alloc),
         }
     }
 }
@@ -152,6 +153,21 @@ impl Print for Goal {
     }
 }
 
+impl Print for declaration::Constant {
+    fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
+    where
+        A::Doc: Clone,
+    {
+        alloc
+            .text("constant ")
+            .append(self.name.pretty(alloc))
+            .append(" : ")
+            .append(self.type_.pretty(alloc))
+            .append(" = ")
+            .append(self.body.pretty(alloc))
+    }
+}
+
 impl Print for LetDecl {
     fn pretty<'b, 'a: 'b, A: DocAllocator<'a>>(&'a self, alloc: &'a A) -> DocBuilder<'a, A>
     where

From 28c34206a6ce8e60bebd0481c98df36f112959bc Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 8 Mar 2024 18:31:16 +0100
Subject: [PATCH 49/66] New VC for lemma functions

This commit completely reworks the verification of lemma (logic)
functions. In particular, they no longer generate why3's `let functions`
which turns out are very problematic when combined with other features
of why3 like cloning and totally incompatible with `Coma`.

The approach is based off of WP-calulus though several adaptations have
to be made given that the terms being verified are logical formulas not
programs.
---
 creusot/src/backend/logic.rs       |  88 +++--
 creusot/src/backend/logic/vcgen.rs | 496 +++++++++++++++++++++++++++++
 creusot/src/backend/term.rs        |  10 +-
 creusot/src/backend/ty.rs          |  14 +-
 creusot/src/backend/ty_inv.rs      |   2 +-
 5 files changed, 574 insertions(+), 36 deletions(-)
 create mode 100644 creusot/src/backend/logic/vcgen.rs

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index 62a5fe78b0..3804262a87 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -1,7 +1,10 @@
 use std::borrow::Cow;
 
 use crate::{
-    backend::all_generic_decls_for, ctx::*, translation::pearlite::Term, util, util::get_builtin,
+    backend::all_generic_decls_for,
+    ctx::*,
+    translation::pearlite::Term,
+    util::{self, get_builtin},
 };
 use rustc_hir::def_id::DefId;
 use why3::{
@@ -10,29 +13,29 @@ use why3::{
     Ident, QName,
 };
 
-use super::{
-    signature::signature_of,
-    term::{lower_impure, lower_pure},
-    CloneSummary, Why3Generator,
-};
+mod vcgen;
+
+use self::vcgen::vc;
+
+use super::{signature::signature_of, term::lower_pure, CloneSummary, Why3Generator};
 
 pub(crate) fn binders_to_args(
     ctx: &mut Why3Generator,
     binders: Vec<Binder>,
-) -> (Vec<why3::Exp>, Vec<Binder>) {
+) -> (Vec<Ident>, Vec<Binder>) {
     let mut args = Vec::new();
     let mut out_binders = Vec::new();
     let mut fresh = 0;
     for b in binders {
         match b {
             Binder::Wild => {
-                args.push(Exp::pure_var(format!("_wild{fresh}").into()));
+                args.push(format!("_wild{fresh}").into());
                 out_binders.push(Binder::Named(format!("_wild{fresh}").into()));
                 fresh += 1;
             }
             Binder::UnNamed(_) => unreachable!("unnamed parameter in logical function signature"),
             Binder::Named(ref nm) => {
-                args.push(Exp::pure_var(nm.clone()));
+                args.push(nm.clone().into());
                 out_binders.push(b);
             }
             Binder::Typed(ghost, binders, ty) => {
@@ -78,8 +81,10 @@ fn builtin_body<'tcx>(
 
     // Program symbol (for proofs)
     let mut val_sig = sig.clone();
-    val_sig.contract.ensures = vec![Exp::pure_var("result".into())
-        .eq(Exp::pure_var(val_sig.name.clone()).app(val_args.clone()))];
+
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+    val_sig.contract.ensures =
+        vec![Exp::pure_var("result").eq(Exp::pure_var(val_sig.name.clone()).app(val_args.clone()))];
 
     if util::is_predicate(ctx.tcx, def_id) {
         sig.retty = None;
@@ -122,10 +127,12 @@ pub(crate) fn val_decl<'tcx, N: Namer<'tcx>>(
     sig.contract.variant = Vec::new();
 
     let (val_args, val_binders) = binders_to_args(ctx, sig.args);
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+
     sig.contract
         .ensures
         // = vec!(Exp::pure_var("result".into()).eq(Exp::pure_var(sig.name.clone()).app(val_args)));
-        .push(Exp::pure_var("result".into()).eq(Exp::pure_var(sig.name.clone()).app(val_args)));
+        .push(Exp::pure_var("result").eq(Exp::pure_var(sig.name.clone()).app(val_args)));
     sig.args = val_binders;
     Decl::ValDecl(ValDecl { sig, ghost: false, val: true, kind: None })
 }
@@ -248,10 +255,12 @@ pub fn sigs<'tcx>(ctx: &mut Why3Generator<'tcx>, mut sig: Signature) -> (Signatu
     contract.variant = Vec::new();
     prog_sig.contract = contract;
     let (val_args, val_binders) = binders_to_args(ctx, prog_sig.args);
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+
     prog_sig.args = val_binders;
 
     prog_sig.contract.ensures =
-        vec![Exp::pure_var("result".into()).eq(Exp::pure_var(sig.name.clone()).app(val_args))];
+        vec![Exp::pure_var("result").eq(Exp::pure_var(sig.name.clone()).app(val_args))];
 
     (sig, prog_sig)
 }
@@ -326,24 +335,51 @@ fn proof_module(ctx: &mut Why3Generator, def_id: DefId) -> Option<Module> {
         return None;
     }
     let term = ctx.term(def_id).unwrap().clone();
-    let mut body = lower_impure(ctx, &mut names, &term);
-    body = ctx.attach_span(term.span, body);
+
+    let mut body_decls = Vec::new();
+
+    let (arg_names, new_binders) = binders_to_args(ctx, sig.args);
+
+    let param_decls = arg_names.iter().zip(new_binders.iter()).map(|(nm, binder)| {
+        Decl::ValDecl(ValDecl {
+            ghost: false,
+            val: false,
+            kind: Some(LetKind::Constant),
+            sig: Signature {
+                name: nm.clone(),
+                trigger: None,
+                attrs: Vec::new(),
+                retty: binder.type_of().cloned(),
+                args: Vec::new(),
+                contract: Default::default(),
+            },
+        })
+    });
+    body_decls.extend(param_decls);
+    sig.args = new_binders;
+
+    let mut val_sig = sig.clone();
+    val_sig.contract = Default::default();
+    body_decls.push(Decl::ValDecl(util::item_type(ctx.tcx, def_id).val(val_sig)));
+
+    let postcondition = sig.contract.ensures_conj();
+    let body = vc(ctx, &mut names, def_id, term, "result".into(), postcondition.clone());
+
+    let body = match body {
+        Ok(body) => body,
+        Err(e) => ctx.fatal_error(e.span(), &format!("{e:?}")).emit(),
+    };
+
+    let body = sig.contract.requires.into_iter().fold(body, |acc, pre| pre.implies(acc));
+
+    body_decls
+        .extend([Decl::Goal(Goal { name: format!("vc_{}", (&*sig.name)).into(), goal: body })]);
 
     let mut decls: Vec<_> = Vec::new();
     decls.extend(all_generic_decls_for(ctx.tcx, def_id));
     let (clones, _) = names.to_clones(ctx, CloneDepth::Deep);
     decls.extend(clones);
-
-    let kind = match util::item_type(ctx.tcx, def_id) {
-        ItemType::Predicate { .. } => {
-            sig.retty = None;
-            Some(LetKind::Predicate)
-        }
-        ItemType::Logic { .. } => Some(LetKind::Function),
-        _ => unreachable!(),
-    };
-
-    decls.push(Decl::Let(LetDecl { sig, rec: true, ghost: true, body, kind }));
+    decls.extend(body_decls);
 
     let name = impl_name(ctx, def_id);
     Some(Module { name, decls })
diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
new file mode 100644
index 0000000000..a3316c8898
--- /dev/null
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -0,0 +1,496 @@
+use std::{
+    cell::RefCell,
+    collections::{HashMap, HashSet},
+};
+
+use rustc_hir::def_id::DefId;
+use rustc_middle::ty::{EarlyBinder, GenericArgsRef, Ty, TyKind};
+use rustc_span::{Span, Symbol};
+use why3::{declaration::Signature, exp::Purity, ty::Type, Exp, Ident, QName};
+
+use crate::{
+    backend::{
+        signature::{sig_to_why3, signature_of},
+        term::{binop_to_binop, lower_literal, lower_pure},
+        ty::{is_int, translate_ty},
+        Namer as _, Why3Generator,
+    },
+    pearlite::{super_visit_term, Literal, Pattern, Term, TermVisitor},
+    util::{self, get_builtin},
+};
+
+use super::{binders_to_args, CloneMap};
+
+/// Verification conditions for lemma functions.
+///
+/// As the `let functions` of Why3 leave a lot to be desired and generally cause an impedence
+/// mismatch with the rest of Creusot, we have instead implemented a custom VCGen for logic
+/// functions.
+///
+/// This VCGen is a sort of cross between WP and an evaluator, we impose a certain 'evaluation
+/// order' on the logical formula so that we can validate the preconditions of function calls and
+/// leverage the structure of the lemma function as the proof skeleton.
+///
+/// There are several intersting / atypical rules here:
+///
+/// 1. Conjunction: 2. Exists & Forall: 3. Function calls:
+
+struct VCGen<'a, 'tcx> {
+    ctx: RefCell<&'a mut Why3Generator<'tcx>>,
+    names: RefCell<&'a mut CloneMap<'tcx>>,
+    self_id: DefId,
+    structurally_recursive: bool,
+}
+
+pub(super) fn vc<'tcx>(
+    ctx: &mut Why3Generator<'tcx>,
+    names: &mut CloneMap<'tcx>,
+    self_id: DefId,
+    t: Term<'tcx>,
+    dest: Ident,
+    post: Exp,
+) -> Result<Exp, VCError<'tcx>> {
+    let structurally_recursive = is_structurally_recursive(ctx, self_id, &t);
+    VCGen { ctx: RefCell::new(ctx), names: RefCell::new(names), self_id, structurally_recursive }
+        .build_vc(&t, &|exp| Ok(Exp::let_(dest.clone(), exp, post.clone())))
+}
+
+/// Verifies whether a given term is structurally recursive: that is, each recursive call is made to
+/// a component of an argument to the prior call.
+///
+/// The check must also ensure that we are always recursing on the *same* argument since otherwise
+/// we could 'ping pong' infinitely.
+///
+/// Currently, the check is *very* naive: we only consider variables and only check `match`. This
+/// means that something like the following would fail:
+///
+/// ``` match x { Cons(_, tl) => recursive((tl, 0).0) } ```
+///
+/// This check can be extended in the future
+fn is_structurally_recursive(ctx: &mut Why3Generator<'_>, self_id: DefId, t: &Term<'_>) -> bool {
+    struct StructuralRecursion {
+        smaller_than: HashMap<Symbol, Symbol>,
+        self_id: DefId,
+        /// Index of the decreasing argument
+        decreasing_args: HashSet<Symbol>,
+
+        orig_args: Vec<Symbol>,
+    }
+    use crate::pearlite::TermKind;
+
+    impl StructuralRecursion {
+        fn valid(&self) -> bool {
+            self.decreasing_args.len() == 1
+        }
+
+        /// Is `t` smaller than the argument `nm`?
+        fn is_smaller_than(&self, t: &Term, nm: Symbol) -> bool {
+            match &t.kind {
+                TermKind::Var(s) => self.smaller_than.get(s) == Some(&nm),
+                _ => false,
+            }
+        }
+
+        // TODO: could make this a `pattern` to term comparison to make it more powerful
+        /// Mark `sym` as smaller than `term`. Currently, this only updates the relation if `term` is a variable.
+        fn smaller_than(&mut self, sym: Symbol, term: &Term<'_>) {
+            let var = match &term.kind {
+                TermKind::Var(s) => s,
+                _ => return,
+            };
+
+            let parent = self.smaller_than.get(var).unwrap_or(var);
+
+            self.smaller_than.insert(sym, *parent);
+        }
+    }
+
+    impl TermVisitor<'_> for StructuralRecursion {
+        fn visit_term(&mut self, term: &Term<'_>) {
+            match &term.kind {
+                TermKind::Call { id, args, .. } if *id == self.self_id => {
+                    for (arg, nm) in args.iter().zip(self.orig_args.iter()) {
+                        if self.is_smaller_than(arg, *nm) {
+                            self.decreasing_args.insert(*nm);
+                        }
+                    }
+                }
+                TermKind::Exists { binder, body } => {
+                    let old_smaller = self.smaller_than.clone();
+                    self.smaller_than.remove(&binder.0);
+                    self.visit_term(body);
+                    self.smaller_than = old_smaller;
+                }
+
+                TermKind::Forall { binder, body } => {
+                    let old_smaller = self.smaller_than.clone();
+                    self.smaller_than.remove(&binder.0);
+                    self.visit_term(body);
+                    self.smaller_than = old_smaller;
+                }
+
+                TermKind::Let { pattern, arg, body } => {
+                    self.visit_term(arg);
+                    let mut binds = Default::default();
+                    pattern.binds(&mut binds);
+                    let old_smaller = self.smaller_than.clone();
+                    self.smaller_than.retain(|nm, _| !binds.contains(&nm));
+                    binds.into_iter().for_each(|b| self.smaller_than(b, arg));
+                    self.visit_term(body);
+                    self.smaller_than = old_smaller;
+                }
+
+                TermKind::Match { arms, scrutinee } => {
+                    self.visit_term(&scrutinee);
+
+                    for (pat, exp) in arms {
+                        let mut binds = Default::default();
+                        pat.binds(&mut binds);
+                        let old_smaller = self.smaller_than.clone();
+                        self.smaller_than.retain(|nm, _| !binds.contains(&nm));
+                        binds.into_iter().for_each(|b| self.smaller_than(b, scrutinee));
+                        self.visit_term(exp);
+                        self.smaller_than = old_smaller;
+                    }
+                }
+                _ => super_visit_term(term, self),
+            }
+        }
+    }
+
+    let orig_args = ctx.sig(self_id).inputs.iter().map(|a| a.0).collect();
+    let mut s = StructuralRecursion {
+        self_id,
+        smaller_than: Default::default(),
+        decreasing_args: Default::default(),
+        orig_args,
+    };
+
+    s.visit_term(&t);
+
+    s.valid()
+}
+
+#[derive(Debug)]
+pub enum VCError<'tcx> {
+    /// `old` doesn't currently make sense inside of a lemma function
+    Old(Span),
+    /// Too lazy to implement this atm.
+    Reborrow(Span),
+    /// Same here...
+    Closure(Span),
+    /// Variants are currently restricted to `Int`
+    UnsupportedVariant(Ty<'tcx>, Span),
+}
+
+impl<'tcx> VCError<'tcx> {
+    pub fn span(&self) -> Span {
+        match self {
+            VCError::Old(s) => *s,
+            VCError::Reborrow(s) => *s,
+            VCError::Closure(s) => *s,
+            VCError::UnsupportedVariant(_, s) => *s,
+        }
+    }
+}
+
+type PostCont<'a, 'tcx, A> = &'a dyn Fn(A) -> Result<Exp, VCError<'tcx>>;
+
+impl<'a, 'tcx> VCGen<'a, 'tcx> {
+    fn lower_literal(&self, lit: &Literal<'tcx>) -> Exp {
+        lower_literal(*self.ctx.borrow_mut(), *self.names.borrow_mut(), lit)
+    }
+
+    fn lower_pure(&self, lit: &Term<'tcx>) -> Exp {
+        lower_pure(*self.ctx.borrow_mut(), *self.names.borrow_mut(), lit)
+    }
+
+    fn build_vc(&self, t: &Term<'tcx>, k: PostCont<'_, 'tcx, Exp>) -> Result<Exp, VCError<'tcx>> {
+        use crate::pearlite::*;
+        match &t.kind {
+            // VC(v, Q) = Q(v)
+            TermKind::Var(v) => k(Exp::pure_var(util::ident_of(*v))),
+            // VC(l, Q) = Q(l)
+            TermKind::Lit(l) => k(self.lower_literal(l)),
+            // Items are just global names so
+            // VC(i, Q) = Q(i)
+            TermKind::Item(id, sub) => {
+                let item_name =
+                    get_func_name(*self.ctx.borrow_mut(), *self.names.borrow_mut(), *id, sub);
+                if get_builtin(self.ctx.borrow().tcx, *id).is_some() {
+                    // Builtins can leverage Why3 polymorphism and sometimes can cause typeck errors in why3 due to ambiguous type variables so lets fix the type now.
+                    k(Exp::pure_qvar(item_name).ascribe(self.ty(t.ty)))
+                } else {
+                    k(Exp::pure_qvar(item_name))
+                }
+            }
+            // VC(assert { C }, Q) => VC(C, |c| c && Q(()))
+            TermKind::Assert { cond } => {
+                self.build_vc(cond, &|exp| Ok(exp.lazy_and(k(Exp::Tuple(Vec::new()))?)))
+            }
+            // VC(f As, Q) = VC(A0, |a0| ... VC(An, |an|
+            //  pre(f)(a0..an) /\ variant(f)(a0..an) /\ (post(f)(a0..an, F(a0..an)) -> Q(F a0..an))
+            // ))
+            TermKind::Call { id, subst, args } => self.build_vc_slice(args, &|args| {
+                let tcx = self.ctx.borrow().tcx;
+                let pre_sig = EarlyBinder::bind(self.ctx.borrow_mut().sig(*id).clone())
+                    .instantiate(tcx, subst);
+                let arg_subst = pre_sig
+                    .inputs
+                    .iter()
+                    .zip(args.clone())
+                    .map(|(nm, res)| (util::ident_of(nm.0), res))
+                    .collect();
+                let fname =
+                    get_func_name(*self.ctx.borrow_mut(), *self.names.borrow_mut(), *id, subst);
+                let mut sig =
+                    sig_to_why3(*self.ctx.borrow_mut(), *self.names.borrow_mut(), &pre_sig, *id);
+                sig.contract.subst(&arg_subst);
+                let variant =
+                    if *id == self.self_id { self.build_variant(&args)? } else { Exp::mk_true() };
+
+                let call = Exp::pure_qvar(fname).app(args);
+                sig.contract.subst(&[("result".into(), call.clone())].into_iter().collect());
+
+                let inner = k(call)?;
+
+                let post = sig
+                    .contract
+                    .requires_conj()
+                    .log_and(variant)
+                    .log_and(sig.contract.ensures_conj().implies(inner));
+
+                Ok(post)
+            }),
+
+            // VC(A && B, Q) = VC(A, |a| VC(B, |b| a -> Q(b) /\ ~a -> Q(false)))
+            // VC(A OP B, Q) = VC(A, |a| VC(B, |b| Q(a OP B)))
+            TermKind::Binary { op, lhs, rhs } => match op {
+                BinOp::And => self.build_vc(lhs, &|lhs| {
+                    Ok(lhs
+                        .clone()
+                        .implies(self.build_vc(rhs, k)?)
+                        .log_and(lhs.not().implies(k(Exp::mk_false())?)))
+                }),
+
+                _ => self.build_vc(&lhs, &|lhs| {
+                    self.build_vc(rhs, &|rhs| {
+                        k(Exp::BinaryOp(
+                            binop_to_binop(*op, Purity::Logic),
+                            Box::new(lhs.clone()),
+                            Box::new(rhs),
+                        ))
+                    })
+                }),
+            },
+            // VC(OP A, Q) = VC(A |a| Q(OP a))
+            TermKind::Unary { op, arg } => self.build_vc(arg, &|arg| {
+                let op = match op {
+                    UnOp::Not => why3::exp::UnOp::Not,
+                    UnOp::Neg => why3::exp::UnOp::Neg,
+                };
+
+                k(Exp::UnaryOp(op, Box::new(arg)))
+            }),
+            // // the dual rule should be the one below but that seems weird...
+            // // VC(forall<x> P(x), Q) => (exists<x> VC(P, false)) \/ Q(forall<x>P(x))
+            // // Instead, I think the rule should just be the same as for the existential quantifiers?
+            TermKind::Forall { binder, body } => {
+                let forall_pre = self.build_vc(body, &|_| Ok(Exp::mk_true()))?;
+                let ty = self.ty(binder.1);
+
+                let forall_pre = Exp::forall(vec![(binder.0.to_string().into(), ty)], forall_pre);
+                let forall_pure = self.lower_pure(t);
+                Ok(forall_pre.log_and(k(forall_pure)?))
+            }
+            // // VC(exists<x> P(x), Q) => (forall<x> VC(P, true)) /\ Q(exists<x>P(x))
+            TermKind::Exists { binder, body } => {
+                let exists_pre = self.build_vc(body, &|_| Ok(Exp::mk_true()))?;
+                let ty = self.ty(binder.1);
+
+                let exists_pre = Exp::forall(vec![(binder.0.to_string().into(), ty)], exists_pre);
+                let exists_pure = self.lower_pure(t);
+                Ok(exists_pre.log_and(k(exists_pure)?))
+            }
+            // VC((T...), Q) = VC(T[0], |t0| ... VC(T[N], |tn| Q(t0..tn))))
+            TermKind::Tuple { fields } => self.build_vc_slice(fields, &|flds| k(Exp::Tuple(flds))),
+            // Same as for tuples
+            TermKind::Constructor { typ, variant, fields } => {
+                self.build_vc_slice(fields, &|args| {
+                    let TyKind::Adt(_, subst) = t.ty.kind() else { unreachable!() };
+
+                    let ctor = self.names.borrow_mut().constructor(
+                        self.ctx.borrow().adt_def(typ).variants()[*variant].def_id,
+                        subst,
+                    );
+
+                    k(Exp::Constructor { ctor, args })
+                })
+            }
+            // VC( * T, Q) = VC(T, |t| Q(*t))
+            TermKind::Cur { term } => self.build_vc(&term, &|term| k(Exp::Current(Box::new(term)))),
+            // VC( ^ T, Q) = VC(T, |t| Q(^t))
+            TermKind::Fin { term } => self.build_vc(&term, &|term| k(Exp::Final(Box::new(term)))),
+            // VC(A -> B, Q) = VC(A, VC(B, Q(A -> B)))
+            TermKind::Impl { lhs, rhs } => {
+                self.build_vc(lhs, &|lhs| self.build_vc(rhs, &|rhs| k(lhs.clone().implies(rhs))))
+            }
+            // VC(match A {P -> E}, Q) = VC(A, |a| match a {P -> VC(E, Q)})
+            TermKind::Match { scrutinee, arms } => self.build_vc(scrutinee, &|scrut| {
+                let arms: Vec<_> = arms
+                    .iter()
+                    .map(&|arm: &(Pattern<'tcx>, Term<'tcx>)| {
+                        Ok((self.build_pattern(&arm.0), self.build_vc(&arm.1, k)?))
+                    })
+                    .collect::<Result<_, _>>()?;
+
+                Ok(Exp::Match(Box::new(scrut), arms))
+            }),
+            // VC(let P = A in B, Q) = VC(A, |a| let P = a in VC(B, Q))
+            TermKind::Let { pattern, arg, body } => self.build_vc(arg, &|arg| {
+                let body = self.build_vc(body, k)?;
+
+                Ok(Exp::Let {
+                    pattern: self.build_pattern(pattern),
+                    arg: Box::new(arg),
+                    body: Box::new(body),
+                })
+            }),
+            // VC(A.f, Q) = VC(A, |a| Q(a.f))
+            TermKind::Projection { lhs, name } => {
+                let accessor = match lhs.ty.kind() {
+                    TyKind::Closure(did, substs) => {
+                        self.names.borrow_mut().accessor(*did, substs, 0, *name)
+                    }
+                    TyKind::Adt(def, substs) => {
+                        self.ctx
+                            .borrow_mut()
+                            .translate_accessor(def.variants()[0u32.into()].fields[*name].did);
+                        self.names.borrow_mut().accessor(def.did(), substs, 0, *name)
+                    }
+                    k => unreachable!("Projection from {k:?}"),
+                };
+
+                self.build_vc(lhs, &|lhs| k(Exp::pure_qvar(accessor.clone()).app(vec![lhs])))
+            }
+            // TODO: lol
+            TermKind::Absurd => todo!("absrd"),
+
+            TermKind::Old { .. } => Err(VCError::Old(t.span)),
+            TermKind::Closure { .. } => Err(VCError::Closure(t.span)),
+            TermKind::Reborrow { .. } => Err(VCError::Reborrow(t.span)),
+        }
+    }
+
+    fn build_pattern(&self, pat: &Pattern<'tcx>) -> why3::exp::Pattern {
+        use why3::exp::Pattern as Pat;
+        match pat {
+            Pattern::Constructor { adt, variant: _, fields, substs } => {
+                let fields = fields.into_iter().map(|pat| self.build_pattern(pat)).collect();
+                Pat::ConsP(self.names.borrow_mut().constructor(*adt, substs), fields)
+            }
+            Pattern::Wildcard => Pat::Wildcard,
+            Pattern::Binder(name) => Pat::VarP(name.to_string().into()),
+            Pattern::Boolean(b) => {
+                if *b {
+                    Pat::mk_true()
+                } else {
+                    Pat::mk_false()
+                }
+            }
+            Pattern::Tuple(pats) => {
+                Pat::TupleP(pats.into_iter().map(|pat| self.build_pattern(pat)).collect())
+            }
+        }
+    }
+
+    fn build_vc_slice(
+        &self,
+        t: &[Term<'tcx>],
+        k: PostCont<'_, 'tcx, Vec<Exp>>,
+    ) -> Result<Exp, VCError<'tcx>> {
+        self.build_vc_slice_inner(t, &|mut args| {
+            args.reverse();
+            k(args)
+        })
+    }
+
+    fn build_vc_slice_inner(
+        &self,
+        t: &[Term<'tcx>],
+        k: PostCont<'_, 'tcx, Vec<Exp>>,
+    ) -> Result<Exp, VCError<'tcx>> {
+        if t.is_empty() {
+            k(Vec::new())
+        } else {
+            self.build_vc(&t[0], &|v| {
+                self.build_vc_slice_inner(&t[1..], &|mut vs| {
+                    vs.push(v.clone());
+                    k(vs)
+                })
+            })
+        }
+    }
+
+    fn ty(&self, ty: Ty<'tcx>) -> Type {
+        translate_ty(*self.ctx.borrow_mut(), *self.names.borrow_mut(), rustc_span::DUMMY_SP, ty)
+    }
+
+    // Generates the expression to test the validity of the variant for a recursive call.
+    // Currently restricted to `Int` until we sort out `WellFounded` (soon?)
+    //
+    // If V is the variant expression at entry and V' is the variant expression of the recursive call it generates
+    //  0 <= V && V' < V
+    //  Weirdly (to me Xavier) this doesn't check `0 <= V'` but this is actually the same behavior as Why3
+    fn build_variant(&self, call_args: &[Exp]) -> Result<Exp, VCError<'tcx>> {
+        if self.structurally_recursive {
+            return Ok(Exp::mk_true());
+        }
+        let variant = self.ctx.borrow_mut().sig(self.self_id).contract.variant.clone();
+        let Some(variant) = variant else { return Ok(Exp::mk_false()) };
+
+        let top_level_args = self.top_level_args();
+
+        let subst: HashMap<_, _> =
+            top_level_args.into_iter().zip(call_args.into_iter().cloned()).collect();
+        let orig_variant = self.self_sig().contract.variant.remove(0);
+        let mut rec_var_exp = orig_variant.clone();
+        rec_var_exp.subst(&subst);
+        if is_int(self.ctx.borrow().tcx, variant.ty) {
+            Ok(Exp::int(0).leq(orig_variant.clone()).log_and(rec_var_exp.lt(orig_variant)))
+        } else {
+            Err(VCError::UnsupportedVariant(variant.ty, variant.span))
+        }
+    }
+
+    fn self_sig(&self) -> Signature {
+        signature_of(*self.ctx.borrow_mut(), *self.names.borrow_mut(), self.self_id)
+    }
+
+    /// Produces the top-level call expression for the function being verified
+    fn top_level_args(&self) -> Vec<Ident> {
+        let sig = self.self_sig();
+        let (arg_names, _) = binders_to_args(*self.ctx.borrow_mut(), sig.args);
+        arg_names
+    }
+}
+
+// Push into `CloneMap::value`?
+pub(crate) fn get_func_name<'tcx>(
+    ctx: &Why3Generator<'tcx>,
+    names: &mut CloneMap<'tcx>,
+    id: DefId,
+    subst: GenericArgsRef<'tcx>,
+) -> QName {
+    let builtin_attr = get_builtin(ctx.tcx, id);
+
+    builtin_attr
+        .and_then(|a| {
+            // Add dependency
+            names.value(id, subst);
+
+            QName::from_string(&a.as_str())
+        })
+        .map(QName::without_search_path)
+        .unwrap_or_else(|| names.value(id, subst))
+}
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index 4af3058768..ad7976ae3a 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -72,8 +72,8 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                 }
 
                 match (op, self.pure) {
-                    (Div, _) => Exp::pure_var("div".into()).app(vec![lhs, rhs]),
-                    (Rem, _) => Exp::pure_var("mod".into()).app(vec![lhs, rhs]),
+                    (Div, _) => Exp::pure_var("div").app(vec![lhs, rhs]),
+                    (Rem, _) => Exp::pure_var("mod").app(vec![lhs, rhs]),
                     (Eq | Ne | Lt | Le | Gt | Ge, Purity::Program) => {
                         let (lfvs, rfvs) = (lhs.fvs(), rhs.fvs());
                         let mut freshvars = (0..)
@@ -289,9 +289,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
     fn lower_pat(&mut self, pat: &Pattern<'tcx>) -> Pat {
         match pat {
             Pattern::Constructor { adt, variant: _, fields, substs } => {
-                // let variant = &adt.variants()[variant];
                 let fields = fields.into_iter().map(|pat| self.lower_pat(pat)).collect();
-                // eprintln!("{adt:?}");
                 Pat::ConsP(self.names.constructor(*adt, substs), fields)
             }
             Pattern::Wildcard => Pat::Wildcard,
@@ -377,7 +375,7 @@ pub(crate) fn lower_literal<'tcx, N: Namer<'tcx>>(
     }
 }
 
-fn binop_to_binop(op: pearlite::BinOp, purity: Purity) -> why3::exp::BinOp {
+pub(crate) fn binop_to_binop(op: pearlite::BinOp, purity: Purity) -> why3::exp::BinOp {
     match (op, purity) {
         (pearlite::BinOp::Add, _) => BinOp::Add,
         (pearlite::BinOp::Sub, _) => BinOp::Sub,
@@ -392,7 +390,7 @@ fn binop_to_binop(op: pearlite::BinOp, purity: Purity) -> why3::exp::BinOp {
         (pearlite::BinOp::And, Purity::Program) => BinOp::LazyAnd,
         (pearlite::BinOp::Or, Purity::Logic) => BinOp::LogOr,
         (pearlite::BinOp::Or, Purity::Program) => BinOp::LazyOr,
-        _ => unreachable!(),
+        _ => unreachable!("{op:?} {purity:?}"),
     }
 }
 
diff --git a/creusot/src/backend/ty.rs b/creusot/src/backend/ty.rs
index 3d981be8b3..a85cd71ab5 100644
--- a/creusot/src/backend/ty.rs
+++ b/creusot/src/backend/ty.rs
@@ -82,7 +82,7 @@ fn translate_ty_inner<'tcx, N: Namer<'tcx>>(
                 return translate_ty_inner(trans, ctx, names, span, s[0].expect_ty());
             }
 
-            if Some(def.did()) == ctx.tcx.get_diagnostic_item(Symbol::intern("creusot_int")) {
+            if is_int(ctx.tcx, ty) {
                 names.import_prelude_module(PreludeModule::Int);
                 return MlT::Integer;
             }
@@ -598,13 +598,13 @@ pub(crate) fn build_accessor(
             let mut exp = Exp::Any(field_ty.clone());
             if ix == variant_ix {
                 pat[field_ix] = Pattern::VarP("a".into());
-                exp = Exp::pure_var("a".into());
+                exp = Exp::pure_var("a");
             };
             (Pattern::ConsP(name.clone(), pat), exp)
         })
         .collect();
 
-    let discr_exp = Exp::Match(Box::new(Exp::pure_var("self".into())), branches);
+    let discr_exp = Exp::Match(Box::new(Exp::pure_var("self")), branches);
 
     Decl::Let(LetDecl {
         sig,
@@ -767,6 +767,14 @@ pub(crate) fn floatty_to_ty<'tcx, N: Namer<'tcx>>(
     }
 }
 
+pub fn is_int(tcx: TyCtxt, ty: Ty) -> bool {
+    if let TyKind::Adt(def, _) = ty.kind() {
+        Some(def.did()) == tcx.get_diagnostic_item(Symbol::intern("creusot_int"))
+    } else {
+        false
+    }
+}
+
 pub(crate) fn double_ty() -> MlT {
     MlT::TConstructor(QName::from_string("Float64.t").unwrap())
 }
diff --git a/creusot/src/backend/ty_inv.rs b/creusot/src/backend/ty_inv.rs
index 2fa093dca8..e56e1b6669 100644
--- a/creusot/src/backend/ty_inv.rs
+++ b/creusot/src/backend/ty_inv.rs
@@ -465,7 +465,7 @@ fn build_inv_axiom<'tcx>(
     let ty = inv_kind.to_skeleton_ty(ctx.tcx);
     let kind = TyInvKind::from_ty(ctx.tcx, ty);
     // TODO : Refactor and push binding down
-    let lhs: Exp = Exp::impure_qvar(names.ty_inv(ty)).app_to(Exp::pure_var("x".into()));
+    let lhs: Exp = Exp::impure_qvar(names.ty_inv(ty)).app_to(Exp::pure_var("x"));
     let rhs = if TyInvKind::Trivial == inv_kind {
         Exp::mk_true()
     } else {

From 6ca30e7bca3b18077185c282776ae48616e356fb Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 8 Mar 2024 18:31:25 +0100
Subject: [PATCH 50/66] update tests

---
 creusot/tests/should_fail/bug/222.mlcfg       |   8 +-
 .../traits/17_impl_refinement.mlcfg           |   8 +-
 creusot/tests/should_succeed/bdd.mlcfg        | 145 ++++------
 .../tests/should_succeed/bdd/why3session.xml  | 247 +++++++++-------
 .../tests/should_succeed/bdd/why3shapes.gz    | Bin 14367 -> 14576 bytes
 .../tests/should_succeed/binary_search.mlcfg  |  15 +-
 .../binary_search/why3session.xml             |   4 +-
 .../binary_search/why3shapes.gz               | Bin 2444 -> 2447 bytes
 creusot/tests/should_succeed/bug/206.mlcfg    |   8 +-
 .../should_succeed/bug/206/why3session.xml    |   2 +-
 .../should_succeed/bug/206/why3shapes.gz      | Bin 204 -> 211 bytes
 creusot/tests/should_succeed/bug/217.mlcfg    |  12 +-
 .../should_succeed/bug/217/why3session.xml    |   6 +-
 .../should_succeed/bug/217/why3shapes.gz      | Bin 128 -> 141 bytes
 creusot/tests/should_succeed/bug/464.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/564.mlcfg    |  16 +-
 .../tests/should_succeed/bug/pure_neq.mlcfg   |   8 +-
 .../bug/pure_neq/why3session.xml              |   4 +-
 .../should_succeed/bug/pure_neq/why3shapes.gz | Bin 102 -> 101 bytes
 creusot/tests/should_succeed/cell/02.mlcfg    |  34 +--
 .../should_succeed/cell/02/why3session.xml    |   8 +-
 .../should_succeed/cell/02/why3shapes.gz      | Bin 2154 -> 2158 bytes
 .../should_succeed/filter_positive.mlcfg      |  46 +--
 .../filter_positive/why3session.xml           |   8 +-
 .../filter_positive/why3shapes.gz             | Bin 886 -> 886 bytes
 .../should_succeed/heapsort_generic.mlcfg     |  17 +-
 .../heapsort_generic/why3session.xml          |   4 +-
 .../heapsort_generic/why3shapes.gz            | Bin 9128 -> 9128 bytes
 creusot/tests/should_succeed/hillel.mlcfg     |  57 ++--
 .../should_succeed/hillel/why3session.xml     |  16 +-
 .../tests/should_succeed/hillel/why3shapes.gz | Bin 7317 -> 7359 bytes
 .../should_succeed/iterators/01_range.mlcfg   |  21 +-
 .../iterators/01_range/why3session.xml        |   6 +-
 .../iterators/01_range/why3shapes.gz          | Bin 962 -> 962 bytes
 .../iterators/02_iter_mut.mlcfg               |  27 +-
 .../iterators/02_iter_mut/why3session.xml     |  22 +-
 .../iterators/02_iter_mut/why3shapes.gz       | Bin 3587 -> 3545 bytes
 .../should_succeed/iterators/04_skip.mlcfg    |  27 +-
 .../iterators/04_skip/why3session.xml         |   8 +-
 .../iterators/04_skip/why3shapes.gz           | Bin 1083 -> 1068 bytes
 .../should_succeed/iterators/05_map.mlcfg     |  79 +++---
 .../iterators/05_map/why3session.xml          | 164 +++++------
 .../iterators/05_map/why3shapes.gz            | Bin 6154 -> 5508 bytes
 .../iterators/06_map_precond.mlcfg            |  74 ++---
 .../iterators/06_map_precond/why3session.xml  | 268 +++++++++---------
 .../iterators/06_map_precond/why3shapes.gz    | Bin 9109 -> 8916 bytes
 .../should_succeed/iterators/07_fuse.mlcfg    |  41 +--
 .../iterators/07_fuse/why3session.xml         |  20 +-
 .../iterators/07_fuse/why3shapes.gz           | Bin 1437 -> 1322 bytes
 .../should_succeed/iterators/09_empty.mlcfg   |  23 +-
 .../iterators/09_empty/why3session.xml        |  10 +-
 .../iterators/09_empty/why3shapes.gz          | Bin 485 -> 449 bytes
 .../should_succeed/iterators/10_once.mlcfg    |  27 +-
 .../iterators/10_once/why3session.xml         |  12 +-
 .../iterators/10_once/why3shapes.gz           | Bin 646 -> 624 bytes
 .../should_succeed/iterators/11_repeat.mlcfg  |  27 +-
 .../iterators/11_repeat/why3session.xml       |  14 +-
 .../iterators/11_repeat/why3shapes.gz         | Bin 519 -> 494 bytes
 .../should_succeed/iterators/12_zip.mlcfg     |  27 +-
 .../iterators/12_zip/why3session.xml          |  42 +--
 .../iterators/12_zip/why3shapes.gz            | Bin 2177 -> 2105 bytes
 .../should_succeed/iterators/13_cloned.mlcfg  |  27 +-
 .../iterators/13_cloned/why3session.xml       |   6 +-
 .../iterators/13_cloned/why3shapes.gz         | Bin 818 -> 792 bytes
 .../should_succeed/iterators/14_copied.mlcfg  |  27 +-
 .../iterators/14_copied/why3session.xml       |   6 +-
 .../iterators/14_copied/why3shapes.gz         | Bin 818 -> 791 bytes
 .../iterators/15_enumerate.mlcfg              |  27 +-
 .../iterators/15_enumerate/why3session.xml    |   6 +-
 .../iterators/15_enumerate/why3shapes.gz      | Bin 1874 -> 1860 bytes
 .../should_succeed/iterators/16_take.mlcfg    |  27 +-
 .../iterators/16_take/why3session.xml         |   4 +-
 .../iterators/16_take/why3shapes.gz           | Bin 965 -> 949 bytes
 creusot/tests/should_succeed/knapsack.mlcfg   |  29 +-
 .../should_succeed/knapsack/why3session.xml   |   4 +-
 .../should_succeed/knapsack/why3shapes.gz     | Bin 5324 -> 5320 bytes
 .../tests/should_succeed/knapsack_full.mlcfg  |  89 +++---
 .../knapsack_full/why3session.xml             |  96 ++++++-
 .../knapsack_full/why3shapes.gz               | Bin 8521 -> 9268 bytes
 .../should_succeed/list_reversal_lasso.mlcfg  | 265 +++++++++--------
 .../list_reversal_lasso/why3session.xml       |  88 +++---
 .../list_reversal_lasso/why3shapes.gz         | Bin 13005 -> 12978 bytes
 .../tests/should_succeed/red_black_tree.mlcfg | 123 ++++----
 .../red_black_tree/why3session.xml            |  49 ++--
 .../red_black_tree/why3shapes.gz              | Bin 79329 -> 79307 bytes
 .../rusthorn/inc_some_2_list.mlcfg            |  15 +-
 .../rusthorn/inc_some_2_list/why3session.xml  |   4 +-
 .../rusthorn/inc_some_2_list/why3shapes.gz    | Bin 1026 -> 1024 bytes
 .../rusthorn/inc_some_2_tree.mlcfg            |  15 +-
 .../rusthorn/inc_some_2_tree/why3session.xml  |   4 +-
 .../rusthorn/inc_some_2_tree/why3shapes.gz    | Bin 1153 -> 1139 bytes
 .../rusthorn/inc_some_list.mlcfg              |  15 +-
 .../rusthorn/inc_some_list/why3session.xml    |   4 +-
 .../rusthorn/inc_some_list/why3shapes.gz      | Bin 913 -> 909 bytes
 .../rusthorn/inc_some_tree.mlcfg              |  15 +-
 .../rusthorn/inc_some_tree/why3session.xml    |   4 +-
 .../rusthorn/inc_some_tree/why3shapes.gz      | Bin 1011 -> 997 bytes
 .../tests/should_succeed/sparse_array.mlcfg   |  11 +-
 .../sparse_array/why3session.xml              |  24 +-
 .../should_succeed/sparse_array/why3shapes.gz | Bin 4259 -> 4244 bytes
 .../should_succeed/specification/forall.mlcfg |  10 +-
 .../specification/forall/why3session.xml      |   2 +-
 .../specification/forall/why3shapes.gz        | Bin 129 -> 144 bytes
 .../tests/should_succeed/sum_of_odds.mlcfg    |  24 +-
 .../sum_of_odds/why3session.xml               |   6 +-
 .../should_succeed/sum_of_odds/why3shapes.gz  | Bin 1712 -> 1729 bytes
 .../should_succeed/syntax/02_operators.mlcfg  | 248 ----------------
 .../should_succeed/syntax/02_operators.stderr |   9 +
 .../syntax/02_operators/why3session.xml       |   2 +-
 .../syntax/02_operators/why3shapes.gz         | Bin 693 -> 713 bytes
 .../should_succeed/syntax/05_pearlite.mlcfg   |   8 +-
 .../syntax/06_logic_function_contracts.mlcfg  |  49 ++--
 .../why3session.xml                           |  10 +-
 .../06_logic_function_contracts/why3shapes.gz | Bin 232 -> 244 bytes
 .../should_succeed/traits/18_trait_laws.mlcfg |  28 +-
 .../traits/18_trait_laws/why3session.xml      |   8 +-
 .../traits/18_trait_laws/why3shapes.gz        | Bin 288 -> 257 bytes
 .../type_invariants/non_zero.mlcfg            |  14 +-
 .../type_invariants/non_zero/why3session.xml  |   4 +-
 .../type_invariants/non_zero/why3shapes.gz    | Bin 378 -> 379 bytes
 .../type_invariants/quant.mlcfg               |  16 +-
 .../type_invariants/quant/why3session.xml     |   6 +-
 .../type_invariants/quant/why3shapes.gz       | Bin 174 -> 165 bytes
 .../vector/06_knights_tour.mlcfg              |   9 +-
 .../vector/06_knights_tour/why3session.xml    |   2 +-
 .../vector/06_knights_tour/why3shapes.gz      | Bin 11330 -> 11308 bytes
 126 files changed, 1362 insertions(+), 1697 deletions(-)
 delete mode 100644 creusot/tests/should_succeed/syntax/02_operators.mlcfg
 create mode 100644 creusot/tests/should_succeed/syntax/02_operators.stderr

diff --git a/creusot/tests/should_fail/bug/222.mlcfg b/creusot/tests/should_fail/bug/222.mlcfg
index afcebfbf66..2d61a81f46 100644
--- a/creusot/tests/should_fail/bug/222.mlcfg
+++ b/creusot/tests/should_fail/bug/222.mlcfg
@@ -6,11 +6,9 @@ module C222_A_IsTrue_Impl
   val mktrue0 [#"../222.rs" 7 4 7 22] (_1 : ()) : int
     ensures { result = mktrue0 _1 }
     
-  let rec ghost function is_true [#"../222.rs" 14 4 14 16] (_1 : ()) : ()
-    ensures { [#"../222.rs" 13 14 13 34] mktrue0 () <= 10 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../222.rs" 15 8 15 10] ()
+  constant _1  : ()
+  function is_true [#"../222.rs" 14 4 14 16] (_1 : ()) : ()
+  goal vc_is_true : [#"../222.rs" 13 14 13 34] mktrue0 () <= 10
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
index fc76655409..2b137a4f8b 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
@@ -23,11 +23,9 @@ module C17ImplRefinement_Impl1_NeedFalse_Impl
   use prelude.UInt64
   use prelude.Int
   use prelude.UInt64
-  let rec ghost function need_false [#"../17_impl_refinement.rs" 29 4 29 25] (y : uint64) : ()
-    requires {[#"../17_impl_refinement.rs" 28 15 28 23] UInt64.to_int y >= 15}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../17_impl_refinement.rs" 27 4 27 12] ()
+  constant y  : uint64
+  function need_false [#"../17_impl_refinement.rs" 29 4 29 25] (y : uint64) : ()
+  goal vc_need_false : true
 end
 module C17ImplRefinement_Impl0
   predicate invariant0 (self : ()) =
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 5beb972661..5f5e1a999c 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -756,15 +756,13 @@ module Bdd_Impl8_Size_Impl
   use Bdd_Node_Type as Bdd_Node_Type
   use Bdd_Bdd_Type as Bdd_Bdd_Type
   use prelude.Int
-  let rec ghost function size [#"../bdd.rs" 224 4 224 24] (self : Bdd_Bdd_Type.t_bdd) : int
-    ensures { [#"../bdd.rs" 223 14 223 25] result >= 0 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 226 12 234 13] match self with
-      | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_True) _ -> 0
-      | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_False) _ -> 0
-      | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> let ht = size childt in let hf = size childf in 1 + ht + hf
-      end
+  constant self  : Bdd_Bdd_Type.t_bdd
+  function size [#"../bdd.rs" 224 4 224 24] (self : Bdd_Bdd_Type.t_bdd) : int
+  goal vc_size : match self with
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_True) _ -> [#"../bdd.rs" 223 14 223 25] 0 >= 0
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_False) _ -> [#"../bdd.rs" 223 14 223 25] 0 >= 0
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> ([#"../bdd.rs" 223 14 223 25] size childt >= 0) -> (let ht = size childt in ([#"../bdd.rs" 223 14 223 25] size childf >= 0) -> (let hf = size childf in [#"../bdd.rs" 223 14 223 25] 1 + ht + hf >= 0))
+    end
 end
 module Bdd_Context_Type
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -946,14 +944,11 @@ module Bdd_Impl10_GrowsIsValidBdd_Impl
   val grows0 [#"../bdd.rs" 296 4 296 35] (self : borrowed (Bdd_Context_Type.t_context)) : bool
     ensures { result = grows0 self }
     
-  let rec ghost function grows_is_valid_bdd [#"../bdd.rs" 336 4 336 56] (self : borrowed (Bdd_Context_Type.t_context)) (b : Bdd_Bdd_Type.t_bdd) : ()
-    requires {[#"../bdd.rs" 333 15 333 27] grows0 self}
-    requires {[#"../bdd.rs" 334 15 334 35] is_valid_bdd0 ( * self) b}
-    requires {[#"../bdd.rs" 336 35 336 39] inv0 self}
-    ensures { [#"../bdd.rs" 335 14 335 37] is_valid_bdd0 ( ^ self) b }
+  constant self  : borrowed (Bdd_Context_Type.t_context)
+  constant b  : Bdd_Bdd_Type.t_bdd
+  function grows_is_valid_bdd [#"../bdd.rs" 336 4 336 56] (self : borrowed (Bdd_Context_Type.t_context)) (b : Bdd_Bdd_Type.t_bdd) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 331 4 331 12] ()
+  goal vc_grows_is_valid_bdd : ([#"../bdd.rs" 336 35 336 39] inv0 self) -> ([#"../bdd.rs" 334 15 334 35] is_valid_bdd0 ( * self) b) -> ([#"../bdd.rs" 333 15 333 27] grows0 self) -> ([#"../bdd.rs" 335 14 335 37] is_valid_bdd0 ( ^ self) b)
 end
 module Bdd_Impl10_GrowsTrans_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1090,18 +1085,12 @@ module Bdd_Impl10_GrowsTrans_Impl
   val grows0 [#"../bdd.rs" 296 4 296 35] (self : borrowed (Bdd_Context_Type.t_context)) : bool
     ensures { result = grows0 self }
     
-  let rec ghost function grows_trans [#"../bdd.rs" 345 4 345 62] (self : borrowed (Bdd_Context_Type.t_context)) (o : borrowed (Bdd_Context_Type.t_context)) (oo : borrowed (Bdd_Context_Type.t_context)) : ()
-    requires {[#"../bdd.rs" 340 15 340 27] grows0 self}
-    requires {[#"../bdd.rs" 341 15 341 24] grows0 o}
-    requires {[#"../bdd.rs" 342 15 342 26]  ^ self =  * o}
-    requires {[#"../bdd.rs" 343 15 343 43]  * self =  * oo /\  ^ self =  ^ oo}
-    requires {[#"../bdd.rs" 345 28 345 32] inv0 self}
-    requires {[#"../bdd.rs" 345 34 345 35] inv0 o}
-    requires {[#"../bdd.rs" 345 48 345 50] inv0 oo}
-    ensures { [#"../bdd.rs" 344 14 344 24] grows0 oo }
+  constant self  : borrowed (Bdd_Context_Type.t_context)
+  constant o  : borrowed (Bdd_Context_Type.t_context)
+  constant oo  : borrowed (Bdd_Context_Type.t_context)
+  function grows_trans [#"../bdd.rs" 345 4 345 62] (self : borrowed (Bdd_Context_Type.t_context)) (o : borrowed (Bdd_Context_Type.t_context)) (oo : borrowed (Bdd_Context_Type.t_context)) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 338 4 338 12] ()
+  goal vc_grows_trans : ([#"../bdd.rs" 345 48 345 50] inv0 oo) -> ([#"../bdd.rs" 345 34 345 35] inv0 o) -> ([#"../bdd.rs" 345 28 345 32] inv0 self) -> ([#"../bdd.rs" 343 15 343 43]  * self =  * oo /\  ^ self =  ^ oo) -> ([#"../bdd.rs" 342 15 342 26]  ^ self =  * o) -> ([#"../bdd.rs" 341 15 341 24] grows0 o) -> ([#"../bdd.rs" 340 15 340 27] grows0 self) -> ([#"../bdd.rs" 344 14 344 24] grows0 oo)
 end
 module Bdd_Impl10_SetIrreleventVar_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1221,17 +1210,17 @@ module Bdd_Impl10_SetIrreleventVar_Impl
     | Bdd_Context_Type.C_Context alloc hashcons hashcons_ghost not_memo and_memo cnt -> true
     end)
   use map.Map
-  let rec ghost function set_irrelevent_var [#"../bdd.rs" 351 4 351 87] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (x : uint64) (v : Map.map uint64 bool) (b : bool) : ()
-    requires {[#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a}
-    requires {[#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a}
-    requires {[#"../bdd.rs" 351 26 351 30] inv0 self}
-    ensures { [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 353 12 359 13] match a with
-      | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> let _ = set_irrelevent_var self childt x v b in let _ = set_irrelevent_var self childf x v b in ()
-      | _ -> ()
-      end
+  constant self  : Bdd_Context_Type.t_context
+  constant a  : Bdd_Bdd_Type.t_bdd
+  constant x  : uint64
+  constant v  : Map.map uint64 bool
+  constant b  : bool
+  function set_irrelevent_var [#"../bdd.rs" 351 4 351 87] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (x : uint64) (v : Map.map uint64 bool) (b : bool) : ()
+    
+  goal vc_set_irrelevent_var : ([#"../bdd.rs" 351 26 351 30] inv0 self) -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a) -> ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a) -> match a with
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childt) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childt)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childt v = interp0 childt (Map.set v x b)) -> (let _ = set_irrelevent_var self childt x v b in (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childf) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childf)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childf v = interp0 childf (Map.set v x b)) -> (let _ = set_irrelevent_var self childf x v b in [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b)))))
+    | _ -> [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b)
+    end
 end
 module Bdd_Impl10_DiscrValuation_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1376,48 +1365,39 @@ module Bdd_Impl10_DiscrValuation_Impl
     ensures { result = size0 self }
     
   axiom size0_spec : forall self : Bdd_Bdd_Type.t_bdd . [#"../bdd.rs" 223 14 223 25] size0 self >= 0
-  let rec ghost function discr_valuation [#"../bdd.rs" 370 4 370 82] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : Map.map uint64 bool
-    requires {[#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a}
-    requires {[#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b}
-    requires {[#"../bdd.rs" 366 15 366 21] a <> b}
-    requires {[#"../bdd.rs" 370 23 370 27] inv0 self}
-    ensures { [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result }
-    variant {[#"../bdd.rs" 368 14 368 33] size0 a + size0 b}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 372 12 372 36] let _ = () in if let x1 = leastvar0 b in let x0 = leastvar0 a in pure {x0 < x1} then
-      match a with
-        | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> if pure {childf <> b} then
-          let a' = discr_valuation self childf b in Map.set a' v false
-        else
-          let a' = discr_valuation self childt b in Map.set a' v true
-        
-        | _ -> Const.const true
+  constant self  : Bdd_Context_Type.t_context
+  constant a  : Bdd_Bdd_Type.t_bdd
+  constant b  : Bdd_Bdd_Type.t_bdd
+  function discr_valuation [#"../bdd.rs" 370 4 370 82] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : Map.map uint64 bool
+    
+  goal vc_discr_valuation : ([#"../bdd.rs" 370 23 370 27] inv0 self) -> ([#"../bdd.rs" 366 15 366 21] a <> b) -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a) -> (let _ = set_irrelevent_var0 in match leastvar0 a < leastvar0 b with
+    | True -> match a with
+      | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> match childf <> b with
+        | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childf <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childf)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childf + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childf (discr_valuation self childf b) <> interp0 b (discr_valuation self childf b)) -> (let result = Map.set (discr_valuation self childf b) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+        | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childt <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childt)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childt + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childt (discr_valuation self childt b) <> interp0 b (discr_valuation self childt b)) -> (let result = Map.set (discr_valuation self childt b) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
         end
-    else
-      if let x1 = leastvar0 b in let x0 = leastvar0 a in pure {x0 > x1} then
-        match b with
-          | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> if pure {childf <> a} then
-            let a' = discr_valuation self a childf in Map.set a' v false
-          else
-            let a' = discr_valuation self a childt in Map.set a' v true
-          
-          | _ -> Const.const true
+      | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
+      end
+    | False -> match leastvar0 a > leastvar0 b with
+      | True -> match b with
+        | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> match childf <> a with
+          | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childf) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childf) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childf) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childf) <> interp0 childf (discr_valuation self a childf)) -> (let result = Map.set (discr_valuation self a childf) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+          | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childt) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childt) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childt) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childt) <> interp0 childt (discr_valuation self a childt)) -> (let result = Map.set (discr_valuation self a childt) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
           end
-      else
-        match a with
-          | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childta childfa) _ -> match b with
-            | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childtb childfb) _ -> if pure {childfa <> childfb} then
-              let a' = discr_valuation self childfa childfb in Map.set a' v false
-            else
-              let a' = discr_valuation self childta childtb in Map.set a' v true
-            
-            | _ -> Const.const true
+        | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
+        end
+      | False -> match a with
+        | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childta childfa) _ -> match b with
+          | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childtb childfb) _ -> match childfa <> childfb with
+            | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childfa <> childfb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childfb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childfa)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childfa + size0 childfb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childfa (discr_valuation self childfa childfb) <> interp0 childfb (discr_valuation self childfa childfb)) -> (let result = Map.set (discr_valuation self childfa childfb) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+            | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childta <> childtb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childtb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childta)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childta + size0 childtb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childta (discr_valuation self childta childtb) <> interp0 childtb (discr_valuation self childta childtb)) -> (let result = Map.set (discr_valuation self childta childtb) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
             end
-          | _ -> Const.const true
+          | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
           end
-      
-    
+        | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
+        end
+      end
+    end)
 end
 module Bdd_Impl10_BddCanonical_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1605,15 +1585,12 @@ module Bdd_Impl10_BddCanonical_Impl
     ensures { result = discr_valuation0 self a b }
     
   axiom discr_valuation0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, b : Bdd_Bdd_Type.t_bdd . ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a) -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 366 15 366 21] a <> b) -> ([#"../bdd.rs" 370 23 370 27] inv0 self) -> ([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation0 self a b) <> interp0 b (discr_valuation0 self a b))
-  let rec ghost function bdd_canonical [#"../bdd.rs" 418 4 418 62] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : ()
-    requires {[#"../bdd.rs" 413 15 413 35] is_valid_bdd0 self a}
-    requires {[#"../bdd.rs" 414 15 414 35] is_valid_bdd0 self b}
-    requires {[#"../bdd.rs" 415 4 415 56] forall v : Map.map uint64 bool . interp0 a v = interp0 b v}
-    requires {[#"../bdd.rs" 418 25 418 29] inv0 self}
-    ensures { [#"../bdd.rs" 416 14 416 20] a = b }
+  constant self  : Bdd_Context_Type.t_context
+  constant a  : Bdd_Bdd_Type.t_bdd
+  constant b  : Bdd_Bdd_Type.t_bdd
+  function bdd_canonical [#"../bdd.rs" 418 4 418 62] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../bdd.rs" 419 8 419 29] let _ = () in ()
+  goal vc_bdd_canonical : ([#"../bdd.rs" 418 25 418 29] inv0 self) -> ([#"../bdd.rs" 415 4 415 56] forall v : Map.map uint64 bool . interp0 a v = interp0 b v) -> ([#"../bdd.rs" 414 15 414 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 413 15 413 35] is_valid_bdd0 self a) -> (let _ = discr_valuation0 in [#"../bdd.rs" 416 14 416 20] a = b)
 end
 module Bdd_Impl11_New
   use Bdd_Bdd_Type as Bdd_Bdd_Type
diff --git a/creusot/tests/should_succeed/bdd/why3session.xml b/creusot/tests/should_succeed/bdd/why3session.xml
index 6618e26c9c..f964ead7ce 100644
--- a/creusot/tests/should_succeed/bdd/why3session.xml
+++ b/creusot/tests/should_succeed/bdd/why3session.xml
@@ -43,158 +43,201 @@
  </goal>
 </theory>
 <theory name="Bdd_Impl8_Size_Impl" proved="true">
- <goal name="size&#39;vc" expl="VC for size" proved="true">
- <proof prover="6"><result status="valid" time="0.005392" steps="905"/></proof>
+ <goal name="vc_size" proved="true">
+ <proof prover="6"><result status="valid" time="0.005392" steps="704"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl10_GrowsIsValidBdd_Impl" proved="true">
- <goal name="grows_is_valid_bdd&#39;vc" expl="VC for grows_is_valid_bdd" proved="true">
+ <goal name="vc_grows_is_valid_bdd" proved="true">
  <proof prover="2"><result status="valid" time="0.019187" steps="34"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl10_GrowsTrans_Impl" proved="true">
- <goal name="grows_trans&#39;vc" expl="VC for grows_trans" proved="true">
- <proof prover="2"><result status="valid" time="0.018313" steps="130"/></proof>
+ <goal name="vc_grows_trans" proved="true">
+ <proof prover="2"><result status="valid" time="0.018313" steps="131"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl10_SetIrreleventVar_Impl" proved="true">
- <goal name="set_irrelevent_var&#39;vc" expl="VC for set_irrelevent_var" proved="true">
- <proof prover="0"><result status="valid" time="0.058851" steps="91912"/></proof>
+ <goal name="vc_set_irrelevent_var" proved="true">
+ <transf name="split_vc" proved="true" >
+  <goal name="vc_set_irrelevent_var.0" proved="true">
+  <proof prover="2"><result status="valid" time="0.009675" steps="18"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.1" proved="true">
+  <proof prover="2"><result status="valid" time="0.023378" steps="271"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.2" proved="true">
+  <proof prover="2"><result status="valid" time="0.028357" steps="430"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.3" proved="true">
+  <proof prover="2"><result status="valid" time="0.007923" steps="18"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.4" proved="true">
+  <proof prover="2"><result status="valid" time="0.019978" steps="274"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.5" proved="true">
+  <proof prover="2"><result status="valid" time="0.026867" steps="432"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.6" proved="true">
+  <proof prover="2"><result status="valid" time="0.015691" steps="262"/></proof>
+  </goal>
+  <goal name="vc_set_irrelevent_var.7" proved="true">
+  <proof prover="2"><result status="valid" time="0.009162" steps="64"/></proof>
+  </goal>
+ </transf>
  </goal>
 </theory>
 <theory name="Bdd_Impl10_DiscrValuation_Impl" proved="true">
- <goal name="discr_valuation&#39;vc" expl="VC for discr_valuation" proved="true">
+ <goal name="vc_discr_valuation" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="discr_valuation&#39;vc.0" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.025812" steps="98"/></proof>
+  <goal name="vc_discr_valuation.0" proved="true">
+  <proof prover="2"><result status="valid" time="0.020664" steps="24"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.114471" steps="601"/></proof>
+  <goal name="vc_discr_valuation.1" proved="true">
+  <proof prover="2"><result status="valid" time="0.032307" steps="24"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.048569" steps="26"/></proof>
+  <goal name="vc_discr_valuation.2" proved="true">
+  <proof prover="2"><result status="valid" time="0.016162" steps="24"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.030356" steps="26"/></proof>
+  <goal name="vc_discr_valuation.3" proved="true">
+  <proof prover="2"><result status="valid" time="0.028853" steps="598"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.016204" steps="26"/></proof>
+  <goal name="vc_discr_valuation.4" proved="true">
+  <proof prover="2"><result status="valid" time="0.034610" steps="42"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.5" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.030290" steps="59"/></proof>
+  <goal name="vc_discr_valuation.5" proved="true">
+  <proof prover="2"><result status="valid" time="0.114471" steps="71"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.078481" steps="686"/></proof>
+  <goal name="vc_discr_valuation.6" proved="true">
+  <proof prover="2"><result status="valid" time="0.042678" steps="739"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.7" expl="precondition" proved="true">
+  <goal name="vc_discr_valuation.7" proved="true">
+  <proof prover="2"><result status="valid" time="0.009565" steps="24"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.8" proved="true">
+  <proof prover="2"><result status="valid" time="0.034402" steps="583"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.9" proved="true">
+  <proof prover="2"><result status="valid" time="0.117302" steps="26"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.10" proved="true">
+  <proof prover="2"><result status="valid" time="0.032639" steps="688"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.11" proved="true">
+  <proof prover="2"><result status="valid" time="0.030290" steps="46"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.12" proved="true">
+  <proof prover="2"><result status="valid" time="0.015638" steps="37"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.13" proved="true">
+  <proof prover="2"><result status="valid" time="0.043320" steps="1187"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.14" proved="true">
+  <proof prover="2"><result status="valid" time="0.048000" steps="416"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.15" proved="true">
   <proof prover="2"><result status="valid" time="0.089751" steps="26"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.8" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.117302" steps="738"/></proof>
+  <goal name="vc_discr_valuation.16" proved="true">
+  <proof prover="2"><result status="valid" time="0.013187" steps="26"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.17" proved="true">
+  <proof prover="2"><result status="valid" time="0.016204" steps="601"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.18" proved="true">
+  <transf name="split_vc" proved="true" >
+   <goal name="vc_discr_valuation.18.0" proved="true">
+   <proof prover="2"><result status="valid" time="0.007793" steps="28"/></proof>
+   </goal>
+  </transf>
   </goal>
-  <goal name="discr_valuation&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.017166" steps="28"/></proof>
+  <goal name="vc_discr_valuation.19" proved="true">
+  <proof prover="2"><result status="valid" time="0.048032" steps="43"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.10" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.037308" steps="101"/></proof>
+  <goal name="vc_discr_valuation.20" proved="true">
+  <proof prover="2"><result status="valid" time="0.012275" steps="73"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.11" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.009565" steps="26"/></proof>
+  <goal name="vc_discr_valuation.21" proved="true">
+  <proof prover="2"><result status="valid" time="0.066769" steps="710"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.12" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.030320" steps="605"/></proof>
+  <goal name="vc_discr_valuation.22" proved="true">
+  <proof prover="2"><result status="valid" time="0.089908" steps="26"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.016162" steps="28"/></proof>
+  <goal name="vc_discr_valuation.23" proved="true">
+  <proof prover="2"><result status="valid" time="0.019378" steps="586"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.028853" steps="28"/></proof>
+  <goal name="vc_discr_valuation.24" proved="true">
+  <proof prover="2"><result status="valid" time="0.013918" steps="691"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.15" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.048032" steps="60"/></proof>
+  <goal name="vc_discr_valuation.25" proved="true">
+  <proof prover="2"><result status="valid" time="0.009560" steps="30"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.096612" steps="26"/></proof>
+  <goal name="vc_discr_valuation.26" proved="true">
+  <proof prover="2"><result status="valid" time="0.012964" steps="47"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.089908" steps="687"/></proof>
+  <goal name="vc_discr_valuation.27" proved="true">
+  <proof prover="2"><result status="valid" time="0.078481" steps="39"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.131765" steps="742"/></proof>
+  <goal name="vc_discr_valuation.28" proved="true">
+  <proof prover="2"><result status="valid" time="0.045751" steps="872"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.026191" steps="30"/></proof>
+  <goal name="vc_discr_valuation.29" proved="true">
+  <proof prover="2"><result status="valid" time="0.022579" steps="422"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.20" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.019378" steps="173"/></proof>
+  <goal name="vc_discr_valuation.30" proved="true">
+  <proof prover="2"><result status="valid" time="0.096612" steps="28"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.21" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.035483" steps="599"/></proof>
+  <goal name="vc_discr_valuation.31" proved="true">
+  <proof prover="2"><result status="valid" time="0.008095" steps="28"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.012964" steps="798"/></proof>
+  <goal name="vc_discr_valuation.32" proved="true">
+  <proof prover="2"><result status="valid" time="0.011262" steps="598"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.013918" steps="32"/></proof>
+  <goal name="vc_discr_valuation.33" proved="true">
+  <proof prover="2"><result status="valid" time="0.026191" steps="794"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.011262" steps="32"/></proof>
+  <goal name="vc_discr_valuation.34" proved="true">
+  <proof prover="2"><result status="valid" time="0.037308" steps="59"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.25" expl="variant decrease" proved="true">
-  <proof prover="2"><result status="valid" time="0.034610" steps="159"/></proof>
+  <goal name="vc_discr_valuation.35" proved="true">
+  <proof prover="2"><result status="valid" time="0.035483" steps="132"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.26" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.146583" steps="638"/></proof>
+  <goal name="vc_discr_valuation.36" proved="true">
+  <proof prover="2"><result status="valid" time="0.051186" steps="795"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.015638" steps="837"/></proof>
+  <goal name="vc_discr_valuation.37" proved="true">
+  <proof prover="2"><result status="valid" time="0.048569" steps="28"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.28" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.032639" steps="188"/></proof>
+  <goal name="vc_discr_valuation.38" proved="true">
+  <proof prover="2"><result status="valid" time="0.008233" steps="159"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.020664" steps="34"/></proof>
+  <goal name="vc_discr_valuation.39" proved="true">
+  <proof prover="2"><result status="valid" time="0.017166" steps="641"/></proof>
   </goal>
-  <goal name="discr_valuation&#39;vc.30" expl="postcondition" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="discr_valuation&#39;vc.30.0" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.156011" steps="1102"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.1" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.157314" steps="1944"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.2" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.109293" steps="415"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.3" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.142576" steps="1722"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.4" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.221156" steps="2025"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.5" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.126515" steps="421"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.6" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.112556" steps="1487"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.7" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.163507" steps="1609"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.8" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.018590" steps="207"/></proof>
-   </goal>
-   <goal name="discr_valuation&#39;vc.30.9" expl="postcondition" proved="true">
-   <proof prover="2"><result status="valid" time="0.065035" steps="1108"/></proof>
-   </goal>
-  </transf>
+  <goal name="vc_discr_valuation.40" proved="true">
+  <proof prover="2"><result status="valid" time="0.030356" steps="839"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.41" proved="true">
+  <proof prover="2"><result status="valid" time="0.025812" steps="63"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.42" proved="true">
+  <proof prover="2"><result status="valid" time="0.030320" steps="116"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.43" proved="true">
+  <proof prover="2"><result status="valid" time="0.044515" steps="838"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.44" proved="true">
+  <proof prover="2"><result status="valid" time="0.013710" steps="204"/></proof>
+  </goal>
+  <goal name="vc_discr_valuation.45" proved="true">
+  <proof prover="2"><result status="valid" time="0.033874" steps="825"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="Bdd_Impl10_BddCanonical_Impl" proved="true">
- <goal name="bdd_canonical&#39;vc" expl="VC for bdd_canonical" proved="true">
- <proof prover="6" timelimit="1"><result status="valid" time="0.062765" steps="17603"/></proof>
+ <goal name="vc_bdd_canonical" proved="true">
+ <proof prover="6" timelimit="1"><result status="valid" time="0.062765" steps="18902"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl11_New" proved="true">
diff --git a/creusot/tests/should_succeed/bdd/why3shapes.gz b/creusot/tests/should_succeed/bdd/why3shapes.gz
index 4506ae1babb921c56720f687b77c2848edd4354f..94b63552160bdd76f2cdcdf136491c8d8f68096e 100644
GIT binary patch
literal 14576
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
aRz#)^E<#l0V&wI({r?BKiYI#g1pxrA>W+;7

literal 14367
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
ZJY?FyB1Ba#MqW=o_%C69tFl%C0RSuWO6&jt

diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg
index 994615dafe..1edf5a7ab8 100644
--- a/creusot/tests/should_succeed/binary_search.mlcfg
+++ b/creusot/tests/should_succeed/binary_search.mlcfg
@@ -28,15 +28,12 @@ module BinarySearch_Impl0_LenLogic_Impl
     
   axiom inv0 : forall x : BinarySearch_List_Type.t_list t . inv0 x = true
   use prelude.Int
-  let rec ghost function len_logic [#"../binary_search.rs" 22 4 22 29] (self : BinarySearch_List_Type.t_list t) : int
-    requires {[#"../binary_search.rs" 22 17 22 21] inv0 self}
-    ensures { [#"../binary_search.rs" 21 14 21 25] result >= 0 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../binary_search.rs" 23 8 26 9] match self with
-      | BinarySearch_List_Type.C_Cons _ ls -> 1 + len_logic ls
-      | BinarySearch_List_Type.C_Nil -> 0
-      end
+  constant self  : BinarySearch_List_Type.t_list t
+  function len_logic [#"../binary_search.rs" 22 4 22 29] (self : BinarySearch_List_Type.t_list t) : int
+  goal vc_len_logic : ([#"../binary_search.rs" 22 17 22 21] inv0 self) -> match self with
+    | BinarySearch_List_Type.C_Cons _ ls -> ([#"../binary_search.rs" 22 17 22 21] inv0 ls) /\ (([#"../binary_search.rs" 21 14 21 25] len_logic ls >= 0) -> ([#"../binary_search.rs" 21 14 21 25] 1 + len_logic ls >= 0))
+    | BinarySearch_List_Type.C_Nil -> [#"../binary_search.rs" 21 14 21 25] 0 >= 0
+    end
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/binary_search/why3session.xml b/creusot/tests/should_succeed/binary_search/why3session.xml
index 426bf24a8c..f72f0b0ff8 100644
--- a/creusot/tests/should_succeed/binary_search/why3session.xml
+++ b/creusot/tests/should_succeed/binary_search/why3session.xml
@@ -6,8 +6,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="binary_search.mlcfg"/>
 <theory name="BinarySearch_Impl0_LenLogic_Impl" proved="true">
- <goal name="len_logic&#39;vc" expl="VC for len_logic" proved="true">
- <proof prover="0"><result status="valid" time="0.010000" steps="27"/></proof>
+ <goal name="vc_len_logic" proved="true">
+ <proof prover="0"><result status="valid" time="0.010000" steps="8"/></proof>
  </goal>
 </theory>
 <theory name="BinarySearch_Impl0_Index" proved="true">
diff --git a/creusot/tests/should_succeed/binary_search/why3shapes.gz b/creusot/tests/should_succeed/binary_search/why3shapes.gz
index c4f7ae7603be9b8183d1eeb77576d810f653cba5..789108b7ca0abd13c2d47ce7d16bd0c461ce7c05 100644
GIT binary patch
delta 2354
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
YuF9!<H@wI(cu~~<04nG}^${Te0DWYSb^rhX

delta 2400
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
SvmApLMg0%J-)txtApii8!KBjw

diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg
index c8536c1bde..345c839ced 100644
--- a/creusot/tests/should_succeed/bug/206.mlcfg
+++ b/creusot/tests/should_succeed/bug/206.mlcfg
@@ -89,11 +89,9 @@ module C206_U2_Impl
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
   use C206_A_Type as C206_A_Type
-  let rec ghost function u2 [#"../206.rs" 9 0 9 11] (a : C206_A_Type.t_a) : ()
-    ensures { [#"../206.rs" 8 10 8 22] shallow_model0 (C206_A_Type.a_0 a) = shallow_model0 (C206_A_Type.a_0 a) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../206.rs" 7 0 7 8] ()
+  constant a  : C206_A_Type.t_a
+  function u2 [#"../206.rs" 9 0 9 11] (a : C206_A_Type.t_a) : ()
+  goal vc_u2 : [#"../206.rs" 8 10 8 22] shallow_model0 (C206_A_Type.a_0 a) = shallow_model0 (C206_A_Type.a_0 a)
 end
 module C206_Ex
   use prelude.UIntSize
diff --git a/creusot/tests/should_succeed/bug/206/why3session.xml b/creusot/tests/should_succeed/bug/206/why3session.xml
index 9350a8b70b..efc26c5c54 100644
--- a/creusot/tests/should_succeed/bug/206/why3session.xml
+++ b/creusot/tests/should_succeed/bug/206/why3session.xml
@@ -6,7 +6,7 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="206.mlcfg"/>
 <theory name="C206_U2_Impl" proved="true">
- <goal name="u2&#39;vc" expl="VC for u2" proved="true">
+ <goal name="postcondition" proved="true">
  <proof prover="0"><result status="valid" time="0.006573" steps="2"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/bug/206/why3shapes.gz b/creusot/tests/should_succeed/bug/206/why3shapes.gz
index 18c61d460e6b30e7e14a80dd46282b1167459adc..1710daa6af2b6a122483ae176037cff81564276c 100644
GIT binary patch
literal 211
zcmV;^04)C>iwFP!00000|80)T3c@fDMfdrNEY;PdNs}nL5JBP(WLu_Ws)e>u8+`n|
zQCw*k!@%L(J2PAG@q}j@`Hik)8;2Fwd@*O~g6(h<9`+2^8|-K}rW0nh>*BrYW1tSa
zz!a-?NZ8{8wx7VCa(Lss_uoqJMXucZc!*V=Nyw-_r)Tx~aysbcB+M5NiTNFG;+4~b
zv05uxD=P}qGyx=_(WO=zgEmyxWVmwD6;3!{a#?0q=&)242vtyxwS>ZkQW6;A#%Wi6
N<rlr8QI<pj0016PWnlmS

literal 204
zcmV;-05ks|iwFP!00000|80y*j>0eyME5?0mjkQzCuwIiED#bh7w|S}%bg)oh=GL9
z@d*gA09I8hy;nbTIc#aqgFN$bXmkH7OF5s3@jz{VRsq(6{ub16|37YNLc1<s>RnFU
zK~Oa2y6s2W(G`{t;RD&+=PB3EO9*<ZBCKSSkMg7iE#4fW8iM&cPUhz2@>PiF2qQR*
z=l~l=;)txvD#ggCQ<Byjuf6ghOjTGDRhcU5fXOD?ILD-1Dhva%L|^*i3Eu!tdT8kv
G0RRAKzg#2$

diff --git a/creusot/tests/should_succeed/bug/217.mlcfg b/creusot/tests/should_succeed/bug/217.mlcfg
index e146410542..bea29c6175 100644
--- a/creusot/tests/should_succeed/bug/217.mlcfg
+++ b/creusot/tests/should_succeed/bug/217.mlcfg
@@ -10,9 +10,11 @@ module C217_Ex_Impl
     ensures { result = tail0 self }
     
   use prelude.Int
-  let rec ghost function ex [#"../217.rs" 11 0 11 37] (c : Seq.seq int) (a : int) : int
-    variant {[#"../217.rs" 10 10 10 17] Seq.length c}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../217.rs" 9 0 9 8] if pure {Seq.length c = 0} then 0 else let a' = tail0 c in ex a' a
+  constant c  : Seq.seq int
+  constant a  : int
+  function ex [#"../217.rs" 11 0 11 37] (c : Seq.seq int) (a : int) : int
+  goal vc_ex : match Seq.length c = 0 with
+    | True -> true
+    | False -> 0 <= ([#"../217.rs" 10 10 10 17] Seq.length c) /\ ([#"../217.rs" 10 10 10 17] Seq.length (tail0 c)) < ([#"../217.rs" 10 10 10 17] Seq.length c)
+    end
 end
diff --git a/creusot/tests/should_succeed/bug/217/why3session.xml b/creusot/tests/should_succeed/bug/217/why3session.xml
index 626a388c9d..1cdddd223a 100644
--- a/creusot/tests/should_succeed/bug/217/why3session.xml
+++ b/creusot/tests/should_succeed/bug/217/why3session.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="217.mlcfg"/>
 <theory name="C217_Ex_Impl" proved="true">
- <goal name="ex&#39;vc" expl="VC for ex" proved="true">
- <proof prover="0"><result status="valid" time="0.007474" steps="17"/></proof>
+ <goal name="vc_ex" proved="true">
+ <proof prover="0"><result status="valid" time="0.009151" steps="17"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/217/why3shapes.gz b/creusot/tests/should_succeed/bug/217/why3shapes.gz
index 8e03a3911c7ae463942247de86b269ad8603306d..05ecd033d9708f8cb5e22ad702b2ad189f445b7f 100644
GIT binary patch
literal 141
zcmV;80CN8yiwFP!00000|2>UC3c@fH1@}2cmfBUClr)icQ3~P#+{^R#YXh;CCJNqO
zu-Mfw43D=fWEwGZl5bv8cuogtWw951#(8-$8bqG%c|=Bt3iMa%(6ppB#St-aSg}sq
vEs_%anDgiIyAlFc)!I{4TW2b7%Yo@?v>O~l`<t<{JSp)7xS8I-ng9R*F3di8

literal 128
zcmV-`0Du1<iwFP!00000|3$~K4uU`o0MNZ((NUQSA}Iz2LSkfbyuCeoLPCIW#Q6Cx
zM&9;L3C2NIi}<!Jj>~+*0+TaHC6mpseUM$oi5&gvsFAAnN4uxg|9HBCYcVVv+6TZh
i8?pAemRY!#8K-h#^@VCM=Df%BLGT4u91^O60002ND>{Mz

diff --git a/creusot/tests/should_succeed/bug/464.mlcfg b/creusot/tests/should_succeed/bug/464.mlcfg
index 012385300c..c30857ff70 100644
--- a/creusot/tests/should_succeed/bug/464.mlcfg
+++ b/creusot/tests/should_succeed/bug/464.mlcfg
@@ -17,11 +17,11 @@ module C464_Impl1_Invariant_Impl
   val invariant0 [#"../464.rs" 23 4 23 30] (self : C464_AssocStruct_Type.t_assocstruct) : bool
     ensures { result = invariant0 self }
     
-  let rec ghost predicate invariant' [#"../464.rs" 34 4 34 50] (self : C464_Struct_Type.t_struct) (assoc : C464_AssocStruct_Type.t_assocstruct)
-    ensures { [#"../464.rs" 33 4 33 44] result -> invariant0 assoc }
+  constant self  : C464_Struct_Type.t_struct
+  constant assoc  : C464_AssocStruct_Type.t_assocstruct
+  predicate invariant' [#"../464.rs" 34 4 34 50] (self : C464_Struct_Type.t_struct) (assoc : C464_AssocStruct_Type.t_assocstruct)
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../464.rs" 35 8 35 12] true
+  goal vc_invariant' : [#"../464.rs" 33 4 33 44] true -> invariant0 assoc
 end
 module C464_Impl0
   
diff --git a/creusot/tests/should_succeed/bug/564.mlcfg b/creusot/tests/should_succeed/bug/564.mlcfg
index 0f035c076a..d0b95f1f51 100644
--- a/creusot/tests/should_succeed/bug/564.mlcfg
+++ b/creusot/tests/should_succeed/bug/564.mlcfg
@@ -7,11 +7,9 @@ module C564_EmitsPureEq_Impl
   val invariants0 [#"../564.rs" 23 0 23 23] (_1 : ()) : bool
     ensures { result = invariants0 _1 }
     
-  let rec ghost function emits_pure_eq [#"../564.rs" 7 0 7 30] (_1 : ()) : bool
-    requires {[#"../564.rs" 6 11 6 23] invariants0 ()}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../564.rs" 9 8 9 30] let x0 = pure {(1 : int32) = (1 : int32)} in pure {x0 = true}
+  constant _1  : ()
+  function emits_pure_eq [#"../564.rs" 7 0 7 30] (_1 : ()) : bool
+  goal vc_emits_pure_eq : true
 end
 module C564_EmitsPureImplies_Impl
   use prelude.Int32
@@ -21,9 +19,7 @@ module C564_EmitsPureImplies_Impl
   val invariants0 [#"../564.rs" 23 0 23 23] (_1 : ()) : bool
     ensures { result = invariants0 _1 }
     
-  let rec ghost function emits_pure_implies [#"../564.rs" 16 0 16 35] (_1 : ()) : bool
-    requires {[#"../564.rs" 15 11 15 23] invariants0 ()}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../564.rs" 17 4 19 5] pure {true}
+  constant _1  : ()
+  function emits_pure_implies [#"../564.rs" 16 0 16 35] (_1 : ()) : bool
+  goal vc_emits_pure_implies : true
 end
diff --git a/creusot/tests/should_succeed/bug/pure_neq.mlcfg b/creusot/tests/should_succeed/bug/pure_neq.mlcfg
index d879bbbd44..e2fe9beecb 100644
--- a/creusot/tests/should_succeed/bug/pure_neq.mlcfg
+++ b/creusot/tests/should_succeed/bug/pure_neq.mlcfg
@@ -9,9 +9,9 @@ module PureNeq_F_Impl
   use prelude.Int
   use prelude.Int
   use Core_Option_Option_Type as Core_Option_Option_Type
-  let rec ghost function f [#"../pure_neq.rs" 7 0 7 48] (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : bool
-    ensures { [#"../pure_neq.rs" 6 10 6 29] result = (not x = y) }
+  constant x  : Core_Option_Option_Type.t_option int
+  constant y  : Core_Option_Option_Type.t_option int
+  function f [#"../pure_neq.rs" 7 0 7 48] (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : bool
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../pure_neq.rs" 8 16 8 22] pure {x <> y}
+  goal vc_f : [#"../pure_neq.rs" 6 10 6 29] (x <> y) = (not x = y)
 end
diff --git a/creusot/tests/should_succeed/bug/pure_neq/why3session.xml b/creusot/tests/should_succeed/bug/pure_neq/why3session.xml
index 58a8feb931..462f47b14d 100644
--- a/creusot/tests/should_succeed/bug/pure_neq/why3session.xml
+++ b/creusot/tests/should_succeed/bug/pure_neq/why3session.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="pure_neq.mlcfg"/>
 <theory name="PureNeq_F_Impl" proved="true">
- <goal name="f&#39;vc" expl="VC for f" proved="true">
+ <goal name="vc_f" proved="true">
  <proof prover="0"><result status="valid" time="0.006019" steps="0"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/bug/pure_neq/why3shapes.gz b/creusot/tests/should_succeed/bug/pure_neq/why3shapes.gz
index fdf5d8e08be43892386571c17fa26d2c84b58f7f..082fa224abbd15cced4ded43f821da7664d1c14f 100644
GIT binary patch
delta 69
zcmV-L0J{HXWsoI6O{_?)EQHcrsksFumGNMuTwIBU78Xe+DT$_r=4NRIrpC#shK82L
bW@+Y@=4R&RCMF7o9tK<hmXgY~S^xk5N3R~F

delta 70
zcmV-M0J;BVW{@R84KoNcEQHc-Tw%@%Y57G8X<S@J$;k#5mPRItiH63hmPw{5sYzx=
cW|js?sb;C>sg?!`h8_l70Dm@e99RGV0J~Zlwg3PC

diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index a97461e951..817b08adf8 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -22,11 +22,15 @@ module C02_Cell_Type
 end
 module C02_Fib_Impl
   use prelude.Int
-  let rec ghost function fib [#"../02.rs" 32 0 32 25] (i : int) : int
-    variant {[#"../02.rs" 31 10 31 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../02.rs" 29 0 29 8] if pure {i <= 0} then 0 else if pure {i = 1} then 1 else fib (i - 1) + fib (i - 2)
+  constant i  : int
+  function fib [#"../02.rs" 32 0 32 25] (i : int) : int
+  goal vc_fib : match i <= 0 with
+    | True -> true
+    | False -> match i = 1 with
+      | True -> true
+      | False -> (0 <= ([#"../02.rs" 31 10 31 11] i) /\ ([#"../02.rs" 31 10 31 11] i - 1) < ([#"../02.rs" 31 10 31 11] i)) /\ 0 <= ([#"../02.rs" 31 10 31 11] i) /\ ([#"../02.rs" 31 10 31 11] i - 2) < ([#"../02.rs" 31 10 31 11] i)
+      end
+    end
 end
 module C02_LemmaFibBound_Impl
   use int.Power
@@ -40,17 +44,15 @@ module C02_LemmaFibBound_Impl
   val fib0 [#"../02.rs" 32 0 32 25] (i : int) : int
     ensures { result = fib0 i }
     
-  let rec ghost function lemma_fib_bound [#"../02.rs" 47 0 47 30] (i : int) : ()
-    requires {[#"../02.rs" 44 11 44 17] 0 <= i}
-    ensures { [#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i }
-    variant {[#"../02.rs" 46 10 46 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../02.rs" 43 0 43 8] if pure {i = 0} then
-      ()
-    else
-      if pure {i = 1} then () else let _ = lemma_fib_bound (i - 2) in lemma_fib_bound (i - 1)
-    
+  constant i  : int
+  function lemma_fib_bound [#"../02.rs" 47 0 47 30] (i : int) : ()
+  goal vc_lemma_fib_bound : ([#"../02.rs" 44 11 44 17] 0 <= i) -> match i = 0 with
+    | True -> [#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i
+    | False -> match i = 1 with
+      | True -> [#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i
+      | False -> (([#"../02.rs" 44 11 44 17] 0 <= i - 2) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 2) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 2) <= Power.power 2 (i - 2)) -> (let _ = lemma_fib_bound (i - 2) in (([#"../02.rs" 44 11 44 17] 0 <= i - 1) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 1) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 1) <= Power.power 2 (i - 1)) -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i))))
+      end
+    end
 end
 module C02_Fib_Type
   use prelude.UIntSize
diff --git a/creusot/tests/should_succeed/cell/02/why3session.xml b/creusot/tests/should_succeed/cell/02/why3session.xml
index abd75c4f6b..faf61b46b4 100644
--- a/creusot/tests/should_succeed/cell/02/why3session.xml
+++ b/creusot/tests/should_succeed/cell/02/why3session.xml
@@ -8,13 +8,13 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="02.mlcfg"/>
 <theory name="C02_Fib_Impl" proved="true">
- <goal name="fib&#39;vc" expl="VC for fib" proved="true">
- <proof prover="0"><result status="valid" time="0.008499" steps="428"/></proof>
+ <goal name="vc_fib" proved="true">
+ <proof prover="0"><result status="valid" time="0.008499" steps="320"/></proof>
  </goal>
 </theory>
 <theory name="C02_LemmaFibBound_Impl" proved="true">
- <goal name="lemma_fib_bound&#39;vc" expl="VC for lemma_fib_bound" proved="true">
- <proof prover="0"><result status="valid" time="0.010987" steps="9108"/></proof>
+ <goal name="vc_lemma_fib_bound" proved="true">
+ <proof prover="0"><result status="valid" time="0.010987" steps="11725"/></proof>
  </goal>
 </theory>
 <theory name="C02_FibMemo" proved="true">
diff --git a/creusot/tests/should_succeed/cell/02/why3shapes.gz b/creusot/tests/should_succeed/cell/02/why3shapes.gz
index 6dbc9f005fd6a05eb13f345ed64be946c480a4e3..89c80ad8e1be8b41116739485dd659bfb0def7a2 100644
GIT binary patch
literal 2158
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

literal 2154
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

diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index f32f455df0..fe25709bb5 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -5,15 +5,17 @@ module FilterPositive_NumOfPos_Impl
   use prelude.Int32
   use seq.Seq
   use prelude.Int
-  let rec ghost function num_of_pos [#"../filter_positive.rs" 37 0 37 49] (i : int) (j : int) (t : Seq.seq int32) : int
-    variant {[#"../filter_positive.rs" 36 10 36 13] j - i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../filter_positive.rs" 38 4 46 5] if pure {i >= j} then
-      0
-    else
-      if pure {Int32.to_int (Seq.get t (j - 1)) > 0} then num_of_pos i (j - 1) t + 1 else num_of_pos i (j - 1) t
-    
+  constant i  : int
+  constant j  : int
+  constant t  : Seq.seq int32
+  function num_of_pos [#"../filter_positive.rs" 37 0 37 49] (i : int) (j : int) (t : Seq.seq int32) : int
+  goal vc_num_of_pos : match i >= j with
+    | True -> true
+    | False -> match Int32.to_int (Seq.get t (j - 1)) > 0 with
+      | True -> 0 <= ([#"../filter_positive.rs" 36 10 36 13] j - i) /\ ([#"../filter_positive.rs" 36 10 36 13] j - 1 - i) < ([#"../filter_positive.rs" 36 10 36 13] j - i)
+      | False -> 0 <= ([#"../filter_positive.rs" 36 10 36 13] j - i) /\ ([#"../filter_positive.rs" 36 10 36 13] j - 1 - i) < ([#"../filter_positive.rs" 36 10 36 13] j - i)
+      end
+    end
 end
 module FilterPositive_LemmaNumOfPosIncreasing_Impl
   use prelude.Int32
@@ -30,13 +32,16 @@ module FilterPositive_LemmaNumOfPosIncreasing_Impl
   val num_of_pos0 [#"../filter_positive.rs" 37 0 37 49] (i : int) (j : int) (t : Seq.seq int32) : int
     ensures { result = num_of_pos0 i j t }
     
-  let rec ghost function lemma_num_of_pos_increasing [#"../filter_positive.rs" 65 0 65 67] (i : int) (j : int) (k : int) (t : Seq.seq int32) : ()
-    requires {[#"../filter_positive.rs" 62 11 62 17] j <= k}
-    ensures { [#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t }
-    variant {[#"../filter_positive.rs" 64 10 64 13] k - j}
+  constant i  : int
+  constant j  : int
+  constant k  : int
+  constant t  : Seq.seq int32
+  function lemma_num_of_pos_increasing [#"../filter_positive.rs" 65 0 65 67] (i : int) (j : int) (k : int) (t : Seq.seq int32) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../filter_positive.rs" 67 8 69 9] if pure {j < k} then lemma_num_of_pos_increasing i (j + 1) k t else ()
+  goal vc_lemma_num_of_pos_increasing : ([#"../filter_positive.rs" 62 11 62 17] j <= k) -> match j < k with
+    | True -> (([#"../filter_positive.rs" 62 11 62 17] j + 1 <= k) /\ 0 <= ([#"../filter_positive.rs" 64 10 64 13] k - j) /\ ([#"../filter_positive.rs" 64 10 64 13] k - (j + 1)) < ([#"../filter_positive.rs" 64 10 64 13] k - j)) /\ (([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i (j + 1) t <= num_of_pos0 i k t) -> ([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t))
+    | False -> [#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t
+    end
 end
 module FilterPositive_LemmaNumOfPosStrictlyIncreasing_Impl
   use prelude.Int32
@@ -54,13 +59,10 @@ module FilterPositive_LemmaNumOfPosStrictlyIncreasing_Impl
     ensures { result = num_of_pos0 i j t }
     
   use seq.Seq
-  let rec ghost function lemma_num_of_pos_strictly_increasing [#"../filter_positive.rs" 79 0 79 60] (i : int) (t : Seq.seq int32) : ()
-    requires {[#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t}
-    requires {[#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0}
-    ensures { [#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../filter_positive.rs" 75 0 75 8] ()
+  constant i  : int
+  constant t  : Seq.seq int32
+  function lemma_num_of_pos_strictly_increasing [#"../filter_positive.rs" 79 0 79 60] (i : int) (t : Seq.seq int32) : ()
+  goal vc_lemma_num_of_pos_strictly_increasing : ([#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0) -> ([#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t) -> ([#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t)
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
diff --git a/creusot/tests/should_succeed/filter_positive/why3session.xml b/creusot/tests/should_succeed/filter_positive/why3session.xml
index 6ff4d0d310..5ddae2cb75 100644
--- a/creusot/tests/should_succeed/filter_positive/why3session.xml
+++ b/creusot/tests/should_succeed/filter_positive/why3session.xml
@@ -7,17 +7,17 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="filter_positive.mlcfg"/>
 <theory name="FilterPositive_NumOfPos_Impl" proved="true">
- <goal name="num_of_pos&#39;vc" expl="VC for num_of_pos" proved="true">
+ <goal name="vc_num_of_pos" proved="true">
  <proof prover="4"><result status="valid" time="0.006805" steps="2"/></proof>
  </goal>
 </theory>
 <theory name="FilterPositive_LemmaNumOfPosIncreasing_Impl" proved="true">
- <goal name="lemma_num_of_pos_increasing&#39;vc" expl="VC for lemma_num_of_pos_increasing" proved="true">
- <proof prover="0"><result status="valid" time="0.015897" steps="39523"/></proof>
+ <goal name="vc_lemma_num_of_pos_increasing" proved="true">
+ <proof prover="0"><result status="valid" time="0.015897" steps="26541"/></proof>
  </goal>
 </theory>
 <theory name="FilterPositive_LemmaNumOfPosStrictlyIncreasing_Impl" proved="true">
- <goal name="lemma_num_of_pos_strictly_increasing&#39;vc" expl="VC for lemma_num_of_pos_strictly_increasing" proved="true">
+ <goal name="vc_lemma_num_of_pos_strictly_increasing" proved="true">
  <proof prover="4"><result status="valid" time="0.008797" steps="31"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/filter_positive/why3shapes.gz b/creusot/tests/should_succeed/filter_positive/why3shapes.gz
index bfed154a011f3011df10b06536d20ad68d454599..0db3cef9ee62f0eab0b5f2cbb0caab3064eb9e1f 100644
GIT binary patch
literal 886
zcmV-+1Bv_}iwFP!00000|BY1Lj@nENz0Xr{*LGKx#`B+Qsf5s?aQ|s88@XY!n<bDf
zgx&V-KhGpk5}>U>8OJ{U86P_z?<V_aeD(Xuo8RrLX8UELCwHHcd5iz;4t|ag_?dn$
z1z;6UtY-KyEm$W<%wHf2toOb@I{a5`o4ne#_~ct`J6D2V0Zz&PCGnfr_E#RuOmK?Z
z!zORa{I%IL#~e6bRYM(qc2JNW@2~5r(DM=q7!3uZBEC*T%tb;MA7l!JP_0AF8r$V1
z?mo8S3U(GdweA5ydO3BfmwVf~Z|pynaHVk%gj~nc=uGJK%&7=&?MQQvRj8R<$XNUB
zQ~Mn24aHT<F=JK1lJ*By+c)Fbq8D{&TPG^VkD_$qC<-T!B6sR2g42s6RN7}Hn(MlG
z&o|A=*Wk=C^9FyiS#-F7EQ6Xka}3FxU5p1MbwIqrXjIa`JfoQa7!Avr<!oFa&I^G%
z<8fj_@R+gon+@i_<B(6W^SH0JPn4ZI5DugRMT>KItv&mj1KyKMC?YuFL+9VM>%3T?
z-Wvz$h0>BTj6pPqri>=Rar(n}7DyY`1eT+Fa|jkj0qN}dB4sxwq>3%*92_^Js7HM|
zrjPSD_`m&5$bmk+F(8~TaY|;#?Sdpc5L(L*(Z>?0=kL0JMVO)ddvn;X_LtV>yzJI!
z9%35DRlim7P3YM$fzYE6s({D1flesG(sT6TBb4BsuPoSO#L$X}$62>GLd=k^n7?6t
z@YGX1ysn_@26Uf;M}IzA{lT3E<wBPboQSE9y%p?gZ$q-j#cYnZc2n9B$F~@|M)@hb
zyfG<?U8h<xC(|+2G95A@)t{&i)&bShIvL2NVw{vG&go6d5$9TtV#y-3b?5g@{pRUw
zCPEx7@O!h{HSd1)VY7D1Vp(mmcA8_gqGu#RbElzWo)W?AR-^Ho)7P6T$#BY@`+EQW
z>~}ObbcYMvwV;Dx8$0!Rzs1u2fQ!NJ;#CqipOnpRvPlxJgr_!ZPG8HEDZi4Ka$%G)
zVx>x5Odw-PX_?Xr($v~iaLttv))dm%l<5)*MIe#!glRCwmcB6FScAN<S_x_W3Oq$d
zPcTU^!$m1m<CV84C1_iuO0Tp+kjkfmO(4y{W?(YV8K?|o1|kEV0c60kG_#q>bf%L3
M0U8uFWEBYj03)=$$N&HU

literal 886
zcmV-+1Bv_}iwFP!00000|AkdukDE#ieb2Apt+!iM8qXJSwW$=XHkwFR_o?z@BL{|E
zR1&t3?6&{D9tde5$ySPB#$)@~=Xl6JcTxLHFTRalebbip?%&8pcOPdZ-P33KjF16}
z@J6wq`+0U;|K;=x?dx^9+tZWZqwF0svHG9B%uygLXZR2mbrbCl+jU*6U+Q*7bNaIr
z!3$+sj%`OoNuRFUGq{1wg$>AD<|tU9Mmw<>w5xJ|;YpuRGt3oly5}q=P=ImwW?+MH
z_tYn5c>Q0WW7P+&LIA%{d{lnBrS+fm+)37WYRlad7k-YLb(N1ToLg~ydNpQ2vo*-W
z4OD*jw0|B-LUkLs-8W^nuYR3Zu>V2j?lnfSJT7e@v|k#O!%~O5{gO)@mNK;2FPXw#
zhrS%*0j#R}ZN05?Ujfs0EPhKrx$Y2f;j#*5f$@-1V6vQ!P>R5c!(@okFcX4l0+@`^
z*~!@;LB}CG_lLtQh2$OLJCZTFL{JDC!Ibp%@KSm4w*VFqf{I-bi`K<ojx8|vF+zG_
zOxW1XRX7f$Ovgs@4=x5rhQ=kVCVfi?CnC(N6vOyPIL?pkDd+=G#*?grJ)O!YWk_%q
zck&$B(;EXK<%;Hfj51mBiVo~;^@lDdVNuWbHiKoDq4lOd?DF>VboEfslB(7}gq$%-
z({KBovWqc*vXc}hgGc(>96Tz%_;Y@i#{|L1bh4L{eXP#JW9P$HL_IG0d!y8XxW)A=
zRR_<U+Ht#z+YR1F4B5rY5yt(vr%}1k0|KfJdf--xtK0^#$K~RIZrx3tOf<fw&^5_V
z==#Q_7;#-{BT%PPsdYM5LYw!b4yPljb%HvG%f+D9C(U_h^+a>4C%O0w&SW;et*ckh
zUo#c*SVfz<Y3ethf7pIUlTcCas6s2L%=y^~VI^AVm1iJW+#;I3p}kHn|67R@_S#qN
z+p}+YZn%dFziUZH!!`{%;(qH&d&jR!e%G}!{DW*~GnrVjloqfll(#+y&97Wj?(<Et
z0U3c4v&1W%rryNaW&?a=L1z?O61wnNAw{H}a&nf$X<<|vE9Di%GK(RTWQxL&0G$*%
zvd*wuELEY?*c+da)?kw?H8!_~KpUSb5lL`TI7l5N4q^w^fpMT6C<oF3I1ny%iHm2y
M0qOo9-3kc+00-*0(EtDd

diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index a476984f29..a94fc218d4 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -127,15 +127,14 @@ module HeapsortGeneric_HeapFragMax_Impl
   val heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq t) (start : int) (end' : int) : bool
     ensures { result = heap_frag0 s start end' }
     
-  let rec ghost function heap_frag_max [#"../heapsort_generic.rs" 25 0 25 58] (s : Seq.seq t) (i : int) (end' : int) : ()
-    requires {[#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end'}
-    requires {[#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end'}
-    requires {[#"../heapsort_generic.rs" 25 30 25 31] inv0 s}
-    ensures { [#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0) }
-    variant {[#"../heapsort_generic.rs" 24 10 24 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../heapsort_generic.rs" 26 4 28 5] if pure {i > 0} then let b' = parent0 i in heap_frag_max s b' end' else ()
+  constant s  : Seq.seq t
+  constant i  : int
+  constant end'  : int
+  function heap_frag_max [#"../heapsort_generic.rs" 25 0 25 58] (s : Seq.seq t) (i : int) (end' : int) : ()
+  goal vc_heap_frag_max : ([#"../heapsort_generic.rs" 25 30 25 31] inv0 s) -> ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end') -> ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end') -> match i > 0 with
+    | True -> ((([#"../heapsort_generic.rs" 25 30 25 31] inv0 s) && ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= parent0 i /\ parent0 i < end') && ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end')) /\ 0 <= ([#"../heapsort_generic.rs" 24 10 24 11] i) /\ ([#"../heapsort_generic.rs" 24 10 24 11] parent0 i) < ([#"../heapsort_generic.rs" 24 10 24 11] i)) /\ (([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s (parent0 i)) (Seq.get s 0)) -> ([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0)))
+    | False -> [#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0)
+    end
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3session.xml b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
index 29a8903bd5..690890b9a9 100644
--- a/creusot/tests/should_succeed/heapsort_generic/why3session.xml
+++ b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
@@ -9,8 +9,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="heapsort_generic.mlcfg"/>
 <theory name="HeapsortGeneric_HeapFragMax_Impl" proved="true">
- <goal name="heap_frag_max&#39;vc" expl="VC for heap_frag_max" proved="true">
- <proof prover="5"><result status="valid" time="0.050000" steps="509"/></proof>
+ <goal name="vc_heap_frag_max" proved="true">
+ <proof prover="5"><result status="valid" time="0.050000" steps="524"/></proof>
  </goal>
 </theory>
 <theory name="HeapsortGeneric_SiftDown" proved="true">
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz b/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz
index 34d7d0264c255d6285bc457c7a719b650c4ced7e..e11d0258e0003122492c1958b120ec81d106e452 100644
GIT binary patch
literal 9128
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

literal 9128
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

diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index bf40bfcafc..1ff97fbf85 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -511,13 +511,10 @@ module Hillel_SubsetPush_Impl
     ensures { result = is_subset0 sub sup }
     
   use seq.Seq
-  let rec ghost function subset_push [#"../hillel.rs" 72 0 72 37] (s : Seq.seq t) (elem : t) : ()
-    requires {[#"../hillel.rs" 72 18 72 19] inv0 s}
-    requires {[#"../hillel.rs" 72 29 72 33] inv1 elem}
-    ensures { [#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../hillel.rs" 70 0 70 8] ()
+  constant s  : Seq.seq t
+  constant elem  : t
+  function subset_push [#"../hillel.rs" 72 0 72 37] (s : Seq.seq t) (elem : t) : ()
+  goal vc_subset_push : ([#"../hillel.rs" 72 29 72 33] inv1 elem) -> ([#"../hillel.rs" 72 18 72 19] inv0 s) -> ([#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem))
 end
 module Core_Slice_Iter_Iter_Type
   use prelude.Borrow
@@ -1667,17 +1664,14 @@ module Hillel_SumRange_Impl
   use seq.Seq
   use seq.Seq
   use prelude.Int
-  let rec ghost function sum_range [#"../hillel.rs" 122 0 122 54] (seq : Seq.seq uint32) (from : int) (to' : int) : int
-    requires {[#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq}
-    ensures { [#"../hillel.rs" 121 10 121 21] result >= 0 }
-    variant {[#"../hillel.rs" 119 10 119 19] to' - from}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../hillel.rs" 118 0 118 8] if pure {to' - from > 0} then
-      UInt32.to_int (Seq.get seq from) + sum_range seq (from + 1) to'
-    else
-      0
-    
+  constant seq  : Seq.seq uint32
+  constant from  : int
+  constant to'  : int
+  function sum_range [#"../hillel.rs" 122 0 122 54] (seq : Seq.seq uint32) (from : int) (to' : int) : int
+  goal vc_sum_range : ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> match to' - from > 0 with
+    | True -> (([#"../hillel.rs" 120 11 120 53] 0 <= from + 1 /\ from + 1 <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 119 10 119 19] to' - from) /\ ([#"../hillel.rs" 119 10 119 19] to' - (from + 1)) < ([#"../hillel.rs" 119 10 119 19] to' - from)) /\ (([#"../hillel.rs" 121 10 121 21] sum_range seq (from + 1) to' >= 0) -> ([#"../hillel.rs" 121 10 121 21] UInt32.to_int (Seq.get seq from) + sum_range seq (from + 1) to' >= 0))
+    | False -> [#"../hillel.rs" 121 10 121 21] 0 >= 0
+    end
 end
 module Hillel_SumRangeSplit_Impl
   use prelude.UInt32
@@ -1697,13 +1691,15 @@ module Hillel_SumRangeSplit_Impl
     ensures { result = sum_range0 seq from to' }
     
   axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
-  let rec ghost function sum_range_split [#"../hillel.rs" 134 0 134 61] (seq : Seq.seq uint32) (from : int) (to' : int) (i : int) : ()
-    requires {[#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq}
-    ensures { [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to' }
-    variant {[#"../hillel.rs" 131 10 131 18] i - from}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../hillel.rs" 135 4 137 5] if pure {i > from} then let _ = sum_range_split seq (from + 1) to' i in () else ()
+  constant seq  : Seq.seq uint32
+  constant from  : int
+  constant to'  : int
+  constant i  : int
+  function sum_range_split [#"../hillel.rs" 134 0 134 61] (seq : Seq.seq uint32) (from : int) (to' : int) (i : int) : ()
+  goal vc_sum_range_split : ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq) -> match i > from with
+    | True -> (([#"../hillel.rs" 132 11 132 63] 0 <= from + 1 /\ from + 1 <= i /\ i <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 131 10 131 18] i - from) /\ ([#"../hillel.rs" 131 10 131 18] i - (from + 1)) < ([#"../hillel.rs" 131 10 131 18] i - from)) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq (from + 1) to' = sum_range0 seq (from + 1) i + sum_range0 seq i to') -> (let _ = sum_range_split seq (from + 1) to' i in [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to'))
+    | False -> [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to'
+    end
 end
 module Hillel_Score_Impl
   use prelude.Int
@@ -1740,13 +1736,10 @@ module Hillel_Score_Impl
     ensures { result = sum_range_split0 seq from to' i }
     
   axiom sum_range_split0_spec : forall seq : Seq.seq uint32, from : int, to' : int, i : int . ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to')
-  let rec ghost function score [#"../hillel.rs" 144 0 144 38] (seq : Seq.seq uint32) (i : int) : int
-    requires {[#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq}
-    ensures { [#"../hillel.rs" 142 10 142 64] 0 <= result /\ result <= sum_range0 seq 0 (Seq.length seq) }
-    ensures { [#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq -> result = sum_range0 seq 0 (Seq.length seq) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../hillel.rs" 145 4 145 41] let _ = sum_range_split0 seq 0 (Seq.length seq) i in let a' = sum_range0 seq 0 i in let b' = sum_range0 seq i (Seq.length seq) in abs_diff0 a' b'
+  constant seq  : Seq.seq uint32
+  constant i  : int
+  function score [#"../hillel.rs" 144 0 144 38] (seq : Seq.seq uint32) (i : int) : int
+  goal vc_score : ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq) -> ([#"../hillel.rs" 132 11 132 63] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq 0 (Seq.length seq) = sum_range0 seq 0 i + sum_range0 seq i (Seq.length seq)) -> (let _ = sum_range_split0 seq 0 (Seq.length seq) i in ([#"../hillel.rs" 120 11 120 53] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq 0 i >= 0) -> ([#"../hillel.rs" 120 11 120 53] 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq i (Seq.length seq) >= 0) -> (let result = abs_diff0 (sum_range0 seq 0 i) (sum_range0 seq i (Seq.length seq)) in ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq -> result = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= result /\ result <= sum_range0 seq 0 (Seq.length seq)))))))
 end
 module Hillel_Fulcrum
   use prelude.UIntSize
diff --git a/creusot/tests/should_succeed/hillel/why3session.xml b/creusot/tests/should_succeed/hillel/why3session.xml
index d768271e21..7a4e081fc7 100644
--- a/creusot/tests/should_succeed/hillel/why3session.xml
+++ b/creusot/tests/should_succeed/hillel/why3session.xml
@@ -19,8 +19,8 @@
  </goal>
 </theory>
 <theory name="Hillel_SubsetPush_Impl" proved="true">
- <goal name="subset_push&#39;vc" expl="VC for subset_push" proved="true">
- <proof prover="4"><result status="valid" time="0.166910" steps="8264"/></proof>
+ <goal name="vc_subset_push" proved="true">
+ <proof prover="4"><result status="valid" time="0.166910" steps="8290"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_InsertUnique" proved="true">
@@ -158,18 +158,18 @@
  </goal>
 </theory>
 <theory name="Hillel_SumRange_Impl" proved="true">
- <goal name="sum_range&#39;vc" expl="VC for sum_range" proved="true">
- <proof prover="4"><result status="valid" time="0.010000" steps="43"/></proof>
+ <goal name="vc_sum_range" proved="true">
+ <proof prover="4"><result status="valid" time="0.010000" steps="14"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_SumRangeSplit_Impl" proved="true">
- <goal name="sum_range_split&#39;vc" expl="VC for sum_range_split" proved="true">
- <proof prover="4"><result status="valid" time="0.010000" steps="133"/></proof>
+ <goal name="vc_sum_range_split" proved="true">
+ <proof prover="4"><result status="valid" time="0.010000" steps="177"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_Score_Impl" proved="true">
- <goal name="score&#39;vc" expl="VC for score" proved="true">
- <proof prover="0"><result status="valid" time="0.080000" steps="9893"/></proof>
+ <goal name="vc_score" proved="true">
+ <proof prover="0"><result status="valid" time="0.080000" steps="8131"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_Fulcrum" proved="true">
diff --git a/creusot/tests/should_succeed/hillel/why3shapes.gz b/creusot/tests/should_succeed/hillel/why3shapes.gz
index 16937cf781d53f6db266a8c1ed9f6c04a7f61eff..ab2d15f69fba80e0ae6c5f1975e26687b1dd5672 100644
GIT binary patch
delta 7113
zcmV;)8#d&XIlno7ABzY8000000RQbh*={5^lJEKoy?NIS1B~FkuniO%(?|ivEU-Js
z#}RmCyS!>uTT**Gf4@O8&#KB&^*JMT53Eimk6=VF7zY_y^B><|-v8>}ru)l3(%t=b
zcl%$L>hk;lym<KCZEydOEqm1$MGLPk+>bxGn{@m7;a5k0qi$|?|G0j$i|K~9=pJ_0
z+uH~C#{J1QW$Zzht6WXb0VHqvP{dXYMQG(vWUYF2@zVW7<(U4wzS+Ir2Il_W>K0UM
zuiTIH?B{LGW(_$g{a<a4!qLmR?@L{Qtk;0$i2|bz1>{k7WY{BOSMKMrybkjeq?JKe
znc~j^`M=M9B5dP+{s7pIj2gN2aOLjO{qE+Ege|~Tl@fr>P#Bvbi$W0`yXl|qmAko5
z`wRYki>yVcl7p~<AhK0SqD9XD4n?U##=S~<y-jyz43;Tz6>2Y2h^sP{5nCOeMQnA@
z85?BQix6F%=5bJ^*V-IcMB2fMgLU_}yRhFI?68`D7wyZ-Zg+Qiw|)KV!}VJiSGACM
zTnmZ07CNR`+=~{B`{6kJQ(}EYkC>uIPVCI8N6d<9vb~D4AA-&R+^!1L$>D1XK%A!l
z9zpHosN)I%2L*tG0>BSa0NA4L6@Wf4P-@tQ`sfy?v1V<HyB~7n0l+fRngk%0eRMF0
zMwIz~4;oek0Zwa{)lI)X=!8DOv-Amm0ewOO@KfQId{s))-KKxEDDs<oM{t$+E<;D*
zUIbXw@K;$-uKn)aZM+{8%uVX5ei{4_Hu)jh_u1ZG-@o(s>4CZXUT3*<lin2Bqq-`C
zrRpNRdHe9s>*84r;AXxQ6lbb0&m1Da$s+=Pn7Kr3@`-HriPrrveV_qB9P}xenpO`m
zO>2fCZH}R+i1)8XM-X7<3F0~m)RQl9_~}T8ZKQvXqL-VmdWHdUV-jBidY8KE`}8}l
zhgcIAktcke9`?GoAm>|G)~cdk<?#sy4Juz%Jo#RGuX2D^$-TYX#djgyv+R(*AQMu5
z)OWUcb%nu>C1U=pw;B4)A(Y`}0hYX#B2wA=7`<o2$$iF2aPk%y1(!C*#hNphHA>$Q
zQ+hjBgO!EL+N?3B8kn;aYICnv*Cv~5*DT3<@O!C5wb*M#t<q+rXNx@>*-)}sRhHiG
zZnwX`OKb*`xj$04C^9{kRNb9K-nGep+QR+q-P@bQE(S}&sD820_rTR{zh60LN`-%a
zpY9$gn94J~{&jc%aGm?*3BMn4VN=V+!$04qOR95sTX*{~q64!oRVVc0-`=ILyN%mn
zj^!qB*RW@bU^Xx0=5Y$FZ+jqet*R}wk7+YMq`PaHG=o+J3Li>iD<N8%U4HF<`_$r3
z<$1lkiG>BVvY(%iZMk1B@U>qN_yP#WhH;#js&00>w-fWIw0)Ruoob;c4C?DRQAH-p
zrTdMZ?zcgDm;EmOO4v>7yyxkU(0)6Vg|h}i%h|!uyqh>Xjt}&EiL+NdtG{>GoSjWK
z4E^icfcyLKO7&=Gt<*JFkUF@3-o~Mp9^m}$?r!&w6u*1(e|b1{>bAG;CO6h$)c2(e
zyEnAO9#Ukb%ggJ(?rzfz%{t%x_VzXP+TFGsdSEZF|9AH$wNx%r_=l*ae*I;^q2NLa
zqCy=T)uOAZBrep%nfth~L)c;W^z0BLJNjCB9I!(S?8uPwuwnn1+S+S>rcyc#i^}-J
zxJZ=xirb*rW=zNobAOii>u{Ie-S5bux!Z-hL-R0qPhGBA<<Ddm2JWwptFxTbk*zk(
zCVcVYKpr0l?Ov?xh4aZMM10WXEl0OMjOxlB#YgrizWSJX`8jN-@Pj%YN2B1#KZ^Bp
z|NMXn)k(XiDYDl7Aoz2C-H#d6p4!JFdLQ$kbOL0F{@0s(fchj-Y2oGcluZ`>hvQ7a
zep3pV_9~!DLxCD9%gnY9RR4DOE-eg&psD9?(~vr1ATL)>l;pQkpJugbW{hFqT9Q#G
zU*!*1J&7}|2M!u_)n4Lxb`OtP%%055l97r*=?#ui@7$3S^gxh*?++cdL#T_Pu;Mgk
z)mt1aTH(pVdf8Q`KWyG(#?5lZ&8V<9OQJTDW4hThS)17+_NQ5CvsmuUC<ax8h;bJ$
zANHn(X>K??S2)AiY-V<A^B(qYQ#OHhyG?I8cQeDeDb{sYZR_T}jq@t6it*o!9z*XN
zJgFtzyuWhT%=FEF=3^As=5fWiIjveZC-w5?h$i3cY5UE-IoQk$%&yQ%k762kxG;S?
zzO;5bn47L0&(>-jE?lV*Wr&zM4R%}1&rWwR`5(Ipe!(@jy~wrwD?juE@|1YOIhxOe
zb(<1t=UC=Lu|FBX9_qT|z5CX4J>_GYY5;L|@4YC9Vu8(nDss8+K5l1^-|JbyZB|VJ
zHC`>WYAZ!m2BmQ1Rzvb*3YDrWPDPv28;vChOI4c37ERjLIEo&BDgAgW@h`n5rDCs2
z3*w|nbItd)?+I0Uj6;LMYK5Alsg)H^!Wqs~p(kJitNhIz%Y{LE4%|?yi0D@J8nP6o
zS{!Pz=*L!n6=o{Ft~3e2^0jc29yEC^!4ajImB~_Dwu;TwWGiKlN-kt5RQSuJ=BRsr
zWswWiPSRuRirR8wElpWfdbUc?Ly<;PgF0$uIaQmz&kxI~m6~3S!=)=V<y=$AsZ+1f
zl$>ca8Zc@!>N1wpFZl$Mz~oXTSnxW7A{d3psdIpTUuMC3ZagMIg<9DMpY%Q)xswQ`
zyN6y{r-N@cJNSm_;2Wp&YCfG;i|M>tPRG@1I<3~ziK$sXx6YSF`$y;Ypi6%XWv7GJ
zd`3P$y@hiAi^KVHJtLOGx#e_h%*QGms$g*p%m)y2-~}?@KXI-{!=MI0YB~!BJ-fs>
zL4H1eqds|TUpnMtdwYyE(-C*Rx?MeTo?l|mH3zc8BWG4`>ld1Mwmq>npK+BR`aApL
zqb=e0%ZY3iV>Y`cn=22*LySeaBIIir_ss=kz6P_R%MZ~N<-)6S7|Z2#O`FjxCN5tC
zET~=WnVa?ou9(8yGhej{(&FXPjbtQ)qi(l<A??8kYv~FLyy|S92+-Byj_xA?lF5>r
zPYv*DG7DH$fvoJVh2ePgJ!h?2TJptYYTfx+7{Zh5oq_Bf3S@&gOxX6}3s7MsjYgSz
zCrX9QP{?wl$VBOKS*vt0eM*(fT6(t1(u4GNxtph#-ohw3*shw%KwYP%Vhl%PL@oJ$
zo_B2hrQRErZi6M`YDANh<-DpELW#{#xLOGh|4y#O;=U?Rz2at<zI&dRJbV0J&kAmB
zfd)g`ThNy|wc^E~$Fp`K*>T<7?hVP&o9jDw`#P1X7p0Q8^|1Rc<m>*QPIjO*ASZ~5
zQ+<8SFLi<TD$2{SDbnwyY7Vm>G*%UVckO4YqRQgHE&RBjXV5dc$Ke+`C)oM5oUIRp
zv6gILi`z2q#G_oh=#+DS@|9+uwk3NTvU&J<0f;2Ol@*hA^s`Ffm>YVL6*a|Z8aAy)
zW#zG!?SAbxcm8Fny}o~Yvwb*NB)7dfoNLkHV7{^S_?&goxAP_6E*E@za=8b8AhU(v
z9$ofN!=j^NQ!!i<m<huQcTI3A%Si{dx;3rc_SeS!<6v#5BZ-hE5u(oS=hkKybSa2~
zC%2$*s1^HlqPUABTQK+yB@r@Lh>}N<OE}9}sQDS$HC%FPW~eF)a_4;A|47#?THD$C
zf4j`5?Jv&x`|G&vI(9hv$STc$0sefj>ht!nOv0qrgQeRiByWHNpt-t-b!<d^h9gUO
zz=C7@YuRC6SRdoT2T(ZRd$rbKjFs3FE5Q^i;S?+JDOM6wtR$ycNlh`1o&_8v)H%Yj
zRal3J1N(H0K2aA+4q2%gQuEB!3<R)Y_zY}@$rdw_xc8wAAH$|uXd~8t!<mxrb1Iyv
z2|*Oj$o@Fyp!KS<4CHDKk~%sy)E#x0gQWJd&3Ua_CYvuu%u~%vJg{sYaw63-AS?@%
z^NL`I8B~dsYEGA(N0c=o8u3_C(lP;QSc)mph?PX6rCvi>GlAwd7K)KAEz7Q?BvEBU
ztE;8e`SsA&mc*Zy_hLVPr9`w?jzVhV5INabM>RLkm$l@%wp=`}y*b73)IC5QKpLEj
z;TCu91JEX-K*%h0cwcMx>j+6x@i(KtP}a9L)lwcfoIdL+-S=U4M<4|KxA0N~8?_IW
z`~5%fTtxn?!6l@F>Ah(8;?e)OY#98S{!5U#Zd+y>-LFJMxdj-1V;5`rrFmp#^TY1J
z-Q?n4`q6!VF?@fRdUQV}9<ed;Xpq1H?>vO}5`U&|EZz&se#-$e@FCd1Av$NmImD;%
zDQDln`(+IwEV72`Yp!Rr){-^E#;hUilT_d^Ylsb5LkRsa*v}eb$Fqjm?BG#g4{XdD
z0z2lZ*?E2+;ZSgY0Xt?5eJYOr<lby=ueXB)SCF|XZtovHe!1Td(kTJ_ct|v`lDX1n
zu)Wt@*ZX`$-2R_DQ@#Vsm5Ys?lf~4KoyZUJ3QJ`bIp}*0FH>$IjLC(yeq<udvk6D%
zVo%axpY`)82EGy1AGD0ib<9xqS0blU4DL#np*6m4CP2%7j)yZITkc{GRu`)PJdxDV
z({T=z)lR?d@$<vfAnr31j&XF!DL4V^c*k?L5S+!1^BK1auNCFwSgd7v4QI!Kzv{OL
z=}3w1A@Mkj=(T%Msr5ZKz^pmzX$hlxueJ0zQ18^KSML)0VK`)S%7vn@5cd>4^fS*C
zJ@3Jeie9pRAs0%rS>|-creeiLML$Wz^(o0Z?DR<_;hLQz1=nm{0!pTW5RXYfiHja5
zqW2jW*p(QP2Cpihk0XJAf54K9V@p1)?BhAFFebgqg~@s}w*t=2dW9329dI)5^_(0J
zSj~LJ_aJ5^2lXrjS|JazUy&+{Jj%!9QLg2`o;kOFI%^3if)r{Em4c}H$YnT@1xw6O
zH4RqEl{DD1rdT*GJVPt`_SAs!J2v-2`NoaocY`%4Mt@e94dn$D((810x%(sCb+kEi
zc4MF5(R;9Y7*2X^GdQ+5n5g07%Bgeych+y)r?RP%9Yc@BvFwj?oc3{COj{aD_TZpx
zcjJ+NBOJH?*Cop$Kl)6u8SEXL$D_?@o^K8oX){~-ngd3UBDg!gkjtG|O5zR|`Dr4H
z(KuYYQd3Tdgq}JL`)ct61UsDNr!A7%N+wy(PZPtdII>mqocxp;o6p7j3^jh<wmDBX
zALw^oj8QHOE?IASuQeVKsQPhd8Mb(Zen`!KC@u$Zm)qOR{^QTX!99`b=Hb4^$;1A7
zu`eg{ck+d@fg=DHOQEBVc>d5SxOpGfjgLbXQ|C=^o>G|Yu+skcCcF6HjoptN^4J%C
zJbq9(zz2{uXM9pa7Y9n};&Uju{b&Rqjqi?sdVMUwTl=_#AM-)+tQZ4N#d!SeP-T68
zvfri?miPE13G7FFCPQ(-{;<a)rg^~h;q!_!KhIfp+m}B5C;vQ0)HC{P6rb$#92B|Y
zPdNGQ%~7S<pRdho{)9c9Rl49g!^VT&h5G8pe}Edn!^71x;T!}>FIV?aKB??~^+1c&
zF0Co9wOP8>tsW9NO-<zNac#9cW3tVEsDkp$$8W9#&h*c$+kE<QRwKruFmrT_SZ5ne
zv7fh;!R}eQoF6nawp#T$Mq1^Y3L{#>$KQCU@<25UiD@+~T5<k+52t(nQp|B)1D&s8
z=06*u?c6t@E(M*M#ITu)wRY7($zW!0hLwaUGcYAjU23##wRv?l_s(gdTV0ZWh_%Q$
zQoV`F)xe;y*Y(pWs=;!x&yM*@J-IY$!Hb${PPOz`%Hx{S`=L{inKu+|&1tr_wKbo4
z2G^Q}8$#l;T!AuDo7R>bZd!7y3#^(XW>w9Pw)qDsI6Vca(_HHBrEL8fhgpT1r%2n(
zoch&A1tDCm6LpxFIu6&ZZ2skc2MwC?r0tmOV@1i6CP=x|3v11jwqi)j>fYUiyLWFc
zE;vudbTLGsEaMP5Vu=OYdCMaj7A{Sr8`a20G`ztE8g?O3C9fia4AvS3oid$H$tJ->
zFh*PgG{D9|whRI$mDI`b=z&%~_(Z(!oYa8Ybe;yu21EnAA!pG9>yoyA%z$FtCzLcz
z=Mp!8{ClnWC2;D;vEioSy5Xwfvf(rtZ*nCxoHb}0G!5zoRfDoY(I63k4MKyg0m8~O
zpc_yZK?LVTgeaKoB-s&-8X$%gzzfCHr658?BX}dQ5zq+MaQkVdM&WhvK{)M%x5;!&
zBMX7(SJ9~yE`@1?ZiM=OTnIqt0R=5UU?{9l8jP2o7@mBG4DnJzBUvNt=S71t27yVb
zO*D!{((fL*5<rp}y-YUqLGtn+es*L`k_;J>jzz1PPZG8FjCHgrjMXw0o)9MD3!>Bo
z+GpT2SBf?bS4<kubpR__V96AeXv4`bij|H5X@6RfO!7!uy7Lk<FeMk1R33D}O8+Ym
zW3;2Sa>iryDnSI1PytI^TF<o4;-q+^uu;$`)=1k(^QDorNGg$&-V#uMCc7vh0XKr9
z?6d(=d|e`Imz3zN*I8(_X$)($%>}I+tr{&GEgH=mjg5vzvwsU(q~|2jL_l(ebQVus
zK)|G&APb%X%O=(E#$aRM$q=QJCnE)s8;DUxYv@HXa-A@R*o9&%4bh?-qZ&g5il;{-
z8D4M5=2<T~lDybyMu9j&XqRlXfp?ik@$|{0C@x8(6ZttvVFMWC(Mf}VNM5Qb2Eww&
z*r!dV<&ww>M5ynih)PC*sza+|f=-0ks}zfkg(s8m6DohFLaOE^A~WQ|P_(3!qKFA4
zM~i4l-{?vz1wo8rG6v6uY_b`_Vkfy{(pwf?j4>ETVX1~dQA)NO6iL#bc#h;}XF8Jc
z7gqV8n2D@oT~sI`YDF<&*1o`~D^t&z4cs6ZAqOPt!~h)?r)Vcih2$D}NV>AYd=0Gd
zyyMF04#*c!r3l`jL+O=}#@deD!lDQAc?-}uW}lO<6dVCHlgtz#0s52e6dD1qlL!?a
zIIo;tDx^e=VnHTy)l%prVj>B1(FAAmp>eO6@vC4*=PdIg#!iyw!pKoK#w3?xM&e0C
zcA%KQ5|dsP909MBdlei3*OQnP9050zwG|+L06AJ1p(IMdd?%b^!dPy}%0%nBL;=E#
z9Pu0uu0SwD+LAN?QvsY*O85?aBF!l=csrw4e+}XcmN93wAvc3!;6M~oXzYX&kbD9y
zdVbg^B+|?$4$wK#b&eujrWMHKI%zfitF)>larVT>QUJk$*3fl{?3n?Lx<f;*HD?rm
zhOj3}7Jy6E2j^8VLYrujd1qqK%5ouWFMtH~>5+!u4Or1RM-emmtI|Yz)zT{`qZj@X
z2oE4cARjwP8cY~L_Gbw#AiN;kUP2BCJ0SFc@PllG2}2+hfp7$#*+c!fxFE}IqT(V7
zZxkn2Ip_!?T2E6(gW;1;NY>97#ZU)-P?B+Ox{fJj6&Xh5RL4s0jT9GAk~VSqH+)S9
z2*L#noTRr)+Ne&&+K*sMf-U7m^iFaSBsgZ2aomxM%Uwt!lFp`qr9Ukzxp(wu#&Hx7
zK;(kCuA|Mtgw;{{WVK@C_Sp_DIm-)}*N6xsg9Ri-p!0&!<RnNyl0;gM{)hp8Buqfk
z1SC$NsGp*KIX+d?Ph|wC9|;+dl##P^p*<}w#vrlt7NY8mrIkPghXK80<#3VACXn3(
zGMtc|sLy~$2*wlVlpvknbpZ{bqoUL<f^(ok#Y24&T$H4^E$S2qi0(viGKrvsFfyg6
ze9SlIU`*Ml1d&{e&yA5bR-?>+C*dAsOh$G{?i&h-9#Y_{&p7z9NI|Eq^%#Wr0$n~%
zA|)u1Je3$xfv;?`Umh_@+5o**DbU8H-AZyTJR*yVw06fzeg?S^{~F|6jLds$tRwwJ
zjTSwvu4D>Cm+v`p=z`?3A-QbGvU<+?nc$Ms2IRE?xou!G0R)#kHz22f4ajTzf)oV9
zEP0@wCDL2@UyiP$S;;8{FZi%kk&(q=WO7(8XR5^6RDC&WSae7cgtDNc=|~MTA!$*#
zkYxV2v6&i#{6|WdT<fPn71%CBiiXLgkS6y+l7vAddO95>w^*sdCrFtH6tAj;LPljt
z-K5CKxr|&&@1tQQPmGLzHT@A4FqHWdqtcTNqF^9Lwaz&kY>-YXWG-|(af<i~mHHV_
z%ChzdK&skt9;r8NMiI%o_86T@P$@Ofgj$LY0%x4;We6!b6;K!tp$pl`p<u64Yo8It
z$>;x1L`RFswNS|$6oPw-FSLwSN?s_Y802|T9SlW+fr8x5I`V~ogbl8oP-yZZy(D+G
zPz}$Ja+4BB^0p}8$!VrC=4_R0Sq+nc+p3>S@QL}}?0GUFAJaur-`Y9UJkfSXr?j(<
zOJ}r{#r#r8iWHKPt3iK6AqDHmb3IX-<MkY{=ZHOr>^Ww~r_L1tWWG8RSx!jSR*J+0
zMO0+PgR`B&a%zHq+5e?z9x0kfismWEp+6#%qIslfo&@Uz+nxiPtYzp~U}&`x#44{N
zNmAmrGe{1P@7YA82qHy%V;Q--&P9t6vd$IEdES|P{9>}(6gsIdNe4Gb$e<*WB#|VE
zB$>~`h$KlQNg`PiS$Sj18S8}o$~Gx07b~WdkXR>>0_P5Yod`iQYj~1|SeZ`|iG-}k
zX)w}YRQNTsELm-gQHH|z5S1Y*R8|L4{2E>Ksc3tG@r`Q>Ye33Oh^_<Dao#6DpMrKg
zL}Et=DfWBTeq-A*f^gcUoK%y*SeZgcekGD=kXq&s6>LdNLIQ{c@EhwEuBp$5lPS0^
zV8@J+Qjm9l-bKY6w-Q~?I{e1I<1r1SE_%-l3n_}EByb8`%je5HMT0&2^fwl+>%4rh
z=#!(}i!8~2UQ;kAv<$ivUZ?X|XmUNh6A~0%eDi4@WxGpO#gNDk_Jp{zkxL#KC%L5{
z%nETH+qL?PY&SjYpA*{!cPvCJ^Dhcu2)qkighY0KOLKwRt23pY>If;+=9|>NpT6!e
zkpCpL*CL-DTkN<FNuYPk=;$l^4Sv(vC)ub-a#Kz>)5$m`ou&UV?tT7k2t)pU&qn@@
zm5;JgcN$Q|4!jl75ftyEFp2yzflz-cC9_g|W9NC2DY%qYg47r_6V9o?e6;8T=g>+1
zjh*j*#m-2fdyokd_nlN)FpnMtjSLj0GBxPS{3pxN^*7F*>wkHv1(4$_Enr7IQRYyB
zl_RAPL=E)`EhMzi68bj36N$!7IjU%gR-@0N?aOCH1RI^~jLkWlA<&Mbu!urU=aSB!
zE%%$z=0EwA=|r!XqKX*2!hBE-M6=WR7iEM<j){*Sk39og8EwZz$}}n;gcMy;HcIPM
zN6{|$&>t9NRG$aEhLZqyGA3{&zFMfz8Pypsl(EdjL59t9qWS*;g4Jd{S(^X=maxvI

delta 7094
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

diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 5dcec0a0f5..7976094f5a 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -30,11 +30,9 @@ module C01Range_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../01_range.rs" 44 4 44 26] (self : C01Range_Range_Type.t_range) : ()
-    ensures { [#"../01_range.rs" 43 14 43 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../01_range.rs" 41 4 41 10] ()
+  constant self  : C01Range_Range_Type.t_range
+  function produces_refl [#"../01_range.rs" 44 4 44 26] (self : C01Range_Range_Type.t_range) : ()
+  goal vc_produces_refl : [#"../01_range.rs" 43 14 43 45] produces0 self (Seq.empty ) self
 end
 module C01Range_Impl0_ProducesTrans_Impl
   use prelude.IntSize
@@ -52,13 +50,14 @@ module C01Range_Impl0_ProducesTrans_Impl
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../01_range.rs" 51 4 51 90] (a : C01Range_Range_Type.t_range) (ab : Seq.seq isize) (b : C01Range_Range_Type.t_range) (bc : Seq.seq isize) (c : C01Range_Range_Type.t_range) : ()
-    requires {[#"../01_range.rs" 48 15 48 32] produces0 a ab b}
-    requires {[#"../01_range.rs" 49 15 49 32] produces0 b bc c}
-    ensures { [#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C01Range_Range_Type.t_range
+  constant ab  : Seq.seq isize
+  constant b  : C01Range_Range_Type.t_range
+  constant bc  : Seq.seq isize
+  constant c  : C01Range_Range_Type.t_range
+  function produces_trans [#"../01_range.rs" 51 4 51 90] (a : C01Range_Range_Type.t_range) (ab : Seq.seq isize) (b : C01Range_Range_Type.t_range) (bc : Seq.seq isize) (c : C01Range_Range_Type.t_range) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../01_range.rs" 46 4 46 10] ()
+  goal vc_produces_trans : ([#"../01_range.rs" 49 15 49 32] produces0 b bc c) -> ([#"../01_range.rs" 48 15 48 32] produces0 a ab b) -> ([#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3session.xml b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
index 906c627a5a..55decb1253 100644
--- a/creusot/tests/should_succeed/iterators/01_range/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
@@ -6,13 +6,13 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="01_range.mlcfg"/>
 <theory name="C01Range_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
+ <goal name="vc_produces_refl" proved="true">
  <proof prover="0"><result status="valid" time="0.030655" steps="13"/></proof>
  </goal>
 </theory>
 <theory name="C01Range_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
- <proof prover="0"><result status="valid" time="0.077811" steps="290"/></proof>
+ <goal name="vc_produces_trans" proved="true">
+ <proof prover="0"><result status="valid" time="0.077811" steps="302"/></proof>
  </goal>
 </theory>
 <theory name="C01Range_Impl0_Next" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz b/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz
index cb2d68289d0b56f8b359c7d0fa9c8274bb1ed344..ab4736a75224ac52842fe9f76d9bf6456cc607d6 100644
GIT binary patch
literal 962
zcmV;z13mm7iwFP!00000|D{z;Z{s!)z3W%_wrz|89DcLdUBECR$iSk9w&1Y_DN<RZ
zwv<Xvw*B`VQnDjuod89Bu!b{lW**5m(hqm5;j4R$!|FNq!=Y<`Udh$nkA-{eyYN)U
zfw&<a8y8QH=YO(UWOJXh<}l~hYv;W4wX1gve{#+}Bc|B8x;s4{<2eRmiQDdf>DoAh
z-Jx?hv=4~rT1(v@8T4Csiq^tzyLF!|TpWDk`Z#pQ=SZyHU_?9L^?mm(h7YGd5%sHU
zAEH%Oy5`WjBbGV@OYRZs4((a;5BP7DTfeMapHlV%8t25NhWl$Bn;fYPe~r3#r8^FB
z;+A$aV@BNX{Zq6oWwOJBOfL8N)7y=|i^MkMR^<i{;n41V_tb{reeO%@yTp&YMwKI@
z^T^U9kon&%%d)WBRnzsWHvWAsQsb%rJceoA{&0@{Oi@^Ky+#<be5M{tUpok5XgN<5
zqg<^hi}PPd?3q|u7D+G^tlEuFVC6+~ALk;VX0C`NkVI_^9Ao=%{)+K7_LgGsMXjR`
z;2N}mLd?BE=a$A&UG5fwqk4X8NU4T$bNfnjFxOF*$}(Hhweg#!B3H$yWdtA0{gjN6
ztEG5WALnbaN&CG<F;s3Y>EN;latgeFQc6wGm7&*4$nOfdTI@@@HY}5@=~To>kYNo<
z=Ou7YU*<zj^S-DXaH#hPCgn8YxXr8@ipOcn-QwK=>ekBxy)T7XdVOTv^!_mU1VLx_
zXyc9Lb4|I@0!Mox3}9~v0|N_TfOtn3Ah7gB7`)spd+0Y>=vN)+dmSjw_NBu(YBULD
z9Ex$Tkd*^uToF4Shq=5Z@Ses)(RG4+zVcAGzRc|KblT@ppN5R#Ku;zzxR`l1FH^`C
zW6Gy7T}<=UiG6bpFPC2me(SRN?5-u=DZk#d*o=h4?!Q%0%PJ!qNNg5lQR)IeD|&a+
zTW;oV^vStHewTO?F<s>-8a8c+Bw${vX|2ojD~cw_hS$Qx1{$dhG{VqEHeLiUq2Xo)
z6)DgW1o1>ta9Z-HYf#>RV6qO{tAHR{NE2z0K7b%3Y7Ls}K!s@_)S?zNta!x=DYPS|
zj><Pea^V#<v}X8yC(1-DypokDj8`70j-GL)YY`gKP|+~uJOt(?wu1^tWhz~%f`#ZJ
zjiRn==YllUGmkAmYNlui5xIe^KvcjhU=`4UD$aGJ_?2T^Dtt=El%~eZsL-QRhFWAa
kP7os+pwTy+=q6}^G@=oj;i=?90=>xi7k{E6b}0z}03Pby)&Kwi

literal 962
zcmV;z13mm7iwFP!00000|D{z+Z{s!)zUx=$wrzp}9KKoXE?@)^WMI)lx8Sh`DN<RZ
zj+9DHw*B`VQnD@Og%<U}8qV`0=Ns~et8)D29^zO&#bMm{-Or^guYN4t!_bGvCXU1s
z7w;dAe_K)&_NHw6p*-1kLu?Og*XwHwmRY`CXlYVxmTu@nUuHWFt{aOR*Yx)fhj@%3
zCA``F(s%I^?5<Eb?z=nm=sQc@@7d{Ve;=)d?aht*WZ|U1szV(6!&4+yZ_uKh?}wrP
z9>a(GKhWz}*WE>{taR<Za|cYd50>1btJ`-+$v@z~Rqpz-azhH)jVK%wmIiLmd2CXo
zGW@yMt*hK&j5D^hqXjbJej6U6Whs*FXV0W^pFh1__=P2QA(yH)cnJG$=ljPljPGM#
zL*FKR<hfThAv#VdO>#2-8)bEFe;5Bc7OC)De`&+8ez!ly;a`$$`;ue}jhKlns^a)3
z0(&A>Rz)HV1*^8x7g%-T+{Yyes97>15hOvI42Rg=9lxQyi-V<VLG@V&a5h>%BIeql
zb4g>VuC^<}QN8RMLTaGeyx!7m%z2chvdWTlUHopT$XW4g8Nm;8KP6$pYAK%8$K_gV
z(tgiYG*z2ZIJm5V90C`o6w(k>W!G~i#CLW%OYBQ(8>UIpd@5oB$S?<`%M`e$FUujP
zd0*6xIMh3ICe=LQxXsKOipOcH?dt9T_1fiu+Dl@Vu8-_D-ybHQAn2@~Wb9Zz*Ay!)
zaFkcX0QLqk(6Ax~h<Atq0#l!e!K=->hJK@jepZ3LSApVepDIkFMiWt{p_ujxnK?kF
z6|vKCnA0tReVPtMH_7Gm8HZ{vkHh$QzssXO4;f1j$0Q<xlbC1oG=*$6rhFdL)ij@#
zSU1P;s>qsMe!kYP27j&be9?D_{pIJbi_HX1Z2wypwazjjgM@4a9BD7`iP76vwbk-r
z<fxNNg?thCs>j^ci9l@L5J`@Ct>(3^(yu65rM!=X1fr#;LIMv=MiZU(qVb-WP?N$t
zXd1x{F+6JGD72C~158A!Txe;@YFbDWX^=jEAS7xHn(IJ?X(2SC5j2#d=7kj65z|EF
zTOqmdiW=Im#x+Elh{;P;%ffi&f$HcPSGp0QB`p;#Q_e$RUWO8A4NwEAO|1(SqKh<&
zrfHlD(ooMl)&QxQq9Mc*bPcKoS%av7*T4#@IM<Qlo5#3R_?3<+O^ugPp+@HrvkGaQ
kAV#!6qi;FUZO{UdL?bjKo^X>wC|QO41L2-4Wl#wK0BqITF#rGn

diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index 482156eabf..87a643ebf1 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -105,12 +105,9 @@ module C02IterMut_Impl1_ProducesRefl_Impl
     ensures { result = produces0 self visited tl }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../02_iter_mut.rs" 50 4 50 26] (self : C02IterMut_IterMut_Type.t_itermut t) : ()
-    requires {[#"../02_iter_mut.rs" 50 21 50 25] inv0 self}
-    ensures { [#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../02_iter_mut.rs" 47 4 47 10] ()
+  constant self  : C02IterMut_IterMut_Type.t_itermut t
+  function produces_refl [#"../02_iter_mut.rs" 50 4 50 26] (self : C02IterMut_IterMut_Type.t_itermut t) : ()
+  goal vc_produces_refl : ([#"../02_iter_mut.rs" 50 21 50 25] inv0 self) -> ([#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
 end
 module C02IterMut_Impl1_ProducesTrans_Impl
   type t
@@ -206,18 +203,14 @@ module C02IterMut_Impl1_ProducesTrans_Impl
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t) : bool
     ensures { result = produces0 self visited tl }
     
-  let rec ghost function produces_trans [#"../02_iter_mut.rs" 57 4 57 90] (a : C02IterMut_IterMut_Type.t_itermut t) (ab : Seq.seq (borrowed t)) (b : C02IterMut_IterMut_Type.t_itermut t) (bc : Seq.seq (borrowed t)) (c : C02IterMut_IterMut_Type.t_itermut t) : ()
-    requires {[#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b}
-    requires {[#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c}
-    requires {[#"../02_iter_mut.rs" 57 22 57 23] inv0 a}
-    requires {[#"../02_iter_mut.rs" 57 31 57 33] inv1 ab}
-    requires {[#"../02_iter_mut.rs" 57 52 57 53] inv0 b}
-    requires {[#"../02_iter_mut.rs" 57 61 57 63] inv1 bc}
-    requires {[#"../02_iter_mut.rs" 57 82 57 83] inv0 c}
-    ensures { [#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C02IterMut_IterMut_Type.t_itermut t
+  constant ab  : Seq.seq (borrowed t)
+  constant b  : C02IterMut_IterMut_Type.t_itermut t
+  constant bc  : Seq.seq (borrowed t)
+  constant c  : C02IterMut_IterMut_Type.t_itermut t
+  function produces_trans [#"../02_iter_mut.rs" 57 4 57 90] (a : C02IterMut_IterMut_Type.t_itermut t) (ab : Seq.seq (borrowed t)) (b : C02IterMut_IterMut_Type.t_itermut t) (bc : Seq.seq (borrowed t)) (c : C02IterMut_IterMut_Type.t_itermut t) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../02_iter_mut.rs" 52 4 52 10] ()
+  goal vc_produces_trans : ([#"../02_iter_mut.rs" 57 82 57 83] inv0 c) -> ([#"../02_iter_mut.rs" 57 61 57 63] inv1 bc) -> ([#"../02_iter_mut.rs" 57 52 57 53] inv0 b) -> ([#"../02_iter_mut.rs" 57 31 57 33] inv1 ab) -> ([#"../02_iter_mut.rs" 57 22 57 23] inv0 a) -> ([#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c) -> ([#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b) -> ([#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
index 6f3549b5ea..047a17ba5d 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
@@ -9,25 +9,25 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="02_iter_mut.mlcfg"/>
 <theory name="C02IterMut_Impl1_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="4"><result status="valid" time="0.010000" steps="95"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="4"><result status="valid" time="0.010000" steps="78"/></proof>
  </goal>
 </theory>
 <theory name="C02IterMut_Impl1_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_trans&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_produces_trans.0" proved="true">
   <transf name="inline_goal" proved="true" >
-   <goal name="produces_trans&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_trans.0.0" proved="true">
    <transf name="split_all_full" proved="true" >
-    <goal name="produces_trans&#39;vc.0.0.0" expl="VC for produces_trans" proved="true">
-    <proof prover="0"><result status="valid" time="0.065386" steps="21738"/></proof>
+    <goal name="vc_produces_trans.0.0.0" proved="true">
+    <proof prover="1"><result status="valid" time="0.137914" steps="123624"/></proof>
     </goal>
-    <goal name="produces_trans&#39;vc.0.0.1" expl="VC for produces_trans" proved="true">
-    <proof prover="1"><result status="valid" time="0.137914" steps="501707"/></proof>
+    <goal name="vc_produces_trans.0.0.1" proved="true">
+    <proof prover="0"><result status="valid" time="0.368971" steps="74078"/></proof>
     </goal>
-    <goal name="produces_trans&#39;vc.0.0.2" expl="VC for produces_trans" proved="true">
-    <proof prover="1"><result status="valid" time="0.126535" steps="501710"/></proof>
+    <goal name="vc_produces_trans.0.0.2" proved="true">
+    <proof prover="1"><result status="valid" time="0.126535" steps="573628"/></proof>
     </goal>
    </transf>
    </goal>
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz b/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz
index 745faae412f4a8bcdc4ddb8d6d6608d3a05c8c8a..6619ebf0d87c389cc1c329efe62aeb640a473b47 100644
GIT binary patch
literal 3545
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
T`eeqDujBj=4*aHql`{YUGn?$<

literal 3587
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
J>Z1xY004$w0lokL

diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index 4bb5388414..dae14f3d07 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -86,12 +86,9 @@ module C04Skip_Impl0_ProducesRefl_Impl
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_refl [#"../04_skip.rs" 50 4 50 26] (self : C04Skip_Skip_Type.t_skip i) : ()
-    requires {[#"../04_skip.rs" 50 21 50 25] inv0 self}
-    ensures { [#"../04_skip.rs" 49 14 49 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../04_skip.rs" 47 4 47 10] ()
+  constant self  : C04Skip_Skip_Type.t_skip i
+  function produces_refl [#"../04_skip.rs" 50 4 50 26] (self : C04Skip_Skip_Type.t_skip i) : ()
+  goal vc_produces_refl : ([#"../04_skip.rs" 50 21 50 25] inv0 self) -> ([#"../04_skip.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
 end
 module C04Skip_Impl0_ProducesTrans_Impl
   type i
@@ -165,18 +162,14 @@ module C04Skip_Impl0_ProducesTrans_Impl
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../04_skip.rs" 57 4 57 90] (a : C04Skip_Skip_Type.t_skip i) (ab : Seq.seq item0) (b : C04Skip_Skip_Type.t_skip i) (bc : Seq.seq item0) (c : C04Skip_Skip_Type.t_skip i) : ()
-    requires {[#"../04_skip.rs" 54 15 54 32] produces0 a ab b}
-    requires {[#"../04_skip.rs" 55 15 55 32] produces0 b bc c}
-    requires {[#"../04_skip.rs" 57 22 57 23] inv0 a}
-    requires {[#"../04_skip.rs" 57 31 57 33] inv1 ab}
-    requires {[#"../04_skip.rs" 57 52 57 53] inv0 b}
-    requires {[#"../04_skip.rs" 57 61 57 63] inv1 bc}
-    requires {[#"../04_skip.rs" 57 82 57 83] inv0 c}
-    ensures { [#"../04_skip.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C04Skip_Skip_Type.t_skip i
+  constant ab  : Seq.seq item0
+  constant b  : C04Skip_Skip_Type.t_skip i
+  constant bc  : Seq.seq item0
+  constant c  : C04Skip_Skip_Type.t_skip i
+  function produces_trans [#"../04_skip.rs" 57 4 57 90] (a : C04Skip_Skip_Type.t_skip i) (ab : Seq.seq item0) (b : C04Skip_Skip_Type.t_skip i) (bc : Seq.seq item0) (c : C04Skip_Skip_Type.t_skip i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../04_skip.rs" 52 4 52 10] ()
+  goal vc_produces_trans : ([#"../04_skip.rs" 57 82 57 83] inv0 c) -> ([#"../04_skip.rs" 57 61 57 63] inv1 bc) -> ([#"../04_skip.rs" 57 52 57 53] inv0 b) -> ([#"../04_skip.rs" 57 31 57 33] inv1 ab) -> ([#"../04_skip.rs" 57 22 57 23] inv0 a) -> ([#"../04_skip.rs" 55 15 55 32] produces0 b bc c) -> ([#"../04_skip.rs" 54 15 54 32] produces0 a ab b) -> ([#"../04_skip.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
index f888ad166e..5d9c28b4cc 100644
--- a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
@@ -7,15 +7,15 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="04_skip.mlcfg"/>
 <theory name="C04Skip_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
+ <goal name="vc_produces_refl" proved="true">
  <proof prover="1"><result status="valid" time="0.025542" steps="7"/></proof>
  </goal>
 </theory>
 <theory name="C04Skip_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-  <goal name="produces_trans&#39;vc.0" expl="VC for produces_trans" proved="true">
-  <proof prover="0"><result status="valid" time="0.077298" steps="11365"/></proof>
+  <goal name="vc_produces_trans.0" proved="true">
+  <proof prover="0"><result status="valid" time="0.077298" steps="11294"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz b/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz
index 5ef67863964e8785fa29c1c101da0a6cc3cf9c3c..4d9473f44805c38ae98c7f4e116aace602a0fce5 100644
GIT binary patch
literal 1068
zcmV+{1k?K;iwFP!00000|D{z;Z{s!)z57@Awrz6Z@SDZvAOtaJpy;Iqk84mAl^E+t
zsqG}&f8U`<S(0lMDC&buKE4^g`OxU6yY=bCzs1w~BOXutzWZe@*LOd!&VTxS_dy-m
zlqERWto+-tZ{9;ZfusKZ-Z3Yf+-7F}2Pev&mpv<cx}90`Y&dg=zWCw-<>Twy`7fu6
zy&9Der)NasPw~)Z?ywx_8C?zNZU}Jh8j^OJL=@kmXys+k%AS@z%%!qyICGcOFSN^|
z{gRt0i)x|WqZ03HUk4wy3p{~yWaJFN`K-?;$^g^_s7FR97n-SpI#n<)m80WQCh2)8
zQU&r7BOI4(Qcsuaolbc)4lo5dQ*2x$a70K!Oab&PEIb{}XKs^EvbYIY$tbYVEt_>F
zpLzpOcn$_s_2@(Y`gVxt*x-rukGtRcE>4B=cL_c1yJzI|odfN^W!~@oYjo&h`-s1`
z0H6K=A;(GOkMYzWKB90;SEXn4C!Y9?Kb+#f^ZXyj_vkoONaL_CCJ97<(LkQ6ve^0u
z|Gw|el7GSH01ZaOG4oXAFqxT$iR~$_!z36cqEnchVweLjhdDZ913X-=ecd0A{by{x
zynau_@B6pm)G_7TediC3f!{ayd@9GzrF({`5{;)Q62konPj~xsJPw2bA1u?8^0d8p
z%!>r(WF>e0-0v{_?4}!hgekQQnN9q$JM_={fQiA^6MN(<KK&tf&*v9B@8S^;D*yEX
z8JumZ`S_T`6(*RA$(8gZ=Kk7kk%!f}7JBjbbWw{Tk*W;Fp_YvJ4jXIe?umvYMWs_}
z9M!ov_|B#lI_;X+`uD?`U^%G#6?IWLP}QPj>2S<uPV|s?L>(1l38?VT@w^*ObF~n;
zyHNR!CU7)04;?FoFAG|OTr>e>K^O$N+(a;jmw4Q#+r~>l23oEqQ+3hVB@g)4nyS3m
zCOO60V7d}#Q>9n)u?$%Dk3Lzs$93Bu*IoQ^zDzYTO*NRN8l6T7n<fcgOdyeFolLW7
zdlQ}aRQk9%H3w9plt4tOzbt!I_PXqs7yK_zoAg^ok;kam-U2tH-);HdtQHgW=46=<
z7KN=bjg>45zaQKG=0)H3vZ>}DYns%p8VMxGS~N|JA_N9R)daZKHLJA>bS<s0+%iio
zSh8Y*a3zcppovhDC}@IaBzT4W%xH~tAjmgXTZMdLJOmI1pcaM-u7#ko@lt`J4O8lx
z52p4;sJ3Zk%T<ul^Qcu5Rb(hj$u;Gcq8Mr^SV}Ay3)+IRfR2O(Zh=`qt+3KUg|@Eo
zlP;N5t&)v0q6x9lhI11LUd@Q5#!_vmvQ%0sRv3!ptY!=tm(s}Cs<wrQX#ozHpkxHs
mMvYd$sR*@TQ3%-*8Ms%BNhU%QwM<6z+UReFDdw>_3IG6Uz7`$;

literal 1083
zcmV-B1jPFviwFP!00000|E*R_Z{s!)zWZ1Bwrz6Z@F^CXgAv4_fJHAYc&tHDR3fY+
zWo0GV{`(F^%95R+K!N(ekn`gA%?wBR<z{<&axdYueG9{>?YrN$a(naZX8hsW?u}Zq
z&s(st-?*2duU~yQfu-*D)-o%sER$vW3s&Sa&u5m;v|M@f<hTllvG~OW%7y2b@o%fL
zznYN{TdWL;)!9&&Nvro8d%tb^VLRI#hR__>u_1z|5k(FzGFYC^ET3sU!x}3~j;nAH
z{snlMF`bjMq)}agM<hTj;2kUz0Jh5+r@JhHSwgZz?^ZzolK)z!r>O8T7vtc%Q%0kg
z`WCUiX{#)qw=(idTM_G%wn%^8vV|JGqE<v|I)N*bZQexTEFoE<v!E!~#K`Qv3OiA|
zxCvNJcTOROWvjmBOXmOrPh>#t?w#+SUyfl6HEN{0Km6WzVX30KiPBTsJ)%wDSt#6J
z$?lK-Iamx)-s7*yf_Ha^BFnKvLpb%vw;(JlcDbR7chtDOJD$S7+qpl7*I+qT{0`SP
zyF?)h81>{~mp7%mbFXbTO8y1cNi;bT%k;x8(PVl}6MI)&(<Dd}r3+0?k>+HVXwJdd
zB%UrWT-6Ul{~qcu&)=ir_x5GdTBcmncJ62yxVFaiA*-#8_e`v!8ILTYgu4@J5A7I+
z$zYOCo^ho-9?uceCJIxsVmLSU2c)0EbW;q!q?Vy&9ey5;{bTDfG5B_|N510fj-h)T
zpHSb00Tny<^$smK+pnI{8eFyneRjEm9>LsRht2S?I@dtY@gB}-krK%-olUi5#C6zM
zQ+F?BIB!(cQf+CGii2-9w$SNNhsM1gM}p;`@*Co!axzsHC5y^An<>##;!$d;m`gx~
zdko`Y(xz&m<mPP3KWPF>WAo6tQutWV8{|b3Kmvp$$oVFM9G=3^#@psgL3*06B};WN
z*f|gQYV|xJbqtEN!E{BN{VqPu`#gQwhd!CdVi$gn=cz`PsRqkbqsu5^%Ov3!6G+5a
zC*y1?Kb5X~Dt`K`S_@P($wWl1zszTq&&53W%l|FXKK?dSZylz80xlV)kt)j1g!}o9
z{K>+xdNEBuoighoqp(eu5tAU|x1{`UQHsx_?04(0I*sTy6(v*%&jt0)Y0}gU#SSJA
z;@%6jl|~qDn4ty?*)#$ltg1PevVx}JA@~|YXb7V6%!@660fG+N6h@&#?N#tijcVOg
zcmu5|DDQ;O0esEW2M5rV(?TH-*>L5hbUYNQ4l1yUfRbA(4CRI*B5EiYN(^WNg#l$i
z8W0A!0cL=13ZZ;cRp2Vgq-vC`l@_%Rb)h-eo@^O43=AWNYC{V{m7#LOh?ksIi~&QI
zT82h74Fm=RIMVc!7rXYV3k94CUkMh3kPVTZJH?n}!q=gYlNZ1C`Uj_$k)CG?0085J
B6662?

diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index 8a3985d28c..71f47a5a03 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -231,12 +231,9 @@ module C05Map_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited succ }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../05_map.rs" 29 4 29 26] (self : C05Map_Map_Type.t_map i b f) : ()
-    requires {[#"../05_map.rs" 29 21 29 25] inv0 self}
-    ensures { [#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../05_map.rs" 26 4 26 10] ()
+  constant self  : C05Map_Map_Type.t_map i b f
+  function produces_refl [#"../05_map.rs" 29 4 29 26] (self : C05Map_Map_Type.t_map i b f) : ()
+  goal vc_produces_refl : ([#"../05_map.rs" 29 21 29 25] inv0 self) -> ([#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self)
 end
 module C05Map_Impl0_ProducesTrans_Impl
   type i
@@ -466,18 +463,14 @@ module C05Map_Impl0_ProducesTrans_Impl
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
-  let rec ghost function produces_trans [#"../05_map.rs" 36 4 36 90] (a : C05Map_Map_Type.t_map i b f) (ab : Seq.seq b) (b : C05Map_Map_Type.t_map i b f) (bc : Seq.seq b) (c : C05Map_Map_Type.t_map i b f) : ()
-    requires {[#"../05_map.rs" 33 15 33 32] produces0 a ab b}
-    requires {[#"../05_map.rs" 34 15 34 32] produces0 b bc c}
-    requires {[#"../05_map.rs" 36 22 36 23] inv0 a}
-    requires {[#"../05_map.rs" 36 31 36 33] inv1 ab}
-    requires {[#"../05_map.rs" 36 52 36 53] inv0 b}
-    requires {[#"../05_map.rs" 36 61 36 63] inv1 bc}
-    requires {[#"../05_map.rs" 36 82 36 83] inv0 c}
-    ensures { [#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C05Map_Map_Type.t_map i b f
+  constant ab  : Seq.seq b
+  constant b  : C05Map_Map_Type.t_map i b f
+  constant bc  : Seq.seq b
+  constant c  : C05Map_Map_Type.t_map i b f
+  function produces_trans [#"../05_map.rs" 36 4 36 90] (a : C05Map_Map_Type.t_map i b f) (ab : Seq.seq b) (b : C05Map_Map_Type.t_map i b f) (bc : Seq.seq b) (c : C05Map_Map_Type.t_map i b f) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../05_map.rs" 31 4 31 10] ()
+  goal vc_produces_trans : ([#"../05_map.rs" 36 82 36 83] inv0 c) -> ([#"../05_map.rs" 36 61 36 63] inv1 bc) -> ([#"../05_map.rs" 36 52 36 53] inv0 b) -> ([#"../05_map.rs" 36 31 36 33] inv1 ab) -> ([#"../05_map.rs" 36 22 36 23] inv0 a) -> ([#"../05_map.rs" 34 15 34 32] produces0 b bc c) -> ([#"../05_map.rs" 33 15 33 32] produces0 a ab b) -> ([#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -617,15 +610,6 @@ module C05Map_Impl1_ProducesOne_Impl
     ensures { result = postcondition_mut_unnest0 self args res }
     
   axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
-  predicate invariant3 (self : item0)
-  val invariant3 (self : item0) : bool
-    ensures { result = invariant3 self }
-    
-  predicate inv3 (_x : item0)
-  val inv3 (_x : item0) : bool
-    ensures { result = inv3 _x }
-    
-  axiom inv3 : forall x : item0 . inv3 x = true
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -651,6 +635,15 @@ module C05Map_Impl1_ProducesOne_Impl
     ensures { result = produces_refl1 self }
     
   axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv6 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  predicate invariant3 (self : item0)
+  val invariant3 (self : item0) : bool
+    ensures { result = invariant3 self }
+    
+  predicate inv3 (_x : item0)
+  val inv3 (_x : item0) : bool
+    ensures { result = inv3 _x }
+    
+  axiom inv3 : forall x : item0 . inv3 x = true
   predicate invariant2 (self : borrowed f)
   val invariant2 (self : borrowed f) : bool
     ensures { result = invariant2 self }
@@ -742,14 +735,12 @@ module C05Map_Impl1_ProducesOne_Impl
     | C05Map_Map_Type.C_Map iter func -> true
     end)
   use seq.Seq
-  let rec ghost predicate produces_one [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f)
-    requires {[#"../05_map.rs" 117 20 117 24] inv0 self}
-    requires {[#"../05_map.rs" 117 26 117 33] inv1 visited}
-    requires {[#"../05_map.rs" 117 38 117 42] inv0 succ}
-    ensures { [#"../05_map.rs" 116 14 116 68] result = produces0 self (Seq.singleton visited) succ }
+  constant self  : C05Map_Map_Type.t_map i b f
+  constant visited  : b
+  constant succ  : C05Map_Map_Type.t_map i b f
+  predicate produces_one [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f)
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../05_map.rs" 118 8 123 9] pure {exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)}
+  goal vc_produces_one : ([#"../05_map.rs" 117 38 117 42] inv0 succ) -> ([#"../05_map.rs" 117 26 117 33] inv1 visited) -> ([#"../05_map.rs" 117 20 117 24] inv0 self) -> (forall f : borrowed f . inv2 f -> ( * f = C05Map_Map_Type.map_func self ->  ^ f = C05Map_Map_Type.map_func succ -> (forall e : item0 . true)) /\ (not  * f = C05Map_Map_Type.map_func self -> false -> (forall e : item0 . true))) /\ ([#"../05_map.rs" 116 14 116 68] ([#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C05Map_Impl1_ProducesOneInvariant_Impl
   type i
@@ -942,20 +933,14 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     ensures { result = produces_refl0 self }
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
-  let rec ghost function produces_one_invariant [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
-    requires {[#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter}
-    requires {[#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self}
-    requires {[#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r}
-    requires {[#"../05_map.rs" 107 30 107 34] inv0 self}
-    requires {[#"../05_map.rs" 107 36 107 37] inv1 e}
-    requires {[#"../05_map.rs" 107 48 107 49] inv2 r}
-    requires {[#"../05_map.rs" 107 54 107 55] inv3 f}
-    requires {[#"../05_map.rs" 107 65 107 69] inv4 iter}
-    ensures { [#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f) }
-    ensures { [#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../05_map.rs" 101 4 101 12] let _ = let a = pure {forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i} in assert {a} in ()
+  constant self  : C05Map_Map_Type.t_map i b f
+  constant e  : item0
+  constant r  : b
+  constant f  : borrowed f
+  constant iter  : i
+  function produces_one_invariant [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
+    
+  goal vc_produces_one_invariant : ([#"../05_map.rs" 107 65 107 69] inv4 iter) -> ([#"../05_map.rs" 107 54 107 55] inv3 f) -> ([#"../05_map.rs" 107 48 107 49] inv2 r) -> ([#"../05_map.rs" 107 36 107 37] inv1 e) -> ([#"../05_map.rs" 107 30 107 34] inv0 self) -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r) -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self) -> ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter) -> (forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../05_map.rs" 101 4 101 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f)))
 end
 module C05Map_Impl0_Next
   type i
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3session.xml b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
index f26ba3068b..d034b22593 100644
--- a/creusot/tests/should_succeed/iterators/05_map/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
@@ -3,22 +3,24 @@
 "https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
-<prover id="3" name="CVC5" version="1.0.5" timelimit="5" steplimit="0" memlimit="1000"/>
+<prover id="1" name="CVC4" version="1.8" timelimit="1" steplimit="0" memlimit="1000"/>
+<prover id="3" name="CVC5" version="1.0.5" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="5" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="05_map.mlcfg"/>
 <theory name="C05Map_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="3"><result status="valid" time="0.153735" steps="19399"/></proof>
  <transf name="split_vc" proved="true" >
-  <goal name="produces_refl&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_produces_refl.0" proved="true">
   <transf name="inline_goal" proved="true" >
-   <goal name="produces_refl&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_refl.0.0" proved="true">
    <transf name="split_all_full" proved="true" >
-    <goal name="produces_refl&#39;vc.0.0.0" expl="VC for produces_refl" proved="true">
-    <proof prover="5"><result status="valid" time="0.000000" steps="10"/></proof>
+    <goal name="vc_produces_refl.0.0.0" proved="true">
+    <proof prover="3"><result status="valid" time="0.167506" steps="7903"/></proof>
     </goal>
-    <goal name="produces_refl&#39;vc.0.0.1" expl="VC for produces_refl" proved="true">
-    <proof prover="3" timelimit="1"><result status="valid" time="0.167506" steps="20870"/></proof>
+    <goal name="vc_produces_refl.0.0.1" proved="true">
+    <proof prover="3"><result status="valid" time="0.137589" steps="20870"/></proof>
     </goal>
    </transf>
    </goal>
@@ -28,60 +30,60 @@
  </goal>
 </theory>
 <theory name="C05Map_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_trans&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_produces_trans.0" proved="true">
   <transf name="inline_goal" proved="true" >
-   <goal name="produces_trans&#39;vc.0.0" expl="postcondition" proved="true">
-   <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="Requires5,Requires6">
-    <goal name="produces_trans&#39;vc.0.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_trans.0.0" proved="true">
+   <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="H,H1">
+    <goal name="vc_produces_trans.0.0.0" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="produces_trans&#39;vc.0.0.0.0" expl="postcondition" proved="true">
-     <proof prover="5"><result status="valid" time="0.017097" steps="132"/></proof>
+     <goal name="vc_produces_trans.0.0.0.0" proved="true">
+     <proof prover="5"><result status="valid" time="0.016674" steps="124"/></proof>
      </goal>
-     <goal name="produces_trans&#39;vc.0.0.0.1" expl="postcondition" proved="true">
-     <transf name="exists" proved="true" arg1="(s1++s)">
-      <goal name="produces_trans&#39;vc.0.0.0.1.0" proved="true">
+     <goal name="vc_produces_trans.0.0.0.1" proved="true">
+     <transf name="exists" proved="true" arg1="(s++s1)">
+      <goal name="vc_produces_trans.0.0.0.1.0" proved="true">
       <transf name="split_vc" proved="true" >
-       <goal name="produces_trans&#39;vc.0.0.0.1.0.0" proved="true">
-       <proof prover="5"><result status="valid" time="0.012249" steps="40"/></proof>
+       <goal name="vc_produces_trans.0.0.0.1.0.0" proved="true">
+       <proof prover="5"><result status="valid" time="0.014003" steps="40"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.0.0.1.0.1" proved="true">
-       <proof prover="5"><result status="valid" time="0.012712" steps="42"/></proof>
+       <goal name="vc_produces_trans.0.0.0.1.0.1" proved="true">
+       <proof prover="5"><result status="valid" time="0.013091" steps="42"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.0.0.1.0.2" proved="true">
-       <proof prover="5"><result status="valid" time="0.015919" steps="118"/></proof>
+       <goal name="vc_produces_trans.0.0.0.1.0.2" proved="true">
+       <proof prover="5"><result status="valid" time="0.015713" steps="118"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.0.0.1.0.3" proved="true">
-       <transf name="exists" proved="true" arg1="(fs1++fs)">
-        <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0" proved="true">
+       <goal name="vc_produces_trans.0.0.0.1.0.3" proved="true">
+       <transf name="exists" proved="true" arg1="(fs++fs1)">
+        <goal name="vc_produces_trans.0.0.0.1.0.3.0" proved="true">
         <transf name="split_vc" proved="true" >
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.0" proved="true">
-         <proof prover="5"><result status="valid" time="0.012346" steps="40"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.0" proved="true">
+         <proof prover="5"><result status="valid" time="0.011917" steps="40"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.1" proved="true">
-         <proof prover="5"><result status="valid" time="0.012512" steps="42"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.1" proved="true">
+         <proof prover="5"><result status="valid" time="0.012396" steps="42"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.2" proved="true">
-         <proof prover="5"><result status="valid" time="0.037825" steps="432"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.2" proved="true">
+         <proof prover="5"><result status="valid" time="0.030109" steps="309"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.3" proved="true">
-         <proof prover="5"><result status="valid" time="0.013359" steps="63"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.3" proved="true">
+         <proof prover="5"><result status="valid" time="0.012800" steps="63"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.4" proved="true">
-         <proof prover="5"><result status="valid" time="0.019057" steps="180"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.4" proved="true">
+         <proof prover="5"><result status="valid" time="0.016802" steps="151"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.5" proved="true">
-         <proof prover="5"><result status="valid" time="0.017845" steps="156"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.5" proved="true">
+         <proof prover="5"><result status="valid" time="0.019165" steps="181"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.6" proved="true">
-         <proof prover="5"><result status="valid" time="0.059177" steps="757"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.6" proved="true">
+         <proof prover="5"><result status="valid" time="0.059910" steps="730"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.7" proved="true">
-         <proof prover="5"><result status="valid" time="0.049988" steps="660"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.7" proved="true">
+         <proof prover="5"><result status="valid" time="0.042799" steps="546"/></proof>
          </goal>
-         <goal name="produces_trans&#39;vc.0.0.0.1.0.3.0.8" proved="true">
-         <proof prover="5"><result status="valid" time="0.032869" steps="364"/></proof>
+         <goal name="vc_produces_trans.0.0.0.1.0.3.0.8" proved="true">
+         <proof prover="5"><result status="valid" time="0.036716" steps="440"/></proof>
          </goal>
         </transf>
         </goal>
@@ -101,51 +103,15 @@
  </goal>
 </theory>
 <theory name="C05Map_Impl1_ProducesOne_Impl" proved="true">
- <goal name="produces_one&#39;vc" expl="VC for produces_one" proved="true">
+ <goal name="vc_produces_one" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_one&#39;vc.0" expl="postcondition" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="produces_one&#39;vc.0.0" expl="postcondition" proved="true">
-   <transf name="inline_goal" proved="true" >
-    <goal name="produces_one&#39;vc.0.0.0" expl="postcondition" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="produces_one&#39;vc.0.0.0.0" expl="postcondition" proved="true">
-     <proof prover="5"><result status="valid" time="0.010000" steps="86"/></proof>
-     </goal>
-     <goal name="produces_one&#39;vc.0.0.0.1" expl="postcondition" proved="true">
-     <transf name="exists" proved="true" arg1="(singleton e)">
-      <goal name="produces_one&#39;vc.0.0.0.1.0" proved="true">
-      <transf name="split_vc" proved="true" >
-       <goal name="produces_one&#39;vc.0.0.0.1.0.0" proved="true">
-       <proof prover="5"><result status="valid" time="0.023917" steps="22"/></proof>
-       </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.1" proved="true">
-       <proof prover="5"><result status="valid" time="0.010000" steps="22"/></proof>
-       </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.2" proved="true">
-       <proof prover="5"><result status="valid" time="0.010000" steps="20"/></proof>
-       </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.3" proved="true">
-       <transf name="exists" proved="true" arg1="(singleton f)">
-        <goal name="produces_one&#39;vc.0.0.0.1.0.3.0" proved="true">
-        <proof prover="5" timelimit="5"><result status="valid" time="0.010000" steps="175"/></proof>
-        </goal>
-       </transf>
-       </goal>
-      </transf>
-      </goal>
-     </transf>
-     </goal>
-    </transf>
-    </goal>
-   </transf>
-   </goal>
-   <goal name="produces_one&#39;vc.0.1" expl="postcondition" proved="true">
-   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-    <goal name="produces_one&#39;vc.0.1.0" expl="postcondition" proved="true">
-    <proof prover="3" memlimit="2000"><result status="valid" time="0.106249" steps="33009"/></proof>
-    </goal>
-   </transf>
+  <goal name="vc_produces_one.0" proved="true">
+  <proof prover="1"><result status="valid" time="0.320443" steps="50233"/></proof>
+  </goal>
+  <goal name="vc_produces_one.1" proved="true">
+  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
+   <goal name="vc_produces_one.1.0" proved="true">
+   <proof prover="5"><result status="valid" time="0.032162" steps="466"/></proof>
    </goal>
   </transf>
   </goal>
@@ -153,18 +119,18 @@
  </goal>
 </theory>
 <theory name="C05Map_Impl1_ProducesOneInvariant_Impl" proved="true">
- <goal name="produces_one_invariant&#39;vc" expl="VC for produces_one_invariant" proved="true">
+ <goal name="vc_produces_one_invariant" proved="true">
  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-  <goal name="produces_one_invariant&#39;vc.0" expl="VC for produces_one_invariant" proved="true">
+  <goal name="vc_produces_one_invariant.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="produces_one_invariant&#39;vc.0.0" expl="assertion" proved="true">
-   <proof prover="3"><result status="valid" time="0.040690" steps="15478"/></proof>
+   <goal name="vc_produces_one_invariant.0.0" proved="true">
+   <proof prover="3" timelimit="5"><result status="valid" time="0.078660" steps="15478"/></proof>
    </goal>
-   <goal name="produces_one_invariant&#39;vc.0.1" expl="postcondition" proved="true">
-   <proof prover="5" timelimit="5" memlimit="2000"><result status="valid" time="0.059818" steps="1335"/></proof>
+   <goal name="vc_produces_one_invariant.0.1" proved="true">
+   <proof prover="3" timelimit="5"><result status="valid" time="0.172007" steps="24202"/></proof>
    </goal>
-   <goal name="produces_one_invariant&#39;vc.0.2" expl="postcondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.078660" steps="24754"/></proof>
+   <goal name="vc_produces_one_invariant.0.2" proved="true">
+   <proof prover="5"><result status="valid" time="0.039117" steps="1332"/></proof>
    </goal>
   </transf>
   </goal>
@@ -181,7 +147,7 @@
   <proof prover="5"><result status="valid" time="0.020531" steps="20"/></proof>
   </goal>
   <goal name="next&#39;vc.2" expl="type invariant" proved="true">
-  <proof prover="3"><result status="valid" time="0.031142" steps="12439"/></proof>
+  <proof prover="3" timelimit="5"><result status="valid" time="0.031142" steps="12439"/></proof>
   </goal>
   <goal name="next&#39;vc.3" expl="type invariant" proved="true">
   <proof prover="5"><result status="valid" time="0.034554" steps="30"/></proof>
@@ -199,7 +165,7 @@
   <proof prover="5"><result status="valid" time="0.021483" steps="59"/></proof>
   </goal>
   <goal name="next&#39;vc.8" expl="type invariant" proved="true">
-  <proof prover="3" timelimit="1"><result status="valid" time="0.088091" steps="13319"/></proof>
+  <proof prover="3"><result status="valid" time="0.088091" steps="13319"/></proof>
   </goal>
   <goal name="next&#39;vc.9" expl="unreachable point" proved="true">
   <proof prover="5"><result status="valid" time="0.028356" steps="28"/></proof>
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz b/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz
index 6f2caa4f438639206176a1bc5a38bbda412c4206..d6d6c62dc84f95337f6facf3799784015109415e 100644
GIT binary patch
literal 5508
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
GSpWcQl*eKK

literal 6154
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

diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 5938683ba3..640967bbf7 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -177,14 +177,11 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
-  let rec ghost predicate preservation_inv [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0)
-    requires {[#"../06_map_precond.rs" 93 24 93 28] inv0 iter}
-    requires {[#"../06_map_precond.rs" 93 33 93 37] inv1 func}
-    requires {[#"../06_map_precond.rs" 93 42 93 50] inv2 produced}
-    ensures { [#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> result = preservation0 iter func }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 94 8 101 9] pure {forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))}
+  constant iter  : i
+  constant func  : f
+  constant produced  : Seq.seq item0
+  predicate preservation_inv [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0)
+  goal vc_preservation_inv : ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 93 33 93 37] inv1 func) -> ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> (forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> ([#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))) = preservation0 iter func)
 end
 module C06MapPrecond_Impl0_ProducesRefl_Impl
   type i
@@ -429,12 +426,9 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited succ }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../06_map_precond.rs" 31 4 31 26] (self : C06MapPrecond_Map_Type.t_map i b f item0) : ()
-    requires {[#"../06_map_precond.rs" 31 21 31 25] inv0 self}
-    ensures { [#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 28 4 28 10] ()
+  constant self  : C06MapPrecond_Map_Type.t_map i b f item0
+  function produces_refl [#"../06_map_precond.rs" 31 4 31 26] (self : C06MapPrecond_Map_Type.t_map i b f item0) : ()
+  goal vc_produces_refl : ([#"../06_map_precond.rs" 31 21 31 25] inv0 self) -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
 end
 module C06MapPrecond_Impl0_ProducesTrans_Impl
   type i
@@ -688,18 +682,14 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
-  let rec ghost function produces_trans [#"../06_map_precond.rs" 38 4 38 90] (a : C06MapPrecond_Map_Type.t_map i b f item0) (ab : Seq.seq b) (b : C06MapPrecond_Map_Type.t_map i b f item0) (bc : Seq.seq b) (c : C06MapPrecond_Map_Type.t_map i b f item0) : ()
-    requires {[#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b}
-    requires {[#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c}
-    requires {[#"../06_map_precond.rs" 38 22 38 23] inv0 a}
-    requires {[#"../06_map_precond.rs" 38 31 38 33] inv1 ab}
-    requires {[#"../06_map_precond.rs" 38 52 38 53] inv0 b}
-    requires {[#"../06_map_precond.rs" 38 61 38 63] inv1 bc}
-    requires {[#"../06_map_precond.rs" 38 82 38 83] inv0 c}
-    ensures { [#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C06MapPrecond_Map_Type.t_map i b f item0
+  constant ab  : Seq.seq b
+  constant b  : C06MapPrecond_Map_Type.t_map i b f item0
+  constant bc  : Seq.seq b
+  constant c  : C06MapPrecond_Map_Type.t_map i b f item0
+  function produces_trans [#"../06_map_precond.rs" 38 4 38 90] (a : C06MapPrecond_Map_Type.t_map i b f item0) (ab : Seq.seq b) (b : C06MapPrecond_Map_Type.t_map i b f item0) (bc : Seq.seq b) (c : C06MapPrecond_Map_Type.t_map i b f item0) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 33 4 33 10] ()
+  goal vc_produces_trans : ([#"../06_map_precond.rs" 38 82 38 83] inv0 c) -> ([#"../06_map_precond.rs" 38 61 38 63] inv1 bc) -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b) -> ([#"../06_map_precond.rs" 38 31 38 33] inv1 ab) -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a) -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c) -> ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b) -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -988,14 +978,12 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     | C06MapPrecond_Map_Type.C_Map iter func produced -> true
     end)
   use seq.Seq
-  let rec ghost predicate produces_one [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
-    requires {[#"../06_map_precond.rs" 142 20 142 24] inv0 self}
-    requires {[#"../06_map_precond.rs" 142 26 142 33] inv1 visited}
-    requires {[#"../06_map_precond.rs" 142 38 142 42] inv0 succ}
-    ensures { [#"../06_map_precond.rs" 141 14 141 68] result = produces0 self (Seq.singleton visited) succ }
+  constant self  : C06MapPrecond_Map_Type.t_map i b f item0
+  constant visited  : b
+  constant succ  : C06MapPrecond_Map_Type.t_map i b f item0
+  predicate produces_one [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 143 8 149 9] pure {exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)}
+  goal vc_produces_one : ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ) -> ([#"../06_map_precond.rs" 142 26 142 33] inv1 visited) -> ([#"../06_map_precond.rs" 142 20 142 24] inv0 self) -> (forall f : borrowed f . inv2 f -> ( * f = C06MapPrecond_Map_Type.map_func self ->  ^ f = C06MapPrecond_Map_Type.map_func succ -> (forall e : item0 . true)) /\ (not  * f = C06MapPrecond_Map_Type.map_func self -> false -> (forall e : item0 . true))) /\ ([#"../06_map_precond.rs" 141 14 141 68] ([#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   type i
@@ -1210,20 +1198,14 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = produces_refl0 self }
     
   axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
-  let rec ghost function produces_one_invariant [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
-    requires {[#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter}
-    requires {[#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self}
-    requires {[#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r}
-    requires {[#"../06_map_precond.rs" 132 30 132 34] inv0 self}
-    requires {[#"../06_map_precond.rs" 132 36 132 37] inv1 e}
-    requires {[#"../06_map_precond.rs" 132 48 132 49] inv2 r}
-    requires {[#"../06_map_precond.rs" 132 54 132 55] inv3 f}
-    requires {[#"../06_map_precond.rs" 132 65 132 69] inv4 iter}
-    ensures { [#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
-    ensures { [#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_map_precond.rs" 126 4 126 12] let _ = let a = pure {forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i} in assert {a} in ()
+  constant self  : C06MapPrecond_Map_Type.t_map i b f item0
+  constant e  : item0
+  constant r  : b
+  constant f  : borrowed f
+  constant iter  : i
+  function produces_one_invariant [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
+    
+  goal vc_produces_one_invariant : ([#"../06_map_precond.rs" 132 65 132 69] inv4 iter) -> ([#"../06_map_precond.rs" 132 54 132 55] inv3 f) -> ([#"../06_map_precond.rs" 132 48 132 49] inv2 r) -> ([#"../06_map_precond.rs" 132 36 132 37] inv1 e) -> ([#"../06_map_precond.rs" 132 30 132 34] inv0 self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> (forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../06_map_precond.rs" 126 4 126 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)))
 end
 module C06MapPrecond_Impl0_Next
   type i
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
index e5a124ca68..d9a3e4b7c8 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
@@ -8,23 +8,23 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="06_map_precond.mlcfg"/>
 <theory name="C06MapPrecond_Impl1_PreservationInv_Impl" proved="true">
- <goal name="preservation_inv&#39;vc" expl="VC for preservation_inv" proved="true">
+ <goal name="vc_preservation_inv" proved="true">
  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-  <goal name="preservation_inv&#39;vc.0" expl="VC for preservation_inv" proved="true">
-  <proof prover="4"><result status="valid" time="0.099951" steps="37326"/></proof>
+  <goal name="vc_preservation_inv.0" proved="true">
+  <proof prover="4"><result status="valid" time="0.099951" steps="37233"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
+ <goal name="vc_produces_refl" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_refl&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_produces_refl.0" proved="true">
   <transf name="inline_goal" proved="true" >
-   <goal name="produces_refl&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_refl.0.0" proved="true">
    <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-    <goal name="produces_refl&#39;vc.0.0.0" expl="postcondition" proved="true">
-    <proof prover="4"><result status="valid" time="0.915522" steps="95579"/></proof>
+    <goal name="vc_produces_refl.0.0.0" proved="true">
+    <proof prover="4"><result status="valid" time="0.712615" steps="93356"/></proof>
     </goal>
    </transf>
    </goal>
@@ -34,66 +34,66 @@
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="unfold" proved="true" arg1="produces0">
-  <goal name="produces_trans&#39;vc.0" expl="VC for produces_trans" proved="true">
+  <goal name="vc_produces_trans.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="produces_trans&#39;vc.0.0" expl="VC for produces_trans" proved="true">
-   <proof prover="0"><result status="valid" time="0.019211" steps="162"/></proof>
+   <goal name="vc_produces_trans.0.0" proved="true">
+   <proof prover="0"><result status="valid" time="0.015019" steps="157"/></proof>
    </goal>
-   <goal name="produces_trans&#39;vc.0.1" expl="VC for produces_trans" proved="true">
-   <transf name="exists" proved="true" arg1="(s1 ++ s)">
-    <goal name="produces_trans&#39;vc.0.1.0" proved="true">
+   <goal name="vc_produces_trans.0.1" proved="true">
+   <transf name="exists" proved="true" arg1="(s ++ s1)">
+    <goal name="vc_produces_trans.0.1.0" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="produces_trans&#39;vc.0.1.0.0" proved="true">
-     <proof prover="0"><result status="valid" time="0.013505" steps="44"/></proof>
+     <goal name="vc_produces_trans.0.1.0.0" proved="true">
+     <proof prover="0"><result status="valid" time="0.011463" steps="44"/></proof>
      </goal>
-     <goal name="produces_trans&#39;vc.0.1.0.1" proved="true">
-     <proof prover="0"><result status="valid" time="0.014444" steps="49"/></proof>
+     <goal name="vc_produces_trans.0.1.0.1" proved="true">
+     <proof prover="0"><result status="valid" time="0.012112" steps="49"/></proof>
      </goal>
-     <goal name="produces_trans&#39;vc.0.1.0.2" proved="true">
-     <proof prover="0"><result status="valid" time="0.018245" steps="163"/></proof>
+     <goal name="vc_produces_trans.0.1.0.2" proved="true">
+     <proof prover="0"><result status="valid" time="0.014672" steps="165"/></proof>
      </goal>
-     <goal name="produces_trans&#39;vc.0.1.0.3" proved="true">
+     <goal name="vc_produces_trans.0.1.0.3" proved="true">
      <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-      <goal name="produces_trans&#39;vc.0.1.0.3.0" proved="true">
-      <proof prover="0"><result status="valid" time="0.014181" steps="49"/></proof>
+      <goal name="vc_produces_trans.0.1.0.3.0" proved="true">
+      <proof prover="0"><result status="valid" time="0.016467" steps="49"/></proof>
       </goal>
      </transf>
      </goal>
-     <goal name="produces_trans&#39;vc.0.1.0.4" proved="true">
-     <transf name="exists" proved="true" arg1="(fs1++fs)">
-      <goal name="produces_trans&#39;vc.0.1.0.4.0" proved="true">
+     <goal name="vc_produces_trans.0.1.0.4" proved="true">
+     <transf name="exists" proved="true" arg1="(fs ++ fs1)">
+      <goal name="vc_produces_trans.0.1.0.4.0" proved="true">
       <transf name="split_vc" proved="true" >
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.0" proved="true">
-       <proof prover="0"><result status="valid" time="0.013607" steps="44"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.0" proved="true">
+       <proof prover="0"><result status="valid" time="0.013062" steps="44"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.1" proved="true">
-       <proof prover="0"><result status="valid" time="0.014432" steps="49"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.1" proved="true">
+       <proof prover="0"><result status="valid" time="0.012345" steps="49"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.2" proved="true">
-       <proof prover="0"><result status="valid" time="0.045168" steps="523"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.2" proved="true">
+       <proof prover="0"><result status="valid" time="0.033742" steps="501"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.3" proved="true">
-       <proof prover="0"><result status="valid" time="0.015055" steps="77"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.3" proved="true">
+       <proof prover="0"><result status="valid" time="0.012183" steps="77"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.4" proved="true">
-       <proof prover="0"><result status="valid" time="0.021948" steps="222"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.4" proved="true">
+       <proof prover="0"><result status="valid" time="0.015515" steps="188"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.5" proved="true">
-       <proof prover="0"><result status="valid" time="0.020306" steps="188"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.5" proved="true">
+       <proof prover="0"><result status="valid" time="0.016892" steps="223"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.6" proved="true">
-       <proof prover="0"><result status="valid" time="0.048112" steps="564"/></proof>
+       <goal name="vc_produces_trans.0.1.0.4.0.6" proved="true">
+       <proof prover="0"><result status="valid" time="0.042316" steps="638"/></proof>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.7" proved="true">
-       <transf name="instantiate" proved="true" arg1="H2" arg2="(i-length ab)">
-        <goal name="produces_trans&#39;vc.0.1.0.4.0.7.0" proved="true">
-        <transf name="instantiate" proved="true" arg1="H12" arg2="i">
-         <goal name="produces_trans&#39;vc.0.1.0.4.0.7.0.0" proved="true">
+       <goal name="vc_produces_trans.0.1.0.4.0.7" proved="true">
+       <transf name="instantiate" proved="true" arg1="H2" arg2="i">
+        <goal name="vc_produces_trans.0.1.0.4.0.7.0" proved="true">
+        <transf name="instantiate" proved="true" arg1="H12" arg2="(i - length ab)">
+         <goal name="vc_produces_trans.0.1.0.4.0.7.0.0" proved="true">
          <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-          <goal name="produces_trans&#39;vc.0.1.0.4.0.7.0.0.0" proved="true">
-          <proof prover="0"><result status="valid" time="0.745031" steps="5635"/></proof>
+          <goal name="vc_produces_trans.0.1.0.4.0.7.0.0.0" proved="true">
+          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.293550" steps="4865"/></proof>
           </goal>
          </transf>
          </goal>
@@ -101,14 +101,14 @@
         </goal>
        </transf>
        </goal>
-       <goal name="produces_trans&#39;vc.0.1.0.4.0.8" proved="true">
-       <transf name="instantiate" proved="true" arg1="H2" arg2="(i-length ab)">
-        <goal name="produces_trans&#39;vc.0.1.0.4.0.8.0" proved="true">
-        <transf name="instantiate" proved="true" arg1="H12" arg2="i">
-         <goal name="produces_trans&#39;vc.0.1.0.4.0.8.0.0" proved="true">
+       <goal name="vc_produces_trans.0.1.0.4.0.8" proved="true">
+       <transf name="instantiate" proved="true" arg1="H2" arg2="i">
+        <goal name="vc_produces_trans.0.1.0.4.0.8.0" proved="true">
+        <transf name="instantiate" proved="true" arg1="H12" arg2="(i - length ab)">
+         <goal name="vc_produces_trans.0.1.0.4.0.8.0.0" proved="true">
          <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-          <goal name="produces_trans&#39;vc.0.1.0.4.0.8.0.0.0" proved="true">
-          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.930000" steps="5407"/></proof>
+          <goal name="vc_produces_trans.0.1.0.4.0.8.0.0.0" proved="true">
+          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.245215" steps="4174"/></proof>
           </goal>
          </transf>
          </goal>
@@ -130,99 +130,99 @@
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl1_ProducesOne_Impl" proved="true">
- <goal name="produces_one&#39;vc" expl="VC for produces_one" proved="true">
+ <goal name="vc_produces_one" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_one&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_produces_one.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="produces_one&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_one.0.0" proved="true">
    <transf name="unfold" proved="true" arg1="produces0">
-    <goal name="produces_one&#39;vc.0.0.0" expl="VC for produces_one" proved="true">
+    <goal name="vc_produces_one.0.0.0" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="produces_one&#39;vc.0.0.0.0" expl="VC for produces_one" proved="true">
-     <proof prover="0"><result status="valid" time="0.018941" steps="111"/></proof>
+     <goal name="vc_produces_one.0.0.0.0" proved="true">
+     <proof prover="0"><result status="valid" time="0.016712" steps="111"/></proof>
      </goal>
-     <goal name="produces_one&#39;vc.0.0.0.1" expl="VC for produces_one" proved="true">
+     <goal name="vc_produces_one.0.0.0.1" proved="true">
      <transf name="exists" proved="true" arg1="(singleton e)">
-      <goal name="produces_one&#39;vc.0.0.0.1.0" proved="true">
+      <goal name="vc_produces_one.0.0.0.1.0" proved="true">
       <transf name="split_vc" proved="true" >
-       <goal name="produces_one&#39;vc.0.0.0.1.0.0" proved="true">
-       <proof prover="0"><result status="valid" time="0.014271" steps="24"/></proof>
-       <proof prover="2"><result status="valid" time="0.024516" steps="75990"/></proof>
-       <proof prover="4"><result status="valid" time="0.068981" steps="12541"/></proof>
+       <goal name="vc_produces_one.0.0.0.1.0.0" proved="true">
+       <proof prover="0"><result status="valid" time="0.013181" steps="24"/></proof>
+       <proof prover="2"><result status="valid" time="0.020326" steps="76005"/></proof>
+       <proof prover="4"><result status="valid" time="0.055417" steps="12541"/></proof>
        </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.1" proved="true">
-       <proof prover="0"><result status="valid" time="0.015154" steps="26"/></proof>
-       <proof prover="2"><result status="valid" time="0.030299" steps="107385"/></proof>
-       <proof prover="4"><result status="valid" time="0.124842" steps="17912"/></proof>
+       <goal name="vc_produces_one.0.0.0.1.0.1" proved="true">
+       <proof prover="0"><result status="valid" time="0.012033" steps="26"/></proof>
+       <proof prover="2"><result status="valid" time="0.024662" steps="107400"/></proof>
+       <proof prover="4"><result status="valid" time="0.100925" steps="17912"/></proof>
        </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.2" proved="true">
-       <proof prover="0"><result status="valid" time="0.012277" steps="22"/></proof>
-       <proof prover="2"><result status="valid" time="0.013187" steps="7212"/></proof>
-       <proof prover="4"><result status="valid" time="0.054772" steps="11815"/></proof>
+       <goal name="vc_produces_one.0.0.0.1.0.2" proved="true">
+       <proof prover="0"><result status="valid" time="0.009999" steps="22"/></proof>
+       <proof prover="2"><result status="valid" time="0.010803" steps="7212"/></proof>
+       <proof prover="4"><result status="valid" time="0.044571" steps="11815"/></proof>
        </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.3" proved="true">
+       <goal name="vc_produces_one.0.0.0.1.0.3" proved="true">
        <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-        <goal name="produces_one&#39;vc.0.0.0.1.0.3.0" proved="true">
-        <proof prover="0"><result status="valid" time="0.015237" steps="24"/></proof>
-        <proof prover="2"><result status="valid" time="0.026879" steps="86479"/></proof>
-        <proof prover="4"><result status="valid" time="0.078333" steps="14209"/></proof>
+        <goal name="vc_produces_one.0.0.0.1.0.3.0" proved="true">
+        <proof prover="0"><result status="valid" time="0.012098" steps="24"/></proof>
+        <proof prover="2"><result status="valid" time="0.022250" steps="86479"/></proof>
+        <proof prover="4"><result status="valid" time="0.064758" steps="14209"/></proof>
         </goal>
        </transf>
        </goal>
-       <goal name="produces_one&#39;vc.0.0.0.1.0.4" proved="true">
+       <goal name="vc_produces_one.0.0.0.1.0.4" proved="true">
        <transf name="exists" proved="true" arg1="(singleton f)">
-        <goal name="produces_one&#39;vc.0.0.0.1.0.4.0" proved="true">
+        <goal name="vc_produces_one.0.0.0.1.0.4.0" proved="true">
         <transf name="split_vc" proved="true" >
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.0" proved="true">
-         <proof prover="0"><result status="valid" time="0.014575" steps="24"/></proof>
-         <proof prover="2"><result status="valid" time="0.025123" steps="77466"/></proof>
-         <proof prover="4"><result status="valid" time="0.069736" steps="12718"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.0" proved="true">
+         <proof prover="0"><result status="valid" time="0.011752" steps="24"/></proof>
+         <proof prover="2"><result status="valid" time="0.020753" steps="77466"/></proof>
+         <proof prover="4"><result status="valid" time="0.056473" steps="12718"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.1" proved="true">
-         <proof prover="0"><result status="valid" time="0.014934" steps="27"/></proof>
-         <proof prover="2"><result status="valid" time="0.031792" steps="111666"/></proof>
-         <proof prover="4"><result status="valid" time="0.134423" steps="19425"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.1" proved="true">
+         <proof prover="0"><result status="valid" time="0.012017" steps="27"/></proof>
+         <proof prover="2"><result status="valid" time="0.025316" steps="111681"/></proof>
+         <proof prover="4"><result status="valid" time="0.108376" steps="19425"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.2" proved="true">
-         <proof prover="0"><result status="valid" time="0.015166" steps="28"/></proof>
-         <proof prover="2"><result status="valid" time="0.028872" steps="97804"/></proof>
-         <proof prover="4"><result status="valid" time="0.120377" steps="17572"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.2" proved="true">
+         <proof prover="0"><result status="valid" time="0.011937" steps="28"/></proof>
+         <proof prover="2"><result status="valid" time="0.024098" steps="97796"/></proof>
+         <proof prover="4"><result status="valid" time="0.096617" steps="17572"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.3" proved="true">
-         <proof prover="0"><result status="valid" time="0.014812" steps="26"/></proof>
-         <proof prover="2"><result status="valid" time="0.028581" steps="98107"/></proof>
-         <proof prover="4"><result status="valid" time="0.087981" steps="15068"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.3" proved="true">
+         <proof prover="0"><result status="valid" time="0.012075" steps="26"/></proof>
+         <proof prover="2"><result status="valid" time="0.023324" steps="98107"/></proof>
+         <proof prover="4"><result status="valid" time="0.071896" steps="15068"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.4" proved="true">
-         <proof prover="0"><result status="valid" time="0.014754" steps="26"/></proof>
-         <proof prover="2"><result status="valid" time="0.031022" steps="111117"/></proof>
-         <proof prover="4"><result status="valid" time="0.103990" steps="17613"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.4" proved="true">
+         <proof prover="0"><result status="valid" time="0.011953" steps="26"/></proof>
+         <proof prover="2"><result status="valid" time="0.025087" steps="111117"/></proof>
+         <proof prover="4"><result status="valid" time="0.083729" steps="17613"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.5" proved="true">
-         <proof prover="0"><result status="valid" time="0.015149" steps="27"/></proof>
-         <proof prover="2"><result status="valid" time="0.031796" steps="114935"/></proof>
-         <proof prover="4"><result status="valid" time="0.131878" steps="19124"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.5" proved="true">
+         <proof prover="0"><result status="valid" time="0.012075" steps="27"/></proof>
+         <proof prover="2"><result status="valid" time="0.026983" steps="114935"/></proof>
+         <proof prover="4"><result status="valid" time="0.108613" steps="19124"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.6" proved="true">
-         <proof prover="0"><result status="valid" time="0.015533" steps="41"/></proof>
-         <proof prover="2"><result status="valid" time="0.749391" steps="803225"/></proof>
-         <proof prover="4"><result status="valid" time="0.133789" steps="19143"/></proof>
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.6" proved="true">
+         <proof prover="0"><result status="valid" time="0.012871" steps="41"/></proof>
+         <proof prover="2"><result status="valid" time="0.162516" steps="600205"/></proof>
+         <proof prover="4"><result status="valid" time="0.110594" steps="19143"/></proof>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.7" proved="true">
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.7" proved="true">
          <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-          <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.7.0" proved="true">
-          <proof prover="0"><result status="valid" time="0.033025" steps="387"/></proof>
-          <proof prover="2"><result status="valid" time="0.786306" steps="908983"/></proof>
-          <proof prover="4"><result status="valid" time="0.181228" steps="25173"/></proof>
+          <goal name="vc_produces_one.0.0.0.1.0.4.0.7.0" proved="true">
+          <proof prover="0"><result status="valid" time="0.026888" steps="388"/></proof>
+          <proof prover="2"><result status="valid" time="0.287393" steps="912369"/></proof>
+          <proof prover="4"><result status="valid" time="0.156156" steps="25173"/></proof>
           </goal>
          </transf>
          </goal>
-         <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.8" proved="true">
+         <goal name="vc_produces_one.0.0.0.1.0.4.0.8" proved="true">
          <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-          <goal name="produces_one&#39;vc.0.0.0.1.0.4.0.8.0" proved="true">
-          <proof prover="0"><result status="valid" time="0.033549" steps="391"/></proof>
-          <proof prover="2"><result status="valid" time="0.308679" steps="375426"/></proof>
-          <proof prover="4"><result status="valid" time="0.184920" steps="25398"/></proof>
+          <goal name="vc_produces_one.0.0.0.1.0.4.0.8.0" proved="true">
+          <proof prover="0"><result status="valid" time="0.028328" steps="391"/></proof>
+          <proof prover="2"><result status="valid" time="0.096270" steps="374660"/></proof>
+          <proof prover="4"><result status="valid" time="0.156603" steps="25398"/></proof>
           </goal>
          </transf>
          </goal>
@@ -238,12 +238,12 @@
     </goal>
    </transf>
    </goal>
-   <goal name="produces_one&#39;vc.0.1" expl="postcondition" proved="true">
-   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-    <goal name="produces_one&#39;vc.0.1.0" expl="postcondition" proved="true">
-    <proof prover="4"><result status="valid" time="0.677519" steps="69177"/></proof>
-    </goal>
-   </transf>
+  </transf>
+  </goal>
+  <goal name="vc_produces_one.1" proved="true">
+  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
+   <goal name="vc_produces_one.1.0" proved="true">
+   <proof prover="4"><result status="valid" time="0.426506" steps="69177"/></proof>
    </goal>
   </transf>
   </goal>
@@ -251,18 +251,18 @@
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl1_ProducesOneInvariant_Impl" proved="true">
- <goal name="produces_one_invariant&#39;vc" expl="VC for produces_one_invariant" proved="true">
+ <goal name="vc_produces_one_invariant" proved="true">
  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-  <goal name="produces_one_invariant&#39;vc.0" expl="VC for produces_one_invariant" proved="true">
+  <goal name="vc_produces_one_invariant.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="produces_one_invariant&#39;vc.0.0" expl="assertion" proved="true">
-   <proof prover="4" timelimit="5"><result status="valid" time="0.165938" steps="17320"/></proof>
+   <goal name="vc_produces_one_invariant.0.0" proved="true">
+   <proof prover="4" timelimit="5"><result status="valid" time="0.100350" steps="17320"/></proof>
    </goal>
-   <goal name="produces_one_invariant&#39;vc.0.1" expl="postcondition" proved="true">
-   <proof prover="0" timelimit="5" memlimit="2000"><result status="valid" time="0.277452" steps="1827"/></proof>
+   <goal name="vc_produces_one_invariant.0.1" proved="true">
+   <proof prover="4" timelimit="5"><result status="valid" time="0.349452" steps="50068"/></proof>
    </goal>
-   <goal name="produces_one_invariant&#39;vc.0.2" expl="postcondition" proved="true">
-   <proof prover="4" timelimit="5"><result status="valid" time="0.765389" steps="70837"/></proof>
+   <goal name="vc_produces_one_invariant.0.2" proved="true">
+   <proof prover="0" timelimit="5" memlimit="2000"><result status="valid" time="0.061877" steps="1825"/></proof>
    </goal>
   </transf>
   </goal>
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz b/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz
index 0b686a41cb0700ad944efaa868a0e4d32847c2c8..53326d03f6141d9740d8166e8515d99199603242 100644
GIT binary patch
literal 8916
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

literal 9109
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
TgffQtrZN6MLupAqIHmvqW4PMs

diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index f94abb9a95..fb1ead2e6c 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -354,12 +354,9 @@ module C07Fuse_Impl0_ProducesRefl_Impl
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  let rec ghost function produces_refl [#"../07_fuse.rs" 55 4 55 26] (self : C07Fuse_Fuse_Type.t_fuse i) : ()
-    requires {[#"../07_fuse.rs" 55 21 55 25] inv0 self}
-    ensures { [#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../07_fuse.rs" 52 4 52 10] ()
+  constant self  : C07Fuse_Fuse_Type.t_fuse i
+  function produces_refl [#"../07_fuse.rs" 55 4 55 26] (self : C07Fuse_Fuse_Type.t_fuse i) : ()
+  goal vc_produces_refl : ([#"../07_fuse.rs" 55 21 55 25] inv0 self) -> ([#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self)
 end
 module C07Fuse_Impl0_ProducesTrans_Impl
   type i
@@ -432,18 +429,14 @@ module C07Fuse_Impl0_ProducesTrans_Impl
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  let rec ghost function produces_trans [#"../07_fuse.rs" 62 4 62 90] (a : C07Fuse_Fuse_Type.t_fuse i) (ab : Seq.seq item0) (b : C07Fuse_Fuse_Type.t_fuse i) (bc : Seq.seq item0) (c : C07Fuse_Fuse_Type.t_fuse i) : ()
-    requires {[#"../07_fuse.rs" 59 15 59 32] produces0 a ab b}
-    requires {[#"../07_fuse.rs" 60 15 60 32] produces0 b bc c}
-    requires {[#"../07_fuse.rs" 62 22 62 23] inv0 a}
-    requires {[#"../07_fuse.rs" 62 31 62 33] inv1 ab}
-    requires {[#"../07_fuse.rs" 62 52 62 53] inv0 b}
-    requires {[#"../07_fuse.rs" 62 61 62 63] inv1 bc}
-    requires {[#"../07_fuse.rs" 62 82 62 83] inv0 c}
-    ensures { [#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C07Fuse_Fuse_Type.t_fuse i
+  constant ab  : Seq.seq item0
+  constant b  : C07Fuse_Fuse_Type.t_fuse i
+  constant bc  : Seq.seq item0
+  constant c  : C07Fuse_Fuse_Type.t_fuse i
+  function produces_trans [#"../07_fuse.rs" 62 4 62 90] (a : C07Fuse_Fuse_Type.t_fuse i) (ab : Seq.seq item0) (b : C07Fuse_Fuse_Type.t_fuse i) (bc : Seq.seq item0) (c : C07Fuse_Fuse_Type.t_fuse i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../07_fuse.rs" 57 4 57 10] ()
+  goal vc_produces_trans : ([#"../07_fuse.rs" 62 82 62 83] inv0 c) -> ([#"../07_fuse.rs" 62 61 62 63] inv1 bc) -> ([#"../07_fuse.rs" 62 52 62 53] inv0 b) -> ([#"../07_fuse.rs" 62 31 62 33] inv1 ab) -> ([#"../07_fuse.rs" 62 22 62 23] inv0 a) -> ([#"../07_fuse.rs" 60 15 60 32] produces0 b bc c) -> ([#"../07_fuse.rs" 59 15 59 32] produces0 a ab b) -> ([#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c)
 end
 module C07Fuse_Impl1_IsFused_Impl
   type i
@@ -566,16 +559,12 @@ module C07Fuse_Impl1_IsFused_Impl
   val completed0 [#"../07_fuse.rs" 16 4 16 35] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) : bool
     ensures { result = completed0 self }
     
-  let rec ghost function is_fused [#"../07_fuse.rs" 81 4 81 62] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) (steps : Seq.seq item0) (next : C07Fuse_Fuse_Type.t_fuse i) : ()
-    requires {[#"../07_fuse.rs" 78 15 78 31] completed0 self}
-    requires {[#"../07_fuse.rs" 79 15 79 44] produces0 ( ^ self) steps next}
-    requires {[#"../07_fuse.rs" 81 21 81 25] inv0 self}
-    requires {[#"../07_fuse.rs" 81 27 81 32] inv1 steps}
-    requires {[#"../07_fuse.rs" 81 51 81 55] inv2 next}
-    ensures { [#"../07_fuse.rs" 80 14 80 50] steps = Seq.empty  /\  ^ self = next }
+  constant self  : borrowed (C07Fuse_Fuse_Type.t_fuse i)
+  constant steps  : Seq.seq item0
+  constant next  : C07Fuse_Fuse_Type.t_fuse i
+  function is_fused [#"../07_fuse.rs" 81 4 81 62] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) (steps : Seq.seq item0) (next : C07Fuse_Fuse_Type.t_fuse i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../07_fuse.rs" 76 4 76 10] ()
+  goal vc_is_fused : ([#"../07_fuse.rs" 81 51 81 55] inv2 next) -> ([#"../07_fuse.rs" 81 27 81 32] inv1 steps) -> ([#"../07_fuse.rs" 81 21 81 25] inv0 self) -> ([#"../07_fuse.rs" 79 15 79 44] produces0 ( ^ self) steps next) -> ([#"../07_fuse.rs" 78 15 78 31] completed0 self) -> ([#"../07_fuse.rs" 80 14 80 50] steps = Seq.empty  /\  ^ self = next)
 end
 module C07Fuse_Impl0
   type i
diff --git a/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml b/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
index 93580f029d..f88983a51b 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/07_fuse/why3session.xml
@@ -12,21 +12,21 @@
  </goal>
 </theory>
 <theory name="C07Fuse_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.010276" steps="39"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.010276" steps="38"/></proof>
  </goal>
 </theory>
 <theory name="C07Fuse_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="compute_specified" proved="true" >
-  <goal name="produces_trans&#39;vc.0" expl="VC for produces_trans" proved="true">
+  <goal name="vc_produces_trans.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="produces_trans&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_produces_trans.0.0" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="produces_trans&#39;vc.0.0.0" expl="postcondition" proved="true">
+    <goal name="vc_produces_trans.0.0.0" proved="true">
     <transf name="inline_goal" proved="true" >
-     <goal name="produces_trans&#39;vc.0.0.0.0" expl="postcondition" proved="true">
-     <proof prover="1"><result status="valid" time="0.127221" steps="19312"/></proof>
+     <goal name="vc_produces_trans.0.0.0.0" proved="true">
+     <proof prover="1"><result status="valid" time="0.127221" steps="30805"/></proof>
      </goal>
     </transf>
     </goal>
@@ -38,8 +38,8 @@
  </goal>
 </theory>
 <theory name="C07Fuse_Impl1_IsFused_Impl" proved="true">
- <goal name="is_fused&#39;vc" expl="VC for is_fused" proved="true">
- <proof prover="0"><result status="valid" time="0.020265" steps="34"/></proof>
+ <goal name="vc_is_fused" proved="true">
+ <proof prover="0"><result status="valid" time="0.020265" steps="32"/></proof>
  </goal>
 </theory>
 <theory name="C07Fuse_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/07_fuse/why3shapes.gz b/creusot/tests/should_succeed/iterators/07_fuse/why3shapes.gz
index 46ebe3e424299a87e11c184e1c7df641a07b97f3..7e6033a116054732d3405c3127613186ef7e7eaf 100644
GIT binary patch
literal 1322
zcmV+_1=ac=iwFP!00000|Fu_3ZyPrdzUx=$*4DmoID8h!K@e<Em-bMA#~9pQGBIjf
zuH-oFzwhv+UD<BZCa4Y)Ih=1^{5Yh3yjUMUhR1kZKgYxIcK`76TCFdBT0Q*{ZXceN
zXV+~gJ@ldQ{CX805BurU7?0pFTwZ$NmDjtxjO|x>)#kFzMVsSpftD4xFh{oJnFABz
z{o~VL-ZZ@Fk)XGI$UU551rMiSnTH&0%|L9nVcg$8-o>Xl(F%s`%`f|hc=E-<MV20K
zA3l)I{=tI`@2lQ#`}^q0#BRGy4Yu8G!#fhS=_VZFaewz5DF@ippz@$e#nvMy)$32k
z=*dshVI;;E;&=2NhW+8N{~V_u?tkyg+=g`f5biwKa68fW)dC1M14*Sub9Hizo|{dr
z05?739JfbNe9?xQt3~wLQZ1?dT(E70d5)V};5=wj?z!4DUZ@g+@mybZk9t{i0?L;)
z2a27fbImc=yy(@McVk$@#e+JlPSLJ~;gAc%;i{;Sdyz*)Cc=mKbW>Kd=psuls%kf0
zO3(2{>2nliwHIHP;_Is(VfviQuM3zmWG9!5EPsrL+w8V`2R(NGEF1}bQ%HBR)@@~K
zWbPHSwBN7kP*!_PSYpC6LSTVv52{B5>aB>dM+Az<sLo7W{YoT1F+;G%j68UY`plzg
z6v585w8*Tj=FIZ&9T|E%GeUnYGc+D`&kXgKGF$oWI_(eZhxq5ysbMVp#aX}MxuIe1
zOuM>Ve|c+U&>9)fjjW!AW&aWtxG<Mn+L;608k%l+J$Ea!P$YiDyHs_{a93-WhpQsJ
zDb0In8glGB2l4fo>luI5dzXR|{aNg)#olY8<|^viXjvG`FSW3-35F(U0~W$E%YhU#
zW|q*0gez*VA<>@S+&;xa7#HJ^xApQeRBWwKYs!mQ?Ma1hhtp~84QOe(tt~yA$8+*E
z{*!$7D*oN89NPwlT`xxy47*;iU9VujYuS9+eUYW&#8%nnqRp|*zmKJ2W+|U<V3==U
zR&L-qWx9lOguwGn1D%f0`3Rkm&>0CQN-j8=Z|QDeX}Z|ObAO$h(76djPU6Y?dXDnp
z&$Kx{#m8e+-7TI2?S#!+)?igVgBQoI?N?c=&ca!5;d6m-E|55jSGI7^GCK*cYolzt
z$<CfcS&d4oyzzGTrj*bNaeiVg1v;yA`>kE8HrH+58ubeY-(~4Ke^zHtuvf2vd>Jku
z1DfuF`6*CMBQf{CSut;0x!x>$B+oVOXN@f$mh)cnc`vb2D?fbmWh6VHUdzbKB37|k
zQmmfCeyO&C$yPA6`&MAC^U9zdrzGPjqheDSHAEOOB?f8?B8_Wc&N}0?Q%*YJ&~XQj
ztp+R7fIJN>!6YQTS3qhLwPs*Z3cCjFKsk^OgadRyFjy%iIK6MhDA1x{<R|he@L|v?
zDf(m-vW(*NZ5^0zN6Ep!D92$`VX_Kv5E|`7{RWt|BZiFP)^Yk)juTcmPT6tC;r}$1
zFhv2A8e$ymkSwst3}#|l#1YL@OqqXWYDlB8oXd&Z6eU_SSRD*K1rpQ2TFj;db7&nJ
zhg2fvP&%YNM2FlVtj36DWXcLY*#VS-1V&C$+oU6dI1~%Q33P%x0SzV8#ABlUFgife
z1T-jF)Hu?Au)&n=5b`C8D8&pR0=<ywazhv=m=d>2SePVF1*Km3O5=pe>S>sm0VUN)
gT+pD+m~cXn8709<=7e>^IH6a61HWe70Im)I03bk-ng9R*

literal 1437
zcmV;O1!DRiiwFP!00000|Fu_1Z(BDIzUx=$*4DmoxW5892!aI~DB42-9&7M%Nrc*x
zD=A6)?>pop-y#c1+n_o~<Z#xHGsDsMckA;9_ZrXZPw{l#9}hpS<@)Z2)#VSjKYWsw
z?CMfjXiIMCZslH2$MDg|Gg#*C?=82|s>giH>aVo2?nT}6x@V6wX)y@S)S)i1FrZz0
zdA<B)b(Po66K1=%q!vbB!NTY)v5>tTBH){?^T(Ih=Xi+$Png?2{d_#c(H3!cnR?zI
z-XqWPU_rRw2EJd9FVUik$L%&%vF&#2-XW=OH|`YA$LCKGV}Q-zR9;jn-&#hIb@%Zc
zE!wF(1j+1*{0_fee>|OzpJVv$<@a_>JD2tc_iUka`+(mMGePLGAhHbJJdB2!rFt_U
zKy`~a`)wI7w(vsr!_51vX@Io*Tx9DBv6O8Ffb*hKsiksL^FkIEw595ySyXe(QBYiC
z4(K~lC(K#KyzmW}H)X7liv_trr*IFzP{_bgcqnXWp66AearZu6p2}$^-DS$%z}l1-
z=qbB`K6_D48~Cb#uO6C*>2ro(6=95!j3x<c{t!?5Y_?ek<(qxt&M5v=l5W)2bmi2@
zxmVQUeZNhIa@u@i#V58%2v$Uu1=&0TdCMc#JOYWyC>JUoe!(OkGlP?w8F_Il^@(M=
zrU+}fmS&OF(;Qh|zC%T~BSY!0MaHycszt`smm*u)?K&M#>qGqWGB%8PzgYAenj0F+
zo#}Bn9)4+UWKbI!&5dlRhI#+ugWybEZfOexsx~xL<<-=!^o$WZ6sep*9&0xvKQ$n*
z_tmhPz|$$F=eZ%sk<jeY*CQAz{!J&I6G|+LNM!Y|AtWbE)jX1RvH0oRy1#MWyWY38
zUk$0!M9UUjmYdW2O7E}u{R+FYOSpX6U*c&bza_bxBlq`iuwDXc9ex&SH?rhwX{Fz~
z*$q3D<%Yf0>+yW?$3xg(@X5Ui)9B6w#x+;*2z|j9u2EpPPcrRmF#_Ez51<{8<pH+-
zH+BFPCT?(a10<FEZC+kZ?r>ftwj6!WZ)(kLe&sDbzgKRe;AXBy3<?%BS@epjPJWtP
zo0e=EXUH^9e6bPmu_1`M=XKBO{@WS>pBe$3h8&oN98!jyd90<t3j`Q(tKnAU(5f6-
znZsD;vqH~<P*X5hUG%cu)wR`r)CwN3;<0-2Q-lv%c@*lnRv9R1SE$<+s(A(#NzjFF
zKAWlOs-{M_KR@Ma3L{E%LWxZ%@rBc(`n(8lB<`wLq9!4Zp5^4J%*9JRh_$rZc8@oy
zyLlFtv35>SnWfpPkjT1Mb>9$L8u%tnyZl)##@;s*SRO#;1DL`~nZ~a{HN#Z?cUtsq
zExXP9C88PcR(xbO%un}9r+Z~J*SIZ%rf7-wmbP0Y6JI7=Da<y=RKP?94D<Rw3TB*F
znsq)T5xt0#1m_h*@GK<)(mS5~8i?tPHp)mN3^&YB1BR@$mO2IoEE3_JOP*6n2$jtD
zl)A{*pbSU@!T>kG44@dSVj?^^fJiALz<}fQFM#w?_Q888){Gj)vJ@o-Is-aOQ62Gr
z01vWHfd=Sk2ta}l+*8j}CyNwZONmI8O2iY@B}s#0Qj(Z>;xdu04{1$1!-%2EP-!U2
zazimXYUux|s?!-D-zyR*VP0vWdq;dqR0tIj0aQixKT;(rSAysuRHDvxo#u#S@3K<X
zcO6@EZa6cX8V-gN!_Y}>m@-TnCJf^%ADQ+<cASQ;2Pq+e7O1aFDiVnOns<h4!<FIE
za8aeW3^bxiu9btNP*5{LqGBE!X|H9L669J6Q;KMmaQLr;ILE*T2#I!*cMt?kMGD^7
rN<J{zsn7?aK?><5rwWwziDCAMB88bLjNnEvBk1aH4|&#CA`k!onr**b

diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index d0d7618fea..add4799173 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -22,11 +22,9 @@ module C09Empty_Impl0_ProducesRefl_Impl
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_refl [#"../09_empty.rs" 28 4 28 26] (self : C09Empty_Empty_Type.t_empty t) : ()
-    ensures { [#"../09_empty.rs" 27 14 27 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../09_empty.rs" 25 4 25 10] ()
+  constant self  : C09Empty_Empty_Type.t_empty t
+  function produces_refl [#"../09_empty.rs" 28 4 28 26] (self : C09Empty_Empty_Type.t_empty t) : ()
+  goal vc_produces_refl : [#"../09_empty.rs" 27 14 27 45] produces0 self (Seq.empty ) self
 end
 module C09Empty_Impl0_ProducesTrans_Impl
   type t
@@ -50,15 +48,14 @@ module C09Empty_Impl0_ProducesTrans_Impl
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../09_empty.rs" 35 4 35 90] (a : C09Empty_Empty_Type.t_empty t) (ab : Seq.seq t) (b : C09Empty_Empty_Type.t_empty t) (bc : Seq.seq t) (c : C09Empty_Empty_Type.t_empty t) : ()
-    requires {[#"../09_empty.rs" 32 15 32 32] produces0 a ab b}
-    requires {[#"../09_empty.rs" 33 15 33 32] produces0 b bc c}
-    requires {[#"../09_empty.rs" 35 31 35 33] inv0 ab}
-    requires {[#"../09_empty.rs" 35 61 35 63] inv0 bc}
-    ensures { [#"../09_empty.rs" 34 14 34 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C09Empty_Empty_Type.t_empty t
+  constant ab  : Seq.seq t
+  constant b  : C09Empty_Empty_Type.t_empty t
+  constant bc  : Seq.seq t
+  constant c  : C09Empty_Empty_Type.t_empty t
+  function produces_trans [#"../09_empty.rs" 35 4 35 90] (a : C09Empty_Empty_Type.t_empty t) (ab : Seq.seq t) (b : C09Empty_Empty_Type.t_empty t) (bc : Seq.seq t) (c : C09Empty_Empty_Type.t_empty t) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../09_empty.rs" 30 4 30 10] ()
+  goal vc_produces_trans : ([#"../09_empty.rs" 35 61 35 63] inv0 bc) -> ([#"../09_empty.rs" 35 31 35 33] inv0 ab) -> ([#"../09_empty.rs" 33 15 33 32] produces0 b bc c) -> ([#"../09_empty.rs" 32 15 32 32] produces0 a ab b) -> ([#"../09_empty.rs" 34 14 34 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/09_empty/why3session.xml b/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
index aa5a4de574..b2efc3e268 100644
--- a/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="09_empty.mlcfg"/>
 <theory name="C09Empty_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="4"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="2"/></proof>
  </goal>
 </theory>
 <theory name="C09Empty_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
- <proof prover="0"><result status="valid" time="0.097871" steps="1851"/></proof>
+ <goal name="vc_produces_trans" proved="true">
+ <proof prover="0"><result status="valid" time="0.097871" steps="1773"/></proof>
  </goal>
 </theory>
 <theory name="C09Empty_Impl0_Next" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/09_empty/why3shapes.gz b/creusot/tests/should_succeed/iterators/09_empty/why3shapes.gz
index d7a57fcd7f6c24cb44d19fe50687308ccc075c8c..5854ddd4b430aeaded38a1e99c69b243a46ce6ad 100644
GIT binary patch
literal 449
zcmV;y0Y3g8iwFP!00000|CNzXkDD+M#qWFyj@|6V|2?j>hbR()OD~mt>}qTe+eitd
zA&uH^UmMbhNIA3!iQ)M-k2k}oO+9_b6HWD%&eMJzKG&w+yi|BPkLhQmiQz<t9_e_x
z{GQ8dF5l;_>hc5k!<Bi~tUC~2Ul9X_h_QRni?~+)GQ|YT(OiUBEw*C2!#EyK2f9#V
zp5yNQ%Q(==V3WmZKYV0j9K6JDGxT*llJ}y+H!p5IO^0Wi#>17ePgD6_-H+#bpkJ5U
z5V8!hl%fzz$-QXqQ_A&}Ugash_SQr9RBg6vIcsJun1XDVPw3mzcK_Cq4<9;N0T+kc
zJ2d5bOgsNKuexVq)7^ZV>S5#R*~Zms<0fxh-8a6(kzRNI=VG6`EU83ERT&BxnKk58
zuaj}YNrfDAU_v?>Sj}5jLA0cLCK+n9HUXgMgL1)IWKPMDA=!$GS%)ATl3-xCbtXEd
zIVR{)Fb-7fR%HxB3e>xxok|iEWi!k%A`gkOBC{K3t!tsRt*K<6q6tV+GaZ>BKnpVJ
rU_oiE0Se9UG$;Y!a$ZdNjtWddt^tj<QTCh)E$;Lm@L>CrrUL)~@#NW{

literal 485
zcmV<B0UG`viwFP!00000|CLfrtJ^RTy!%)9*ydgIExFJ`NNa2;rBKkZVI{5l0*Rg4
zZfO5~WjimiX$pPDpw(z*cNq4~Chwo&jD3E=u0OQRyIkd)w;7zfHvIJ16H5S3=i#>{
zpJ2EDIF{-B@(j(;o<6_;ncd~F?eZ7JzQcITh97WfE=gT3dr5eDveYum>-m{&=aX(1
zEHM(6fJ_?kkMXaA%fH+X9W;IR;${cFJ)Ms@U`VEt_H*0d-3e?G*dLnjiP1Ke!?%g_
zwLPJ=tcLfNT{UG59ro?<f~n7KYJ<OqYcza}W-i&tn9Gz+dCQKkvJ+!=(rRn!hiJKu
zP+GMF)JWORBjoke_5Uf-<4Q?J;@shSH|6+c)1vIBg<3nGH%Qcv!1B5ZqRdw5i%02;
zMfxhGFK+42*0`1R>$>R2U1nEobd_=NLOKy6VJ3JNeNZaK!V>|KqhdL&NX7*VKA_^r
zfm6+dbBafVh*T@?Fc%fCSVnXKh82K}7)5oVd_g3IU?MO=4d$wni3Tn>jD?eh2;2w+
z7D1u&)CEik&nc@YtthFA%2YbzF?i(wxg^pPg$A_YUOH`rl+u`q&+mLAm@$R%8bbQL
bFe(6*29(sEM~V|)-1&b1e;}4RC<FiiYzOqH

diff --git a/creusot/tests/should_succeed/iterators/10_once.mlcfg b/creusot/tests/should_succeed/iterators/10_once.mlcfg
index 95da1af9bf..7ff8808fd4 100644
--- a/creusot/tests/should_succeed/iterators/10_once.mlcfg
+++ b/creusot/tests/should_succeed/iterators/10_once.mlcfg
@@ -47,12 +47,9 @@ module C10Once_Impl0_ProducesRefl_Impl
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_refl [#"../10_once.rs" 31 4 31 26] (self : C10Once_Once_Type.t_once t) : ()
-    requires {[#"../10_once.rs" 31 21 31 25] inv0 self}
-    ensures { [#"../10_once.rs" 30 14 30 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../10_once.rs" 28 4 28 10] ()
+  constant self  : C10Once_Once_Type.t_once t
+  function produces_refl [#"../10_once.rs" 31 4 31 26] (self : C10Once_Once_Type.t_once t) : ()
+  goal vc_produces_refl : ([#"../10_once.rs" 31 21 31 25] inv0 self) -> ([#"../10_once.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
 end
 module C10Once_Impl0_ProducesTrans_Impl
   type t
@@ -96,18 +93,14 @@ module C10Once_Impl0_ProducesTrans_Impl
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../10_once.rs" 38 4 38 90] (a : C10Once_Once_Type.t_once t) (ab : Seq.seq t) (b : C10Once_Once_Type.t_once t) (bc : Seq.seq t) (c : C10Once_Once_Type.t_once t) : ()
-    requires {[#"../10_once.rs" 35 15 35 32] produces0 a ab b}
-    requires {[#"../10_once.rs" 36 15 36 32] produces0 b bc c}
-    requires {[#"../10_once.rs" 38 22 38 23] inv0 a}
-    requires {[#"../10_once.rs" 38 31 38 33] inv1 ab}
-    requires {[#"../10_once.rs" 38 52 38 53] inv0 b}
-    requires {[#"../10_once.rs" 38 61 38 63] inv1 bc}
-    requires {[#"../10_once.rs" 38 82 38 83] inv0 c}
-    ensures { [#"../10_once.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C10Once_Once_Type.t_once t
+  constant ab  : Seq.seq t
+  constant b  : C10Once_Once_Type.t_once t
+  constant bc  : Seq.seq t
+  constant c  : C10Once_Once_Type.t_once t
+  function produces_trans [#"../10_once.rs" 38 4 38 90] (a : C10Once_Once_Type.t_once t) (ab : Seq.seq t) (b : C10Once_Once_Type.t_once t) (bc : Seq.seq t) (c : C10Once_Once_Type.t_once t) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../10_once.rs" 33 4 33 10] ()
+  goal vc_produces_trans : ([#"../10_once.rs" 38 82 38 83] inv0 c) -> ([#"../10_once.rs" 38 61 38 63] inv1 bc) -> ([#"../10_once.rs" 38 52 38 53] inv0 b) -> ([#"../10_once.rs" 38 31 38 33] inv1 ab) -> ([#"../10_once.rs" 38 22 38 23] inv0 a) -> ([#"../10_once.rs" 36 15 36 32] produces0 b bc c) -> ([#"../10_once.rs" 35 15 35 32] produces0 a ab b) -> ([#"../10_once.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
 end
 module C10Once_Impl0_Next
   type t
diff --git a/creusot/tests/should_succeed/iterators/10_once/why3session.xml b/creusot/tests/should_succeed/iterators/10_once/why3session.xml
index 01828c4b5a..04d21c9212 100644
--- a/creusot/tests/should_succeed/iterators/10_once/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/10_once/why3session.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="10_once.mlcfg"/>
 <theory name="C10Once_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="6"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="4"/></proof>
  </goal>
 </theory>
 <theory name="C10Once_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-  <goal name="produces_trans&#39;vc.0" expl="VC for produces_trans" proved="true">
-  <proof prover="0"><result status="valid" time="0.019793" steps="199"/></proof>
+  <goal name="vc_produces_trans.0" proved="true">
+  <proof prover="0"><result status="valid" time="0.019793" steps="226"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/iterators/10_once/why3shapes.gz b/creusot/tests/should_succeed/iterators/10_once/why3shapes.gz
index 22af7df85bc79cc64176d1375f6ec9c8197511ca..464974532355ea56d0430608159195c25afc1186 100644
GIT binary patch
literal 624
zcmV-$0+0P4iwFP!00000|D{q*kJB&^z2{ft2DBHCzm3#GRVi{M1P3G^cQuZk-HJ9T
zZCT*oW2Y|3u6jZAV*6#@n>TOzeo>#F@fgqbOFW%-L;tas_2NTy`Hs8(1srM0l{jcB
zJf4Q|qm5^R=eX}M9*&pa<8?dMjMr*JA4l0jrjrh2otq?mC5gCPB6{>Kw%b>D2It7F
zX6%XM37AVpz!$*ZD%#SJO*ZIc1G0^qBi2-#GA>zfupJJ^eZ0g#9LLS$=b?`?8;b;<
zcl}eU7<vbQ4`bEW;SgQoZ}Ak*!~P`_r>~ZrUYB!=t5o4kbG7Kq8dr%fOOsDYTduE0
zWtrk3-&RheA5N#?XAJKS-%|OPzKtWZ+x56l26n;mrhIVOV`fPwQma+|D3aWBJnb%z
zyMRwIAC9+>4J@44IG}TKQ=Idra+|svPIVuDT}obj3Y1NO(kW2Lf!?y^^KB;^<Nw5o
z?LDwrUpb=WBl2Em+YtA*A!gf9DHHK`8B>=3rlRkwG-ZvVgd^Tewp^ybwKLnhXkyRc
zgsC~8a>;G_^)*^q-m1KHdB1M(UrJ5>RTYFN!E~*cRB^2haxSz0#kvS01gM#%7A&cl
zmW*((y%$7wG7=9hBA7N%mDn;BDl4t9yi%ZADJhi<Jg3nIqd;pEhAUu3>Uk;QR2omU
zh%z8mL;)cPxmol8rUqsq82}5!8mlWqO%hIm9u!h90YZ?J`;JkjB#%iOj0J5$S&$Zl
z1zv&ThJ~P&LFgd1!Dy~p2;DdUc6mthmgGUkh?JTTNJj%VU7|{+SR!|^Rha~DNq+$7
K^Zh+v1pom3Bqb*R

literal 646
zcmV;10(t!(iwFP!00000|E*I^kJB&^z2{ft26QhTf5u3As47LSw1NYYk5o=P-i>IJ
zl9UDhJx=Q+?a~Vpy)-kP_x$F~`28v$UfdCf{1yA5>DrIE%vT?>(|6ajuV6`;K8b}g
zbH~2(KWZF^WeyL=({IbRms9rSHoMPljh2>~-Q=O`^Qn5*W7sDix=_MMIkD3lb|CKI
z!E!5Yk@$=C1tQm%Sf`k$7|8kxuSewihA^_}S>vKs%wOtn-KXBQLz2iA;dBuWqwuK*
zR%V-7&BoQ;;kd^W`gnJ|<Wtw;qR6dca%kG;Skbi>z<oVeed!KpBYx|89J>80l4JqQ
z7R2~*Y)F^e*^9>rm+6wH$bGSiT6rlMPe)YYs;=+5pXlEmzNN;`$k4QI9|bht@^W%y
z)HtG~74fRa@lZs%7wntUuJP^}$3M$!7zM1X*jS*~;4&%av$ZY$IwimOVklb-rHi33
z8ajE)Z}vl^?GxL3$ujMPNdAa2JD=>%tDfCVM%<f>xSEWL{)l-ni?9F2Qru@L(?~@!
zO1$YZK7zQ&R&VcS%j*pnF{iE*YAl(YSYK?OUXMy~F}<eke`6}gUzRCC717S2LIoHg
zsGtkQkZPqU_&R5X8Zac2Ogl=2@Szeyfb)gtP7_Z;t(f2;FN`wM2*Wd9qlCJm%0bYa
z6F`le5bZtp6({vosUn<8UC~0I^e#$KK!^iYNQM=F&Vd_X2BHQqK#a~b)igpBRG=KK
zB!Ksl@+vUOl;oIGFq9b31_}epfHWX7P+T+b3#Fqbz}oAAs~UW84s`9p8AacsDv*e=
g>!_Rr>bVXPE16;u9k5ns6nl&M1BApZ!mI@V0N7YX=>Px#

diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
index 7b0cbf1e57..e18cf52a0c 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
+++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
@@ -32,12 +32,9 @@ module C11Repeat_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../11_repeat.rs" 33 4 33 26] (self : C11Repeat_Repeat_Type.t_repeat a) : ()
-    requires {[#"../11_repeat.rs" 33 21 33 25] inv0 self}
-    ensures { [#"../11_repeat.rs" 32 14 32 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../11_repeat.rs" 30 4 30 10] ()
+  constant self  : C11Repeat_Repeat_Type.t_repeat a
+  function produces_refl [#"../11_repeat.rs" 33 4 33 26] (self : C11Repeat_Repeat_Type.t_repeat a) : ()
+  goal vc_produces_refl : ([#"../11_repeat.rs" 33 21 33 25] inv0 self) -> ([#"../11_repeat.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
 end
 module C11Repeat_Impl0_ProducesTrans_Impl
   type a
@@ -72,18 +69,14 @@ module C11Repeat_Impl0_ProducesTrans_Impl
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../11_repeat.rs" 40 4 40 90] (a : C11Repeat_Repeat_Type.t_repeat a) (ab : Seq.seq a) (b : C11Repeat_Repeat_Type.t_repeat a) (bc : Seq.seq a) (c : C11Repeat_Repeat_Type.t_repeat a) : ()
-    requires {[#"../11_repeat.rs" 37 15 37 32] produces0 a ab b}
-    requires {[#"../11_repeat.rs" 38 15 38 32] produces0 b bc c}
-    requires {[#"../11_repeat.rs" 40 22 40 23] inv0 a}
-    requires {[#"../11_repeat.rs" 40 31 40 33] inv1 ab}
-    requires {[#"../11_repeat.rs" 40 52 40 53] inv0 b}
-    requires {[#"../11_repeat.rs" 40 61 40 63] inv1 bc}
-    requires {[#"../11_repeat.rs" 40 82 40 83] inv0 c}
-    ensures { [#"../11_repeat.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C11Repeat_Repeat_Type.t_repeat a
+  constant ab  : Seq.seq a
+  constant b  : C11Repeat_Repeat_Type.t_repeat a
+  constant bc  : Seq.seq a
+  constant c  : C11Repeat_Repeat_Type.t_repeat a
+  function produces_trans [#"../11_repeat.rs" 40 4 40 90] (a : C11Repeat_Repeat_Type.t_repeat a) (ab : Seq.seq a) (b : C11Repeat_Repeat_Type.t_repeat a) (bc : Seq.seq a) (c : C11Repeat_Repeat_Type.t_repeat a) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../11_repeat.rs" 35 4 35 10] ()
+  goal vc_produces_trans : ([#"../11_repeat.rs" 40 82 40 83] inv0 c) -> ([#"../11_repeat.rs" 40 61 40 63] inv1 bc) -> ([#"../11_repeat.rs" 40 52 40 53] inv0 b) -> ([#"../11_repeat.rs" 40 31 40 33] inv1 ab) -> ([#"../11_repeat.rs" 40 22 40 23] inv0 a) -> ([#"../11_repeat.rs" 38 15 38 32] produces0 b bc c) -> ([#"../11_repeat.rs" 37 15 37 32] produces0 a ab b) -> ([#"../11_repeat.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/11_repeat/why3session.xml b/creusot/tests/should_succeed/iterators/11_repeat/why3session.xml
index 4559255de1..d12c471928 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/11_repeat/why3session.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="11_repeat.mlcfg"/>
 <theory name="C11Repeat_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="10"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="8"/></proof>
  </goal>
 </theory>
 <theory name="C11Repeat_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
- <proof prover="0"><result status="valid" time="0.010000" steps="67"/></proof>
+ <goal name="vc_produces_trans" proved="true">
+ <proof prover="0"><result status="valid" time="0.010000" steps="61"/></proof>
  </goal>
 </theory>
 <theory name="C11Repeat_Impl0_Next" proved="true">
@@ -21,10 +21,10 @@
  </goal>
 </theory>
 <theory name="C11Repeat_Impl0" proved="true">
- <goal name="produces_trans_refn" proved="true">
+ <goal name="produces_refl_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="0"/></proof>
  </goal>
- <goal name="produces_refl_refn" proved="true">
+ <goal name="produces_trans_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="0"/></proof>
  </goal>
  <goal name="next_refn" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/11_repeat/why3shapes.gz b/creusot/tests/should_succeed/iterators/11_repeat/why3shapes.gz
index 95c7eed61562707323ed45aaea8f3338e20396c6..c09e6ad31decfa7d45fb0fa9604c04908789cfc3 100644
GIT binary patch
literal 494
zcmV<K0TKQmiwFP!00000|D};ji`y_1h4=myUbe|b&nvmmMF<!hN*66?+2QKd1`<1s
z)6o9=N`7P<$YvOCY#+XR&e7F}O*#C+a~R57xD1EB`&2@?`B+?k<Dt6|L+S$0m)`$z
zVIVk!W5jSeU;mAt?Z}Lu#i+iFUh^=`!;24n@Il;e5iMGWu6@w6xK<Ws48rkEF(ad3
zXTdInn*;f4Hp|&dBlg;er$(cuc6)UF>3j^=;E55qfBD*XVO3(2#Np8WOhn%qjXy@{
zdw&YXs1`pPwfsWe;w23I@fMQPRLY3m{LUyCS+`R~xtsdQFMCrZhi~B=@M?10GFca9
zU&j7YcH!@JwZT+iTzDp*i1lmY;`4xQw?-Oebo*3I(<?b?uofUAyY<QFd=iqud8O0;
zW5Bzd>iiUMyD50MsmVI6y?vXDdhSxsw>RyW<sBC>Xep6sN`wGq3Al<#N-bDhA*({k
z8rqOTT9iyg<q36Ga-<xkRzzr5Ne&7UCL7W4LZGvPS?(!MBjC99#B(OSCV<4tlG28f
zrfPJf8YqYcUrFa7I8Pmqk}IzxtDFOfOvoJ1?sU=#DlVfA0>Gw;%7#c?<Q${bF4O!@
k>qr^ZG;pRsXaUkymG)Etqmc?2k0$Q)f7t?QLRSO;04?+LQUCw|

literal 519
zcmV+i0{HzOiwFP!00000|E*HXj+`(Myz><tli7=(Z4)U6G!g=7l|v%=n31vD$w)IW
z0WwPdKIXNs+PSP0PISAvTvhE4hqV7`Z`h}I?D})td`clbd`yO4_T1cwAw^<uUF&~4
z?1^C(ueaf^Vby%fp6&7U6>n$<LyN>5)6jP5ia&K2E(;SKnO0KziZruNPlg+5)WWLr
zc|zuMt(TfFb(Zg@^*Fe1WRXknbnP{Y-9Nn5J9M_`7nOVy%tpbh4Yt|f(Z<wM`O&)e
zdb{9&o){4?`O-GHiL!^-?9a`Qh-e$5?e_`vt-YcdZGSduEupAvhkbjwV`N$q5sPy%
zLcz$QnkCK&F(aRkF~%2b<8|xgi^~T84Exx{7<<gl=;~p&*oP`&5B3chA^Be2wlB!n
zSeE@&|Ba~_zhruZr|I3kb~L|EQ9WuFTZU^g@7o%@+S)8JuAq7!i+apbESsFwu~A)u
zvesOYER(g>L=xw0?Y-0}IMiJFl$Eq330GWrA%)_y_TY*2EOQc(JB?OzmO?2@QSwAs
zR|{5iPkC)6IIcbMoJp?<SmI?$BOxs*DYH_SDv312M%EB-1gJfAS&f0Zz_|^zb}1Dl
z<r|)8@R@WT&_yf{k}I!6WN`q22|3~AhSz~Iswr}&KxhHdWtsL=0i%HmzzGi<{vQGc
J^q{N+007a^{yYEx

diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
index 0d5bc25a57..b903c0cfd3 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
@@ -129,12 +129,9 @@ module C12Zip_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited tl }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../12_zip.rs" 41 4 41 26] (self : C12Zip_Zip_Type.t_zip a b) : ()
-    requires {[#"../12_zip.rs" 41 21 41 25] inv0 self}
-    ensures { [#"../12_zip.rs" 40 14 40 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../12_zip.rs" 38 4 38 10] ()
+  constant self  : C12Zip_Zip_Type.t_zip a b
+  function produces_refl [#"../12_zip.rs" 41 4 41 26] (self : C12Zip_Zip_Type.t_zip a b) : ()
+  goal vc_produces_refl : ([#"../12_zip.rs" 41 21 41 25] inv0 self) -> ([#"../12_zip.rs" 40 14 40 45] produces0 self (Seq.empty ) self)
 end
 module C12Zip_Impl0_ProducesTrans_Impl
   type a
@@ -262,18 +259,14 @@ module C12Zip_Impl0_ProducesTrans_Impl
   val produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b) : bool
     ensures { result = produces0 self visited tl }
     
-  let rec ghost function produces_trans [#"../12_zip.rs" 48 4 48 90] (a : C12Zip_Zip_Type.t_zip a b) (ab : Seq.seq (item0, item1)) (b : C12Zip_Zip_Type.t_zip a b) (bc : Seq.seq (item0, item1)) (c : C12Zip_Zip_Type.t_zip a b) : ()
-    requires {[#"../12_zip.rs" 45 15 45 32] produces0 a ab b}
-    requires {[#"../12_zip.rs" 46 15 46 32] produces0 b bc c}
-    requires {[#"../12_zip.rs" 48 22 48 23] inv0 a}
-    requires {[#"../12_zip.rs" 48 31 48 33] inv1 ab}
-    requires {[#"../12_zip.rs" 48 52 48 53] inv0 b}
-    requires {[#"../12_zip.rs" 48 61 48 63] inv1 bc}
-    requires {[#"../12_zip.rs" 48 82 48 83] inv0 c}
-    ensures { [#"../12_zip.rs" 47 14 47 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C12Zip_Zip_Type.t_zip a b
+  constant ab  : Seq.seq (item0, item1)
+  constant b  : C12Zip_Zip_Type.t_zip a b
+  constant bc  : Seq.seq (item0, item1)
+  constant c  : C12Zip_Zip_Type.t_zip a b
+  function produces_trans [#"../12_zip.rs" 48 4 48 90] (a : C12Zip_Zip_Type.t_zip a b) (ab : Seq.seq (item0, item1)) (b : C12Zip_Zip_Type.t_zip a b) (bc : Seq.seq (item0, item1)) (c : C12Zip_Zip_Type.t_zip a b) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../12_zip.rs" 43 4 43 10] ()
+  goal vc_produces_trans : ([#"../12_zip.rs" 48 82 48 83] inv0 c) -> ([#"../12_zip.rs" 48 61 48 63] inv1 bc) -> ([#"../12_zip.rs" 48 52 48 53] inv0 b) -> ([#"../12_zip.rs" 48 31 48 33] inv1 ab) -> ([#"../12_zip.rs" 48 22 48 23] inv0 a) -> ([#"../12_zip.rs" 46 15 46 32] produces0 b bc c) -> ([#"../12_zip.rs" 45 15 45 32] produces0 a ab b) -> ([#"../12_zip.rs" 47 14 47 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
index dba1ecb9da..5c63b0250b 100644
--- a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
@@ -7,48 +7,48 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="12_zip.mlcfg"/>
 <theory name="C12Zip_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="0.017139" steps="266"/></proof>
+ <goal name="postcondition" proved="true">
+ <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="0.017139" steps="274"/></proof>
  </goal>
 </theory>
 <theory name="C12Zip_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="postcondition" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="produces_trans&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="postcondition.0" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-   <goal name="produces_trans&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="postcondition.0.0" proved="true">
    <transf name="unfold" proved="true" arg1="produces0">
-    <goal name="produces_trans&#39;vc.0.0.0" expl="VC for produces_trans" proved="true">
-    <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="Requires5,Requires6">
-     <goal name="produces_trans&#39;vc.0.0.0.0" expl="VC for produces_trans" proved="true">
-     <transf name="destruct_rec" proved="true" arg1="Requires6">
-      <goal name="produces_trans&#39;vc.0.0.0.0.0" expl="VC for produces_trans" proved="true">
-      <transf name="destruct_rec" proved="true" arg1="Requires5">
-       <goal name="produces_trans&#39;vc.0.0.0.0.0.0" expl="VC for produces_trans" proved="true">
+    <goal name="postcondition.0.0.0" proved="true">
+    <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="pre_0,pre_1">
+     <goal name="postcondition.0.0.0.0" proved="true">
+     <transf name="destruct_rec" proved="true" arg1="pre_1">
+      <goal name="postcondition.0.0.0.0.0" proved="true">
+      <transf name="destruct_rec" proved="true" arg1="pre_0">
+       <goal name="postcondition.0.0.0.0.0.0" proved="true">
        <transf name="exists" proved="true" arg1="(p21++p2)">
-        <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0" proved="true">
+        <goal name="postcondition.0.0.0.0.0.0.0" proved="true">
         <transf name="exists" proved="true" arg1="(p11++p1)">
-         <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0" proved="true">
+         <goal name="postcondition.0.0.0.0.0.0.0.0" proved="true">
          <transf name="split_vc" proved="true" >
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.0" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.0" proved="true">
           <proof prover="2"><result status="valid" time="0.011443" steps="36"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.1" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.1" proved="true">
           <proof prover="2"><result status="valid" time="0.011081" steps="36"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.2" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.2" proved="true">
           <proof prover="2"><result status="valid" time="0.012099" steps="39"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.3" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.3" proved="true">
           <proof prover="2"><result status="valid" time="0.011603" steps="39"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.4" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.4" proved="true">
           <proof prover="2"><result status="valid" time="0.023011" steps="249"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.5" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.5" proved="true">
           <proof prover="2"><result status="valid" time="0.014035" steps="95"/></proof>
           </goal>
-          <goal name="produces_trans&#39;vc.0.0.0.0.0.0.0.0.6" proved="true">
+          <goal name="postcondition.0.0.0.0.0.0.0.0.6" proved="true">
           <proof prover="2"><result status="valid" time="0.013065" steps="94"/></proof>
           </goal>
          </transf>
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz b/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz
index 467ac4ca1f20581ca9049433a801ccf9442d55f2..1af6949cd06f4dd64b291f5e224d65e0efc69657 100644
GIT binary patch
literal 2105
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

literal 2177
zcmV-{2!8h;iwFP!00000|Fu|6a~n4jz3W%-wj28bG`_c@14~5~blDuTHHST{3K(D<
zR%DVZF?M!;eHxg-42B#^ievd;Vj4hqzt@d!K!5+Rdj7>7<MZlEe0ts;_WxMP)rTK$
zPXBeg{TJSl?J#5wEkkIa3~9r*H}3d!2*0)Q85-_Ber!ae8hzjI?|*5dhHp81i{YE!
zSG#4uu~LV+<jjC^@$>QYzs3yvO*Km!N|Jqw19X?)4}SLpKw*(Uk<cO`_q7@*3To9^
zFU;+U!5u1!B2lQp^|kBxsmkJ>j3n9KG<U1+@U$w+9-d<NIA{<P`+Q=bP3*(V?2F+S
z2KL3kJ`C)OzsSCLoqb+~ffWf92`!TE!#=Orr<wgR5=eAL?v9WL%pK{CyLFFo|LKJJ
zPsb6|Vkjf$llW6S;i#e7{p+{mV}vX?(j>?ubQ}r%F@2Bw*6zpK7Cq3l>+b)%<AcM0
z$1?O4%~|BrY#I8|dpf#5_rC%#n}Bh`w*`W48*1hdXp;08(lCQC)6N3IEP(LYdOvP2
zQTXgbKW?-0#JT)S-GGY>zcl-p1?>R%<Htlo!jvQZkZaXIL7JmyM2xap0B59(vPyt{
zCgTaF+u^U<T~7Awm2X^8Q8*dijo-bE-BR4A<yVPwm5!0VH!NDe#oYP~Oao*QO_I;x
zpdcj&iqGg7QUu6${RXDjZwcA@EY9omocKmMlJ{46pcN0eFbU2GpqYRLNIe1cPZBWa
zvPO<G=a4rGm<yb1U|$G2%)rtlD6k=;gli~adkw(_JUT5axQ0-oWV5;GfTt(7e_kjg
zsUls)=@)`}J)EfOB96-uJS&5jka59Tv{15HjuX5XCw4tfe1?K0K^`H4Jfq;(;>2fh
zS_tPf$);rm5i4<mWklHMhTtqA8se3k;MhE8g(k;=^do&yTE^x%D=KH*^)gVnVDNtk
zO=`<a{`=;oGT}?S&N7P4VgX4|P7llev&)QP+oc0>#y?C83ja{}r&ltHznD?tdPd0^
z3XueP#Br2S$ZHuTXIK^zZ<-X-vVuqyM7%~sQj_xaC5ZGrcB$n}S+|IK%(_>a+{?N5
zQd_GsZ~^t(^N{rYsvtcco=@#zA9g2vhRq%hI^U~JU!jM$!;l-aWD6<vhZb`rJ20uq
z)i3X>RrfTE*Jd)kIn4Ct(9@ekr8h@ElnvjGPZcpeRpxI7m7Lf84Ss&{H~He9C1w!l
z;ak=35K}f+N>QVknW0b~1LN}os<$hf-b|ENj|4G)QOL}+>Paa~_k-kvDGxV2ipIB`
zoV{0cQBf<;nr9DzR1A8zffjRgdba@d?-rR((4A`!pD}w+F{F~>?jHVm*vBfHJ|yY$
zZvP3_9QNt>{ik2|^Wk%BQmeSTbGPZt_FLEPDLx+_zeIe+m)?~IgOoI^<QRit%iR?X
ztYK>1CqfzwQhY-82Or=0WlJ~s^EJ<n4)9Xy(%=^78qPLlFRQVmkLDaZAa;~a*m=U9
z*Y((oGM2^J0yuwodOCcK;cuUR#fAUg9UD&iZQX9~9+3;T3;6$Lm~E03k~TBbFuh5K
zJ}uCw`Iq>#J3Z_|swWS5SDS#O9i>{O&6~U%&rtGb;#n4+WuBMCZzeXIGVZ?Sc;GY!
z83hk1KAVxvVGh}$o1%@@ykV}XbKYpm8CCNpQ_iT7x1x+>akfA%dCQXx6y7lBkO5#d
zZ|N#=n^(!g8@8BB-hj2V=MAU(I-WLfe!9EsrW_oHB^i^qLv3#qZB!;h;W&p2B_f9l
zzZ)qxRf0-0B$>=vA;*-FdPcnzd0H0grI@Hsb7LaQa%Ykmu@sHuC6OhcC$c0<iHy=I
zAc~dy@jm{38VfI(3NM`sZ&mQBdRLXZ>W@?NzfF}tO;vTb5^jfnQfi$#+glg-W%;&l
zI=Oh)f}y|{D?|F~;oFq9MoL?ooB7Myw&~x^th`>FlvG{ogJLk}r(;qYy}ti*S}0jo
zvt8GJw}V9ZP3Jv{QFKI*NV!*-_ev4)-n7a@5GzWovDzvtt+3oO3zk}PLk&3Uff3#X
zOm9Y+V|c<jBPw>JgOy-batp*#W2v@OSt>0RmU2s(rKkm8+JPBCJ?e3-@~-O?b1I@c
zCP3#!SV>d@mKn>mWy&&XnXr;rVP4VP8DWUhT5%H{5m-aCArxeEO1PG)Z`Vwe1O|pv
z?S=83R-si|8OK$tTST6L({IttkqPOMgb++C4b_qu5{Qu@q{|#jnuR{sER+@U70ry3
zwv9~ij+o9c9~6^XI&V;<y=t>&aiJN*r!1gyVFAY&dayuWv899V(3qiwur_p_$!PF;
z%{_xCRLqGXE|_PSS<Et&BXz_Aa;3k;x*)-kpnTMk0}-IT(G)29qw%(()rwOqE~4|@
ztb5K(E4pC1(DDwTjcxRTDLhi0lD&2EUe?h9-afhxqz4+g7p;k1ClsDg4MfpooxhuP
zCu87}6Ac2(NA#iN5v0IZhV~L9Wb5x1_o(pjao)8|v;v&)ScDYSp(WlZU|qJ(-pe{L
z<up}<@rXqr2!%z}nZSdTn0(-~b^cz~xrouU3`?eJ32;S(P?!sy3qb|i_1Kl=((;Ql
z{=Iy_BFKrC9dw!o;~bE5@M9OEimmfJ`*2aazT3IO=0U)CCGnm|u>pC9M_vjBspeyS
zOV-W1Vdt#X3OSdZ)+}%noF<G49u){<!b(%CiB-lb?4!ymX_c^wTg9vbtEg4PN@JzA
z65Fh_Qru9ki8k26oRF;ZSgRpK0TLS+i%iOdNMm2tRx7Ke)xv6SHM1ISj3-=h(Y6vi
z!HU#jG>{Cz1CPRonD!d7yqCB@S}#3i(o1QK7g2HNB=$NYBGGv-UEcc#D!p&$^&J2J
D_8d8H

diff --git a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
index e1190f808c..3601063d99 100644
--- a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
+++ b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
@@ -78,12 +78,9 @@ module C13Cloned_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../13_cloned.rs" 39 4 39 26] (self : C13Cloned_Cloned_Type.t_cloned i) : ()
-    requires {[#"../13_cloned.rs" 39 21 39 25] inv0 self}
-    ensures { [#"../13_cloned.rs" 38 14 38 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../13_cloned.rs" 36 4 36 10] ()
+  constant self  : C13Cloned_Cloned_Type.t_cloned i
+  function produces_refl [#"../13_cloned.rs" 39 4 39 26] (self : C13Cloned_Cloned_Type.t_cloned i) : ()
+  goal vc_produces_refl : ([#"../13_cloned.rs" 39 21 39 25] inv0 self) -> ([#"../13_cloned.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
 end
 module C13Cloned_Impl0_ProducesTrans_Impl
   type i
@@ -164,18 +161,14 @@ module C13Cloned_Impl0_ProducesTrans_Impl
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../13_cloned.rs" 46 4 46 90] (a : C13Cloned_Cloned_Type.t_cloned i) (ab : Seq.seq t) (b : C13Cloned_Cloned_Type.t_cloned i) (bc : Seq.seq t) (c : C13Cloned_Cloned_Type.t_cloned i) : ()
-    requires {[#"../13_cloned.rs" 43 15 43 32] produces0 a ab b}
-    requires {[#"../13_cloned.rs" 44 15 44 32] produces0 b bc c}
-    requires {[#"../13_cloned.rs" 46 22 46 23] inv0 a}
-    requires {[#"../13_cloned.rs" 46 31 46 33] inv1 ab}
-    requires {[#"../13_cloned.rs" 46 52 46 53] inv0 b}
-    requires {[#"../13_cloned.rs" 46 61 46 63] inv1 bc}
-    requires {[#"../13_cloned.rs" 46 82 46 83] inv0 c}
-    ensures { [#"../13_cloned.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C13Cloned_Cloned_Type.t_cloned i
+  constant ab  : Seq.seq t
+  constant b  : C13Cloned_Cloned_Type.t_cloned i
+  constant bc  : Seq.seq t
+  constant c  : C13Cloned_Cloned_Type.t_cloned i
+  function produces_trans [#"../13_cloned.rs" 46 4 46 90] (a : C13Cloned_Cloned_Type.t_cloned i) (ab : Seq.seq t) (b : C13Cloned_Cloned_Type.t_cloned i) (bc : Seq.seq t) (c : C13Cloned_Cloned_Type.t_cloned i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../13_cloned.rs" 41 4 41 10] ()
+  goal vc_produces_trans : ([#"../13_cloned.rs" 46 82 46 83] inv0 c) -> ([#"../13_cloned.rs" 46 61 46 63] inv1 bc) -> ([#"../13_cloned.rs" 46 52 46 53] inv0 b) -> ([#"../13_cloned.rs" 46 31 46 33] inv1 ab) -> ([#"../13_cloned.rs" 46 22 46 23] inv0 a) -> ([#"../13_cloned.rs" 44 15 44 32] produces0 b bc c) -> ([#"../13_cloned.rs" 43 15 43 32] produces0 a ab b) -> ([#"../13_cloned.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/13_cloned/why3session.xml b/creusot/tests/should_succeed/iterators/13_cloned/why3session.xml
index 69a0b0d1a3..e31fb4ea76 100644
--- a/creusot/tests/should_succeed/iterators/13_cloned/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/13_cloned/why3session.xml
@@ -6,12 +6,12 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="13_cloned.mlcfg"/>
 <theory name="C13Cloned_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="20"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="19"/></proof>
  </goal>
 </theory>
 <theory name="C13Cloned_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <proof prover="0"><result status="valid" time="0.030000" steps="165"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/13_cloned/why3shapes.gz b/creusot/tests/should_succeed/iterators/13_cloned/why3shapes.gz
index 019ccdbb4daaefba2f0f52c74c25cc4f2fff381f..6f78d5a9476be359157e8f9ab33e6be1dd5b7837 100644
GIT binary patch
literal 792
zcmV+z1Lyo7iwFP!00000|D{z;kK;BBz57?>*6r*?q`nL6AqZ+Hm-bLV#~sL$yc=vL
zo+jzE{r9D8Id;-Pfnsw=M2e5(qaKkDPn*lv@R~21w|u@FhSN_QwR!rnx&9swr#JMh
zZNlq$NPon90T1EhM~_~3xu345U+|*ZyxLf8*ssuh0<O|gE`C=)h5Yh*{oAXGS8eSC
zyq=HDn-zwIOFs4!Y&?$0$=i(H=aFCq^Z#bVZ_Grsd9|_H-^YkAjBsHDh0#pT-jNH`
zUkF|3Vu<@Ye{rrobIiy-Oz#j%$mr;*qnjgQEvU*srla&QABD&EHZi`mES8q#15KKv
z_SOTN3d{%PZFQJx>uRg@;7o<CGEzEo|5i|E2{6}yWo|$n@9JB@b{FFC@_NkIoal;&
z-SaQQDX+%$RJ@nN=?ldSCyy9DPjSBuFWFOyefUJ*9$7mpfNhJ5%`wP}4R&phQ$+sr
zuk%f*dV>{XzrJa=)3AYNbk3LI_?D?#U6%;-c0Nof4`ynH5N1u0LgXVwC=}(Iq9_#Q
zjUpx6R!z$)iqGSbO6kxI=kxGqPCvYSBgF1Vsndk-52tV}vpOXDZg01KoaqQBB?;>E
z(-<Ns_t$(rT%Qjqe97g9;v&#k3PS8W%7-NFJOPrP-);KgygB8+t~YVAMVzpR6Blvv
zMHgbdPhJ+Csv@`jyIvZ}%3VabcIXnao$|{1II7z7W0`8-7x=DBZTZ}@m=;0q-*dKe
z-nu2SEXHab{w0;N4Qr)ndgw(bs;Wfo|6dmKewL{_T>e7Zrb#?15w%d7$38NtWE9Xv
zrcBNXRo*Bkop9Wt1IHS{ZHZ(#iH;-VB1Db~G4YUs=`@7{cR<15fH~`o(@iuy3&s1C
ztm#AFGqh-X&@A@cunspU98v{z2o9M8>%chB4k(*+Aex@aX=ZKAsRM<<DoMGx4O%eK
znU2bG=FmDc4z)w&P&Noj8|-q9A>@>>=YppkEbDuN#)<-hN08MirhrN$rA<oG801E#
W1X*M3vMnHd1pNcH>SmV92LJ##5t0A^

literal 818
zcmV-21I_#&iwFP!00000|D{z;kJ~m7z3W%#)^>B@48H^9U>FrBphyn|c<h1_$;7DF
z+Q`l}`S&3u%95Q$fFM5DoZ-AjzTq4A_lNrY(LINA{SwCWVK}|5Mg8zcb@}8Drx&!O
zsoe88_|JVfg9Z2IjYZ2WZ|Cj#7c46=EislD+6|h{zztpEqBjQ!7oMIkU#%#3(UhBj
zmCKS?wZRYzq=105^FENj-2QQY98SSo-Bfm8$6>4&$m1B|v5?UpE2LMYti-g$SmIw(
zNLPipDuk?X5vy;-%6vgc%;{*p=;gZ^26R_4V#&agk-II8m<euja^e-6-rY13a2v4i
z+j<$@>0ItDa$n~qx3Dak#pc?0x+-U@a(>sXq*hwJecN{C*CnA!EK4l5{Z|FLVN7)D
z_Q_%K4=iWE+I~nk-j^qb-QM-X)AKQ0f=^pC_2YeN$J#{qkhAB*=|id+P8QMqJJ<a)
zJO!I5TK6t}TO`e5B(lpXveY2WG3aePbrI>Ge=j@v)GI6p?RKZx&CQ0?qcNO^<4efT
zTV^vmp)6*U1vOtLA=Fl4D&hAMAxq?2i7ZRxSBZ&iS4N}wbK0MdlCB%Zari&@-=6-v
znrX(z!^s_UuMWvwv{|h-^>l*sY`e6YN?79l7{<fp@!;KukbhELpZxwVBiP;|zawdu
z4$!N4PvOhuYEH766IOHLYEHWPg58WI&ps8|ZtbhtW;<v+n{b<uxuneLGRmUF%VVh$
z-yZNwOilh&llLE|KY?3C^HA{iwPdrLQ6`4xA=!+^cecrsv2~41kG^_F6vv46=UCM1
zEc5Mf{g-O03M7w;qjFNYUSl6UGU6R2LPQy)tcBr*8EVjgAyo*Jc#qL_glgYY9-TxT
zMO2JPPrDkJ0cs#sg8^c+QASq1qJaq-z1J$b7zyeG0!jKv73r`>Zjc#Fr=USFNDOEL
z%78Q=4Dc#?)=8puAAAP_ofbTCQSBrntW#Z0(NHjy7}N%pL1|D_2wp1eLg<|f`P!6G
wADkvJDpZ<HD0+|5()Zq>U|vY&Jy!~;;@(4$*mprsD0Ywf2F~xNY%&M{0FxJ;vH$=8

diff --git a/creusot/tests/should_succeed/iterators/14_copied.mlcfg b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
index bf7ebba998..eaf3255cce 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.mlcfg
+++ b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
@@ -78,12 +78,9 @@ module C14Copied_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../14_copied.rs" 39 4 39 26] (self : C14Copied_Copied_Type.t_copied i) : ()
-    requires {[#"../14_copied.rs" 39 21 39 25] inv0 self}
-    ensures { [#"../14_copied.rs" 38 14 38 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../14_copied.rs" 36 4 36 10] ()
+  constant self  : C14Copied_Copied_Type.t_copied i
+  function produces_refl [#"../14_copied.rs" 39 4 39 26] (self : C14Copied_Copied_Type.t_copied i) : ()
+  goal vc_produces_refl : ([#"../14_copied.rs" 39 21 39 25] inv0 self) -> ([#"../14_copied.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
 end
 module C14Copied_Impl0_ProducesTrans_Impl
   type i
@@ -164,18 +161,14 @@ module C14Copied_Impl0_ProducesTrans_Impl
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../14_copied.rs" 46 4 46 90] (a : C14Copied_Copied_Type.t_copied i) (ab : Seq.seq t) (b : C14Copied_Copied_Type.t_copied i) (bc : Seq.seq t) (c : C14Copied_Copied_Type.t_copied i) : ()
-    requires {[#"../14_copied.rs" 43 15 43 32] produces0 a ab b}
-    requires {[#"../14_copied.rs" 44 15 44 32] produces0 b bc c}
-    requires {[#"../14_copied.rs" 46 22 46 23] inv0 a}
-    requires {[#"../14_copied.rs" 46 31 46 33] inv1 ab}
-    requires {[#"../14_copied.rs" 46 52 46 53] inv0 b}
-    requires {[#"../14_copied.rs" 46 61 46 63] inv1 bc}
-    requires {[#"../14_copied.rs" 46 82 46 83] inv0 c}
-    ensures { [#"../14_copied.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C14Copied_Copied_Type.t_copied i
+  constant ab  : Seq.seq t
+  constant b  : C14Copied_Copied_Type.t_copied i
+  constant bc  : Seq.seq t
+  constant c  : C14Copied_Copied_Type.t_copied i
+  function produces_trans [#"../14_copied.rs" 46 4 46 90] (a : C14Copied_Copied_Type.t_copied i) (ab : Seq.seq t) (b : C14Copied_Copied_Type.t_copied i) (bc : Seq.seq t) (c : C14Copied_Copied_Type.t_copied i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../14_copied.rs" 41 4 41 10] ()
+  goal vc_produces_trans : ([#"../14_copied.rs" 46 82 46 83] inv0 c) -> ([#"../14_copied.rs" 46 61 46 63] inv1 bc) -> ([#"../14_copied.rs" 46 52 46 53] inv0 b) -> ([#"../14_copied.rs" 46 31 46 33] inv1 ab) -> ([#"../14_copied.rs" 46 22 46 23] inv0 a) -> ([#"../14_copied.rs" 44 15 44 32] produces0 b bc c) -> ([#"../14_copied.rs" 43 15 43 32] produces0 a ab b) -> ([#"../14_copied.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/14_copied/why3session.xml b/creusot/tests/should_succeed/iterators/14_copied/why3session.xml
index 1de23695ca..ad84849a1f 100644
--- a/creusot/tests/should_succeed/iterators/14_copied/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/14_copied/why3session.xml
@@ -6,12 +6,12 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="14_copied.mlcfg"/>
 <theory name="C14Copied_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="0"><result status="valid" time="0.010000" steps="20"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="0"><result status="valid" time="0.010000" steps="19"/></proof>
  </goal>
 </theory>
 <theory name="C14Copied_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <proof prover="0"><result status="valid" time="0.040000" steps="165"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/14_copied/why3shapes.gz b/creusot/tests/should_succeed/iterators/14_copied/why3shapes.gz
index 7b03763cb4837c929c60bd15fcacfffe161ad4eb..dd930c6d47147a01f13f13b73ef4e6949a70bd20 100644
GIT binary patch
literal 791
zcmV+y1L*u8iwFP!00000|D{z;Z`&{oz57?>wynL0)c1fMf?$Sn*$xAAY#~c>8!U~p
zB<r?+KgpJ3Co2XF%^?vfK9Y}mMBd*lj!$kMkBgUhIBvS#$Awtje5g*}-DdZKmeiHo
zAG+|v$0Jy9x3?B8vwS^V55Hhpv1zff*sz|V=>VLiOS$Mp0pa5F{`A|5f){n^1gsp7
z#HtyFxMSS51FS#x$iZ9n-iMxG0n>joqGx8T*tFPK?6)zZ6C<1$L1r|P(--7i>d(2x
zHQxF4g+Dvzo-w9p?}m49Iiz<q#nFrrz7!OBAj6Sc7>~?ieV!PdT4qzr{EB9pqqN!r
z848RCVRdn+V#{KS`QTK6&N8NS>hi6i%o1R%0n^+db-XHX1<RH5-Sd7MPcft`>Q)b*
zyIq`(>n3}To84oI>2?;;-4AhJyXR<AinY5--xf(dDu67ri;OWyvkiJ~_ftgr>C1SN
ztDa%mSkG_j<uGhWGdjd$w|$AJTUnL}<Z?U=C<|(6CLz?EVhZ8c6d_aObBZie<Y$U0
z*|KPw7g5~z$5cwXraK(EpE109{+1A{Zoi3Pz_**7+vZtqLi(=Hx3-^Y4^K*BsnfeY
zgr(e1@vu2PY=V1?`6tDBNMp$ewz9~tlGNh_lJx9q(RPQ$F8(^5#YrY{!X!?d#7QSz
zu=ze&o^>j++}5vp(@19SEW)`%=8)x(mzT#8#U39^75lQln=;k;bID>@1ipUFS&w<k
zmhik7vvv4ODtQ~`N|EWIC!L6*60!cjEb8?vLw7j+h169Qs29vjCM5N(CtPsPpz%bg
z7zK*B5QZCOs6hjURE+8zNn&6PMM9bL6a`|SE;!Z56b{rt3I+qjXrqj*yrPi_+J>N2
z>)Mu}M%{uWzNLyZxIktwRX~GakQmSglmTfVW#a}|)uwWiXzgQYK%motr(9G!$p~vy
zlgd(JP#aVRr9okkR|r8WY-04z#SpNijE3kmX<LO#vkZc3ke0y*hk^wmRR~-uq>6_C
VQKE06&LF%7{Q)JmqCLw8007gNhHC%-

literal 818
zcmV-21I_#&iwFP!00000|D{z;kJ~m7z3W%#)^>B@48H^9U>FrBphyn|c<h1_$;9Zc
z<;c!9`S&3u%95Q$fFM5DoZ-AjzTq4A_lNrY(VfD%ehK6GFdX03qJH?Jx_okn;|p5S
zRPHnm{&OGBV8Ok4W6?6p+j)Eb1<OiION=Fkc7vufa6^~4=*<Dbh3C`ds}%(=nsO7c
za#<3qHW*@o6cCVh-UsrR+duAy(;;}Po67F%IE?iIc^pH0DrEG>3h7lTD={rGmiX5c
z(p4d@3Lz_8#OhnIGG7o9b2^$YdiidK0o|31STe9=<ZeqNW`diXoOs2icQ=g$+y?CX
zwq8beJePZm+}C-@Ei6lBvAH&$uFBb}oZodTsg+i5-?p9kbxEia%My!i|5br*7!#ek
zeR5d*1Irn(wja`s_vOi9w|D*Ue0mC(;L{dO{dhkd!`ejmkhAB*@k6Q^juz4VJJ<a)
zJO`U7TK6t}TO`e5B(lpXveY2WG3aePbrI>Ge=j@v)GI6p?RKZx&CQ0?qcNO^r<ahQ
zx6EdCLRrix3u?YhLa438RKo8iLYBz45?PkWuM!j4u8c<U=d?c^C0#d+<M4m*zdiqV
zHPeibhogJSy*ea!(Pp*U)YA#hv+dGqDq)HHV;B#Y$AfntLjFm0ee(Oej9`0<{Ennq
zIzX@HJ%%rrt2xPPPFT%}t2ycF3wAS>Jo{8+yS1-oo9&?SY{G3q=8`g}%P5NyFOQ{4
ze0#tzF*W&9P2PW;{se9n%|pT4*OJY0Mwu9%hh#Gv-`OTl#@015J^JbyQ5+-MpJP$4
zv&^@{^<S!~Dv&%Xj><{pdX0Vb$cT582oYtFvKEFLW~e~}hEyR?;yp&!5vqMpd2|wW
z6j3oEJ?&~>2B?8l4F-tOMj2W4iUuZV^j@pzVkD>&2qftvRiwijxj|+yoq`6zATgi~
zC<D@fFu<$mStp6seefL!bXxGlMYWTRuugR~MMJ?*Vo)1Y2Bkq!A$X~<3!!%|<ZDw#
weQ=t@s8DG(q3AtIOW%8kf_Wj8_gpEYihB=1V&4Tlq1Zj@8*gQTm@)_e0QQTMYybcN

diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index 784e7b7fb8..b2eddf6477 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -105,12 +105,9 @@ module C15Enumerate_Impl0_ProducesRefl_Impl
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  let rec ghost function produces_refl [#"../15_enumerate.rs" 40 4 40 26] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
-    requires {[#"../15_enumerate.rs" 40 21 40 25] inv0 self}
-    ensures { [#"../15_enumerate.rs" 39 14 39 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../15_enumerate.rs" 37 4 37 10] ()
+  constant self  : C15Enumerate_Enumerate_Type.t_enumerate i
+  function produces_refl [#"../15_enumerate.rs" 40 4 40 26] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
+  goal vc_produces_refl : ([#"../15_enumerate.rs" 40 21 40 25] inv0 self) -> ([#"../15_enumerate.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
 end
 module C15Enumerate_Impl0_ProducesTrans_Impl
   type i
@@ -212,18 +209,14 @@ module C15Enumerate_Impl0_ProducesTrans_Impl
   val produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../15_enumerate.rs" 47 4 47 90] (a : C15Enumerate_Enumerate_Type.t_enumerate i) (ab : Seq.seq (usize, item0)) (b : C15Enumerate_Enumerate_Type.t_enumerate i) (bc : Seq.seq (usize, item0)) (c : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
-    requires {[#"../15_enumerate.rs" 44 15 44 32] produces0 a ab b}
-    requires {[#"../15_enumerate.rs" 45 15 45 32] produces0 b bc c}
-    requires {[#"../15_enumerate.rs" 47 22 47 23] inv0 a}
-    requires {[#"../15_enumerate.rs" 47 31 47 33] inv1 ab}
-    requires {[#"../15_enumerate.rs" 47 52 47 53] inv0 b}
-    requires {[#"../15_enumerate.rs" 47 61 47 63] inv1 bc}
-    requires {[#"../15_enumerate.rs" 47 82 47 83] inv0 c}
-    ensures { [#"../15_enumerate.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C15Enumerate_Enumerate_Type.t_enumerate i
+  constant ab  : Seq.seq (usize, item0)
+  constant b  : C15Enumerate_Enumerate_Type.t_enumerate i
+  constant bc  : Seq.seq (usize, item0)
+  constant c  : C15Enumerate_Enumerate_Type.t_enumerate i
+  function produces_trans [#"../15_enumerate.rs" 47 4 47 90] (a : C15Enumerate_Enumerate_Type.t_enumerate i) (ab : Seq.seq (usize, item0)) (b : C15Enumerate_Enumerate_Type.t_enumerate i) (bc : Seq.seq (usize, item0)) (c : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../15_enumerate.rs" 42 4 42 10] ()
+  goal vc_produces_trans : ([#"../15_enumerate.rs" 47 82 47 83] inv0 c) -> ([#"../15_enumerate.rs" 47 61 47 63] inv1 bc) -> ([#"../15_enumerate.rs" 47 52 47 53] inv0 b) -> ([#"../15_enumerate.rs" 47 31 47 33] inv1 ab) -> ([#"../15_enumerate.rs" 47 22 47 23] inv0 a) -> ([#"../15_enumerate.rs" 45 15 45 32] produces0 b bc c) -> ([#"../15_enumerate.rs" 44 15 44 32] produces0 a ab b) -> ([#"../15_enumerate.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml b/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
index d4685790e2..f6b39fd698 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/15_enumerate/why3session.xml
@@ -7,12 +7,12 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="15_enumerate.mlcfg"/>
 <theory name="C15Enumerate_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
- <proof prover="3"><result status="valid" time="0.010000" steps="469"/></proof>
+ <goal name="vc_produces_refl" proved="true">
+ <proof prover="3"><result status="valid" time="0.010000" steps="473"/></proof>
  </goal>
 </theory>
 <theory name="C15Enumerate_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <proof prover="3"><result status="valid" time="0.110000" steps="274"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate/why3shapes.gz b/creusot/tests/should_succeed/iterators/15_enumerate/why3shapes.gz
index a581ba10285f4be23ed20ae8035c0514f51e27a6..735d97ebf2641a0b9337c0fef5e7f714488ce0b7 100644
GIT binary patch
literal 1860
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

literal 1874
zcmV-Y2d(%YiwFP!00000|E*U`ZyPxhzUx=$HapIRMHXL+^+7N!P{3j@yXa#Cb~if_
z##VbJIr04aEwV|8ZOfS?8^dVvRbR2bDi(`>yICGT`=@YRehG);ZruNUsg^gtFHZmU
zyZsl@uyt<o21*kezFzpJ!`MG};RucJA3ikLs77z5mD4XYD)(jXWA2MhB`qhx3XZVk
zOo8#?@#*wuW3s$iFYZqMZhOCfehdeH3Qg14Rh;vOo!_5WW79_Ix58l!@C*ceGtC28
z(%dbF@vtn*wudl0WJ~d4zqr`Xziq!b^PqBH=04{B|7X95_7_jsD^viRaRDro0c_4j
z+BaYWssUXH(W?m<)GCk2GJ<79tZEoJ0nElk!j*5yJstf1_;$<nj#V>lSY61MjaZ*u
zf)|%Wn&L|Tv6;53{7s{>lhlPJ{fbVq+cp4o9Bd{%0A+;b5t|20?IU1Cyn>CGY^I4Q
z&H*P1?AZ`%<FtM5kKtih_*;MDx9CIRWxG4k@6CC3*T?DI{&P6&PFw1I3h5`#cQDDv
zcFnDS@h@pAPJnO6!(sdy`rjV^n63I4kzc?MyS;yyKr(RJAxjHV6Jz7)5V~>S?@p93
z7I(fIAD<q=DfAFw?zaCL_u<0AWYuxE|3quXJ%z=j?r!_<@i8=hD-tlI#w~p_!s7Jj
zQ&^tEV&M<rI6iy{tVm3}!C5H6`4=AhFTx+Gw`DcxG>=ms%D{Nm4l@-AcVBs<8=v>5
zOmW3F%;}c?MMcDIOUwJC|KOi@6w~+{ecuBk=h1BV6b{Rg((v#wevSB*;0WIflwHl=
zbv5m9tQ`%-(@>Gh7sKLte+a(&?AwR1d>TpX;_fa|$FhG`g)NxGSCvmzHIu7Ca2CA4
zBnSNGnSzJ=t)YJsyp2EpWor2SD=oaz!dHJ~Yy;MhS8ZLr;`cl0ou{obzWP?A%&34f
z7n7w`7?xHud`+BD5MN@rIxLf%A9;qN#*dyr4)YV3v8GeL`mSU_IsZzsxJpl*AXr&8
z+aN26tJ)$bHF<5eoGqTl<LQ!j(iISg^YyH19^$=pMNJ&7GLfc>Bdtp+2x1dsGurk#
z#A!pTeE0K<M;ng$a^zSA_XJP{cO$S7bdTQBx8YL*8*c9_1wv#6u|f0V-Jlk%5qx4l
z^0e#edp{58xZv9nO)?$azjj!%?v{3TRp7q1+!V`Ak}!ouuJ7+Jp_~|^X_;f0`epV!
zM@)$Of+l9s91rl@XpW;7FN%2mr*)GT3m8koNyGcuFfNJbVPcbFf!GB3mKR7)qqSfX
z)p415dl%EXE}iU~IQ{x2kI3s4MaWbQQmJvK6Gf?!bGoF)C8DM(nwH$s_uaTa+sG0Z
z7*id6*PD4<$a!2el9Jkb_0D~jX8(C56!1+VOxD~sXs)ha*Or#o0hUrTj*zG>9z?ZX
zR}qBCZp0EnDAwl)N^_;i+=rLbw@XWrOUv22MqKJdoE6A2)`=?Cb$Q3Oygzb(Ugtxs
z^DokR60G22p+B#{St$=$MgUfohp;ZGEinLMezozAt&13)+JE?mu>W-W9E12YZsVbU
z^e=2Pd;g?ry*$I9yvwK%U9aY8QcXLH=Yy=P)2b?!EP1IgfA)Fa{H%0`OX<!prMtND
zaKXw|bUw0w&Q<cq#^l@orZJhM_!O+S_a<FLYwBzPboVuvWRc%Wk@?LJ0`d2N*7==O
zUJmp|OJr`-OS=vLn_gg(W5njYiP|^mjX_4tURyA&%lF6h5*B4gJguHa${qGf*{^|I
z$G^FCQ*_(SwZV14&e2FLEm|YJ7=kh&K(oH{hN2t?Gl&ibZuC++<)lL=9CzT@LV{$b
z<%R|NVi&AvTdTaWC>0x+U4n8T9iRi@fMmb{bJm%KU<P_)^k7uah3UN4TrdbCU<V!R
zmx?)Q9hZ)y<D`!}4vsSi)`4-L7t(0!d(L{vm~Fd31}nSJD#MM^(%PjEPH-o{3FbIK
z8OOEb>RXtI1cIF!LaT%61vd~38LtUY*_JT16VeHlzW8I{eXq%4FoO<*_C}cwO*eGP
zAcPjZN#NEA^Ybb=205^<=QemQ5J^ePK?jRoc|HtL1)@XYkUIp2>}Rxy-nX6go$Ue!
zu8H#2XsI-C*@BX|MC;HvBwfm(`~?~<mpBAq;1z4FMbf2MfPqPct(Q95CApK}B>R<m
z2UH#162dbIiC&=WwCG!|LfiE=*mfz=NfDj((<(ZNp_7`mY!IUBL-0LCFzY=N!9d$D
zC7DL2PJS0!+YYLgTK0;2)*CGXooA$&wjBiEn9$4*0Mbb|CK%)(2iZ$u2Rf^qb~t#=
z7{jG9PElG=PD!WGDd7}%3Kjx5xoT)7YK;aImwM2x2!rBWNyV31IW3*Ws8kE5=?hLX
zr|g1BHULlpLDP!XD~dJ61ND2#Ha%jJ)z@XazE_G{9$F#*xz}LG0MSuGBGlF-S#w?X
Me<sR7GL97h05+tk761SM

diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg
index 8567343ed5..97d8327966 100644
--- a/creusot/tests/should_succeed/iterators/16_take.mlcfg
+++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg
@@ -81,12 +81,9 @@ module C16Take_Impl0_ProducesRefl_Impl
   val produces0 [#"../16_take.rs" 31 4 31 64] (self : C16Take_Take_Type.t_take i) (visited : Seq.seq item0) (o : C16Take_Take_Type.t_take i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_refl [#"../16_take.rs" 40 4 40 26] (self : C16Take_Take_Type.t_take i) : ()
-    requires {[#"../16_take.rs" 40 21 40 25] inv0 self}
-    ensures { [#"../16_take.rs" 39 14 39 45] produces0 self (Seq.empty ) self }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../16_take.rs" 37 4 37 10] ()
+  constant self  : C16Take_Take_Type.t_take i
+  function produces_refl [#"../16_take.rs" 40 4 40 26] (self : C16Take_Take_Type.t_take i) : ()
+  goal vc_produces_refl : ([#"../16_take.rs" 40 21 40 25] inv0 self) -> ([#"../16_take.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
 end
 module C16Take_Impl0_ProducesTrans_Impl
   type i
@@ -155,18 +152,14 @@ module C16Take_Impl0_ProducesTrans_Impl
   val produces0 [#"../16_take.rs" 31 4 31 64] (self : C16Take_Take_Type.t_take i) (visited : Seq.seq item0) (o : C16Take_Take_Type.t_take i) : bool
     ensures { result = produces0 self visited o }
     
-  let rec ghost function produces_trans [#"../16_take.rs" 47 4 47 90] (a : C16Take_Take_Type.t_take i) (ab : Seq.seq item0) (b : C16Take_Take_Type.t_take i) (bc : Seq.seq item0) (c : C16Take_Take_Type.t_take i) : ()
-    requires {[#"../16_take.rs" 44 15 44 32] produces0 a ab b}
-    requires {[#"../16_take.rs" 45 15 45 32] produces0 b bc c}
-    requires {[#"../16_take.rs" 47 22 47 23] inv0 a}
-    requires {[#"../16_take.rs" 47 31 47 33] inv1 ab}
-    requires {[#"../16_take.rs" 47 52 47 53] inv0 b}
-    requires {[#"../16_take.rs" 47 61 47 63] inv1 bc}
-    requires {[#"../16_take.rs" 47 82 47 83] inv0 c}
-    ensures { [#"../16_take.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c }
+  constant a  : C16Take_Take_Type.t_take i
+  constant ab  : Seq.seq item0
+  constant b  : C16Take_Take_Type.t_take i
+  constant bc  : Seq.seq item0
+  constant c  : C16Take_Take_Type.t_take i
+  function produces_trans [#"../16_take.rs" 47 4 47 90] (a : C16Take_Take_Type.t_take i) (ab : Seq.seq item0) (b : C16Take_Take_Type.t_take i) (bc : Seq.seq item0) (c : C16Take_Take_Type.t_take i) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../16_take.rs" 42 4 42 10] ()
+  goal vc_produces_trans : ([#"../16_take.rs" 47 82 47 83] inv0 c) -> ([#"../16_take.rs" 47 61 47 63] inv1 bc) -> ([#"../16_take.rs" 47 52 47 53] inv0 b) -> ([#"../16_take.rs" 47 31 47 33] inv1 ab) -> ([#"../16_take.rs" 47 22 47 23] inv0 a) -> ([#"../16_take.rs" 45 15 45 32] produces0 b bc c) -> ([#"../16_take.rs" 44 15 44 32] produces0 a ab b) -> ([#"../16_take.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
diff --git a/creusot/tests/should_succeed/iterators/16_take/why3session.xml b/creusot/tests/should_succeed/iterators/16_take/why3session.xml
index 0818cbc038..270c9442ac 100644
--- a/creusot/tests/should_succeed/iterators/16_take/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/16_take/why3session.xml
@@ -6,12 +6,12 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="16_take.mlcfg"/>
 <theory name="C16Take_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="produces_refl&#39;vc" expl="VC for produces_refl" proved="true">
+ <goal name="vc_produces_refl" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="17"/></proof>
  </goal>
 </theory>
 <theory name="C16Take_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="produces_trans&#39;vc" expl="VC for produces_trans" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="92"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/16_take/why3shapes.gz b/creusot/tests/should_succeed/iterators/16_take/why3shapes.gz
index 7b1a76b21044e4d8074e0d8a4b4f4c9430f0691e..a500e09d8c06fa0f1bc71518a2d1cddd2da0009a 100644
GIT binary patch
literal 949
zcmV;m14{fKiwFP!00000|D{z;kK;BBz2{ftw(Tqykf=`=m_rbZVFN`kUFf(0ZOgmH
zX6$K_nYRDFlq`?!tbw9v4z@@=l23dx^V7rr`VC+Fb^qos*KX*4+3Wqo&%4_n*!6GV
zSe};L@qC9bm!WyB{gpewj~|_I%IR|49^c?pvSqSGvY}i=%Q0|~j&jLW0fYYe<@UET
zDc(#>n6nEY!>d2HBQ`E0eDv<3_Y@DfOw9v#2qgZUbF}%Asu%+o=>q!|cb&LTJ<)R)
z&5An`6T}Lu8tZc956-1$!o<Vj$PWV~I;!NTCPbYI%2`1X6r6O06<-k=BAuR_U5>$%
zxGLE)*<yKqH3r^wXjQ<bhS(Hu=Z0jnuAI20hQr~A_3-?1_BY?q4#(r^x1slojyweK
zwd=nUX6PLk_+`ZXK0JFzDas>0(kn$C@Zzt-`OSxHhg6Vbj_0dC9_LMvX)`QByaRPe
zO;bx&B>NAnII)5yE6~IWW>%n{4x?1T9SVTNYPej6KYjDz`8xqW<98o-9SCf@9?y<v
z*fsQgO54tb(`PZ9V2pA;1_Ut5{moyx+o@~ts}C>2)uB*e#_&ebr|#x2F~L(jVYWfQ
zaqYOB%JW#B$1<;7f79{<Jp<s=!XA_NQJ9*qxpMq`d8Mo>R#aUy$L0rztl7wg7Uf+L
za{anYos$Un>P1`7?Rs>Q7Fj-h$k|#kp|%tw@2r>%(nQ>-7$rN5pN~jmBJPJ$!fs0^
zloKZPPKeMuA@XHAgoxn;lX*ExC*+27LQK-p_EI{^7c+=0=^%3g?xf4_x=MggE1MLH
z=R8%zYu{Xd++As~r7gtvgT2!hOwA(Mu()FpT&uh#?%Z+T4wrrJ|GK>oE;bJ?K2Hvq
zC&zO9GAGltk>!>%Pv7@A%UJl^S<M=`HEQJIhJ;UAzTb~&IH>Z!Wii`XMt1yt(#pG&
z(V$k&gh9IHrRaq_Oy;FS2gr2#bg5Ocb+S#e*9HDprab(1J8NVE23U>AB-0E$^HL%T
zWV~+LX0HoX$U+oQ@Ph3cV|?3Mo<XJ=HdUiDue}7r72SF%3C<bev%(gJ@Stc=C~YK{
zw&JQnt+l9G-AbJqgKE#Sg4=?df>Wd_xGcCRI2GeNR%JEQwN}V0SvAlwZ7qN{G=P=R
znreY8fT%$Mya2YVQ0S_zT5Cj>wYF+C3J<!mwQW`Fd5BP}2$?ltd0X3xDOOjaYOqmS
X*t)TqWMD&tUPb%^)wa4JoCyE`7#iMH

literal 965
zcmV;$13LU4iwFP!00000|D{z;kJ~m7z57@AmUM#v9DXyv9t>jz3MhJMz+((bq7osy
z(pL6v+kf97MXe;Sfug7nmS#Bf=5Zc1{CKxN|M1V@ynhYjxf}W~d%3^+Wq0|*cl|4M
zq{y$}pxF86acExZa0W;Hr%#SK;bb{2PfzMZwt2Q$wrRP_=2PMd4zc*Afb!w#`SQ0@
zIbY38h|{Y;;!F-S<+N&wojdN^VcgF#r!lmTYix+*X=L&5q>~M6u53zN!A1HT@-lOp
zn<AGssw?uy1c(Ey!SV)x9dgI%A$wr<knAys6$rqTzxJ7g3h#Sy8GV1wZ1|!ti~7#0
z)6HgB<j9>|q$sE4S$dIeo^7^nj+hd!+P5j7bGLNP*Gsp|qB<bgtOh+CeLXxqKZZ+a
z;x_&9^xM#fW&i#zde2?|9b<+bo8!Mtala2w!68I>^!ND4nFl|H^YHi@-kP0Y3;%cy
z$K$d{d0vb!G2c;f$W0S#R(K}fu>xd8*Q}^SR&-%S#ls|Ya>oLc`)U}+;m^=~c>0Nf
zU;WRJRvl%&?Rx*{!1%7g|A)NnT-?1$=@>>3^FBsUg4jR8*j-Lt<G+Xaz_>aVip+?=
zVD_oIgfRg;q#c?Y1RO{QdM*#CJft!&U4N1M1OCT=&ntTZ?~^b!Y`KE}I=&#PNEJnw
z%&Ga&!D}*c!I$!?2)ce<Ll-E*wR*{Bc)IQ##}`w~U%A;T#>6ef(7PzcqckaQQVhWk
z)91tT3`y&;6w|k*W5O|&d&gMp9b?719gL-P4C6&PNyqpN=@^@(!{xPfh?fx9E$OIn
zj9y7sTy+%#K5uMPEba4D4KICje!sfW;Fh*DwV&!MZK<kBA{$?>SVY$bxAgNg>%(7{
zx4}i0!3E3Ypv&Z7n~}@&wBh9~XOX{eo`*4BN@?YkuF2hI?(kb<hp$dc{Ji<wS(yig
zDE}LZx{XpC)^`?cuFr^yLt8i%hw3eFvA!(Qb-Z@S7&3PvA8?UvnQfKrZGr!VRK(wI
z=cP6(v`n=@ac_hc#Ar^v_F6RD>%FwXa?32WV9BnMgcF8Kz?8v(P=V&Uu0j)d(8`28
zfCYjH#%ilDfeM@&LMjeiS0E}crDQd!TP}@KUhFBcU@T}0%7U~YEN~0V0^O0y)I`=&
zc&K>Q(1u8@DU}MRv0zf}skBsB$}L5H)Kb`0p2@1NTCJEdt*%<>S)j7fwQfZlAf>2H
n3O5ba(AK&lg47kO8s7-Xblqsf3Dqe@Z&LmNj`(0-$_W4fEr{^p

diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index 92debca829..a5f688504c 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -66,26 +66,21 @@ module Knapsack_M_Impl
   axiom inv0 : forall x : Seq.seq (Knapsack_Item_Type.t_item name) . inv0 x = true
   use int.MinMax
   use prelude.UIntSize
+  use prelude.UIntSize
   use seq.Seq
   use seq.Seq
   use prelude.Int
-  let rec ghost function m [#"../knapsack.rs" 34 0 34 57] (items : Seq.seq (Knapsack_Item_Type.t_item name)) (i : int) (w : int) : int
-    requires {[#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items}
-    requires {[#"../knapsack.rs" 32 11 32 17] 0 <= w}
-    requires {[#"../knapsack.rs" 34 11 34 16] inv0 items}
-    ensures { [#"../knapsack.rs" 33 10 33 21] result >= 0 }
-    variant {[#"../knapsack.rs" 30 10 30 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../knapsack.rs" 35 4 42 5] if pure {i = 0} then
-      0
-    else
-      if pure {UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1))) > w} then
-        m items (i - 1) w
-      else
-        let a' = m items (i - 1) w in let b' = m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (Knapsack_Item_Type.item_value (Seq.get items (i - 1))) in MinMax.max a' b'
-      
-    
+  constant items  : Seq.seq (Knapsack_Item_Type.t_item name)
+  constant i  : int
+  constant w  : int
+  function m [#"../knapsack.rs" 34 0 34 57] (items : Seq.seq (Knapsack_Item_Type.t_item name)) (i : int) (w : int) : int
+  goal vc_m : ([#"../knapsack.rs" 34 11 34 16] inv0 items) -> ([#"../knapsack.rs" 32 11 32 17] 0 <= w) -> ([#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items) -> match i = 0 with
+    | True -> [#"../knapsack.rs" 33 10 33 21] 0 >= 0
+    | False -> match UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1))) > w with
+      | True -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0) -> ([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0))
+      | False -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0) -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0) -> ([#"../knapsack.rs" 33 10 33 21] MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (Knapsack_Item_Type.item_value (Seq.get items (i - 1)))) >= 0)))
+      end
+    end
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
diff --git a/creusot/tests/should_succeed/knapsack/why3session.xml b/creusot/tests/should_succeed/knapsack/why3session.xml
index 098364b3b7..b63e834524 100644
--- a/creusot/tests/should_succeed/knapsack/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack/why3session.xml
@@ -12,8 +12,8 @@
  </goal>
 </theory>
 <theory name="Knapsack_M_Impl" proved="true">
- <goal name="m&#39;vc" expl="VC for m" proved="true">
- <proof prover="4"><result status="valid" time="0.011091" steps="96"/></proof>
+ <goal name="vc_m" proved="true">
+ <proof prover="4"><result status="valid" time="0.011091" steps="43"/></proof>
  </goal>
 </theory>
 <theory name="Knapsack_Knapsack01Dyn" proved="true">
diff --git a/creusot/tests/should_succeed/knapsack/why3shapes.gz b/creusot/tests/should_succeed/knapsack/why3shapes.gz
index cf84daa5a187fd2734e8115ce0e81e1750dd965d..62583679649c0875459fc0923fa91e7ed7e23630 100644
GIT binary patch
literal 5320
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
aB}(vnuZUn}_KzO7_4xm0=(;4IfdBxs<ZCtn

literal 5324
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

diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index d33904c30f..e294a4a67b 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -64,42 +64,38 @@ module KnapsackFull_SumWeights_Impl
     
   axiom inv0 : forall x : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv0 x = true
   use prelude.UIntSize
+  use prelude.UIntSize
   use seq.Seq
   use prelude.Borrow
   use seq.Seq
   use prelude.Int
-  let rec ghost function sum_weights [#"../knapsack_full.rs" 27 0 27 56] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
-    requires {[#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s}
-    requires {[#"../knapsack_full.rs" 27 21 27 22] inv0 s}
-    ensures { [#"../knapsack_full.rs" 26 10 26 21] result >= 0 }
-    variant {[#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../knapsack_full.rs" 28 4 31 5] if pure {i = Seq.length s} then
-      0
-    else
-      UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get s i)) + sum_weights s (i + 1)
-    
+  constant s  : Seq.seq (KnapsackFull_Item_Type.t_item name)
+  constant i  : int
+  function sum_weights [#"../knapsack_full.rs" 27 0 27 56] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
+    
+  goal vc_sum_weights : ([#"../knapsack_full.rs" 27 21 27 22] inv0 s) -> ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s) -> match i = Seq.length s with
+    | True -> [#"../knapsack_full.rs" 26 10 26 21] 0 >= 0
+    | False -> ((([#"../knapsack_full.rs" 27 21 27 22] inv0 s) && ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i + 1 /\ i + 1 <= Seq.length s)) /\ 0 <= ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i) /\ ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - (i + 1)) < ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i)) /\ (([#"../knapsack_full.rs" 26 10 26 21] sum_weights s (i + 1) >= 0) -> ([#"../knapsack_full.rs" 26 10 26 21] UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get s i)) + sum_weights s (i + 1) >= 0))
+    end
 end
 module KnapsackFull_SumValues_Impl
   type name
   use prelude.UIntSize
+  use prelude.UIntSize
   use seq.Seq
   use KnapsackFull_Item_Type as KnapsackFull_Item_Type
   use prelude.Borrow
   use seq.Seq
   use seq.Seq
   use prelude.Int
-  let rec ghost function sum_values [#"../knapsack_full.rs" 37 0 37 55] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
-    requires {[#"../knapsack_full.rs" 36 11 36 33] i >= 0 /\ i <= Seq.length s}
-    variant {[#"../knapsack_full.rs" 35 10 35 19] Seq.length s - i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../knapsack_full.rs" 38 4 41 5] if pure {i = Seq.length s} then
-      0
-    else
-      UIntSize.to_int (KnapsackFull_Item_Type.item_value (Seq.get s i)) + sum_values s (i + 1)
-    
+  constant s  : Seq.seq (KnapsackFull_Item_Type.t_item name)
+  constant i  : int
+  function sum_values [#"../knapsack_full.rs" 37 0 37 55] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
+    
+  goal vc_sum_values : ([#"../knapsack_full.rs" 36 11 36 33] i >= 0 /\ i <= Seq.length s) -> match i = Seq.length s with
+    | True -> true
+    | False -> ([#"../knapsack_full.rs" 36 11 36 33] i + 1 >= 0 /\ i + 1 <= Seq.length s) /\ 0 <= ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - i) /\ ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - (i + 1)) < ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - i)
+    end
 end
 module KnapsackFull_SubseqRev_Impl
   type t
@@ -110,17 +106,15 @@ module KnapsackFull_SubseqRev_Impl
   use seq.Seq
   use seq.Seq
   use prelude.Int
-  let rec ghost predicate subseq_rev [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq t) (i1 : int) (s2 : Seq.seq t) (i2 : int)
-    requires {[#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1}
-    requires {[#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2}
-    variant {[#"../knapsack_full.rs" 45 10 45 12] i2}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../knapsack_full.rs" 49 4 55 5] if pure {i2 = 0} then
-      pure {i1 = Seq.length s1}
-    else
-      pure {i1 < Seq.length s1} && pure {Seq.get s1 i1 = Seq.get s2 (i2 - 1)} && subseq_rev s1 (i1 + 1) s2 (i2 - 1) || subseq_rev s1 i1 s2 (i2 - 1)
-    
+  constant s1  : Seq.seq t
+  constant i1  : int
+  constant s2  : Seq.seq t
+  constant i2  : int
+  predicate subseq_rev [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq t) (i1 : int) (s2 : Seq.seq t) (i2 : int)
+  goal vc_subseq_rev : ([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2) -> ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1) -> match i2 = 0 with
+    | True -> true
+    | False -> (i1 < Seq.length s1 -> (Seq.get s1 i1 = Seq.get s2 (i2 - 1) -> ((([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 + 1 /\ i1 + 1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (not Seq.get s1 i1 = Seq.get s2 (i2 - 1) -> (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2))) /\ (not i1 < Seq.length s1 -> (false -> ((([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 + 1 /\ i1 + 1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (not false -> (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)))
+    end
 end
 module KnapsackFull_M_Impl
   type name
@@ -146,6 +140,7 @@ module KnapsackFull_M_Impl
   axiom inv0 : forall x : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv0 x = true
   use int.MinMax
   use prelude.UIntSize
+  use prelude.UIntSize
   use seq.Seq
   use seq.Seq
   use prelude.Borrow
@@ -188,24 +183,18 @@ module KnapsackFull_M_Impl
     requires {[#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2}
     ensures { result = subseq_rev0 s1 i1 s2 i2 }
     
-  let rec ghost function m [#"../knapsack_full.rs" 66 0 66 57] (items : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) (w : int) : int
-    requires {[#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items}
-    requires {[#"../knapsack_full.rs" 61 11 61 17] 0 <= w}
-    requires {[#"../knapsack_full.rs" 66 11 66 16] inv0 items}
-    ensures { [#"../knapsack_full.rs" 62 10 62 21] result >= 0 }
-    ensures { [#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result }
-    variant {[#"../knapsack_full.rs" 59 10 59 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../knapsack_full.rs" 67 4 74 5] if pure {i = 0} then
-      0
-    else
-      if pure {UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))) > w} then
-        m items (i - 1) w
-      else
-        let a' = m items (i - 1) w in let b' = m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (KnapsackFull_Item_Type.item_value (Seq.get items (i - 1))) in MinMax.max a' b'
-      
+  constant items  : Seq.seq (KnapsackFull_Item_Type.t_item name)
+  constant i  : int
+  constant w  : int
+  function m [#"../knapsack_full.rs" 66 0 66 57] (items : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) (w : int) : int
     
+  goal vc_m : ([#"../knapsack_full.rs" 66 11 66 16] inv0 items) -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) -> ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items) -> match i = 0 with
+    | True -> let result = 0 in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)
+    | False -> match UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))) > w with
+      | True -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0) -> (let result = m items (i - 1) w in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)))
+      | False -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0) -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))) -> sum_values0 s j <= m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))))) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0) -> (let result = MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (KnapsackFull_Item_Type.item_value (Seq.get items (i - 1)))) in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0))))
+      end
+    end
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
diff --git a/creusot/tests/should_succeed/knapsack_full/why3session.xml b/creusot/tests/should_succeed/knapsack_full/why3session.xml
index d157d16530..90847a4add 100644
--- a/creusot/tests/should_succeed/knapsack_full/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack_full/why3session.xml
@@ -14,23 +14,103 @@
  </goal>
 </theory>
 <theory name="KnapsackFull_SumWeights_Impl" proved="true">
- <goal name="sum_weights&#39;vc" expl="VC for sum_weights" proved="true">
- <proof prover="0"><result status="valid" time="0.057561" steps="8050"/></proof>
+ <goal name="vc_sum_weights" proved="true">
+ <proof prover="0"><result status="valid" time="0.057561" steps="7795"/></proof>
  </goal>
 </theory>
 <theory name="KnapsackFull_SumValues_Impl" proved="true">
- <goal name="sum_values&#39;vc" expl="VC for sum_values" proved="true">
- <proof prover="6"><result status="valid" time="0.008662" steps="12"/></proof>
+ <goal name="vc_sum_values" proved="true">
+ <proof prover="6"><result status="valid" time="0.008662" steps="8"/></proof>
  </goal>
 </theory>
 <theory name="KnapsackFull_SubseqRev_Impl" proved="true">
- <goal name="subseq_rev&#39;vc" expl="VC for subseq_rev" proved="true">
- <proof prover="1"><result status="valid" time="0.015920" steps="42227"/></proof>
+ <goal name="vc_subseq_rev" proved="true">
+ <proof prover="1"><result status="valid" time="0.015920" steps="46340"/></proof>
+ <transf name="split_vc" >
+  <goal name="vc_subseq_rev.0">
+  </goal>
+  <goal name="vc_subseq_rev.1">
+  </goal>
+  <goal name="vc_subseq_rev.2">
+  </goal>
+  <goal name="vc_subseq_rev.3">
+  </goal>
+  <goal name="vc_subseq_rev.4">
+  </goal>
+  <goal name="vc_subseq_rev.5" proved="true">
+  <proof prover="6"><result status="valid" time="0.008857" steps="14"/></proof>
+  </goal>
+  <goal name="vc_subseq_rev.6">
+  </goal>
+  <goal name="vc_subseq_rev.7">
+  </goal>
+  <goal name="vc_subseq_rev.8">
+  </goal>
+  <goal name="vc_subseq_rev.9">
+  </goal>
+  <goal name="vc_subseq_rev.10">
+  </goal>
+  <goal name="vc_subseq_rev.11" proved="true">
+  <proof prover="6"><result status="valid" time="0.013149" steps="14"/></proof>
+  </goal>
+  <goal name="vc_subseq_rev.12">
+  </goal>
+  <goal name="vc_subseq_rev.13">
+  </goal>
+  <goal name="vc_subseq_rev.14">
+  </goal>
+  <goal name="vc_subseq_rev.15">
+  </goal>
+  <goal name="vc_subseq_rev.16">
+  </goal>
+  <goal name="vc_subseq_rev.17" proved="true">
+  <proof prover="6"><result status="valid" time="0.008425" steps="14"/></proof>
+  </goal>
+  <goal name="vc_subseq_rev.18">
+  </goal>
+  <goal name="vc_subseq_rev.19">
+  </goal>
+  <goal name="vc_subseq_rev.20">
+  </goal>
+  <goal name="vc_subseq_rev.21">
+  </goal>
+  <goal name="vc_subseq_rev.22">
+  </goal>
+  <goal name="vc_subseq_rev.23" proved="true">
+  <proof prover="6"><result status="valid" time="0.009241" steps="12"/></proof>
+  </goal>
+  <goal name="vc_subseq_rev.24">
+  </goal>
+  <goal name="vc_subseq_rev.25">
+  </goal>
+  <goal name="vc_subseq_rev.26">
+  </goal>
+  <goal name="vc_subseq_rev.27">
+  </goal>
+  <goal name="vc_subseq_rev.28">
+  </goal>
+  <goal name="vc_subseq_rev.29" proved="true">
+  <proof prover="6"><result status="valid" time="0.010571" steps="12"/></proof>
+  </goal>
+  <goal name="vc_subseq_rev.30">
+  </goal>
+  <goal name="vc_subseq_rev.31">
+  </goal>
+  <goal name="vc_subseq_rev.32">
+  </goal>
+  <goal name="vc_subseq_rev.33">
+  </goal>
+  <goal name="vc_subseq_rev.34">
+  </goal>
+  <goal name="vc_subseq_rev.35" proved="true">
+  <proof prover="6"><result status="valid" time="0.008385" steps="12"/></proof>
+  </goal>
+ </transf>
  </goal>
 </theory>
 <theory name="KnapsackFull_M_Impl" proved="true">
- <goal name="m&#39;vc" expl="VC for m" proved="true">
- <proof prover="1"><result status="valid" time="0.019525" steps="71776"/></proof>
+ <goal name="vc_m" proved="true">
+ <proof prover="1"><result status="valid" time="0.019525" steps="84429"/></proof>
  </goal>
 </theory>
 <theory name="KnapsackFull_Knapsack01Dyn" proved="true">
diff --git a/creusot/tests/should_succeed/knapsack_full/why3shapes.gz b/creusot/tests/should_succeed/knapsack_full/why3shapes.gz
index 6c8e7012cf249cd29a64fb46d69e5129182a8f53..ac0ed7ee8ba40fa5cc1c28e463cc869b4ffce796 100644
GIT binary patch
literal 9268
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
W6wl>4B)-le@&5rY=YZFR4FLev9{N!L

literal 8521
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
Dqq45@

diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index d87a7114c1..2ad8c0e9c0 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -1240,28 +1240,40 @@ module ListReversalLasso_Impl4_FindPtrInSeq_Impl
   use Core_Option_Option_Type as Core_Option_Option_Type
   use seq.Seq
   use prelude.Int
-  let rec ghost function find_ptr_in_seq [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
-    requires {[#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s}
-    ensures { [#"../list_reversal_lasso.rs" 199 14 202 5] match result with
+  constant s  : Seq.seq usize
+  constant i  : int
+  constant p  : int
+  function find_ptr_in_seq [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
+    
+  goal vc_find_ptr_in_seq : ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s) -> match i = Seq.length s with
+    | True -> [#"../list_reversal_lasso.rs" 199 14 202 5] match Core_Option_Option_Type.C_None with
       | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
       | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
-      end }
-    variant {[#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 205 8 209 9] if pure {i = Seq.length s} then
-      Core_Option_Option_Type.C_None
-    else
-      if pure {UIntSize.to_int (Seq.get s i) = p} then Core_Option_Option_Type.C_Some i else find_ptr_in_seq s (i + 1) p
-    
+      end
+    | False -> match UIntSize.to_int (Seq.get s i) = p with
+      | True -> [#"../list_reversal_lasso.rs" 199 14 202 5] match Core_Option_Option_Type.C_Some i with
+        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
+        end
+      | False -> (([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i + 1 /\ i + 1 <= Seq.length s) /\ 0 <= ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - i) /\ ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - (i + 1)) < ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - i)) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq s (i + 1) p with
+        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        | Core_Option_Option_Type.C_Some j -> i + 1 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
+        end) -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq s (i + 1) p with
+        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
+        end))
+      end
+    end
 end
 module ListReversalLasso_Impl4_Pigeon_Impl
+  use seq.Seq
+  use seq_ext.SeqExt
   use prelude.Int
+  use Core_Option_Option_Type as Core_Option_Option_Type
   use prelude.UIntSize
   use seq.Seq
   use prelude.UIntSize
   use seq.Seq
-  use Core_Option_Option_Type as Core_Option_Option_Type
   use seq.Seq
   use prelude.Int
   function find_ptr_in_seq0 [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
@@ -1279,28 +1291,25 @@ module ListReversalLasso_Impl4_Pigeon_Impl
     | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
     | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
     end)
-  use seq.Seq
-  use seq_ext.SeqExt
-  let rec ghost function pigeon [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
-    requires {[#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n}
-    requires {[#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n}
-    requires {[#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j}
-    ensures { [#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n }
-    ensures { [#"../list_reversal_lasso.rs" 217 14 217 20] result }
-    variant {[#"../list_reversal_lasso.rs" 218 14 218 15] n}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 220 8 232 9] if pure {n = 0} then
-      true
-    else
-      match find_ptr_in_seq0 s 0 (n - 1) with
-        | Core_Option_Option_Type.C_None -> pigeon s (n - 1)
-        | Core_Option_Option_Type.C_Some i -> match find_ptr_in_seq0 s (i + 1) (n - 1) with
-          | Core_Option_Option_Type.C_None -> pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)
-          | Core_Option_Option_Type.C_Some _ -> true
-          end
-        end
-    
+  constant s  : Seq.seq usize
+  constant n  : int
+  function pigeon [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
+  goal vc_pigeon : ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n) -> ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n) -> match n = 0 with
+    | True -> ([#"../list_reversal_lasso.rs" 217 14 217 20] true) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
+    | False -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= 0 /\ 0 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s 0 (n - 1) with
+      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> n - 1
+      | Core_Option_Option_Type.C_Some j -> 0 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = n - 1
+      end) -> match find_ptr_in_seq0 s 0 (n - 1) with
+      | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n - 1) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
+      | Core_Option_Option_Type.C_Some i -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i + 1 /\ i + 1 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s (i + 1) (n - 1) with
+        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> n - 1
+        | Core_Option_Option_Type.C_Some j -> i + 1 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = n - 1
+        end) -> match find_ptr_in_seq0 s (i + 1) (n - 1) with
+        | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ 0 <= j /\ j < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ i' <> j -> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i' <> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) -> UIntSize.to_int (Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i') < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) <= n - 1) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
+        | Core_Option_Option_Type.C_Some _ -> ([#"../list_reversal_lasso.rs" 217 14 217 20] true) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
+        end)
+      end)
+    end
 end
 module ListReversalLasso_Impl4_FindLassoAux_Impl
   use prelude.UIntSize
@@ -1338,8 +1347,25 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  use prelude.Int
+  use seq_ext.SeqExt
+  use seq.Seq
   use seq.Seq
+  function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 31 8 31 32] Seq.get (shallow_model0 self) (UIntSize.to_int ix)
+  val index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
+    ensures { result = index_logic2 self ix }
+    
+  use ListReversalLasso_Memory_Type as ListReversalLasso_Memory_Type
+  function index_logic1 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
+    
+   =
+    [#"../list_reversal_lasso.rs" 21 8 21 31] index_logic2 (ListReversalLasso_Memory_Type.memory_0 self) i
+  val index_logic1 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
+    ensures { result = index_logic1 self i }
+    
+  use prelude.Int
   use Core_Option_Option_Type as Core_Option_Option_Type
   function find_ptr_in_seq0 [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
     
@@ -1356,23 +1382,6 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
     | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
     end)
-  use seq_ext.SeqExt
-  use seq.Seq
-  function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
-    
-   =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 31 8 31 32] Seq.get (shallow_model0 self) (UIntSize.to_int ix)
-  val index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
-    ensures { result = index_logic2 self ix }
-    
-  use ListReversalLasso_Memory_Type as ListReversalLasso_Memory_Type
-  function index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
-    
-   =
-    [#"../list_reversal_lasso.rs" 21 8 21 31] index_logic2 (ListReversalLasso_Memory_Type.memory_0 self) i
-  val index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
-    ensures { result = index_logic0 self i }
-    
   use seq.Seq
   function pigeon0 [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
   axiom pigeon0_def : forall s : Seq.seq usize, n : int . pigeon0 s n = ([#"../list_reversal_lasso.rs" 220 8 232 9] if n = 0 then
@@ -1407,7 +1416,7 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic0 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
@@ -1438,33 +1447,44 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
-    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i -> index_logic0 self i = null0 \/ nonnull_ptr0 self (index_logic0 self i)
+    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i -> index_logic1 self i = null0 \/ nonnull_ptr0 self (index_logic1 self i)
   val mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory) : bool
     ensures { result = mem_is_well_formed0 self }
     
-  let rec ghost function find_lasso_aux [#"../list_reversal_lasso.rs" 244 4 244 95] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (last : usize) (s : Seq.seq usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
-    requires {[#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self}
-    requires {[#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last}
-    requires {[#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s)}
-    ensures { [#"../list_reversal_lasso.rs" 239 14 242 5] match result with
+  constant self  : ListReversalLasso_Memory_Type.t_memory
+  constant first  : usize
+  constant last  : usize
+  constant s  : Seq.seq usize
+  function find_lasso_aux [#"../list_reversal_lasso.rs" 244 4 244 95] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (last : usize) (s : Seq.seq usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
+    
+  goal vc_find_lasso_aux : ([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s)) -> ([#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last) -> ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self) -> match last = null0 with
+    | True -> [#"../list_reversal_lasso.rs" 239 14 242 5] match (s, Core_Option_Option_Type.C_None) with
       | (s, Core_Option_Option_Type.C_None) -> list0 self first s
       | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
-      end }
-    variant {[#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length s}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 245 8 259 9] if pure {last = null0} then
-      (s, Core_Option_Option_Type.C_None)
-    else
-      match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
-        | Core_Option_Option_Type.C_None -> if let b' = let a' = shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self) in Seq.length a' in pigeon0 s b' then
-          let c' = index_logic0 self last in find_lasso_aux self first c' (Seq.snoc s last)
-        else
-          (s, Core_Option_Option_Type.C_None)
-        
-        | Core_Option_Option_Type.C_Some i -> (SeqExt.subsequence s 0 (i + 1), Core_Option_Option_Type.C_Some (SeqExt.subsequence s (i + 1) (Seq.length s)))
+      end
+    | False -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= 0 /\ 0 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
+      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> UIntSize.to_int last
+      | Core_Option_Option_Type.C_Some j -> 0 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = UIntSize.to_int last
+      end) -> match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
+      | Core_Option_Option_Type.C_None -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 (ListReversalLasso_Memory_Type.memory_0 self)) /\ (([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) <= UIntSize.to_int max0) -> (([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) -> match pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) with
+        | True -> ((([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first (Seq.snoc s last) (index_logic1 self last) 0 (Seq.length (Seq.snoc s last))) && ([#"../list_reversal_lasso.rs" 237 15 237 53] index_logic1 self last = null0 \/ nonnull_ptr0 self (index_logic1 self last)) && ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)) /\ 0 <= ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length s) /\ ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length (Seq.snoc s last)) < ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length s)) /\ (([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux self first (index_logic1 self last) (Seq.snoc s last) with
+          | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+          | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
+          end) -> ([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux self first (index_logic1 self last) (Seq.snoc s last) with
+          | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+          | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
+          end))
+        | False -> [#"../list_reversal_lasso.rs" 239 14 242 5] match (s, Core_Option_Option_Type.C_None) with
+          | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+          | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
+          end
+        end))
+      | Core_Option_Option_Type.C_Some i -> [#"../list_reversal_lasso.rs" 239 14 242 5] match (SeqExt.subsequence s 0 (i + 1), Core_Option_Option_Type.C_Some (SeqExt.subsequence s (i + 1) (Seq.length s))) with
+        | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+        | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
         end
-    
+      end)
+    end
 end
 module ListReversalLasso_Impl4_FindLasso_Impl
   use prelude.UIntSize
@@ -1502,8 +1522,45 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  use prelude.Int
   use seq.Seq
+  function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 31 8 31 32] Seq.get (shallow_model0 self) (UIntSize.to_int ix)
+  val index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
+    ensures { result = index_logic2 self ix }
+    
+  use ListReversalLasso_Memory_Type as ListReversalLasso_Memory_Type
+  function index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
+    
+   =
+    [#"../list_reversal_lasso.rs" 21 8 21 31] index_logic2 (ListReversalLasso_Memory_Type.memory_0 self) i
+  val index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
+    ensures { result = index_logic0 self i }
+    
+  predicate nonnull_ptr0 [#"../list_reversal_lasso.rs" 49 4 49 44] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize)
+    
+   =
+    [#"../list_reversal_lasso.rs" 50 20 50 70] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) <= UIntSize.to_int max0 /\ UIntSize.to_int i < Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))
+  val nonnull_ptr0 [#"../list_reversal_lasso.rs" 49 4 49 44] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : bool
+    ensures { result = nonnull_ptr0 self i }
+    
+  predicate list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int)
+    
+   =
+    [#"../list_reversal_lasso.rs" 83 12 85 98] first = (if h = l then
+      last
+    else
+      Seq.get s l
+    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic0 self (Seq.get s i) = (if i = h - 1 then
+      last
+    else
+      Seq.get s (i + 1)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+  val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
+    ensures { result = list_seg0 self first s last l h }
+    
+  use prelude.Int
   use Core_Option_Option_Type as Core_Option_Option_Type
   function find_ptr_in_seq0 [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
     
@@ -1522,21 +1579,6 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     end)
   use seq_ext.SeqExt
   use seq.Seq
-  function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
-    
-   =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 31 8 31 32] Seq.get (shallow_model0 self) (UIntSize.to_int ix)
-  val index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : usize) : usize
-    ensures { result = index_logic2 self ix }
-    
-  use ListReversalLasso_Memory_Type as ListReversalLasso_Memory_Type
-  function index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
-    
-   =
-    [#"../list_reversal_lasso.rs" 21 8 21 31] index_logic2 (ListReversalLasso_Memory_Type.memory_0 self) i
-  val index_logic0 [#"../list_reversal_lasso.rs" 20 4 20 39] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
-    ensures { result = index_logic0 self i }
-    
   use seq.Seq
   function pigeon0 [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
   axiom pigeon0_def : forall s : Seq.seq usize, n : int . pigeon0 s n = ([#"../list_reversal_lasso.rs" 220 8 232 9] if n = 0 then
@@ -1557,28 +1599,6 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     ensures { result = pigeon0 s n }
     
   axiom pigeon0_spec : forall s : Seq.seq usize, n : int . ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n) -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n) -> ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s n) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
-  predicate nonnull_ptr0 [#"../list_reversal_lasso.rs" 49 4 49 44] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize)
-    
-   =
-    [#"../list_reversal_lasso.rs" 50 20 50 70] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) <= UIntSize.to_int max0 /\ UIntSize.to_int i < Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))
-  val nonnull_ptr0 [#"../list_reversal_lasso.rs" 49 4 49 44] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : bool
-    ensures { result = nonnull_ptr0 self i }
-    
-  predicate list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int)
-    
-   =
-    [#"../list_reversal_lasso.rs" 83 12 85 98] first = (if h = l then
-      last
-    else
-      Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic0 self (Seq.get s i) = (if i = h - 1 then
-      last
-    else
-      Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
-  val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
-    ensures { result = list_seg0 self first s last l h }
-    
   predicate lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize)
     
    =
@@ -1631,16 +1651,17 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
     end)
   use seq.Seq
-  let rec ghost function find_lasso [#"../list_reversal_lasso.rs" 270 4 270 71] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
-    requires {[#"../list_reversal_lasso.rs" 264 15 264 40] mem_is_well_formed0 self}
-    requires {[#"../list_reversal_lasso.rs" 265 15 265 55] first = null0 \/ nonnull_ptr0 self first}
-    ensures { [#"../list_reversal_lasso.rs" 266 14 269 5] match result with
-      | (s, Core_Option_Option_Type.C_None) -> list0 self first s
-      | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
-      end }
+  constant self  : ListReversalLasso_Memory_Type.t_memory
+  constant first  : usize
+  function find_lasso [#"../list_reversal_lasso.rs" 270 4 270 71] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../list_reversal_lasso.rs" 272 13 272 65] find_lasso_aux0 self first first (Seq.empty )
+  goal vc_find_lasso : ([#"../list_reversal_lasso.rs" 265 15 265 55] first = null0 \/ nonnull_ptr0 self first) -> ([#"../list_reversal_lasso.rs" 264 15 264 40] mem_is_well_formed0 self) -> (([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first (Seq.empty : Seq.seq usize) first 0 (Seq.length (Seq.empty : Seq.seq usize))) && ([#"../list_reversal_lasso.rs" 237 15 237 53] first = null0 \/ nonnull_ptr0 self first) && ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)) /\ (([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
+    | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+    | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
+    end) -> ([#"../list_reversal_lasso.rs" 266 14 269 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
+    | (s, Core_Option_Option_Type.C_None) -> list0 self first s
+    | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
+    end))
 end
 module ListReversalLasso_Impl0
   
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
index 322885afcb..514616e7cc 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
+++ b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
@@ -562,59 +562,74 @@
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_FindPtrInSeq_Impl" proved="true">
- <goal name="find_ptr_in_seq&#39;vc" expl="VC for find_ptr_in_seq" proved="true">
- <proof prover="4" timelimit="5"><result status="valid" time="0.070000" steps="9280"/></proof>
+ <goal name="vc_find_ptr_in_seq" proved="true">
+ <proof prover="4" timelimit="5"><result status="valid" time="0.070000" steps="8546"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_Pigeon_Impl" proved="true">
- <goal name="pigeon&#39;vc" expl="VC for pigeon" proved="true">
- <proof prover="1" timelimit="5"><result status="valid" time="0.679743" steps="894866"/></proof>
+ <goal name="vc_pigeon" proved="true">
+ <proof prover="1" timelimit="5"><result status="valid" time="0.137332" steps="684420"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_FindLassoAux_Impl" proved="true">
- <goal name="find_lasso_aux&#39;vc" expl="VC for find_lasso_aux" proved="true">
+ <goal name="vc_find_lasso_aux" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="find_lasso_aux&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.010000" steps="16"/></proof>
+  <goal name="vc_find_lasso_aux.0" proved="true">
+  <proof prover="6"><result status="valid" time="0.029977" steps="14"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.029977" steps="25"/></proof>
+  <goal name="vc_find_lasso_aux.1" proved="true">
+  <proof prover="6"><result status="valid" time="0.009872" steps="12"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.2" expl="precondition" proved="true">
+  <goal name="vc_find_lasso_aux.2" proved="true">
+  <proof prover="6"><result status="valid" time="0.010671" steps="14"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.3" proved="true">
   <proof prover="6"><result status="valid" time="0.010000" steps="25"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.062282" steps="71481"/></proof>
+  <goal name="vc_find_lasso_aux.4" proved="true">
+  <proof prover="6"><result status="valid" time="0.015015" steps="112"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.5" proved="true">
+  <proof prover="1"><result status="valid" time="0.044759" steps="73704"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.6" proved="true">
+  <proof prover="6"><result status="valid" time="0.009561" steps="26"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.010000" steps="105"/></proof>
+  <goal name="vc_find_lasso_aux.7" proved="true">
+  <proof prover="1"><result status="valid" time="0.349219" steps="1873063"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.5" expl="variant decrease" proved="true">
-  <proof prover="1"><result status="valid" time="0.044759" steps="164444"/></proof>
+  <goal name="vc_find_lasso_aux.8" proved="true">
+  <proof prover="1"><result status="valid" time="0.021420" steps="76263"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.000000" steps="20"/></proof>
+  <goal name="vc_find_lasso_aux.9" proved="true">
+  <proof prover="6"><result status="valid" time="0.010000" steps="26"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.010000" steps="121"/></proof>
+  <goal name="vc_find_lasso_aux.10" proved="true">
+  <proof prover="6"><result status="valid" time="0.008602" steps="24"/></proof>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.8" expl="precondition" proved="true">
+  <goal name="vc_find_lasso_aux.11" proved="true">
+  <proof prover="6"><result status="valid" time="0.010158" steps="35"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.12" proved="true">
+  <proof prover="6"><result status="valid" time="0.010000" steps="35"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.13" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="find_lasso_aux&#39;vc.8.0" expl="precondition" proved="true">
+   <goal name="vc_find_lasso_aux.13.0" proved="true">
    <transf name="inline_goal" proved="true" >
-    <goal name="find_lasso_aux&#39;vc.8.0.0" expl="precondition" proved="true">
+    <goal name="vc_find_lasso_aux.13.0.0" proved="true">
     <transf name="split_all_full" proved="true" >
-     <goal name="find_lasso_aux&#39;vc.8.0.0.0" expl="VC for find_lasso_aux" proved="true">
-     <proof prover="6"><result status="valid" time="0.035975" steps="113"/></proof>
+     <goal name="vc_find_lasso_aux.13.0.0.0" proved="true">
+     <proof prover="6"><result status="valid" time="0.081749" steps="416"/></proof>
      </goal>
-     <goal name="find_lasso_aux&#39;vc.8.0.0.1" expl="VC for find_lasso_aux" proved="true">
-     <proof prover="6"><result status="valid" time="0.040206" steps="148"/></proof>
+     <goal name="vc_find_lasso_aux.13.0.0.1" proved="true">
+     <proof prover="6"><result status="valid" time="0.040206" steps="1661"/></proof>
      </goal>
-     <goal name="find_lasso_aux&#39;vc.8.0.0.2" expl="VC for find_lasso_aux" proved="true">
-     <proof prover="6"><result status="valid" time="0.081749" steps="325"/></proof>
+     <goal name="vc_find_lasso_aux.13.0.0.2" proved="true">
+     <proof prover="6"><result status="valid" time="0.069856" steps="1100"/></proof>
      </goal>
-     <goal name="find_lasso_aux&#39;vc.8.0.0.3" expl="VC for find_lasso_aux" proved="true">
-     <proof prover="6"><result status="valid" time="0.069856" steps="270"/></proof>
+     <goal name="vc_find_lasso_aux.13.0.0.3" proved="true">
+     <proof prover="6"><result status="valid" time="0.035975" steps="1663"/></proof>
      </goal>
     </transf>
     </goal>
@@ -622,15 +637,18 @@
    </goal>
   </transf>
   </goal>
-  <goal name="find_lasso_aux&#39;vc.9" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.336196" steps="466907"/></proof>
+  <goal name="vc_find_lasso_aux.14" proved="true">
+  <proof prover="1"><result status="valid" time="0.062282" steps="6224"/></proof>
+  </goal>
+  <goal name="vc_find_lasso_aux.15" proved="true">
+  <proof prover="1"><result status="valid" time="0.050405" steps="226542"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_FindLasso_Impl" proved="true">
- <goal name="find_lasso&#39;vc" expl="VC for find_lasso" proved="true">
- <proof prover="4" timelimit="5"><result status="valid" time="0.156412" steps="12772"/></proof>
+ <goal name="vc_find_lasso" proved="true">
+ <proof prover="4" timelimit="5"><result status="valid" time="0.156412" steps="12390"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl1" proved="true">
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz b/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz
index a2551c2dbda295b54ac3ec112947c6ca4424a1ad..e39d51327def515e87b7115db7fa356c0984e1d3 100644
GIT binary patch
delta 12595
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
VQ8e#($@$|8{(pslU9(AM0RY;VqGbR8

delta 12672
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

diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index c75504381d..6b565242fb 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -161,17 +161,15 @@ module RedBlackTree_Impl0_ModelAccHasMapping_Impl
   val model_acc0 [#"../red_black_tree.rs" 49 4 52 47] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     ensures { result = model_acc0 self accu }
     
-  let rec ghost function model_acc_has_mapping [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
-    requires {[#"../red_black_tree.rs" 69 8 69 12] inv0 self}
-    requires {[#"../red_black_tree.rs" 70 8 70 12] inv1 accu}
-    requires {[#"../red_black_tree.rs" 71 8 71 9] inv2 k}
-    ensures { [#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 74 12 82 13] match self with
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> ()
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> let _ = model_acc_has_mapping left accu k in let accu1 = model_acc0 left accu in let accu2 = let b' = deep_model0 key in Map.set accu1 b' (Core_Option_Option_Type.C_Some val') in model_acc_has_mapping right accu2 k
-      end
+  constant self  : RedBlackTree_Tree_Type.t_tree k v
+  constant accu  : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
+  constant k  : deep_model_ty0
+  function model_acc_has_mapping [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
+    
+  goal vc_model_acc_has_mapping : ([#"../red_black_tree.rs" 71 8 71 9] inv2 k) -> ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) -> ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> match self with
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 left)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 left accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 left k v)) -> (let _ = model_acc_has_mapping left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v)) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)))))
+    end
 end
 module Core_Cmp_Ordering_Type
   type t_ordering  =
@@ -366,18 +364,15 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
   val bst_invariant0 [#"../red_black_tree.rs" 204 4 204 34] (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = bst_invariant0 self }
     
-  let rec ghost function has_mapping_model_acc [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
-    requires {[#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self}
-    requires {[#"../red_black_tree.rs" 89 29 89 33] inv0 self}
-    requires {[#"../red_black_tree.rs" 89 35 89 39] inv1 accu}
-    requires {[#"../red_black_tree.rs" 89 81 89 82] inv2 k}
-    ensures { [#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v }
+  constant self  : RedBlackTree_Tree_Type.t_tree k v
+  constant accu  : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
+  constant k  : deep_model_ty0
+  function has_mapping_model_acc [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 94 12 103 13] match self with
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> ()
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> let _ = has_mapping_model_acc left accu k in let accu1 = model_acc0 left accu in let accu2 = let b' = deep_model0 key in Map.set accu1 b' (Core_Option_Option_Type.C_Some val') in let _ = has_mapping_model_acc right accu2 k in model_acc_has_mapping0 right accu2 k
-      end
+  goal vc_has_mapping_model_acc : ([#"../red_black_tree.rs" 89 81 89 82] inv2 k) -> ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu) -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) -> ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> match self with
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 left) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 left)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 left k v -> Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v) -> (let _ = has_mapping_model_acc left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu2) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 right) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 right)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 right k v -> Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v) -> (let _ = has_mapping_model_acc right accu2 k in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v)) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v))))))
+    end
 end
 module RedBlackTree_Impl0_HasMappingModel_Impl
   type k
@@ -588,14 +583,11 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
   val shallow_model0 [#"../red_black_tree.rs" 172 4 172 50] (self : RedBlackTree_Tree_Type.t_tree k v) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     ensures { result = shallow_model0 self }
     
-  let rec ghost function has_mapping_model [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
-    requires {[#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self}
-    requires {[#"../red_black_tree.rs" 110 25 110 29] inv0 self}
-    requires {[#"../red_black_tree.rs" 110 31 110 32] inv1 k}
-    ensures { [#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v) }
+  constant self  : RedBlackTree_Tree_Type.t_tree k v
+  constant k  : deep_model_ty0
+  function has_mapping_model [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 115 12 115 61] let _ = model_acc_has_mapping0 self (Const.const (Core_Option_Option_Type.C_None)) k in has_mapping_model_acc0 self (Const.const (Core_Option_Option_Type.C_None)) k
+  goal vc_has_mapping_model : ([#"../red_black_tree.rs" 110 31 110 32] inv1 k) -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) -> ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> (([#"../red_black_tree.rs" 71 8 71 9] inv1 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Map.get (Const.const (Core_Option_Option_Type.C_None)) k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)) -> (let _ = model_acc_has_mapping0 self (Const.const (Core_Option_Option_Type.C_None)) k in (([#"../red_black_tree.rs" 89 81 89 82] inv1 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v -> has_mapping0 self k v -> Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v)))))
 end
 module RedBlackTree_Impl0_HasMappingInj_Impl
   type k
@@ -817,21 +809,16 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     ensures { result = has_mapping_model0 self k }
     
   axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv1 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
-  let rec ghost function has_mapping_inj [#"../red_black_tree.rs" 125 4 127 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) (v1 : v) (v2 : v) : ()
-    requires {[#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self}
-    requires {[#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1}
-    requires {[#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2}
-    requires {[#"../red_black_tree.rs" 125 23 125 27] inv0 self}
-    requires {[#"../red_black_tree.rs" 125 29 125 30] inv1 k}
-    requires {[#"../red_black_tree.rs" 125 48 125 50] inv2 v1}
-    requires {[#"../red_black_tree.rs" 125 55 125 57] inv2 v2}
-    ensures { [#"../red_black_tree.rs" 124 14 124 22] v1 = v2 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 130 12 130 37] let _ = has_mapping_model0 self k in match let a' = shallow_model0 self in Map.get a' k with
-      | Core_Option_Option_Type.C_None -> ()
-      | Core_Option_Option_Type.C_Some _v -> ()
-      end
+  constant self  : RedBlackTree_Tree_Type.t_tree k v
+  constant k  : deep_model_ty0
+  constant v1  : v
+  constant v2  : v
+  function has_mapping_inj [#"../red_black_tree.rs" 125 4 127 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) (v1 : v) (v2 : v) : ()
+    
+  goal vc_has_mapping_inj : ([#"../red_black_tree.rs" 125 55 125 57] inv2 v2) -> ([#"../red_black_tree.rs" 125 48 125 50] inv2 v1) -> ([#"../red_black_tree.rs" 125 29 125 30] inv1 k) -> ([#"../red_black_tree.rs" 125 23 125 27] inv0 self) -> ([#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2) -> ([#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1) -> ([#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self) -> (([#"../red_black_tree.rs" 110 31 110 32] inv1 k) && ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) && ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v)) -> (let _ = has_mapping_model0 self k in match Map.get (shallow_model0 self) k with
+    | Core_Option_Option_Type.C_None -> [#"../red_black_tree.rs" 124 14 124 22] v1 = v2
+    | Core_Option_Option_Type.C_Some _v -> [#"../red_black_tree.rs" 124 14 124 22] v1 = v2
+    end))
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
@@ -920,14 +907,12 @@ module RedBlackTree_Impl1_HasMapping_Impl
   val has_mapping0 [#"../red_black_tree.rs" 31 4 31 57] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) (v : v) : bool
     ensures { result = has_mapping0 self k v }
     
-  let rec ghost predicate has_mapping [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
-    requires {[#"../red_black_tree.rs" 140 19 140 23] inv0 self}
-    requires {[#"../red_black_tree.rs" 140 25 140 26] inv1 k}
-    requires {[#"../red_black_tree.rs" 140 44 140 45] inv2 v}
-    ensures { [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> result = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v }
+  constant self  : RedBlackTree_Node_Type.t_node k v
+  constant k  : deep_model_ty0
+  constant v  : v
+  predicate has_mapping [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 141 8 144 9] has_mapping0 (RedBlackTree_Node_Type.node_left self) k v || has_mapping0 (RedBlackTree_Node_Type.node_right self) k v || (let x0 = deep_model0 (RedBlackTree_Node_Type.node_key self) in pure {k = x0}) && pure {v = RedBlackTree_Node_Type.node_val self}
+  goal vc_has_mapping : ([#"../red_black_tree.rs" 140 44 140 45] inv2 v) -> ([#"../red_black_tree.rs" 140 25 140 26] inv1 k) -> ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> (k = deep_model0 (RedBlackTree_Node_Type.node_key self) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ v = RedBlackTree_Node_Type.node_val self) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)) /\ (not k = deep_model0 (RedBlackTree_Node_Type.node_key self) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ false) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v))
 end
 module RedBlackTree_Cp_Type
   use RedBlackTree_Color_Type as RedBlackTree_Color_Type
@@ -953,18 +938,15 @@ module RedBlackTree_Impl9_Height_Impl
   use RedBlackTree_Node_Type as RedBlackTree_Node_Type
   use Core_Option_Option_Type as Core_Option_Option_Type
   use prelude.Int
-  let rec ghost function height [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int
-    requires {[#"../red_black_tree.rs" 296 14 296 18] inv0 self}
-    ensures { [#"../red_black_tree.rs" 295 14 295 25] result >= 0 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 298 12 306 13] match self with
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> 0
-      | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left color _ _ _)) -> match color with
-        | RedBlackTree_Color_Type.C_Red -> height left
-        | RedBlackTree_Color_Type.C_Black -> height left + 1
-        end
-      end
+  constant self  : RedBlackTree_Tree_Type.t_tree k v
+  function height [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int
+  goal vc_height : ([#"../red_black_tree.rs" 296 14 296 18] inv0 self) -> match self with
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 295 14 295 25] 0 >= 0
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left color _ _ _)) -> match color with
+      | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0) -> ([#"../red_black_tree.rs" 295 14 295 25] height left >= 0))
+      | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0) -> ([#"../red_black_tree.rs" 295 14 295 25] height left + 1 >= 0))
+      end
+    end
 end
 module RedBlackTree_Impl10_Height_Impl
   type k
@@ -1015,15 +997,12 @@ module RedBlackTree_Impl10_Height_Impl
     ensures { result = height0 self }
     
   axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv2 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
-  let rec ghost function height [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int
-    requires {[#"../red_black_tree.rs" 328 14 328 18] inv0 self}
-    ensures { [#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> result = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
-      | RedBlackTree_Color_Type.C_Red -> height0 (RedBlackTree_Node_Type.node_left self)
-      | RedBlackTree_Color_Type.C_Black -> height0 (RedBlackTree_Node_Type.node_left self) + 1
-      end
+  constant self  : RedBlackTree_Node_Type.t_node k v
+  function height [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int
+  goal vc_height : ([#"../red_black_tree.rs" 328 14 328 18] inv0 self) -> match RedBlackTree_Node_Type.node_color self with
+    | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
+    | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height0 (RedBlackTree_Node_Type.node_left self) + 1 = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
+    end
 end
 module RedBlackTree_Impl13_IsRed
   type k
diff --git a/creusot/tests/should_succeed/red_black_tree/why3session.xml b/creusot/tests/should_succeed/red_black_tree/why3session.xml
index 76ce5a3f71..224374f90a 100644
--- a/creusot/tests/should_succeed/red_black_tree/why3session.xml
+++ b/creusot/tests/should_succeed/red_black_tree/why3session.xml
@@ -14,54 +14,57 @@
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl0_ModelAccHasMapping_Impl" proved="true">
- <goal name="model_acc_has_mapping&#39;vc" expl="VC for model_acc_has_mapping" proved="true">
- <proof prover="6"><result status="valid" time="0.010000" steps="23890"/></proof>
+ <goal name="vc_model_acc_has_mapping" proved="true">
+ <proof prover="6"><result status="valid" time="0.010000" steps="25123"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl0_HasMappingModelAcc_Impl" proved="true">
- <goal name="has_mapping_model_acc&#39;vc" expl="VC for has_mapping_model_acc" proved="true">
- <proof prover="7"><result status="valid" time="0.186913" steps="1486"/></proof>
+ <goal name="vc_has_mapping_model_acc" proved="true">
+ <proof prover="7"><result status="valid" time="0.062067" steps="1365"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl0_HasMappingModel_Impl" proved="true">
- <goal name="has_mapping_model&#39;vc" expl="VC for has_mapping_model" proved="true">
- <proof prover="7"><result status="valid" time="0.000000" steps="79"/></proof>
+ <goal name="vc_has_mapping_model" proved="true">
+ <proof prover="7"><result status="valid" time="0.000000" steps="94"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl0_HasMappingInj_Impl" proved="true">
- <goal name="has_mapping_inj&#39;vc" expl="VC for has_mapping_inj" proved="true">
- <proof prover="7"><result status="valid" time="0.010000" steps="71"/></proof>
+ <goal name="vc_has_mapping_inj" proved="true">
+ <proof prover="7"><result status="valid" time="0.010000" steps="57"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl1_HasMapping_Impl" proved="true">
- <goal name="has_mapping&#39;vc" expl="VC for has_mapping" proved="true">
- <proof prover="7"><result status="valid" time="0.010000" steps="160"/></proof>
+ <goal name="vc_has_mapping" proved="true">
+ <proof prover="7"><result status="valid" time="0.010000" steps="126"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl9_Height_Impl" proved="true">
- <goal name="height&#39;vc" expl="VC for height" proved="true">
- <proof prover="2"><result status="valid" time="0.010000" steps="2148"/></proof>
+ <goal name="vc_height" proved="true">
+ <proof prover="2"><result status="valid" time="0.010000" steps="1931"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl10_Height_Impl" proved="true">
- <goal name="height&#39;vc" expl="VC for height" proved="true">
+ <goal name="vc_height" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="height&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="7" timelimit="5"><result status="valid" time="0.009842" steps="8"/></proof>
-  </goal>
-  <goal name="height&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="7"><result status="valid" time="0.030000" steps="8"/></proof>
-  </goal>
-  <goal name="height&#39;vc.2" expl="postcondition" proved="true">
+  <goal name="vc_height.0" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="height&#39;vc.2.0" expl="postcondition" proved="true">
-   <proof prover="7"><result status="valid" time="0.085166" steps="770"/></proof>
+   <goal name="vc_height.0.0" proved="true">
+   <proof prover="7"><result status="valid" time="0.085166" steps="8"/></proof>
    </goal>
-   <goal name="height&#39;vc.2.1" expl="postcondition" proved="true">
+   <goal name="height&#39;vc.2.1" expl="postcondition">
    <proof prover="7"><result status="valid" time="0.057583" steps="1097"/></proof>
    </goal>
   </transf>
   </goal>
+  <goal name="vc_height.1" proved="true">
+  <proof prover="7"><result status="valid" time="0.048667" steps="1342"/></proof>
+  </goal>
+  <goal name="vc_height.2" proved="true">
+  <proof prover="7" timelimit="5"><result status="valid" time="0.009842" steps="8"/></proof>
+  </goal>
+  <goal name="vc_height.3" proved="true">
+  <proof prover="7"><result status="valid" time="0.030000" steps="2028"/></proof>
+  </goal>
  </transf>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/red_black_tree/why3shapes.gz b/creusot/tests/should_succeed/red_black_tree/why3shapes.gz
index 406cbb9607e1cb48a8c38a07c5708a676cae06d4..2fa4f4ea2feb71366b7b9b6b5f3059259fbd474c 100644
GIT binary patch
delta 74001
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

delta 74031
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

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index 3b576c80d4..f91b29fa98 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -30,15 +30,12 @@ module IncSome2List_Impl0_LemmaSumNonneg_Impl
   val sum0 [#"../inc_some_2_list.rs" 21 4 21 23] (self : IncSome2List_List_Type.t_list) : int
     ensures { result = sum0 self }
     
-  let rec ghost function lemma_sum_nonneg [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : ()
-    ensures { [#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0 }
-    variant {[#"../inc_some_2_list.rs" 32 15 32 19] self}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../inc_some_2_list.rs" 35 8 38 9] match self with
-      | IncSome2List_List_Type.C_Cons _ l -> lemma_sum_nonneg l
-      | IncSome2List_List_Type.C_Nil -> ()
-      end
+  constant self  : IncSome2List_List_Type.t_list
+  function lemma_sum_nonneg [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : ()
+  goal vc_lemma_sum_nonneg : match self with
+    | IncSome2List_List_Type.C_Cons _ l -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 l >= 0) -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0)
+    | IncSome2List_List_Type.C_Nil -> [#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0
+    end
 end
 module IncSome2List_Impl0_SumX
   use prelude.UInt32
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
index cd3fc0a742..000f1a83fd 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3session.xml
@@ -7,8 +7,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="inc_some_2_list.mlcfg"/>
 <theory name="IncSome2List_Impl0_LemmaSumNonneg_Impl" proved="true">
- <goal name="lemma_sum_nonneg&#39;vc" expl="VC for lemma_sum_nonneg" proved="true">
- <proof prover="3"><result status="valid" time="0.008121" steps="63"/></proof>
+ <goal name="vc_lemma_sum_nonneg" proved="true">
+ <proof prover="3"><result status="valid" time="0.008121" steps="31"/></proof>
  </goal>
 </theory>
 <theory name="IncSome2List_Impl0_SumX" proved="true">
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_2_list/why3shapes.gz
index 2544af080016284cec23f7bab5ef83f6f98c18a2..72e8ec813aee58ba81668adb86965d7b2fd2aad2 100644
GIT binary patch
literal 1024
zcmV+b1poUViwFP!00000|D9G#kJ~m7zUx=$mUfE(9KJ*q-2#TNh7A-w1w2NeWGX8}
zmKJ_w+kf97Daw-8n*{a2COMC9X2|)*zdWSpXY*pu={I{iw?qGXD$|EwlfwM@XwKIo
zF=yK~HQC3#CN(idSq%O8Rj-ur{O`8&o5UVpF8`L^cVZsRWhmSJqG9y0FU+F`EjK8-
zqJYs4PAtuD^DUik#1krOp}G5w{&?`myo{L|qbflYzolV|XiqWVSBDzo)MUFUOxu^$
zaP1H0C3H650H%+IMCaT64Lc9mYP&IijI~iU5dU%dY6{0$p~o1`b_(YbBiT<bNOZAH
zbdfg0DaGURA6LW99*?GU+kWVK`vsMYJBM()o=?}8&fd~Zrc0!?+l`p!L5sLxA(>~>
zb;E0U91gaFvC2XEXg-GBXRLQT#<P!Dzfc&I@Tel*btU%ZWY0tQ%~CC=HPP9$2Ceo5
zeq8Oa_~G`c3qf;D>1Gx_okF2-F9AyD@>vQLZi00Z(de^x|E|OE_LQlH(`k6MhY!cE
z!Ew{}rqduyd%$o1BGJ&lO=stf!9D6Jbs%PIy0Z<5W@Dn_uKVns`%F_A-OK3Sy}XsN
zh{nVl`_fW`46TJnl$$U1QbwWk$DKdyq)(@-)sQ<A$Tg@Z4<Q#2;r(fl2nG`v^I$AW
zb@S?6`uhZ-VFCw^P5Eq3tqWj^gVi)dg5uCu-rA$1)3@*r8*55Oc#qDWmgoT-`#NIh
zcc57f0XZK#*csj^r5RZd50Oub;<AFEuK5|)jCt~K4%s~v8WUvfmLQ{^I~cv6Ak8&{
zMS|NEy0b<tsv<a5Gw?_;7xUGY=iz8ee2kZ*X!gyf36Jp-Zk&5hoVDW<b%!o6rTG}5
zTkV&0&eVM8#rUl`Y*&gLmh8*PVhkX|zC+V1MGt`EAYTKpd}X(w_wV>$=#6=@Y(559
z7AQ5F&4KJT2PTrEbjEB<dS8pS(JZzKcDK8!>`fM886D$4S*DfZU#_9&M9ci`GPVpS
zwhs1?>p=P@9J)e*pRDRi(S-xI>X0zDsDIslk}@1vax=YT|K1$giLjE$PLaY~lg;J=
z|G`{f|7R|+NsE8SArHaPcL#&?Rh2=_O@^sO$;5hcJ}jK-x<;UohW8^G`;p;Jc&HIb
zWY(}kf(0+-$d;oNt;1gv0G*FasC@k*FSLCfXn~epi^Px!(r}^}<(z=3xKdIW4nh!H
zSx!lv!j2@I%Gv;)+Po$tWBH-6wlaiJDeM7Q%62r#S#3d7b<QP_tg2;2z_7foC{(H;
uBF%PkCw4r6hSQ2y#AJ#oTMMZ~W-|N}N8n&(CenPTlK%kvspXT$3IG6E;sz!F

literal 1026
zcmV+d1pWITiwFP!00000|D9G#kJ~m7zWZ0`mUfE(91cZEMYn(<tYHI1PXUh+D2d7n
zk)^<oxIe!`Qj{gFHx0T6FUfg)Gegcd`sFD)zv^%19DO&Zb363EM>2Z)b))}$*5~Vy
zDORyVKJB1lIxq5}Ki|}aR)4phV%t2|&k7ZvL`@LARo-n>9yP-$>df(|3-Vg@L*JV(
z8~v;=L(%pZ1tavq`UNGoB)XCS`3EbO`nUO(&o}W4DXUls`#<;--XA&{>WU&NKry%F
zeoJUCA=sNmb&2|jx4CZnq8zS$eO^K*^9`_rHDoH=9q!nf$4+-!{l{3uv;yY-tbRI$
zW39+z2xm8iGu7@exnRM?R8CvSe{2ocbtUEe!68gnqd#50b>^P#{qA{XcO#~LQgK+I
zPv%v3-Eb?8Lv1=3tL&xE`lH`{rh12CI{QfV^MxUa2rBWruHu6}ne)(nH(beS%~Ue2
zL8XU0cP}uZ;``g@HUuRU=i6EMd<uobqXamg%V#NYxC_=v1f$Q+{ksnR+e>vhoKC~d
z)E|ytz2m0sb*CWKZB4)KMUtU=o7T=6gMHLf>cI3)cW2`hO~ypyhwhU{?i0mja4&;<
z`|?)CaWH1i*p-$Oq;D-c;zEBhmm&zQKVkh*Cw)3yje^XYK&BvlaS(C=;oqMENnkL6
zp##GpRn5)1boU9df(aZ1HRY>0wKjk$4y?G3gv7qDoV7zIr*GjcHr14m@D3ecmgpXw
z`Z{1|51_FEkDQGiYz^;}GBTn)BtFUW%L;<q=0~9r9eG%X_y~oE1QG8EB6r+@{BeRj
zQwWO$cPn&jO<Ft+;5?my2a37quckN;M^n&aylnF3&}<w37%%?Dh4Un^9iON@w1K5c
zj3L_9VM*th&Ua2sze>Pvr6^#@zJe{r05R-4G`&)E05lG=H2`KSy9K@f!2d#T%oCIO
z7{J6+YBHMx$$bt?B**!T*-$!Pi?&f1T7|mX-c<4?i+C9wik~dgO7Sn-&~u_ice{wo
za6;=)57`dnZ^Gd#6!^)it`u!JaIX&YV~e}j?ItPGz>?ePCA;@#$u9OQN$eCT%r@C<
zE{Ok_3;2KL0!~`u2M&b~j=wt?q^qj*YIZVAEy^a=lk;I=Ro69wlxX-clCc{Z_C)v^
zfh1=2D<W8MQbBAvO3B)PngFP5WWv<dFYrR!SDqGl(X~Vj8))hhbzPPyB(G}v#4=pR
zvB@Yck;poNJ=+K_D-B?eE5;Jc>c*H-Gsb0XYQPBhe3M~iATFy+NMK1>$&!J_tSUK_
wX~W_u*~@*r7X&GIDN3f36jM{hGK~|R&_^7D+Q=l1vVFSw7uIrIh3yIe0OK(8>Hq)$

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
index e8fccb745a..81af8dc36f 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
@@ -35,15 +35,12 @@ module IncSome2Tree_Impl0_LemmaSumNonneg_Impl
   val sum0 [#"../inc_some_2_tree.rs" 21 4 21 23] (self : IncSome2Tree_Tree_Type.t_tree) : int
     ensures { result = sum0 self }
     
-  let rec ghost function lemma_sum_nonneg [#"../inc_some_2_tree.rs" 33 4 33 30] (self : IncSome2Tree_Tree_Type.t_tree) : ()
-    ensures { [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0 }
-    variant {[#"../inc_some_2_tree.rs" 31 15 31 19] self}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../inc_some_2_tree.rs" 34 8 40 9] match self with
-      | IncSome2Tree_Tree_Type.C_Node tl _ tr -> let _ = lemma_sum_nonneg tl in let _ = lemma_sum_nonneg tr in ()
-      | IncSome2Tree_Tree_Type.C_Leaf -> ()
-      end
+  constant self  : IncSome2Tree_Tree_Type.t_tree
+  function lemma_sum_nonneg [#"../inc_some_2_tree.rs" 33 4 33 30] (self : IncSome2Tree_Tree_Type.t_tree) : ()
+  goal vc_lemma_sum_nonneg : match self with
+    | IncSome2Tree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tl >= 0) -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tr >= 0) -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0))
+    | IncSome2Tree_Tree_Type.C_Leaf -> [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0
+    end
 end
 module IncSome2Tree_Impl0_SumX
   use prelude.UInt32
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
index 5278b87c40..ff2a97b0eb 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3session.xml
@@ -7,8 +7,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="inc_some_2_tree.mlcfg"/>
 <theory name="IncSome2Tree_Impl0_LemmaSumNonneg_Impl" proved="true">
- <goal name="lemma_sum_nonneg&#39;vc" expl="VC for lemma_sum_nonneg" proved="true">
- <proof prover="2"><result status="valid" time="0.009947" steps="112"/></proof>
+ <goal name="vc_lemma_sum_nonneg" proved="true">
+ <proof prover="2"><result status="valid" time="0.009947" steps="35"/></proof>
  </goal>
 </theory>
 <theory name="IncSome2Tree_Impl0_SumX" proved="true">
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree/why3shapes.gz
index 73fdd1b22853c18196dd4a1fbb79d302d5ea1fa3..61064af20ea70d2df481d9e8629541fef68e0a40 100644
GIT binary patch
literal 1139
zcmV-(1dRJ1iwFP!00000|BY5%i`zI9efO`(TX$zENLR8YFHIqYgcyc>Dta8FIC3X6
zv4_Od?Ed?``mil~lG1^3EZq;CdvtZ=Kb{uXSN&$Li=XClJ+{r?i)``qXR_8`m-_mC
zCi-elbw!@_$(+x+#Hq4ro5p-swCH^lz3V_m2T~EeF8^r{M%~mbH5#6cuH7gx=eO>^
z(m_h}@<UF{wASC=-%jSvf<(c+NgA!}L&J)SY?A?DTG`Q3cWrrWIwkyUR;=|>2}Q*U
zZSQDd@X6Y#(0@(Fd@{;5=#M{&ruMDRO4Gm>@pi5#+srewS!Rewxeo+I=_E1riREV1
zIR~N}EV%^bk>q|z!%+Gm*0%}d+-^5p=&&0q+pgC7*p&PBy*XT`kYG|QWCeyorXbxG
zBP0m50@<$gmt{YwC~<!-hAUt$CQdi2A13wF9J4)wHS=^!fC4&!6_}zjf<@&3t6Oz0
zZY0n~W43`oKOQOEjudtSd&Q7D>r-zNwO-WiWnr81-=ufYPq-c7CG(J8_36~!$}=WC
z(a?(Cy40Wj=tX72G|qiSCVYWt5xt9im`WD<Vy^A!rva4@?-cuH7$7S&wm`9Vf3CZ*
zbzL7RW<lWrVd*L=hz;NvzgH4VV|!E-<D+3-Rv+}@(mzZXjvnZJd%3hXbNF=r;WO9A
zMxSh79uN4mUW_Z|4<H6Ie1JW!W6fM|_33K-iSr>+aS}?-<B~ZU5XieF=dnF5S&oJe
zCFi}DP5&q%4{Ac@CCgAU)`2DaEn~Q6qAywCgYvj!War!E-6#gm85E<N(QbRfQ&I;v
z#|6WKoo|Bl<P#J@daXJLgoNqCE-<$XtanhVzFGd6O#vxNgTrWj5Pb7$F2}As9`tu(
zf6%XDz6Lb=gX*Fk5t#KJ1WO~ORwV)}(y<~pGYnKZHgWs&009sGM+m4H;2{j!;DY^L
z$U6}1`rKU#!b9i<q0>K1d2P?8M4r23T^IGL_B?l<XU?qXaCQt0X(#<=a&UU&-eyXQ
z`yY**8J~*Nx#V&>6;f=rSXLh^?#$6GK(I6C3t+EK<0eA=i~JM6qHo_=&sn&sMI`59
zykrKI1Bk?oxho50B-$jaA)z;g>pStGigb#O@!zCr=J;$|Rm5=I?lLxoGxRCA9)u5Y
zV73bVO;%@)77iWRA^sx?8O!lt7vXq2na3HBTi0(O!gcSCHt$cZz0F5Wgh9=L-qS=p
zsF6L=#BfPF!(0>lpcj|^VM6Y~&94E>7g)_4tNu0zYCltoAUI?=;#trbo6)(>IifOr
zXVBb#Bf1&xIdY$W{w+m48NT>}6{CrNqbm0TuB79y*M(zKd0Bw6yBL!sT&D+~3nPf8
zCN)4H&Eb%lLzPxlR__;dN0O=**hxGkDWuE*&ofSHDN;j$A3*1ebjNpW2MOKll+=65
zMOq7~wW%svWjX3vrG=@hh1g}z5ln6uWtlO1of&zM_)j(CP{}N<*&^S`<bMMRsohEp
F004^zEbjmS

literal 1153
zcmV-{1b+J;iwFP!00000|BY7Lj@vd6efL-RE$tQo$RQ<?MYn)q*sy>_`x5YR1zM)E
zMr<jtwQ)bc!;7fP+CdgrndDqJb2xLz-=3D&H}l<Imp|;~dTg6Nm-+JP_l5cU*<9bx
zM3agX>okLktkQ&5#H`DI+Jn_M-Qn=Xnp%_9dTpL{uKB<ClW9Ka)JdmEP8fQ0`cgBe
zFEqQSe{Y}dLa&!~ds&|B`D{w`RyJ+Z*slxoZ02j2$l82)|9-OM<&F^UEz)7vXgb<E
zC6HBa_H4SgJT{#cVKpz-J{u}lD0@c<gHKLQh52JL=aX5!L4EwuG;^cgE6pP0B*?j@
zY%}-FW}aa@Q^624r4z?AIF_4L=M{))Fy#_-h(v`cjZ+z>nBOLXbGzMKqE*5s-{N^5
zn{wa2H;3yqB$y-%d4Z;oYsj|65E8^(foxaiufFg|MT!6OHe3VqHe+|Q{9%$mRp{+e
zSTjw(1!$m?up&}aj>4ich1IP(Z#MwwtkGLSFw6%Cw*!Q!su7ajciy{Bh3<;;zeTTL
zp71#0AP*tEnbWDgm1lH%qOlZ%^x1q4vsay`WnBA=NQ4AYB6=11(3LFA#a`Rf4+~nQ
zF~zz`6GVlMB~YyWpRX<~-Bsvz7nE!FY&A-VrQjI9mlDgy@=;QZ4}y7Gz0s?8|IlG<
zJuv(Ba%pe&@ag<5c&?9)Ik~z#9`Nh57}qQ`AR03KfNR$wXKuFUbhV-5f{E0e#FW)I
zWlmBA@@~p%EFY&V2f>GwRj=jTKXS+;n~-_RGNz1qV9Mdh7@nEvQx^E4e4H|(^X2kx
zH3P2<n$gW5cQp|psiT_5f?;E;O{5+*i6T<3V+VmDq5F6W%%4KKCA6+@4u9rcK!()d
zV{|$geDh{6$F4jc%vbAvP_JSk2NZ`!_0}E;^m;D@2P379B_b-)qaru67^w7U;_<5(
z0yh805Rfw<gpjzw8;7%ycS3OcbAKs_5JFD~o%v?VYkRgO;@mCPby2VCfO8jc=FE`}
zXUABOZZRAt2hT@-G-Fac|Iy5g@vAwVQ!b}dBE@1G)9Pc!ohkYa@GYR`8(^(Y?IuM1
z6aN#vqA%YupR;&VixHiR;gU%#2QVTt=C3TIk<lSJ4vDoXeBFr;S!C1b82?3>W{NMa
zRK++Pf4YoK!%1}tz6Rk#I569V{vxU~MHdbo&>`WGgor6@>>{?er+Hifx%Kr1B3}2t
zwRzvQ?lvDd5fYmNy~l~zs3ZA^6XPZA1#?d9jb6R`hYooNZhj4*zldt?Q4O~_Q1?tJ
zBH@tK;(6p4=h3UqF`_cQGpGu0M8CoVM*jI1Mj7%+dhtamT9YuMS_J~v(&N|j!m+6W
zEkM~_tX(WvEy$jjyb@3=keo3p01jL+Nr<ialJ3Z&ss&aO&qxLtv%po(Ni9WYDewar
zwaj*W$9Axwdy|oRPr1lyA&s$BMXOvPuT@6ax>|}|?iIl*C9Gh%wR@9Wd64)|4dYPB
TJgeDK?d0NrWjl9zgA4!w2j4t<

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index a07eb61556..18a224e3c3 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -30,15 +30,12 @@ module IncSomeList_Impl0_LemmaSumNonneg_Impl
   val sum0 [#"../inc_some_list.rs" 21 4 21 23] (self : IncSomeList_List_Type.t_list) : int
     ensures { result = sum0 self }
     
-  let rec ghost function lemma_sum_nonneg [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : ()
-    ensures { [#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0 }
-    variant {[#"../inc_some_list.rs" 31 15 31 19] self}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../inc_some_list.rs" 34 8 37 9] match self with
-      | IncSomeList_List_Type.C_Cons _ l -> lemma_sum_nonneg l
-      | IncSomeList_List_Type.C_Nil -> ()
-      end
+  constant self  : IncSomeList_List_Type.t_list
+  function lemma_sum_nonneg [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : ()
+  goal vc_lemma_sum_nonneg : match self with
+    | IncSomeList_List_Type.C_Cons _ l -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 l >= 0) -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0)
+    | IncSomeList_List_Type.C_Nil -> [#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0
+    end
 end
 module IncSomeList_Impl0_SumX
   use prelude.UInt32
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
index 9e41983958..afc9d52bcc 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3session.xml
@@ -7,8 +7,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="inc_some_list.mlcfg"/>
 <theory name="IncSomeList_Impl0_LemmaSumNonneg_Impl" proved="true">
- <goal name="lemma_sum_nonneg&#39;vc" expl="VC for lemma_sum_nonneg" proved="true">
- <proof prover="0"><result status="valid" time="0.008183" steps="63"/></proof>
+ <goal name="vc_lemma_sum_nonneg" proved="true">
+ <proof prover="0"><result status="valid" time="0.008183" steps="31"/></proof>
  </goal>
 </theory>
 <theory name="IncSomeList_Impl0_SumX" proved="true">
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_list/why3shapes.gz
index 73c6652a9f171825d694c04e0ffee14f8ef7ed5c..30f95ddefb183f04a81e28a9ba25293b952e884c 100644
GIT binary patch
literal 909
zcmV;819JQyiwFP!00000|BY2!tJ^pbe)q5NTicX^?w7J>A((^&mVGLEtWj*aHFfMm
zob+`6{pw=LmvmtR$Hz08`R3E78TtJ#AHVBYGv+_dZET1BbI$VJhpf<lzUc9B1$s1H
zQ-O1|6{vtN%3|opH?;|}{=eJK8=1Mj-v22*cBWtSeJI=huHb}mF7%6nitX*v!!BU-
z&Mh<jacQEZK@T=qQAOPUh(`h*_G?&ImQ@KA@FohTt#*in-(1zmQ-R~Y&~0B{hDTqI
z>(YE_K)ZdL2$VdY=h`yV7RSB*W70-c5cr>q7m1F`vWSt+G10k4Cg%hJBE&IMMcxdz
z+`7wOPQ%Vzuex+*KlHu%W`m30IN^LeUmmZWnYWvzLqwIcT+Q#g>xQ@TI@G3v3W{)^
zJB6LfpMv$(N*mqQ7xr(xE_$1P);BW_-A{uQN$-}FTpG;lDfMNz-G(<)zq|eja829m
zPC=^M+CIH*P$<Z~?#{>cH*+ujsw22_o?QxMTSOWWk<UgUj4DVHB1wp7LL~0tLK9({
z-fhn=H-eW&=n}l;fF=&om6L%1QV=EvFfx!60camnAlRVE35>f;FN>141t%yGk$6B7
z_Rj_t_UC5@!Trn^Ge0z2&G=LS6NiZXxGAo%*V}n$EP_d>Vm-SUh>5~(8lPJW&pm|J
zy@lq5Wp}xRErhSJWsIZ3h&h5N><cLj4--KrC}M}j<`L9K-Hpb<`HZwefJ-M^;gc-F
ziy)#bGRh*8EMlrE-6I6jE#=timWQJZJ!PRVKSaFL>3-2cxlTuL-UW0U{&IU5g*|6%
zw<Qn09$D23_klv(R<<cqWfCu#yZ&Lyak!eSXwJ>P3Ci39^fario%C`}-{xuP+}nA5
zkJ}+wT68^i%O$eDcGr3KX8n)rc^wyNpyl-pLt81fxS!d4KhI+u(&17uH+MlLf7;@S
zHdxb<|C9DQ?k_i?{!8H}`FUh`91OY|7@FM6ap6zd{&<*6@Nf3h>G!cyWcnmwwNh*n
z3@ii#vtZWsadIY!pT1RXU-?cdyLP;183hdi0wY2I6c-`{qnbcUfw>rhK$XK2$OvMU
zhSqCj1pvpgZj8BT01%_5hB(J3lu^y7WLOfaam9gb0I7_&ca%LhjvAKp6Fbop$r!HC
j1!8&OTmwpUC1A~EZ49djt#y^llgR!BIF}hT_6Ps~-Q~fU

literal 913
zcmV;C18)2uiwFP!00000|BY4Ks^c~kefL-RZQ2Y4-DM3ug<ujAD193ASfkkTOc=)=
z;$%)gzuJ-|U(&)HIF7Y1YcDPDE&Z~~$FJtQ9rGXdK3<3ZQ!et|ubKJd&5X|*(x^t~
zGOcipOj(sfKfddSd;9C!X|yj(^QNgL$<;>JYw$7CW!?_=ytB8PsT^w64}EXHWaiC0
zhU(fsG@eSI0T*krcdn;%Q1SuX!hBpV$#TIDE?9HT;5Xv2fJeQLn%Xg{utt7K!qQbc
zM6&Nt)o(N~-k0XuSC`@0H{-grTrMy=Ln6}Zc%EykP`fzp&F_<lMU9dFgZLuRfh>m@
z=^PWCq}@3|pa_xV1R?(c4Y#_w;PO9=IDH!P`T4!G^LFQNPij~}&9A2GhWF|=G`7PU
z7v67nnu5x|h1K6q+GuvRuzzQT=xzSl-0e7YKP=HKy*pBBxe#7YWiG@0KD^uJ!|hvu
zYp=cOH0I{oxTn_*7aB{iJJ_W8Vjq?F0>K?vb}3YB5qU%;KAVIvt}#o9EFqE!k--B(
z6Jeg-UC%BzLYIrsC3MSyOdJ%HQ-J}|7$*ieGEfr%>>g7f+MuZkOhTrYMJv~W6I2nA
zWI!t1zY8i$KgV1Xyr20};fH3cnVc$628h&;o0gh-y}`m`5z0apXW7L-$~1*(d~Gc{
z_Yhh47MUH(?t+9Zgs-t>Oryd?06`M=MKr~Si696{#9^^{g3Zx%qXjshkvt4RI@=1L
zWGTD|MU+KFSyYmxn5rsxgh0Nf99!M-0Ls`?E;N;gh?hFuI{^who#1&F7&iR*{<NBU
z&eUy79eh2usu#`!O{A;rQl`o*9xxB{%~s=Zvsu}m+kG39c?9TbR>gJF3yi+a)6l`&
zd3}z%Ay}^Xdg_)gwmx>(dG2KWpW}HQ7io~?@r*-TX|Xt;#e6=`V;j=(QZbmjppyUE
z#S3k;rlWq6_B!rQm{5OH_(^^p85swIuLg!E^Kx9|OSb<!0uub2yE^?ocA8CBlDpWK
zicNx{g<xnF%$Yt;#w78}U3Kki-$_+>9UobS+vY+|bGc9^NZq&_*%HIKRj%!s6itp#
zC}Tv_24gVS2uZ4%*4m3fhzM>QOmli788?C}K^5bM))J`}vDzAUM!D}MNh@-B5+{CQ
nnV>bfV5%-s8pN5Y3*1Q6SSxDA8&l`%RAm1G^*jr390>pbUX{R>

diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
index 8855917e14..31f1d09150 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
@@ -35,15 +35,12 @@ module IncSomeTree_Impl0_LemmaSumNonneg_Impl
   val sum0 [#"../inc_some_tree.rs" 21 4 21 23] (self : IncSomeTree_Tree_Type.t_tree) : int
     ensures { result = sum0 self }
     
-  let rec ghost function lemma_sum_nonneg [#"../inc_some_tree.rs" 33 4 33 30] (self : IncSomeTree_Tree_Type.t_tree) : ()
-    ensures { [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0 }
-    variant {[#"../inc_some_tree.rs" 31 15 31 19] self}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../inc_some_tree.rs" 34 8 40 9] match self with
-      | IncSomeTree_Tree_Type.C_Node tl _ tr -> let _ = lemma_sum_nonneg tl in let _ = lemma_sum_nonneg tr in ()
-      | IncSomeTree_Tree_Type.C_Leaf -> ()
-      end
+  constant self  : IncSomeTree_Tree_Type.t_tree
+  function lemma_sum_nonneg [#"../inc_some_tree.rs" 33 4 33 30] (self : IncSomeTree_Tree_Type.t_tree) : ()
+  goal vc_lemma_sum_nonneg : match self with
+    | IncSomeTree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tl >= 0) -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tr >= 0) -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0))
+    | IncSomeTree_Tree_Type.C_Leaf -> [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0
+    end
 end
 module IncSomeTree_Impl0_SumX
   use prelude.UInt32
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
index d9bab340bd..13138a09eb 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3session.xml
@@ -7,8 +7,8 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="inc_some_tree.mlcfg"/>
 <theory name="IncSomeTree_Impl0_LemmaSumNonneg_Impl" proved="true">
- <goal name="lemma_sum_nonneg&#39;vc" expl="VC for lemma_sum_nonneg" proved="true">
- <proof prover="1"><result status="valid" time="0.009766" steps="112"/></proof>
+ <goal name="vc_lemma_sum_nonneg" proved="true">
+ <proof prover="1"><result status="valid" time="0.009766" steps="35"/></proof>
  </goal>
 </theory>
 <theory name="IncSomeTree_Impl0_SumX" proved="true">
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3shapes.gz b/creusot/tests/should_succeed/rusthorn/inc_some_tree/why3shapes.gz
index e6a10f17f39ca96c630862b6443c93be459dee50..aaa9e12f0e1e6b3cbbe1e733d26b5cbc6cd1387e 100644
GIT binary patch
literal 997
zcmV<B0~-7viwFP!00000|BY5%ui`ckeb2ApZMUo{`D^T?S}Gv~0_mzxD?c_eiL;9q
z$Q6X8{r4Sz#3X?$m50ELXO7RD%-DRM&#phryS>hS*~|6Np8uH1+5ER`W&T{4>+M9$
z)gGIQyqTjtolJ?Y^4y-!_PeILK1S1*0pt-tDq>dUUu|vmT~DBK;mw-HTbVt*cmI~2
zQf3xUn25A8-)`?m`(i_)*()a<>>N_#j+$(;#1JZHElk&zhjXV@@XFoFEVR;8EphFJ
zE1Z3D>r|O9BU_9txyE?>(iGgU9+g7Wi-dKdDPK>K`2?8_ts*2cP3Z`j2H<?X?0f(*
zXDqp7Ixs1MNu!wu6YE<?aqjoKD>S_gEjP=RIh@OVdpp<HF(o!CmdPEaGN~DCb`MG{
z*2>6cX}&IcqoTxre2&nJ`<x-%q<%K4pB9Mr5v@t2--2mIN3^0+G#}8Sd7{-VJD>Lu
z&}Ac9QZU#L2{#W3yQJPOVapzRlj+s0X)iO^od0A#;D<RL+k1J!^dofz__>&C>E7+{
z!TMXv<VIhp1HCSKn!hs_du@-uEYm9eM%nq$2-<VAZ!eejZtG8{p8>8poXydddZ?Yy
zWBt&F+I_cO=~o@Wx%13ZD48H4P(+j-u~*V*9}!W;9#IBF^vpwOBusTaAYTmplnfT=
zuwE+sPHIX>_Jp|KoCiW~N)sVSgm@$b?h!-96p{Cc)MwKW#&JRuB1?!gA~N^D(3StV
zdBka1KIjXlE<UH5(YTpV4p^vg7EmqnW!Ot3IfV*)2`6Wa6iN#>|IdvlQill`b)JC7
z!m#&T!W3d151uh;%nPKsZvrko6VO7eBSV1??y}R1#iL_mj#umPd`glA@}c3uApb}w
z0JkMTuM?=K6R2J%fWQJh^F9*f1Q7Zf!1oRC5C$4T5zZ$PV(c4mb@icK1AC=>e<XC~
zr!BAT$!4o&*DRY*e`mg3ZWbFfwCN$L;+(O|AoUyUp01Ih1wIb2gQw>$_Vnl!9p`;~
z+K%JKZQtKYEFOV_qgFmHfXBFobUKvXby5&Lclzc}w8@xG@jq#g<KFNc<vTxtYO{MW
z8LIF9@m!>_7)^zG%J#2Ex&;3V+uqlKU5|f0oQLa?Vo|W+l{vUE(e))dlf+NA%i&!4
zPAa>LwOJ+%)S^&U5koClMi>;VmbR{-s${dD(JjfUM&WfJfB*w-nJA<nO|HOFCTeDi
z8EnOtZ&}7{vFDJprY2P`>PiY(RQsY}hUc8-FjHIU0~>~aCGhYejOT{#5!Ey~!(hc5
TRuefZwt4m+Lk+B_eF^{oWP<7`

literal 1011
zcmV<P0}T8hiwFP!00000|BY5#&*C-^eb2AR+qSGK`EIA`R|z2ykv_FAD?c_e!P!L%
z$qK^KpWpE%&ILZHJcP`6=J?F<*v>Dj{PxZKu($lDz1~h;`+F|()vuZP^Ud7u7o<^*
z%1yFJjn>J)H8Pv(ukL8|L-+9dZcU@ndb2TaT4?q+{Bh03m?p)P34{Woi&vVuc&X{D
z_*e7nGQG*0?wX(N<zgy8tJ<z@?bpn_nWYa3*_bc)A7_i+Uks90PCU*UQzvt$0(kAL
zH`903sqM84UQup*HCV1;><%N8d~)Mhn$I(v%`CBnc=*$pySD)q^C&qA<4j|^T_V#3
zGMQRMNF*BL888mOYP;@z05UC<ToE0Z6v4#NRKbM$wo#nN<KYUelQv=p>v?LcLw9eF
zw>c#;E0%~7Qi;%n@5+%9iM0~6Tbn<I#zQqm{^xU;Ce-Il;TH9iS^c;Gw2x>lBK;IZ
z6Fj38mBMO53#&w{U-v$56wqY@T2e6BqlCLr!qn9u$$%{e=+x-0IseUkz&CR~caQ1<
z>1XT;a4BY`g<IR-g7uFU$ql|x2Y6ldGQTued+W|WEzvT)gY0x_1nsFgbk}S5u*XlA
z?*XnkwdU+fJsq9UbN#>v+I_Ws<wqUCmGi7pC|V!_P(&0SaZu7}9}z*u0Z{}*@T@{;
zB#gD1kS`{Fj3xtkS}$gPCb=Xe213+NP6HvgOA{fU2+>H0yGIOVOGG*#VxNse7=<00
z5J^JB5s|nDgl_!LpPGcPNBYdE3(w_bI8Mf-17<Ru1z0n+4s)?2CzD|==H!f#Ols!#
z|8wK9)M1RzI*;*jVA^{wVF|H~2hW@|<OR~yHvtu%3EU@a8yPZqP?wz+7LJacIp3_u
z^C?LhuBL_u<LV=wICoQWKIp_{)QQVMC(Z*4@T`VNE*5}%sDb;w;WUJC%|j8+#}Z=f
z8}8~FLaFBDmGZ-p(3|hJx^)+uZJM%KH=+LCe7W8&G-znkQ&hz{W0&#NZ@hfEMy3|`
zaU42$dEP=#&rZ>K-p8lyJZ|3h!>vT(5jZ(&#draX+cl))sqC(kg6PWWtDb11Ii2Ev
z(w@h?!y2j5??AaLU+fGy^#6Qcq-`<V74j+DFOP5u{tepR*8yD*A0N&`^-QrS*!0Sr
z+?e3{9Gywxr`zS!*1nUf{%UQO(MF;JGNP8GDTrc}VoAu66;vT)8<yie%IZeKb-*~{
zgi}jcAsA|u<Q5ZlB&Nvup6%(LWW*K+$`xsjs8;M)3nq&CP!z;aMX}<!+zTJrz$d1G
h!v_(n3_bv=X%vBANgHxRA}{tT`w!E>0=2dZ003fV`=0;+

diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 9c7fab2f30..8b16048a60 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -515,14 +515,11 @@ module SparseArray_Impl2_LemmaPermutation_Impl
   axiom inv0 : forall x : SparseArray_Sparse_Type.t_sparse t . inv0 x = (invariant0 x /\ match x with
     | SparseArray_Sparse_Type.C_Sparse size n values idx back -> true
     end)
-  let rec ghost function lemma_permutation [#"../sparse_array.rs" 104 4 104 38] (self : SparseArray_Sparse_Type.t_sparse t) (i : int) : ()
-    requires {[#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self}
-    requires {[#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self)}
-    requires {[#"../sparse_array.rs" 104 25 104 29] inv0 self}
-    ensures { [#"../sparse_array.rs" 103 14 103 28] is_elt0 self i }
+  constant self  : SparseArray_Sparse_Type.t_sparse t
+  constant i  : int
+  function lemma_permutation [#"../sparse_array.rs" 104 4 104 38] (self : SparseArray_Sparse_Type.t_sparse t) (i : int) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../sparse_array.rs" 100 4 100 12] ()
+  goal vc_lemma_permutation : ([#"../sparse_array.rs" 104 25 104 29] inv0 self) -> ([#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self)) -> ([#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self) -> ([#"../sparse_array.rs" 103 14 103 28] is_elt0 self i)
 end
 module SparseArray_Impl2_Set
   type t
diff --git a/creusot/tests/should_succeed/sparse_array/why3session.xml b/creusot/tests/should_succeed/sparse_array/why3session.xml
index beee7ce2f0..387e1df8d9 100644
--- a/creusot/tests/should_succeed/sparse_array/why3session.xml
+++ b/creusot/tests/should_succeed/sparse_array/why3session.xml
@@ -13,30 +13,30 @@
  </goal>
 </theory>
 <theory name="SparseArray_Impl2_LemmaPermutation_Impl" proved="true">
- <goal name="lemma_permutation&#39;vc" expl="VC for lemma_permutation" proved="true">
+ <goal name="vc_lemma_permutation" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="lemma_permutation&#39;vc.0" expl="postcondition" proved="true">
+  <goal name="vc_lemma_permutation.0" proved="true">
   <transf name="use_th" proved="true" arg1="map.MapInjection">
-   <goal name="lemma_permutation&#39;vc.0.0" expl="postcondition" proved="true">
+   <goal name="vc_lemma_permutation.0.0" proved="true">
    <transf name="pose" proved="true" arg1="f" arg2="(fun k -&gt; to_int (get1 (shallow_model1 (sparse_back self)) k))">
-    <goal name="lemma_permutation&#39;vc.0.0.0" expl="postcondition" proved="true">
+    <goal name="vc_lemma_permutation.0.0.0" proved="true">
     <transf name="assert" proved="true" arg1="(surjective f (sparse_n self))">
-     <goal name="lemma_permutation&#39;vc.0.0.0.0" expl="asserted formula" proved="true">
+     <goal name="vc_lemma_permutation.0.0.0.0" expl="asserted formula" proved="true">
      <proof prover="0"><result status="valid" time="0.054183" steps="219953"/></proof>
      </goal>
-     <goal name="lemma_permutation&#39;vc.0.0.0.1" expl="postcondition" proved="true">
+     <goal name="vc_lemma_permutation.0.0.0.1" proved="true">
      <transf name="assert" proved="true" arg1="(exists k. 0 &lt;= k &lt; sparse_n self /\ (f k) = i)">
-      <goal name="lemma_permutation&#39;vc.0.0.0.1.0" expl="asserted formula" proved="true">
+      <goal name="vc_lemma_permutation.0.0.0.1.0" expl="asserted formula" proved="true">
       <transf name="unfold" proved="true" arg1="surjective" arg2="in" arg3="h1">
-       <goal name="lemma_permutation&#39;vc.0.0.0.1.0.0" expl="asserted formula" proved="true">
-       <proof prover="4"><result status="valid" time="0.142095" steps="2178"/></proof>
+       <goal name="vc_lemma_permutation.0.0.0.1.0.0" expl="asserted formula" proved="true">
+       <proof prover="4"><result status="valid" time="0.142095" steps="2172"/></proof>
        </goal>
       </transf>
       </goal>
-      <goal name="lemma_permutation&#39;vc.0.0.0.1.1" expl="postcondition" proved="true">
+      <goal name="vc_lemma_permutation.0.0.0.1.1" proved="true">
       <proof prover="0"><result status="valid" time="0.066092" steps="279713"/></proof>
-      <proof prover="3"><result status="valid" time="0.107415" steps="12270"/></proof>
-      <proof prover="4"><result status="valid" time="0.030666" steps="302"/></proof>
+      <proof prover="3"><result status="valid" time="0.107415" steps="12275"/></proof>
+      <proof prover="4"><result status="valid" time="0.030666" steps="303"/></proof>
       </goal>
      </transf>
      </goal>
diff --git a/creusot/tests/should_succeed/sparse_array/why3shapes.gz b/creusot/tests/should_succeed/sparse_array/why3shapes.gz
index 6411368d4b4b4314e8e851204af6b3840086d3ce..a5748f4f32c22dfe4245e91cfd77a5a2ba94de8d 100644
GIT binary patch
literal 4244
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

literal 4259
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
F002}`OFaMp

diff --git a/creusot/tests/should_succeed/specification/forall.mlcfg b/creusot/tests/should_succeed/specification/forall.mlcfg
index f4f9ba2051..99a5bb5cbe 100644
--- a/creusot/tests/should_succeed/specification/forall.mlcfg
+++ b/creusot/tests/should_succeed/specification/forall.mlcfg
@@ -18,10 +18,8 @@ module Forall_F
 end
 module Forall_Omg_Impl
   use prelude.Int
-  let rec ghost predicate omg [#"../forall.rs" 12 0 12 34] (a : int) (b : int)
-    requires {[#"../forall.rs" 10 11 10 17] a <= b}
-    ensures { [#"../forall.rs" 11 10 11 14] true }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../forall.rs" 13 4 15 7] pure {exists c : int . a + c = b}
+  constant a  : int
+  constant b  : int
+  predicate omg [#"../forall.rs" 12 0 12 34] (a : int) (b : int)
+  goal vc_omg : ([#"../forall.rs" 10 11 10 17] a <= b) -> (forall c : int . true)
 end
diff --git a/creusot/tests/should_succeed/specification/forall/why3session.xml b/creusot/tests/should_succeed/specification/forall/why3session.xml
index a13cb3153e..7bd4f2e982 100644
--- a/creusot/tests/should_succeed/specification/forall/why3session.xml
+++ b/creusot/tests/should_succeed/specification/forall/why3session.xml
@@ -11,7 +11,7 @@
  </goal>
 </theory>
 <theory name="Forall_Omg_Impl" proved="true">
- <goal name="omg&#39;vc" expl="VC for omg" proved="true">
+ <goal name="vc_omg" proved="true">
  <proof prover="0"><result status="valid" time="0.005485" steps="0"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/specification/forall/why3shapes.gz b/creusot/tests/should_succeed/specification/forall/why3shapes.gz
index 5091d03c5830b69c981ff121886de9bd2324f0e2..9ff2ddc6e36df8c0633d32a7113b85bbfa3c2b46 100644
GIT binary patch
literal 144
zcmV;B0B`>viwFP!00000|6Po`3c^4T0Q>!lEj88N!@E_q5J8e3u$8?RvCxFvA^7(O
zOPOk5m`#UulsQ*?=cPWT*8v@NTWIG$h6c9_mTAEP?K;TuBq9Owb8eseZvjBGcS@MO
y4vNWWSzV|YCa<+i8C6dZVlXMOw`5r<x3k5VHOx^|bRl{)y@oF$5AJQ300028mObJC

literal 129
zcmb2|=3oGW|FOpn`3@QII9$BD`~$~a8TT7}(n*@)3FT8*Bosn}3+rY`T!_DS-`C>Z
zzAKIIclEi~%LW$QI$ZYa^`?Vgd)BVM@!<HsJ&XdXoO#RUGzX^q-xu8Nc1mYy(hSZO
hER$8HbZf7U4&(LpS~Zn<w~WC#9(hNlC&j%$n*r^#H`@RJ

diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index 4932dfaf12..a40475b1ea 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -1,11 +1,12 @@
 
 module SumOfOdds_SumOfOdd_Impl
   use prelude.Int
-  let rec ghost function sum_of_odd [#"../sum_of_odds.rs" 18 0 18 28] (x : int) : int
-    variant {[#"../sum_of_odds.rs" 17 10 17 11] x}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../sum_of_odds.rs" 16 0 16 8] if pure {x <= 0} then 0 else sum_of_odd (x - 1) + 2 * x - 1
+  constant x  : int
+  function sum_of_odd [#"../sum_of_odds.rs" 18 0 18 28] (x : int) : int
+  goal vc_sum_of_odd : match x <= 0 with
+    | True -> true
+    | False -> 0 <= ([#"../sum_of_odds.rs" 17 10 17 11] x) /\ ([#"../sum_of_odds.rs" 17 10 17 11] x - 1) < ([#"../sum_of_odds.rs" 17 10 17 11] x)
+    end
 end
 module SumOfOdds_SumOfOddIsSqr_Impl
   use prelude.Int
@@ -23,13 +24,12 @@ module SumOfOdds_SumOfOddIsSqr_Impl
   val sum_of_odd0 [#"../sum_of_odds.rs" 18 0 18 28] (x : int) : int
     ensures { result = sum_of_odd0 x }
     
-  let rec ghost function sum_of_odd_is_sqr [#"../sum_of_odds.rs" 30 0 30 28] (x : int) : ()
-    requires {[#"../sum_of_odds.rs" 27 11 27 17] x >= 0}
-    ensures { [#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x }
-    variant {[#"../sum_of_odds.rs" 29 10 29 11] x}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../sum_of_odds.rs" 31 4 31 65] if pure {x > 0} then sum_of_odd_is_sqr (x - 1) else ()
+  constant x  : int
+  function sum_of_odd_is_sqr [#"../sum_of_odds.rs" 30 0 30 28] (x : int) : ()
+  goal vc_sum_of_odd_is_sqr : ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0) -> match x > 0 with
+    | True -> (([#"../sum_of_odds.rs" 27 11 27 17] x - 1 >= 0) /\ 0 <= ([#"../sum_of_odds.rs" 29 10 29 11] x) /\ ([#"../sum_of_odds.rs" 29 10 29 11] x - 1) < ([#"../sum_of_odds.rs" 29 10 29 11] x)) /\ (([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 (x - 1) = sqr0 (x - 1)) -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x))
+    | False -> [#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x
+    end
 end
 module Core_Ops_Range_Range_Type
   type t_range 'idx =
diff --git a/creusot/tests/should_succeed/sum_of_odds/why3session.xml b/creusot/tests/should_succeed/sum_of_odds/why3session.xml
index 4644e4ffc6..af019f2ad0 100644
--- a/creusot/tests/should_succeed/sum_of_odds/why3session.xml
+++ b/creusot/tests/should_succeed/sum_of_odds/why3session.xml
@@ -7,13 +7,13 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="sum_of_odds.mlcfg"/>
 <theory name="SumOfOdds_SumOfOdd_Impl" proved="true">
- <goal name="sum_of_odd&#39;vc" expl="VC for sum_of_odd" proved="true">
+ <goal name="vc_sum_of_odd" proved="true">
  <proof prover="3"><result status="valid" time="0.007178" steps="2"/></proof>
  </goal>
 </theory>
 <theory name="SumOfOdds_SumOfOddIsSqr_Impl" proved="true">
- <goal name="sum_of_odd_is_sqr&#39;vc" expl="VC for sum_of_odd_is_sqr" proved="true">
- <proof prover="0"><result status="valid" time="0.010615" steps="1603"/></proof>
+ <goal name="vc_sum_of_odd_is_sqr" proved="true">
+ <proof prover="0"><result status="valid" time="0.010615" steps="1574"/></proof>
  </goal>
 </theory>
 <theory name="SumOfOdds_ComputeSumOfOdd" proved="true">
diff --git a/creusot/tests/should_succeed/sum_of_odds/why3shapes.gz b/creusot/tests/should_succeed/sum_of_odds/why3shapes.gz
index 189ce8519b1966de8fbfcc5c7cd7fa1fc3eef6e1..e54c48ad90a51f877f2e010e7da42f40a638682e 100644
GIT binary patch
literal 1729
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
X;In0{)K(%t!WRDmsY3&8z7+rfwjp8;

literal 1712
zcmV;h22c4PiwFP!00000|HW5ZZ|pP>e$TJS8_){L_V|igq^eTol@Jer{7B?DPFc}z
z$|mhO{Cmbuvd!L3TaXSf@onat@p$}s^6f?0|KXovU%td`zwS0al(M||uJBj>dq)Cw
z<i=lJ2ja-;XYAk<xhvdl*>>Bqe}1gGw(6Ru@Ynuzgu-k8y}w*ejcEQNu+#>!!#dEU
zzW-~B&1yXytgvx~{e(~yp?<_KI``wXgVbI*aCGvOPBN=eXqANMNyn>oUm<KU{N>l1
z7jP&ucA2AdmpX=SK5e_^ImDhg@Ryg4JL%LaEt9DQC#SKP#(WyXYN0Jg#RVK<i9G|_
z$H%APZ>J}HJ$pi&IS$y#SkpP!bQf)U9PVlN2twEXx96vaNKULKxGCWD)QL?8L)jQ-
zmSwK|&{gZr;6Dc`1jwuvNNOtWZ>wMY=02ihp9|br5*^~UdfK7`l`gOi-KJR&n2$x?
zc$!@bcKwj%d>Ty>WA{3@Rrk>NP5iW*oPs+}=I9m=UH4R?rr)mpX29NhSR4XkZsPV8
zY#i=jX549${a*MV;^uz%<3MF8P2U!$)2=Rj#mKw;qO<%M2I_yGhd58oVztTR`#4mo
zJ5FLlecf%h-KW@m^Y~}dMxl1S@egUy&!Xv4q^084hwc&6W{9|tBzs%^+->5*-O+Bp
z-rS>9w{a9E)Z6OU?lC&-=aYS5V{aS#?%^e+0XmbNqIyDIM6e?7ir_i<IW>!vM~h6G
zttHR==h1u>w(+^|229Q_jM*0-;-l|TrXr)$*Ruz^eV)||8TCDa<m}SI;N|5}2D}Z8
zY;ihb@83q=#J@7`DEEhIIJZIq$CcB5&9u(%{)=7lp0Fpf6KCAWK8pVo`m~cX=m>o`
z-a^PM^{?=kT*nerzU=44k@EUJZfByc>h5{d^y%gB&v-?EeUmQAy1;L|kK3}tDxrPo
zJ|)<NK*h|l&I0f9KzO_bdvp4v&>0A1(0%0txSqW!zk4(2;Y)z84~FE$k3o4S^RfwR
z!Sd{Fj$+85vw{P9f~1fzR~}0oEJDcLOs_i?&d=I#pl%MGcgSw@qGRG_tSOjC7C3ht
z?pAwo#F@P~q7Qqk?C$2w2^~ph6U=dXWP<K1ax7TR!=}{?g>{oTgo48)bfEX3j#gL0
z&5*;Z9k9FHQx4?Vlj#~d5ZMg2jtgu68G_Fw;2;y%Vk{On99MA(J($#`&oeTs$XB6>
z-nh)7JER>=qsXoYKc(suVN!2AOU6bAu?)stEFmCZCH(sKLOumx)7#}BXH<IZaGO{q
z&u_0|ItyYa#W+{P%-k#=d&ks?w?56jn&Zm<KFZ~nK7rj#^|VU(c;)wsjU=0E4aYc^
z8u-oUz%W(wiR3vs)hxK0c6yO!E_R|Kp-g@5*qG0_433S7H{Ba{zJ9=Pe&OCQj0BzU
z4bA5@-_tK#MQYAN&i^DSw$DSX&iz!q*6MGR>hrJBQK3HnK;<%htkSdEvrlFBw2jOK
zn5)ZZ@l(76xcRHyU@Y=iM>D%$t|9hAQPjSz+nOp(1wLoS6Q-qBoOuWhGfI}!l7h(E
zfCzQ1DF_9E5Q7<~qTz~gBBA6KEGrr&YZQc9nz~USmBf$=2{rXXX<3(2S}80AOPQtA
zQeutOR#|C9(Kb?WWP^w#3~dvYYK%t&6(Z8GASKn7DodrM2*J;ws1_JR0E0SGYe*kc
z(~#T{jgT3|yaT9)rsk@S3L_z+iqwFNp4W}8IcYs98MlmDhWlo@L*7F4Ovai5skJdg
zn6^cSg2Y4NA`m7`Mid_fRXlKLq^>0kEMPKtFF={-jfy0;8B~58H>yBQh(R`uQo1&R
zD6X^*N;48AZ&MrrPaP~U3)BL!%vh!^Qy(#dxg@!2RZAnSl?p8o9i@VxJf0laC8w4X
z3&sN4Qx>EJamwlkOk#F7x}ng}n)_DNx^9CYI3}u%T$Tc?U{+8oh~>s|ZMm{sS}rW-
zmV@Q&i>`bq04ypViAg+b80J+71PBDfb*r?{=#8*~e?^BB#Z0O(`m!}5G$3^dx+Ou<
znsCj0c1T$vzoJhyqYZ7M!Fw$m@Qo5a@)!&rrD~ZUeKJ<)uj>{^KA>C$E|6{nF^!-E
zS&VZ$KY}b#N@gXsl6-Z~h!z~l*hB_IF%~1f5=h9}BkwT6L-q{*C+9R$aTG!{GQB#I
zd10hcpc)==OhtB%|9}307B$BkATWAH8DB^6oJoeSAtw!~OGT_SR%$B|xA+ITk!`)N
G6#xKr#aK=N

diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
deleted file mode 100644
index 6ff5206ef7..0000000000
--- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg
+++ /dev/null
@@ -1,248 +0,0 @@
-
-module C02Operators_Division
-  use prelude.UIntSize
-  use prelude.UIntSize
-  use prelude.Int
-  let rec cfg division [#"../02_operators.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
-    requires {[#"../02_operators.rs" 7 11 7 17] UIntSize.to_int y > 0}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : usize;
-  var x : usize = x;
-  var y : usize = y;
-  var _5 : usize;
-  var _6 : bool;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y);
-    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = (0 : usize));
-    assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 };
-    goto BB1
-  }
-  BB1 {
-    [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] x / _5);
-    _5 <- any usize;
-    return _0
-  }
-  
-end
-module C02Operators_Modulus
-  use prelude.UIntSize
-  use prelude.UIntSize
-  use prelude.Int
-  let rec cfg modulus [#"../02_operators.rs" 23 0 23 39] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
-    requires {[#"../02_operators.rs" 22 11 22 17] UIntSize.to_int y > 0}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : usize;
-  var x : usize = x;
-  var y : usize = y;
-  var _5 : usize;
-  var _6 : bool;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y);
-    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = (0 : usize));
-    assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 };
-    goto BB1
-  }
-  BB1 {
-    [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] x % _5);
-    _5 <- any usize;
-    return _0
-  }
-  
-end
-module C02Operators_Multiply
-  use prelude.UIntSize
-  use prelude.Int
-  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
-  use prelude.UIntSize
-  let rec cfg multiply [#"../02_operators.rs" 38 0 38 40] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
-    requires {[#"../02_operators.rs" 37 11 37 33] UIntSize.to_int x * UIntSize.to_int y <= UIntSize.to_int max0}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : usize;
-  var x : usize = x;
-  var y : usize = y;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] x * y);
-    return _0
-  }
-  
-end
-module C02Operators_Add
-  use prelude.UIntSize
-  use prelude.Int
-  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
-  use prelude.UIntSize
-  let rec cfg add [#"../02_operators.rs" 48 0 48 35] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
-    requires {[#"../02_operators.rs" 47 11 47 33] UIntSize.to_int x + UIntSize.to_int y <= UIntSize.to_int max0}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : usize;
-  var x : usize = x;
-  var y : usize = y;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] x + y);
-    return _0
-  }
-  
-end
-module C02Operators_Sub
-  use prelude.UIntSize
-  use prelude.UIntSize
-  use prelude.Int
-  let rec cfg sub [#"../02_operators.rs" 63 0 63 35] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
-    requires {[#"../02_operators.rs" 62 11 62 23] UIntSize.to_int x - UIntSize.to_int y >= 0}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : usize;
-  var x : usize = x;
-  var y : usize = y;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] x - y);
-    return _0
-  }
-  
-end
-module C02Operators_Expression
-  use prelude.UIntSize
-  use prelude.Int
-  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
-  use prelude.UIntSize
-  let rec cfg expression [#"../02_operators.rs" 77 0 77 51] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) (z : usize) : bool
-    requires {[#"../02_operators.rs" 74 11 74 17] UIntSize.to_int y > 0}
-    requires {[#"../02_operators.rs" 75 11 75 38] div (UIntSize.to_int x) (UIntSize.to_int y) * UIntSize.to_int z <= UIntSize.to_int max0}
-    ensures { [#"../02_operators.rs" 76 10 76 16] result }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : bool;
-  var x : usize = x;
-  var y : usize = y;
-  var z : usize = z;
-  var _7 : usize;
-  var _8 : usize;
-  var _10 : usize;
-  var _11 : bool;
-  var _13 : usize;
-  var _14 : usize;
-  var _16 : usize;
-  var _17 : bool;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y);
-    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = (0 : usize));
-    assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 };
-    goto BB1
-  }
-  BB1 {
-    [#"../02_operators.rs" 78 4 78 9] _8 <- ([#"../02_operators.rs" 78 4 78 9] x / _10);
-    _10 <- any usize;
-    [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z);
-    _8 <- any usize;
-    [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y);
-    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = (0 : usize));
-    assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 };
-    goto BB2
-  }
-  BB2 {
-    [#"../02_operators.rs" 78 17 78 24] _14 <- ([#"../02_operators.rs" 78 17 78 24] x / _16);
-    _16 <- any usize;
-    [#"../02_operators.rs" 78 17 78 28] _13 <- ([#"../02_operators.rs" 78 17 78 28] _14 * z);
-    _14 <- any usize;
-    [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] _7 = _13);
-    _7 <- any usize;
-    _13 <- any usize;
-    return _0
-  }
-  
-end
-module C02Operators_ExpressionLogic_Impl
-  use prelude.UIntSize
-  use prelude.Int
-  let rec ghost function expression_logic [#"../02_operators.rs" 83 0 83 57] (x : usize) (y : usize) (z : usize) : bool
-    ensures { [#"../02_operators.rs" 82 10 82 16] result }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../02_operators.rs" 84 4 84 28] pure {div x y * z = div x y * z}
-end
-module C02Operators_X_Type
-  use prelude.UIntSize
-  use prelude.Int
-  type t_x  =
-    | C_X usize
-    
-  let function x_a (self : t_x) : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    match self with
-      | C_X a -> a
-      end
-end
-module C02Operators_PrimitiveComparison
-  use prelude.Int
-  use C02Operators_X_Type as C02Operators_X_Type
-  let rec cfg primitive_comparison [#"../02_operators.rs" 92 0 92 29] [@cfg:stackify] [@cfg:subregion_analysis] (x : C02Operators_X_Type.t_x) : ()
-    ensures { [#"../02_operators.rs" 91 10 91 20] C02Operators_X_Type.x_a x <= C02Operators_X_Type.x_a x }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : ();
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] ());
-    return _0
-  }
-  
-end
-module C02Operators_BoolEq
-  use prelude.Bool
-  let rec cfg bool_eq [#"../02_operators.rs" 95 0 95 36] [@cfg:stackify] [@cfg:subregion_analysis] (a : bool) (b : bool) : bool
-    ensures { [#"../02_operators.rs" 94 10 94 28] result = (a = b) }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : bool;
-  var a : bool = a;
-  var b : bool = b;
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb a b);
-    return _0
-  }
-  
-end
-module C02Operators_OldTest
-  let rec cfg old_test [#"../02_operators.rs" 100 0 100 20] [@cfg:stackify] [@cfg:subregion_analysis] (x : bool) : ()
-    ensures { [#"../02_operators.rs" 99 10 99 21] old(x) = x }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-  var _0 : ();
-  {
-    goto BB0
-  }
-  BB0 {
-    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] ());
-    return _0
-  }
-  
-end
diff --git a/creusot/tests/should_succeed/syntax/02_operators.stderr b/creusot/tests/should_succeed/syntax/02_operators.stderr
new file mode 100644
index 0000000000..c3bef2b092
--- /dev/null
+++ b/creusot/tests/should_succeed/syntax/02_operators.stderr
@@ -0,0 +1,9 @@
+thread 'rustc' panicked at creusot/src/backend/term.rs:393:14:
+internal error: entered unreachable code: Div Logic
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+
+note: Creusot has panic-ed!
+  |
+  = note: Oops, that shouldn't have happened, sorry about that.
+  = note: Please report this bug over here: https://github.com/xldenis/creusot/issues/new
+
diff --git a/creusot/tests/should_succeed/syntax/02_operators/why3session.xml b/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
index 5c5f974fe6..d427ef5464 100644
--- a/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
+++ b/creusot/tests/should_succeed/syntax/02_operators/why3session.xml
@@ -38,7 +38,7 @@
  </goal>
 </theory>
 <theory name="C02Operators_ExpressionLogic_Impl" proved="true">
- <goal name="expression_logic&#39;vc" expl="VC for expression_logic" proved="true">
+ <goal name="vc_expression_logic" proved="true">
  <proof prover="4"><result status="valid" time="0.005586" steps="2"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz b/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz
index 0c910d3b7bcb710d14daf3c18e388bb729088b53..dc0fe1513a03905677e5830afd76818dde1c3ea9 100644
GIT binary patch
literal 713
zcmV;)0yh00iwFP!00000|IL)kZrd;rMfdy)?b;?Nz~S&&Gy#GFh71&471|nnq5|y5
zvE(4>*O!u2N0u8m-F0J=!_noPLk{0x73~kZjcxH5cWvF=e=1~g^?}&>e&w3|eQ0f{
zAML)r?<9Yhe=9nju)A;e<|N?hGKVU(-*@|X_cC1equMU)x{X61&vWu(dH7$R%k&Es
z<b+$>HLE@fIiFNtiq!0i?5ghlPMvO=@E<zOuJ-GFJ2iUss!dqh&o_B})S*YgabP$0
zX(GK}clCDtJk`Gbi}v*!wQUGf*^ifGZ*TJYne2o?yLTj00&ye^Vun~(zz4?tU<O&A
z?8k@ic?Gzb<pG|e1$J^&i@Vp(V3s&+kdGA3Hh_!mU`}?pm^r_WX1tC-U+&{L9^B9w
zE;HUpb9N&Sk;)7=vd5|BRjAYA<r^W%Ge)u!b8T_4Y<x2yoCCrU5P#vrk9hcu4vuv2
zjLsoa;Xr3-wcf>REm5&)Z`}R4!Q<0*7u&;QbW<J9?CYtaahn$(_GvnKo=$%LQ!<I0
zZTGwy9&yqa^cqmQ?2eANyLwZ1^<!N5X0x@sx*fe&@X$YIN3LwfH76{NDz0hPtN1{=
zW%oPOti!5{ZAVA|B^=j^X`o(v1uPk9qSev{1zZ<UQer5LK^gCjc1lI%C|BHq=aC`@
zDhn(bi9RAXMkHX-fdFffhiG%lY8%l&AxciT3M>Z7tVE+xq+|{Apdxy-$_FS^DG3N+
zgmo?n#i>l%8jKP!x|pc)(G;fC#3CpvoTDaDFa|x(HFz{=xk)^!0-yv+xS%WvZ6wuM
zEh*|4qIbDwDU(B40G7ZAhhT(B(Q##Mpgj6q92(EF9Lqin5G8OTG4BX8c&Rn@feV$m
v*MN!|3lX6JRe~hSNX!U04<_&wL$VH%LIE@;WGq89C1~;s_E-<X)dv6oj>1#h

literal 693
zcmV;m0!sZKiwFP!00000|IL)kZre%>hWGOn+VwO=fuYE`9W(`k0*1Wls?gTp+|Ci;
zM6M+V?b~;x7>+GBX_nncBM$YG{Dz!=ZmQvb-ld^>O#7khAO5X$b@N_u_ptH(;UNwj
zyGK5B52L1c<=M*fkNWN_-(DDkTo+S|{B3_ochAf9wCZ@p+ab+{@?D%)>!<hnT4vg4
zp*VczvENKqDE^}TQssVMm8`lc-}6lG`}h}TTCzH955sw)H!r3MYyNaw_K!O9BzRo#
zJ^wh9K5WNsxBYpp{oxPVAKs|VF`mnQd`<TAZP~w)J!3E&yeO1Fod|<kAhs>g%y?QX
zAlr+0H2+U6;A-Iqc!?J3i=$fIy>tc($2mYbQn(5Lua1Mei14cCvK`&A9YH?#<8eJ_
zBNw>bu_N78M?P6vH+STO(=4knm&NNhLef`^bgP!y>eaIG&46$T2#<j1nGc=t(1H#g
z>EIQeCrgVnoq5!zEM6LkwmzSYyWbCZ`mx)mVZMyUYujeq|JMaE#d@h$xgJkqyM1@x
zjoo9~g#LcV`)-)-xZ75?@O`>xP9@iil8eLYq~iO2yGh^0xISgnZ{uc6!ze@qqdZwt
zTadv919f)VCAONQ0kRb|QaCA7G%f^Zy)nsnNro5#C5Z%5SJ>1dg@ojs%1|c{3Yd{%
z;xbK^6FR6=LxN1KQ<ODpbQV?4?CJm}VL&z^LS-5)Kq;r#`>YH}oh>^|8Zh~kr3uMZ
zuCam<j8xuBmnArdfl3Vl9WuF0*;D`xNP*f!AB?vu)FhE3dXoV)QmM$xPysej3xepB
z%gK{rj*?O+#i0vS<m!@V1*!oO8cRfwF=%ULh@?!WU;&ME3<;qE(|{JnX)FkcqKlMM
b%<Lf>R3KBvx-L*%16KS3(n~{Pa0dVY=66&u

diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index 9f91579208..b2873eb912 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -42,11 +42,9 @@ module C05Pearlite_HasLen3_Impl
   val shallow_model0 (self : slice uint32) : Seq.seq uint32
     ensures { result = shallow_model0 self }
     
-  let rec ghost predicate has_len_3 [#"../05_pearlite.rs" 9 0 9 35] (v : slice uint32)
-    requires {[#"../05_pearlite.rs" 8 11 8 24] Seq.length (shallow_model0 v) = 3}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../05_pearlite.rs" 10 16 10 29] let x0 = let a' = shallow_model0 v in Seq.length a' in pure {x0 = 3}
+  constant v  : slice uint32
+  predicate has_len_3 [#"../05_pearlite.rs" 9 0 9 35] (v : slice uint32)
+  goal vc_has_len_3 : true
 end
 module C05Pearlite_A_Type
   type t_a  =
diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
index 43b989b7cc..4fc70650a8 100644
--- a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
+++ b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
@@ -6,15 +6,12 @@ module C06LogicFunctionContracts_Sum_Impl
   use prelude.Int
   use seq.Seq
   use seq.Seq
-  let rec ghost function sum [#"../06_logic_function_contracts.rs" 10 0 10 32] (seq : Seq.seq int) : int
-    variant {[#"../06_logic_function_contracts.rs" 9 10 9 19] Seq.length seq}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_logic_function_contracts.rs" 11 4 16 5] if pure {Seq.length seq = 0} then
-      0
-    else
-      Seq.get seq (Seq.length seq - 1) + sum (SeqExt.subsequence seq 0 (Seq.length seq - 1))
-    
+  constant seq  : Seq.seq int
+  function sum [#"../06_logic_function_contracts.rs" 10 0 10 32] (seq : Seq.seq int) : int
+  goal vc_sum : match Seq.length seq = 0 with
+    | True -> true
+    | False -> 0 <= ([#"../06_logic_function_contracts.rs" 9 10 9 19] Seq.length seq) /\ ([#"../06_logic_function_contracts.rs" 9 10 9 19] Seq.length (SeqExt.subsequence seq 0 (Seq.length seq - 1))) < ([#"../06_logic_function_contracts.rs" 9 10 9 19] Seq.length seq)
+    end
 end
 module C06LogicFunctionContracts_AllZero_Impl
   use seq_ext.SeqExt
@@ -23,26 +20,24 @@ module C06LogicFunctionContracts_AllZero_Impl
   use prelude.Int
   use seq.Seq
   use seq.Seq
-  let rec ghost predicate all_zero [#"../06_logic_function_contracts.rs" 22 0 22 38] (seq : Seq.seq int)
-    variant {[#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_logic_function_contracts.rs" 23 4 28 5] if pure {Seq.length seq = 0} then
-      true
-    else
-      pure {Seq.get seq (Seq.length seq - 1) = 0} && all_zero (SeqExt.subsequence seq 0 (Seq.length seq - 1))
-    
+  constant seq  : Seq.seq int
+  predicate all_zero [#"../06_logic_function_contracts.rs" 22 0 22 38] (seq : Seq.seq int)
+  goal vc_all_zero : match Seq.length seq = 0 with
+    | True -> true
+    | False -> Seq.get seq (Seq.length seq - 1) = 0 -> 0 <= ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq) /\ ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length (SeqExt.subsequence seq 0 (Seq.length seq - 1))) < ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq)
+    end
 end
 module C06LogicFunctionContracts_Stupid_Impl
   type t
   use prelude.Int
-  let rec ghost predicate stupid [#"../06_logic_function_contracts.rs" 34 0 34 38] (x : t) (i : int)
-    variant {[#"../06_logic_function_contracts.rs" 33 10 33 11] i}
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_logic_function_contracts.rs" 35 4 43 5] if pure {i <= 0} then
-      true
-    else
-      if pure {x = x} then stupid x 0 else false
-    
+  constant x  : t
+  constant i  : int
+  predicate stupid [#"../06_logic_function_contracts.rs" 34 0 34 38] (x : t) (i : int)
+  goal vc_stupid : match i <= 0 with
+    | True -> true
+    | False -> match x = x with
+      | True -> 0 <= ([#"../06_logic_function_contracts.rs" 33 10 33 11] i) /\ ([#"../06_logic_function_contracts.rs" 33 10 33 11] 0) < ([#"../06_logic_function_contracts.rs" 33 10 33 11] i)
+      | False -> true
+      end
+    end
 end
diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3session.xml b/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3session.xml
index 40beb9cd22..5e4ccbb6e1 100644
--- a/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3session.xml
+++ b/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3session.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="3" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="06_logic_function_contracts.mlcfg"/>
 <theory name="C06LogicFunctionContracts_Sum_Impl" proved="true">
- <goal name="sum&#39;vc" expl="VC for sum" proved="true">
- <proof prover="0"><result status="valid" time="0.012757" steps="37880"/></proof>
+ <goal name="vc_sum" proved="true">
+ <proof prover="0"><result status="valid" time="0.012757" steps="37873"/></proof>
  </goal>
 </theory>
 <theory name="C06LogicFunctionContracts_AllZero_Impl" proved="true">
- <goal name="all_zero&#39;vc" expl="VC for all_zero" proved="true">
+ <goal name="vc_all_zero" proved="true">
  <proof prover="3"><result status="valid" time="0.008419" steps="15"/></proof>
  </goal>
 </theory>
 <theory name="C06LogicFunctionContracts_Stupid_Impl" proved="true">
- <goal name="stupid&#39;vc" expl="VC for stupid" proved="true">
+ <goal name="vc_stupid" proved="true">
  <proof prover="3"><result status="valid" time="0.006345" steps="2"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3shapes.gz b/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3shapes.gz
index 11f34d98cbb4ff0ca26568260f6acc1c15c0f1b2..d1d155b8bc9bc3a16cdc49fa61610bfa66662772 100644
GIT binary patch
literal 244
zcmV<Q01N*giwFP!00000|E*3<O9L?wz2{fts0AU(<fALQhf)x|dzaZ{rVZ4!ZFWWf
zy<uClqTog5Ff(u7d-JXqvTSirMZVIp<d@-Adbzk3>k%K16Jd)x8aCq=%hVS-Of*Eo
zIz)vxpQpO&i)DpvSMOf{-r=rLKDCo?cPUnap7-PX)12ggUq94O8ye>n-&K|NXRLFS
zHMW(V&*pi?#$VNMwSMAlhq<~5QVi5vW(9-+lF_<HL|{i|2?$c(E1@}3(|h(QHAzKa
u024KM6{1VN36*4og@oW}X}t?7H5d#zZ;e$<fq}V_KzsmVaFXZT0RRBl-EfKk

literal 232
zcmV<E02lusiwFP!00000|D}#GPs1<}g?Il7k5CEe?AT`;B?Cf2VPVW#UF=I+DI_IM
z82I&gpi~{0*zW1Q``)|T$$X?UXZguXKF!mkM7g^cRMW`QVLejb`ph32Pmw!_Ko37g
z5$gARqPi*GMZUgKbB)1^=$_>;FEVfM|0Ngjf!FRf9sg{kaom6LGMCy27h1ur<)LnF
z$F1A>l!WM`C1){IpkYWZSj~gioG5~iPJ5|Z5MEm(Fv|DL=rK7pC=96CC`XvItXeIC
iM~>+FU=v!Ej7b3vS74*D2!^F?jraywV3DYT0RRAdux~;D

diff --git a/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg b/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
index 101e578eff..91d0278ed4 100644
--- a/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
+++ b/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
@@ -21,13 +21,10 @@ module C18TraitLaws_UsesOp_Impl
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : t . inv0 x = true
-  let rec ghost function uses_op [#"../18_trait_laws.rs" 16 0 16 48] (x : t) (y : t) : bool
-    requires {[#"../18_trait_laws.rs" 16 29 16 30] inv0 x}
-    requires {[#"../18_trait_laws.rs" 16 35 16 36] inv0 y}
-    ensures { [#"../18_trait_laws.rs" 15 10 15 24] result = true }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../18_trait_laws.rs" 17 16 17 34] let x1 = op0 y x in let x0 = op0 x y in pure {x0 = x1}
+  constant x  : t
+  constant y  : t
+  function uses_op [#"../18_trait_laws.rs" 16 0 16 48] (x : t) (y : t) : bool
+  goal vc_uses_op : ([#"../18_trait_laws.rs" 16 35 16 36] inv0 y) -> ([#"../18_trait_laws.rs" 16 29 16 30] inv0 x) -> ([#"../18_trait_laws.rs" 15 10 15 24] (op0 x y = op0 y x) = true)
 end
 module C18TraitLaws_Impl0_Reflexive_Impl
   function op0 [#"../18_trait_laws.rs" 23 4 23 32] (self : ()) (_2 : ()) : () =
@@ -35,11 +32,10 @@ module C18TraitLaws_Impl0_Reflexive_Impl
   val op0 [#"../18_trait_laws.rs" 23 4 23 32] (self : ()) (_2 : ()) : ()
     ensures { result = op0 self _2 }
     
-  let rec ghost function reflexive [#"../18_trait_laws.rs" 30 4 30 34] (a : ()) (b : ()) : ()
-    ensures { [#"../18_trait_laws.rs" 29 14 29 32] op0 a b = op0 b a }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../18_trait_laws.rs" 27 4 27 10] ()
+  constant a  : ()
+  constant b  : ()
+  function reflexive [#"../18_trait_laws.rs" 30 4 30 34] (a : ()) (b : ()) : ()
+  goal vc_reflexive : [#"../18_trait_laws.rs" 29 14 29 32] op0 a b = op0 b a
 end
 module C18TraitLaws_ImplLaws_Impl
   function op0 [#"../18_trait_laws.rs" 23 4 23 32] (self : ()) (_2 : ()) : () =
@@ -53,11 +49,9 @@ module C18TraitLaws_ImplLaws_Impl
     ensures { result = reflexive0 a b }
     
   axiom reflexive0_spec : forall a : (), b : () . [#"../18_trait_laws.rs" 29 14 29 32] op0 a b = op0 b a
-  let rec ghost function impl_laws [#"../18_trait_laws.rs" 36 0 36 26] (_1 : ()) : bool
-    ensures { [#"../18_trait_laws.rs" 35 10 35 24] result = true }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../18_trait_laws.rs" 37 16 37 38] let x1 = op0 () () in let x0 = op0 () () in pure {x0 = x1}
+  constant _1  : ()
+  function impl_laws [#"../18_trait_laws.rs" 36 0 36 26] (_1 : ()) : bool
+  goal vc_impl_laws : [#"../18_trait_laws.rs" 35 10 35 24] (op0 () () = op0 () ()) = true
 end
 module C18TraitLaws_Impl0
   predicate invariant0 (self : ()) =
diff --git a/creusot/tests/should_succeed/traits/18_trait_laws/why3session.xml b/creusot/tests/should_succeed/traits/18_trait_laws/why3session.xml
index bfd0c24fa6..72a1d23385 100644
--- a/creusot/tests/should_succeed/traits/18_trait_laws/why3session.xml
+++ b/creusot/tests/should_succeed/traits/18_trait_laws/why3session.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="0" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="3" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="18_trait_laws.mlcfg"/>
 <theory name="C18TraitLaws_UsesOp_Impl" proved="true">
- <goal name="uses_op&#39;vc" expl="VC for uses_op" proved="true">
+ <goal name="vc_uses_op" proved="true">
  <proof prover="3"><result status="valid" time="0.004897" steps="6"/></proof>
  </goal>
 </theory>
 <theory name="C18TraitLaws_Impl0_Reflexive_Impl" proved="true">
- <goal name="reflexive&#39;vc" expl="VC for reflexive" proved="true">
+ <goal name="vc_reflexive" proved="true">
  <proof prover="0"><result status="valid" time="0.007368" steps="6"/></proof>
  </goal>
 </theory>
 <theory name="C18TraitLaws_ImplLaws_Impl" proved="true">
- <goal name="impl_laws&#39;vc" expl="VC for impl_laws" proved="true">
+ <goal name="vc_impl_laws" proved="true">
  <proof prover="3"><result status="valid" time="0.005844" steps="0"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/traits/18_trait_laws/why3shapes.gz b/creusot/tests/should_succeed/traits/18_trait_laws/why3shapes.gz
index e9f474f20de2b418e8599945fc4a60ba56227147..a4bdc70ea562e3729fa768db8ca2af57d804cda5 100644
GIT binary patch
literal 257
zcmV+c0sj6UiwFP!00000|80-WP6IIvgztHZJwi`*{)5DU%WAo!y&@-ZL?vh!wp87>
zC#2g7shqx%H6D-eHr@P26VKg|zvk_J_t4pHb1&$T_7jXSVk3_5OxxYDs+G`-!{=Gb
zCffp?XlY#NbT(eO2>zH3%WFHg<`YqDj70yO{FD3gJ-zc4H<N3Zy0hlsC>!N(<(pA|
zdFSc!LoWo%91zi1889Vq&W6ZIAs}%~*>!4=0}dcK6m8IRfRYSWZ}djS$Xue-jHVj3
zDAAh4P(0@76>II8oCnU*urna5$qq(n<d6+1<+8(^WTN2FmIw&ov{u#T2Pb|2Ahm`z
HsQ~~0#T$Ni

literal 288
zcmV+*0pI=~iwFP!00000|80;#Ps1<_h41+lIl@kklO+ujhY6_)5=YeQ<R*?*sawms
z4fywzZh-@wKFfOcd-mN*PCFWTk{3Qs-Eer2R<7;^J<>2j1C3g!8hEDeaG9$cp%$mN
zYl(G{>&7fJjlRju=1N_Q=1Jz^D9;m5+hHst^XB68La*nsXDBQaN6tNebQk_7)tsWp
zy8YO1dwQRKf<gW3f(!9G|DRS}ZrhZDYQg*Q^toMrBZSMOR2!Z3tw{`!+tzwwP$@<P
zh*Ad(Du8gU)(JU#mm*n{ov+xDLswBs7E!K)5suMXWi=Yi*%MYRd4sr)4mmpVvI;I(
mVHEqcCaqm^vk^w}m9n`71>lU)QmLRIc<}`+aReR20RRAPjE49C

diff --git a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
index 1b3b40db52..bfb1259191 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
@@ -107,16 +107,12 @@ module NonZero_Impl1_SubPreTrans_Impl
   val sub_pre0 [#"../non_zero.rs" 27 4 27 43] (self : NonZero_NonZeroU32_Type.t_nonzerou32) (rhs : NonZero_NonZeroU32_Type.t_nonzerou32) : bool
     ensures { result = sub_pre0 self rhs }
     
-  let rec ghost function sub_pre_trans [#"../non_zero.rs" 36 4 36 51] (a : NonZero_NonZeroU32_Type.t_nonzerou32) (b : NonZero_NonZeroU32_Type.t_nonzerou32) (c : NonZero_NonZeroU32_Type.t_nonzerou32) : ()
-    requires {[#"../non_zero.rs" 33 15 33 27] sub_pre0 a b}
-    requires {[#"../non_zero.rs" 34 15 34 27] sub_pre0 b c}
-    requires {[#"../non_zero.rs" 36 25 36 26] inv0 a}
-    requires {[#"../non_zero.rs" 36 34 36 35] inv0 b}
-    requires {[#"../non_zero.rs" 36 43 36 44] inv0 c}
-    ensures { [#"../non_zero.rs" 35 14 35 26] sub_pre0 a c }
+  constant a  : NonZero_NonZeroU32_Type.t_nonzerou32
+  constant b  : NonZero_NonZeroU32_Type.t_nonzerou32
+  constant c  : NonZero_NonZeroU32_Type.t_nonzerou32
+  function sub_pre_trans [#"../non_zero.rs" 36 4 36 51] (a : NonZero_NonZeroU32_Type.t_nonzerou32) (b : NonZero_NonZeroU32_Type.t_nonzerou32) (c : NonZero_NonZeroU32_Type.t_nonzerou32) : ()
     
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../non_zero.rs" 31 4 31 10] ()
+  goal vc_sub_pre_trans : ([#"../non_zero.rs" 36 43 36 44] inv0 c) -> ([#"../non_zero.rs" 36 34 36 35] inv0 b) -> ([#"../non_zero.rs" 36 25 36 26] inv0 a) -> ([#"../non_zero.rs" 34 15 34 27] sub_pre0 b c) -> ([#"../non_zero.rs" 33 15 33 27] sub_pre0 a b) -> ([#"../non_zero.rs" 35 14 35 26] sub_pre0 a c)
 end
 module NonZero_Impl1_Sub
   use prelude.Int
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml b/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
index 4a34826995..cce66003e4 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
+++ b/creusot/tests/should_succeed/type_invariants/non_zero/why3session.xml
@@ -17,8 +17,8 @@
  </goal>
 </theory>
 <theory name="NonZero_Impl1_SubPreTrans_Impl" proved="true">
- <goal name="sub_pre_trans&#39;vc" expl="VC for sub_pre_trans" proved="true">
- <proof prover="0"><result status="valid" time="0.012607" steps="2296"/></proof>
+ <goal name="vc_sub_pre_trans" proved="true">
+ <proof prover="0"><result status="valid" time="0.012607" steps="2206"/></proof>
  </goal>
 </theory>
 <theory name="NonZero_Impl1_Sub" proved="true">
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero/why3shapes.gz b/creusot/tests/should_succeed/type_invariants/non_zero/why3shapes.gz
index e69dd91a18b6dcc7c707bb67de58831cb4af4e19..06f4f61679dea6de408a1adf7de41be4d3ced7f1 100644
GIT binary patch
literal 379
zcmV->0fhb^iwFP!00000|BaE&Zrd;rgztI^-kPQ;KrMe&GzAO;h71I`g@;~*CAma=
zh~!FglD>UO$4MN+FnXFDX_gv&yt-!718!+zPc%-Oq5r`&yZ%}&XIyr7L;st`;a-4q
ze1V((3C9igGk5$?aamW@e)t>~YrJv7!D@}aa2~o%KRXCH>y|7HBkSq;+?p<H+No7h
z<z!LZ<z)e1$`KO39a}gyVpaNee%SSKx|Ca=>$^Df5El6JCZF`y|7{S50Uz<@<CieT
z3a6d#wj*&w4C`a(kDM>>_MgLp`h$jw9=G$~Zhs-?0NDb@I<p64oIVAl@%w)Qx{!M<
z<K!z7rxx$k%bnbwKsxc_9Y|iPDgcULBN-2>=AJi61}RgJP2)+Wz@V*LUe$pIVQUJZ
zrYJ*FCS)2lZ^%eVsbR7eIc95bp-DAZ5sdd5L=>C=xgkw4X{KA1W67h4(yJh%57rwM
ZxCLVoK&fN}G25CP`v(@ORdV_Q000fIuCM?A

literal 378
zcmV-=0fqh_iwFP!00000|BX>iPlG@Zz4I&frq-A&`;D<CqzR#k@#Y@9kl7C+2cZJ3
z{(RY%)=EhAH1n1>Z{|I&7pQxKjqlLTw_VlL_eh|{O|<G^RXjKKt8beZO0>o)RP_$p
z3hEwf{1MPlvuNM^Cet-6HPs|r!z1)fQPsUBcHrt2Dw`J7{&Q|jgfXFc7An^)RM-x~
zlw1V~2Dj&soCBJL`wG)+Yu8=kt>^AdXC6rk56eO6c>l4XV*~H-^<xQ~i=f+@V$*u8
zrRIk{njfUK7^_TwSR#Bqn-Ncw3nrLOFgtA@MT)+Kx|@qug-Df_`)G$v(`W_U{WIDN
zywNgCPu5T7hQIljxpOm7M2L4pIWG<2F*Z0UnPsfBEJ=*#r9~u<a~#DMTdHDjZR{Ph
zC6^Y1jd9{7W4=rf%jrNXy)uFmp9qSr0RfB|!@(quuox1BM9u@v0Cmi8OP#UGNN%wr
YQUM{Hmx_9%ayihx0nxTqr!)fq0P-}ldjJ3c

diff --git a/creusot/tests/should_succeed/type_invariants/quant.mlcfg b/creusot/tests/should_succeed/type_invariants/quant.mlcfg
index 573a17ad37..faae2505c8 100644
--- a/creusot/tests/should_succeed/type_invariants/quant.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/quant.mlcfg
@@ -18,11 +18,9 @@ module Quant_Forall_Impl
   axiom inv0 : forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x = (invariant0 x /\ match x with
     | Quant_WithInvariant_Type.C_WithInvariant -> true
     end)
-  let rec ghost function forall' [#"../quant.rs" 17 0 17 15] (_1 : ()) : ()
-    ensures { [#"../quant.rs" 16 0 16 50] forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x -> invariant0 x }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../quant.rs" 14 0 14 6] ()
+  constant _1  : ()
+  function forall' [#"../quant.rs" 17 0 17 15] (_1 : ()) : ()
+  goal vc_forall' : [#"../quant.rs" 16 0 16 50] forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x -> invariant0 x
 end
 module Quant_Exists_Impl
   use Quant_WithInvariant_Type as Quant_WithInvariant_Type
@@ -38,11 +36,9 @@ module Quant_Exists_Impl
   axiom inv0 : forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x = (invariant0 x /\ match x with
     | Quant_WithInvariant_Type.C_WithInvariant -> true
     end)
-  let rec ghost function exists' [#"../quant.rs" 22 0 22 15] (_1 : ()) : ()
-    ensures { [#"../quant.rs" 21 0 21 42] exists _x : Quant_WithInvariant_Type.t_withinvariant . inv0 _x }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../quant.rs" 19 0 19 6] ()
+  constant _1  : ()
+  function exists' [#"../quant.rs" 22 0 22 15] (_1 : ()) : ()
+  goal vc_exists' : [#"../quant.rs" 21 0 21 42] exists _x : Quant_WithInvariant_Type.t_withinvariant . inv0 _x
 end
 module Quant_Impl0
   
diff --git a/creusot/tests/should_succeed/type_invariants/quant/why3session.xml b/creusot/tests/should_succeed/type_invariants/quant/why3session.xml
index da7f747618..9a4cbfb0ea 100644
--- a/creusot/tests/should_succeed/type_invariants/quant/why3session.xml
+++ b/creusot/tests/should_succeed/type_invariants/quant/why3session.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
-"http://why3.lri.fr/why3session.dtd">
+"https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
 <prover id="2" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="3" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="quant.mlcfg"/>
 <theory name="Quant_Forall_Impl" proved="true">
- <goal name="forall&#39;&#39;vc" expl="VC for forall&#39;" proved="true">
+ <goal name="postcondition" proved="true">
  <proof prover="3"><result status="valid" time="0.004267" steps="2"/></proof>
  </goal>
 </theory>
 <theory name="Quant_Exists_Impl" proved="true">
- <goal name="exists&#39;&#39;vc" expl="VC for exists&#39;" proved="true">
+ <goal name="postcondition" proved="true">
  <proof prover="2"><result status="valid" time="0.012453" steps="413"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/type_invariants/quant/why3shapes.gz b/creusot/tests/should_succeed/type_invariants/quant/why3shapes.gz
index f9e79a1ce9ef961d8d76d9ad65e875d7a01b640a..a106b9f87d548ab02bcca5beef3abb318aa60da9 100644
GIT binary patch
literal 165
zcmV;W09yYaiwFP!00000|4od&3WG2dM)y2L#@6XxW7N16spt#XQ4*7j8EUNtp>N;x
z4?2CE!{Iw5e4F&*Hom)c^S8O;IZuwP4!RyLK1|)b>(%Qy^l;Mt2hhX)MR6PUud(}R
zY?!+);W515*;k$!GvI_7Q&$jx8LhHb7|7C5pe3{ldD>zN%!-1Pj3F7&lx1l0QcGD7
Tp)7$^%tXwdjYV67zW@LLY{X9<

literal 174
zcmV;f08#%RiwFP!00000|4qtG3WG2d1mJy6k)5rpmtV2FA{D)WU6z-aU_i7rL3;cu
zt<c3V%*UK^8V7v3NLRPSFi#h%X?`YE!s>AkX=tYvmw;31;ELfG(7|h8Ti4{DS^H&H
zldhtEUiRQPX5{C$!`(Z?6f;5$7ozt}YR0{lf@`6BrAouC;U!2%dBYkYRs$MYC<SE!
c(pa#*aOkCQwzNtBm5tbLACS%7Xwd)w0NN2zAOHXW

diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index 9ac2e093bb..cf267cbe28 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -2093,12 +2093,9 @@ module C06KnightsTour_DumbNonlinearArith_Impl
   use prelude.UIntSize
   use prelude.Int
   use prelude.UIntSize
-  let rec ghost function dumb_nonlinear_arith [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : ()
-    requires {[#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000}
-    ensures { [#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000 }
-    
-   = [@vc:do_not_keep_trace] [@vc:sp]
-    [#"../06_knights_tour.rs" 128 0 128 8] ()
+  constant a  : usize
+  function dumb_nonlinear_arith [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : ()
+  goal vc_dumb_nonlinear_arith : ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000) -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000)
 end
 module C06KnightsTour_KnightsTour
   use prelude.IntSize
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
index 6f7baff70d..fe7cd466b4 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
+++ b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
@@ -259,7 +259,7 @@
  </goal>
 </theory>
 <theory name="C06KnightsTour_DumbNonlinearArith_Impl" proved="true">
- <goal name="dumb_nonlinear_arith&#39;vc" expl="VC for dumb_nonlinear_arith" proved="true">
+ <goal name="vc_dumb_nonlinear_arith" proved="true">
  <proof prover="3"><result status="valid" time="0.000000" steps="7"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz b/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz
index a185e4dae05f3fcbacb248dd4bd90b85ac0ba024..dd4aec6d2aff7df7935d7f49191dca9227480cf6 100644
GIT binary patch
delta 10727
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
ZL#dY+YXH^&3@z~N{{vrm&gw?|000Ond4&J~

delta 10722
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
U*ed`STHx9L2T+1R;A8v%08mj(9{>OV


From 628f45ef3891dc321cebeeefcb3b8c19e1892fc4 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 8 Mar 2024 18:31:35 +0100
Subject: [PATCH 51/66] suppress warnings

---
 why3tests/tests/why3.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/why3tests/tests/why3.rs b/why3tests/tests/why3.rs
index 0e0598c1a9..08084bba3a 100644
--- a/why3tests/tests/why3.rs
+++ b/why3tests/tests/why3.rs
@@ -95,6 +95,7 @@ fn main() {
         let mut command = creusot_dev_config::why3_command().unwrap();
         command.arg("--warn-off=unused_variable");
         command.arg("--warn-off=clone_not_abstract");
+        command.arg("--warn-off=axiom_abstract");
 
         if sessionfile.is_file() {
             let proved = BufReader::new(File::open(&sessionfile).unwrap())

From cd6d234cc25e7c16210dffa3882660c06e5af6e1 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sat, 9 Mar 2024 15:47:09 +0100
Subject: [PATCH 52/66] Fix operators test

---
 creusot/src/backend/logic/vcgen.rs            |   4 +-
 .../should_succeed/syntax/02_operators.mlcfg  | 248 ++++++++++++++++++
 .../should_succeed/syntax/02_operators.stderr |   9 -
 3 files changed, 251 insertions(+), 10 deletions(-)
 create mode 100644 creusot/tests/should_succeed/syntax/02_operators.mlcfg
 delete mode 100644 creusot/tests/should_succeed/syntax/02_operators.stderr

diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index a3316c8898..db70c9cef2 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -272,7 +272,9 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                         .implies(self.build_vc(rhs, k)?)
                         .log_and(lhs.not().implies(k(Exp::mk_false())?)))
                 }),
-
+                BinOp::Div => self.build_vc(&lhs, &|lhs| {
+                    self.build_vc(rhs, &|rhs| Ok(Exp::pure_var("div").app(vec![lhs.clone(), rhs])))
+                }),
                 _ => self.build_vc(&lhs, &|lhs| {
                     self.build_vc(rhs, &|rhs| {
                         k(Exp::BinaryOp(
diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
new file mode 100644
index 0000000000..1bec1d5b15
--- /dev/null
+++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
@@ -0,0 +1,248 @@
+
+module C02Operators_Division
+  use prelude.UIntSize
+  use prelude.UIntSize
+  use prelude.Int
+  let rec cfg division [#"../02_operators.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
+    requires {[#"../02_operators.rs" 7 11 7 17] UIntSize.to_int y > 0}
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : usize;
+  var x : usize = x;
+  var y : usize = y;
+  var _5 : usize;
+  var _6 : bool;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y);
+    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = (0 : usize));
+    assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 };
+    goto BB1
+  }
+  BB1 {
+    [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] x / _5);
+    _5 <- any usize;
+    return _0
+  }
+  
+end
+module C02Operators_Modulus
+  use prelude.UIntSize
+  use prelude.UIntSize
+  use prelude.Int
+  let rec cfg modulus [#"../02_operators.rs" 23 0 23 39] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
+    requires {[#"../02_operators.rs" 22 11 22 17] UIntSize.to_int y > 0}
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : usize;
+  var x : usize = x;
+  var y : usize = y;
+  var _5 : usize;
+  var _6 : bool;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y);
+    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = (0 : usize));
+    assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 };
+    goto BB1
+  }
+  BB1 {
+    [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] x % _5);
+    _5 <- any usize;
+    return _0
+  }
+  
+end
+module C02Operators_Multiply
+  use prelude.UIntSize
+  use prelude.Int
+  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
+    (18446744073709551615 : usize)
+  use prelude.UIntSize
+  let rec cfg multiply [#"../02_operators.rs" 38 0 38 40] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
+    requires {[#"../02_operators.rs" 37 11 37 33] UIntSize.to_int x * UIntSize.to_int y <= UIntSize.to_int max0}
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : usize;
+  var x : usize = x;
+  var y : usize = y;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] x * y);
+    return _0
+  }
+  
+end
+module C02Operators_Add
+  use prelude.UIntSize
+  use prelude.Int
+  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
+    (18446744073709551615 : usize)
+  use prelude.UIntSize
+  let rec cfg add [#"../02_operators.rs" 48 0 48 35] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
+    requires {[#"../02_operators.rs" 47 11 47 33] UIntSize.to_int x + UIntSize.to_int y <= UIntSize.to_int max0}
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : usize;
+  var x : usize = x;
+  var y : usize = y;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] x + y);
+    return _0
+  }
+  
+end
+module C02Operators_Sub
+  use prelude.UIntSize
+  use prelude.UIntSize
+  use prelude.Int
+  let rec cfg sub [#"../02_operators.rs" 63 0 63 35] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) : usize
+    requires {[#"../02_operators.rs" 62 11 62 23] UIntSize.to_int x - UIntSize.to_int y >= 0}
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : usize;
+  var x : usize = x;
+  var y : usize = y;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] x - y);
+    return _0
+  }
+  
+end
+module C02Operators_Expression
+  use prelude.UIntSize
+  use prelude.Int
+  let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
+    (18446744073709551615 : usize)
+  use prelude.UIntSize
+  let rec cfg expression [#"../02_operators.rs" 77 0 77 51] [@cfg:stackify] [@cfg:subregion_analysis] (x : usize) (y : usize) (z : usize) : bool
+    requires {[#"../02_operators.rs" 74 11 74 17] UIntSize.to_int y > 0}
+    requires {[#"../02_operators.rs" 75 11 75 38] div (UIntSize.to_int x) (UIntSize.to_int y) * UIntSize.to_int z <= UIntSize.to_int max0}
+    ensures { [#"../02_operators.rs" 76 10 76 16] result }
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : bool;
+  var x : usize = x;
+  var y : usize = y;
+  var z : usize = z;
+  var _7 : usize;
+  var _8 : usize;
+  var _10 : usize;
+  var _11 : bool;
+  var _13 : usize;
+  var _14 : usize;
+  var _16 : usize;
+  var _17 : bool;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y);
+    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = (0 : usize));
+    assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 };
+    goto BB1
+  }
+  BB1 {
+    [#"../02_operators.rs" 78 4 78 9] _8 <- ([#"../02_operators.rs" 78 4 78 9] x / _10);
+    _10 <- any usize;
+    [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z);
+    _8 <- any usize;
+    [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y);
+    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = (0 : usize));
+    assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 };
+    goto BB2
+  }
+  BB2 {
+    [#"../02_operators.rs" 78 17 78 24] _14 <- ([#"../02_operators.rs" 78 17 78 24] x / _16);
+    _16 <- any usize;
+    [#"../02_operators.rs" 78 17 78 28] _13 <- ([#"../02_operators.rs" 78 17 78 28] _14 * z);
+    _14 <- any usize;
+    [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] _7 = _13);
+    _7 <- any usize;
+    _13 <- any usize;
+    return _0
+  }
+  
+end
+module C02Operators_ExpressionLogic_Impl
+  use prelude.UIntSize
+  use prelude.Int
+  constant x  : usize
+  constant y  : usize
+  constant z  : usize
+  function expression_logic [#"../02_operators.rs" 83 0 83 57] (x : usize) (y : usize) (z : usize) : bool
+  goal vc_expression_logic : div x y
+end
+module C02Operators_X_Type
+  use prelude.UIntSize
+  use prelude.Int
+  type t_x  =
+    | C_X usize
+    
+  let function x_a (self : t_x) : usize = [@vc:do_not_keep_trace] [@vc:sp]
+    match self with
+      | C_X a -> a
+      end
+end
+module C02Operators_PrimitiveComparison
+  use prelude.Int
+  use C02Operators_X_Type as C02Operators_X_Type
+  let rec cfg primitive_comparison [#"../02_operators.rs" 92 0 92 29] [@cfg:stackify] [@cfg:subregion_analysis] (x : C02Operators_X_Type.t_x) : ()
+    ensures { [#"../02_operators.rs" 91 10 91 20] C02Operators_X_Type.x_a x <= C02Operators_X_Type.x_a x }
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : ();
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] ());
+    return _0
+  }
+  
+end
+module C02Operators_BoolEq
+  use prelude.Bool
+  let rec cfg bool_eq [#"../02_operators.rs" 95 0 95 36] [@cfg:stackify] [@cfg:subregion_analysis] (a : bool) (b : bool) : bool
+    ensures { [#"../02_operators.rs" 94 10 94 28] result = (a = b) }
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : bool;
+  var a : bool = a;
+  var b : bool = b;
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb a b);
+    return _0
+  }
+  
+end
+module C02Operators_OldTest
+  let rec cfg old_test [#"../02_operators.rs" 100 0 100 20] [@cfg:stackify] [@cfg:subregion_analysis] (x : bool) : ()
+    ensures { [#"../02_operators.rs" 99 10 99 21] old(x) = x }
+    
+   = [@vc:do_not_keep_trace] [@vc:sp]
+  var _0 : ();
+  {
+    goto BB0
+  }
+  BB0 {
+    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] ());
+    return _0
+  }
+  
+end
diff --git a/creusot/tests/should_succeed/syntax/02_operators.stderr b/creusot/tests/should_succeed/syntax/02_operators.stderr
deleted file mode 100644
index c3bef2b092..0000000000
--- a/creusot/tests/should_succeed/syntax/02_operators.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-thread 'rustc' panicked at creusot/src/backend/term.rs:393:14:
-internal error: entered unreachable code: Div Logic
-note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-
-note: Creusot has panic-ed!
-  |
-  = note: Oops, that shouldn't have happened, sorry about that.
-  = note: Please report this bug over here: https://github.com/xldenis/creusot/issues/new
-

From 1169fb78d1751d5fe83fd921cf22ba04862fef00 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sat, 9 Mar 2024 16:07:39 +0100
Subject: [PATCH 53/66] Fix pre sig of function calls

---
 creusot/src/backend/logic.rs       |  3 ++-
 creusot/src/backend/logic/vcgen.rs | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index 3804262a87..564582095e 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -10,7 +10,7 @@ use rustc_hir::def_id::DefId;
 use why3::{
     declaration::*,
     exp::{super_visit_mut, BinOp, Binder, Exp, ExpMutVisitor, Trigger},
-    Ident, QName,
+    Ident, Print as _, QName,
 };
 
 mod vcgen;
@@ -377,6 +377,7 @@ fn proof_module(ctx: &mut Why3Generator, def_id: DefId) -> Option<Module> {
 
     let mut decls: Vec<_> = Vec::new();
     decls.extend(all_generic_decls_for(ctx.tcx, def_id));
+
     let (clones, _) = names.to_clones(ctx, CloneDepth::Deep);
     decls.extend(clones);
     decls.extend(body_decls);
diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index db70c9cef2..265fa90eb5 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use rustc_hir::def_id::DefId;
-use rustc_middle::ty::{EarlyBinder, GenericArgsRef, Ty, TyKind};
+use rustc_middle::ty::{EarlyBinder, GenericArgsRef, ParamEnv, Ty, TyKind};
 use rustc_span::{Span, Symbol};
 use why3::{declaration::Signature, exp::Purity, ty::Type, Exp, Ident, QName};
 
@@ -40,6 +40,7 @@ struct VCGen<'a, 'tcx> {
     names: RefCell<&'a mut CloneMap<'tcx>>,
     self_id: DefId,
     structurally_recursive: bool,
+    param_env: ParamEnv<'tcx>,
 }
 
 pub(super) fn vc<'tcx>(
@@ -51,8 +52,14 @@ pub(super) fn vc<'tcx>(
     post: Exp,
 ) -> Result<Exp, VCError<'tcx>> {
     let structurally_recursive = is_structurally_recursive(ctx, self_id, &t);
-    VCGen { ctx: RefCell::new(ctx), names: RefCell::new(names), self_id, structurally_recursive }
-        .build_vc(&t, &|exp| Ok(Exp::let_(dest.clone(), exp, post.clone())))
+    VCGen {
+        param_env: ctx.param_env(self_id),
+        ctx: RefCell::new(ctx),
+        names: RefCell::new(names),
+        self_id,
+        structurally_recursive,
+    }
+    .build_vc(&t, &|exp| Ok(Exp::let_(dest.clone(), exp, post.clone())))
 }
 
 /// Verifies whether a given term is structurally recursive: that is, each recursive call is made to
@@ -217,6 +224,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
             TermKind::Item(id, sub) => {
                 let item_name =
                     get_func_name(*self.ctx.borrow_mut(), *self.names.borrow_mut(), *id, sub);
+
                 if get_builtin(self.ctx.borrow().tcx, *id).is_some() {
                     // Builtins can leverage Why3 polymorphism and sometimes can cause typeck errors in why3 due to ambiguous type variables so lets fix the type now.
                     k(Exp::pure_qvar(item_name).ascribe(self.ty(t.ty)))
@@ -235,6 +243,8 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 let tcx = self.ctx.borrow().tcx;
                 let pre_sig = EarlyBinder::bind(self.ctx.borrow_mut().sig(*id).clone())
                     .instantiate(tcx, subst);
+
+                let pre_sig = pre_sig.normalize(tcx, self.param_env);
                 let arg_subst = pre_sig
                     .inputs
                     .iter()

From 0c6508bb0df944eb2f00adb1980d8a4e4d3997a1 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sat, 9 Mar 2024 16:35:55 +0100
Subject: [PATCH 54/66] Improve the VC for conjunction

---
 creusot/src/backend/logic.rs                  |   2 +-
 creusot/src/backend/logic/vcgen.rs            |  16 ++--
 .../should_succeed/iterators/05_map.mlcfg     |   4 +-
 .../iterators/05_map/why3shapes.gz            | Bin 5508 -> 5486 bytes
 .../iterators/06_map_precond.mlcfg            |   6 +-
 .../iterators/06_map_precond/why3shapes.gz    | Bin 8916 -> 8887 bytes
 .../tests/should_succeed/knapsack_full.mlcfg  |  10 ++-
 .../knapsack_full/why3session.xml             |  82 +-----------------
 .../knapsack_full/why3shapes.gz               | Bin 9268 -> 8457 bytes
 .../tests/should_succeed/red_black_tree.mlcfg |   6 +-
 .../red_black_tree/why3session.xml            |   5 +-
 .../red_black_tree/why3shapes.gz              | Bin 79307 -> 79283 bytes
 .../should_succeed/specification/forall.mlcfg |   2 +-
 .../specification/forall/why3shapes.gz        | Bin 144 -> 137 bytes
 .../syntax/06_logic_function_contracts.mlcfg  |   6 +-
 .../06_logic_function_contracts/why3shapes.gz | Bin 244 -> 244 bytes
 why3/src/exp.rs                               |  39 ++++++++-
 17 files changed, 74 insertions(+), 104 deletions(-)

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index 564582095e..bc2d8f60d5 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -10,7 +10,7 @@ use rustc_hir::def_id::DefId;
 use why3::{
     declaration::*,
     exp::{super_visit_mut, BinOp, Binder, Exp, ExpMutVisitor, Trigger},
-    Ident, Print as _, QName,
+    Ident, QName,
 };
 
 mod vcgen;
diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index 265fa90eb5..0ec034d868 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -273,15 +273,15 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 Ok(post)
             }),
 
-            // VC(A && B, Q) = VC(A, |a| VC(B, |b| a -> Q(b) /\ ~a -> Q(false)))
+            // VC(A && B, Q) = VC(A, |a| if a then VC(B, Q) else Q(false))
             // VC(A OP B, Q) = VC(A, |a| VC(B, |b| Q(a OP B)))
             TermKind::Binary { op, lhs, rhs } => match op {
                 BinOp::And => self.build_vc(lhs, &|lhs| {
-                    Ok(lhs
-                        .clone()
-                        .implies(self.build_vc(rhs, k)?)
-                        .log_and(lhs.not().implies(k(Exp::mk_false())?)))
+                    Ok(Exp::if_(lhs, self.build_vc(rhs, k)?, k(Exp::mk_false())?))
                 }),
+                // BinOp::Or => self.build_vc(lhs, &|lhs| {
+                //     Ok(Exp::if_(lhs, k(Exp::mk_true())?, self.build_vc(rhs, k)?,))
+                // }),
                 BinOp::Div => self.build_vc(&lhs, &|lhs| {
                     self.build_vc(rhs, &|rhs| Ok(Exp::pure_var("div").app(vec![lhs.clone(), rhs])))
                 }),
@@ -344,9 +344,9 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
             // VC( ^ T, Q) = VC(T, |t| Q(^t))
             TermKind::Fin { term } => self.build_vc(&term, &|term| k(Exp::Final(Box::new(term)))),
             // VC(A -> B, Q) = VC(A, VC(B, Q(A -> B)))
-            TermKind::Impl { lhs, rhs } => {
-                self.build_vc(lhs, &|lhs| self.build_vc(rhs, &|rhs| k(lhs.clone().implies(rhs))))
-            }
+            TermKind::Impl { lhs, rhs } => self.build_vc(lhs, &|lhs| {
+                Ok(Exp::if_(lhs, self.build_vc(rhs, k)?, k(Exp::mk_true())?))
+            }),
             // VC(match A {P -> E}, Q) = VC(A, |a| match a {P -> VC(E, Q)})
             TermKind::Match { scrutinee, arms } => self.build_vc(scrutinee, &|scrut| {
                 let arms: Vec<_> = arms
diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index 71f47a5a03..9eb4c7f24d 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -740,7 +740,7 @@ module C05Map_Impl1_ProducesOne_Impl
   constant succ  : C05Map_Map_Type.t_map i b f
   predicate produces_one [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f)
     
-  goal vc_produces_one : ([#"../05_map.rs" 117 38 117 42] inv0 succ) -> ([#"../05_map.rs" 117 26 117 33] inv1 visited) -> ([#"../05_map.rs" 117 20 117 24] inv0 self) -> (forall f : borrowed f . inv2 f -> ( * f = C05Map_Map_Type.map_func self ->  ^ f = C05Map_Map_Type.map_func succ -> (forall e : item0 . true)) /\ (not  * f = C05Map_Map_Type.map_func self -> false -> (forall e : item0 . true))) /\ ([#"../05_map.rs" 116 14 116 68] ([#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)) = produces0 self (Seq.singleton visited) succ)
+  goal vc_produces_one : ([#"../05_map.rs" 117 38 117 42] inv0 succ) -> ([#"../05_map.rs" 117 26 117 33] inv1 visited) -> ([#"../05_map.rs" 117 20 117 24] inv0 self) -> ([#"../05_map.rs" 116 14 116 68] ([#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C05Map_Impl1_ProducesOneInvariant_Impl
   type i
@@ -940,7 +940,7 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
   constant iter  : i
   function produces_one_invariant [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
-  goal vc_produces_one_invariant : ([#"../05_map.rs" 107 65 107 69] inv4 iter) -> ([#"../05_map.rs" 107 54 107 55] inv3 f) -> ([#"../05_map.rs" 107 48 107 49] inv2 r) -> ([#"../05_map.rs" 107 36 107 37] inv1 e) -> ([#"../05_map.rs" 107 30 107 34] inv0 self) -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r) -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self) -> ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter) -> (forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../05_map.rs" 101 4 101 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f)))
+  goal vc_produces_one_invariant : ([#"../05_map.rs" 107 65 107 69] inv4 iter) -> ([#"../05_map.rs" 107 54 107 55] inv3 f) -> ([#"../05_map.rs" 107 48 107 49] inv2 r) -> ([#"../05_map.rs" 107 36 107 37] inv1 e) -> ([#"../05_map.rs" 107 30 107 34] inv0 self) -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r) -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self) -> ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../05_map.rs" 101 4 101 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f)))
 end
 module C05Map_Impl0_Next
   type i
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz b/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz
index d6d6c62dc84f95337f6facf3799784015109415e..82337df990a01f6482b8777a21fe1e65c8dee345 100644
GIT binary patch
delta 3101
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

delta 3187
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
ZIvkk>3iHIb=HEp7{{R&e^giiX006U{4Ilsj

diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 640967bbf7..7843747f96 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -181,7 +181,7 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   constant func  : f
   constant produced  : Seq.seq item0
   predicate preservation_inv [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0)
-  goal vc_preservation_inv : ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 93 33 93 37] inv1 func) -> ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> (forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> ([#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))) = preservation0 iter func)
+  goal vc_preservation_inv : ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 93 33 93 37] inv1 func) -> ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> ([#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))) = preservation0 iter func)
 end
 module C06MapPrecond_Impl0_ProducesRefl_Impl
   type i
@@ -983,7 +983,7 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   constant succ  : C06MapPrecond_Map_Type.t_map i b f item0
   predicate produces_one [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
-  goal vc_produces_one : ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ) -> ([#"../06_map_precond.rs" 142 26 142 33] inv1 visited) -> ([#"../06_map_precond.rs" 142 20 142 24] inv0 self) -> (forall f : borrowed f . inv2 f -> ( * f = C06MapPrecond_Map_Type.map_func self ->  ^ f = C06MapPrecond_Map_Type.map_func succ -> (forall e : item0 . true)) /\ (not  * f = C06MapPrecond_Map_Type.map_func self -> false -> (forall e : item0 . true))) /\ ([#"../06_map_precond.rs" 141 14 141 68] ([#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)) = produces0 self (Seq.singleton visited) succ)
+  goal vc_produces_one : ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ) -> ([#"../06_map_precond.rs" 142 26 142 33] inv1 visited) -> ([#"../06_map_precond.rs" 142 20 142 24] inv0 self) -> ([#"../06_map_precond.rs" 141 14 141 68] ([#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   type i
@@ -1205,7 +1205,7 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   constant iter  : i
   function produces_one_invariant [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
-  goal vc_produces_one_invariant : ([#"../06_map_precond.rs" 132 65 132 69] inv4 iter) -> ([#"../06_map_precond.rs" 132 54 132 55] inv3 f) -> ([#"../06_map_precond.rs" 132 48 132 49] inv2 r) -> ([#"../06_map_precond.rs" 132 36 132 37] inv1 e) -> ([#"../06_map_precond.rs" 132 30 132 34] inv0 self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> (forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . true) /\ ([#"../06_map_precond.rs" 126 4 126 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)))
+  goal vc_produces_one_invariant : ([#"../06_map_precond.rs" 132 65 132 69] inv4 iter) -> ([#"../06_map_precond.rs" 132 54 132 55] inv3 f) -> ([#"../06_map_precond.rs" 132 48 132 49] inv2 r) -> ([#"../06_map_precond.rs" 132 36 132 37] inv1 e) -> ([#"../06_map_precond.rs" 132 30 132 34] inv0 self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../06_map_precond.rs" 126 4 126 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)))
 end
 module C06MapPrecond_Impl0_Next
   type i
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz b/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz
index 53326d03f6141d9740d8166e8515d99199603242..efce9065d954f0c90795b607235e53df03c1032e 100644
GIT binary patch
delta 8831
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
BOaK4?

delta 8807
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

diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index e294a4a67b..263a186144 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -113,7 +113,15 @@ module KnapsackFull_SubseqRev_Impl
   predicate subseq_rev [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq t) (i1 : int) (s2 : Seq.seq t) (i2 : int)
   goal vc_subseq_rev : ([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2) -> ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1) -> match i2 = 0 with
     | True -> true
-    | False -> (i1 < Seq.length s1 -> (Seq.get s1 i1 = Seq.get s2 (i2 - 1) -> ((([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 + 1 /\ i1 + 1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (not Seq.get s1 i1 = Seq.get s2 (i2 - 1) -> (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2))) /\ (not i1 < Seq.length s1 -> (false -> ((([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 + 1 /\ i1 + 1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (not false -> (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)))
+    | False -> if i1 < Seq.length s1 then
+      if Seq.get s1 i1 = Seq.get s2 (i2 - 1) then
+        ((([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 + 1 /\ i1 + 1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)) /\ (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)
+      else
+        (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)
+      
+    else
+      (([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 - 1 /\ i2 - 1 <= Seq.length s2) && ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)) /\ 0 <= ([#"../knapsack_full.rs" 45 10 45 12] i2) /\ ([#"../knapsack_full.rs" 45 10 45 12] i2 - 1) < ([#"../knapsack_full.rs" 45 10 45 12] i2)
+    
     end
 end
 module KnapsackFull_M_Impl
diff --git a/creusot/tests/should_succeed/knapsack_full/why3session.xml b/creusot/tests/should_succeed/knapsack_full/why3session.xml
index 90847a4add..98c4ca0ed8 100644
--- a/creusot/tests/should_succeed/knapsack_full/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack_full/why3session.xml
@@ -25,87 +25,7 @@
 </theory>
 <theory name="KnapsackFull_SubseqRev_Impl" proved="true">
  <goal name="vc_subseq_rev" proved="true">
- <proof prover="1"><result status="valid" time="0.015920" steps="46340"/></proof>
- <transf name="split_vc" >
-  <goal name="vc_subseq_rev.0">
-  </goal>
-  <goal name="vc_subseq_rev.1">
-  </goal>
-  <goal name="vc_subseq_rev.2">
-  </goal>
-  <goal name="vc_subseq_rev.3">
-  </goal>
-  <goal name="vc_subseq_rev.4">
-  </goal>
-  <goal name="vc_subseq_rev.5" proved="true">
-  <proof prover="6"><result status="valid" time="0.008857" steps="14"/></proof>
-  </goal>
-  <goal name="vc_subseq_rev.6">
-  </goal>
-  <goal name="vc_subseq_rev.7">
-  </goal>
-  <goal name="vc_subseq_rev.8">
-  </goal>
-  <goal name="vc_subseq_rev.9">
-  </goal>
-  <goal name="vc_subseq_rev.10">
-  </goal>
-  <goal name="vc_subseq_rev.11" proved="true">
-  <proof prover="6"><result status="valid" time="0.013149" steps="14"/></proof>
-  </goal>
-  <goal name="vc_subseq_rev.12">
-  </goal>
-  <goal name="vc_subseq_rev.13">
-  </goal>
-  <goal name="vc_subseq_rev.14">
-  </goal>
-  <goal name="vc_subseq_rev.15">
-  </goal>
-  <goal name="vc_subseq_rev.16">
-  </goal>
-  <goal name="vc_subseq_rev.17" proved="true">
-  <proof prover="6"><result status="valid" time="0.008425" steps="14"/></proof>
-  </goal>
-  <goal name="vc_subseq_rev.18">
-  </goal>
-  <goal name="vc_subseq_rev.19">
-  </goal>
-  <goal name="vc_subseq_rev.20">
-  </goal>
-  <goal name="vc_subseq_rev.21">
-  </goal>
-  <goal name="vc_subseq_rev.22">
-  </goal>
-  <goal name="vc_subseq_rev.23" proved="true">
-  <proof prover="6"><result status="valid" time="0.009241" steps="12"/></proof>
-  </goal>
-  <goal name="vc_subseq_rev.24">
-  </goal>
-  <goal name="vc_subseq_rev.25">
-  </goal>
-  <goal name="vc_subseq_rev.26">
-  </goal>
-  <goal name="vc_subseq_rev.27">
-  </goal>
-  <goal name="vc_subseq_rev.28">
-  </goal>
-  <goal name="vc_subseq_rev.29" proved="true">
-  <proof prover="6"><result status="valid" time="0.010571" steps="12"/></proof>
-  </goal>
-  <goal name="vc_subseq_rev.30">
-  </goal>
-  <goal name="vc_subseq_rev.31">
-  </goal>
-  <goal name="vc_subseq_rev.32">
-  </goal>
-  <goal name="vc_subseq_rev.33">
-  </goal>
-  <goal name="vc_subseq_rev.34">
-  </goal>
-  <goal name="vc_subseq_rev.35" proved="true">
-  <proof prover="6"><result status="valid" time="0.008385" steps="12"/></proof>
-  </goal>
- </transf>
+ <proof prover="6"><result status="valid" time="0.009124" steps="10"/></proof>
  </goal>
 </theory>
 <theory name="KnapsackFull_M_Impl" proved="true">
diff --git a/creusot/tests/should_succeed/knapsack_full/why3shapes.gz b/creusot/tests/should_succeed/knapsack_full/why3shapes.gz
index ac0ed7ee8ba40fa5cc1c28e463cc869b4ffce796..6ee9fa461999ce4d64d4b42f6f9c4f310a580536 100644
GIT binary patch
literal 8457
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

literal 9268
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
W6wl>4B)-le@&5rY=YZFR4FLev9{N!L

diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index 6b565242fb..bc7f67acbf 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -912,7 +912,11 @@ module RedBlackTree_Impl1_HasMapping_Impl
   constant v  : v
   predicate has_mapping [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
-  goal vc_has_mapping : ([#"../red_black_tree.rs" 140 44 140 45] inv2 v) -> ([#"../red_black_tree.rs" 140 25 140 26] inv1 k) -> ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> (k = deep_model0 (RedBlackTree_Node_Type.node_key self) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ v = RedBlackTree_Node_Type.node_val self) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)) /\ (not k = deep_model0 (RedBlackTree_Node_Type.node_key self) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ false) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v))
+  goal vc_has_mapping : ([#"../red_black_tree.rs" 140 44 140 45] inv2 v) -> ([#"../red_black_tree.rs" 140 25 140 26] inv1 k) -> ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> (if k = deep_model0 (RedBlackTree_Node_Type.node_key self) then
+    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ v = RedBlackTree_Node_Type.node_val self) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
+  else
+    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ false) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
+  )
 end
 module RedBlackTree_Cp_Type
   use RedBlackTree_Color_Type as RedBlackTree_Color_Type
diff --git a/creusot/tests/should_succeed/red_black_tree/why3session.xml b/creusot/tests/should_succeed/red_black_tree/why3session.xml
index 224374f90a..e647279fbd 100644
--- a/creusot/tests/should_succeed/red_black_tree/why3session.xml
+++ b/creusot/tests/should_succeed/red_black_tree/why3session.xml
@@ -35,7 +35,7 @@
 </theory>
 <theory name="RedBlackTree_Impl1_HasMapping_Impl" proved="true">
  <goal name="vc_has_mapping" proved="true">
- <proof prover="7"><result status="valid" time="0.010000" steps="126"/></proof>
+ <proof prover="7"><result status="valid" time="0.010000" steps="169"/></proof>
  </goal>
 </theory>
 <theory name="RedBlackTree_Impl9_Height_Impl" proved="true">
@@ -51,9 +51,6 @@
    <goal name="vc_height.0.0" proved="true">
    <proof prover="7"><result status="valid" time="0.085166" steps="8"/></proof>
    </goal>
-   <goal name="height&#39;vc.2.1" expl="postcondition">
-   <proof prover="7"><result status="valid" time="0.057583" steps="1097"/></proof>
-   </goal>
   </transf>
   </goal>
   <goal name="vc_height.1" proved="true">
diff --git a/creusot/tests/should_succeed/red_black_tree/why3shapes.gz b/creusot/tests/should_succeed/red_black_tree/why3shapes.gz
index 2fa4f4ea2feb71366b7b9b6b5f3059259fbd474c..c6bad50f978b04f49ee0cef24f6a3c26e41519cd 100644
GIT binary patch
delta 61159
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%0At{n~oIe{uPJSZ1?vRP4zv-LJ1Es5(;`#!b6OL
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

delta 61209
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

diff --git a/creusot/tests/should_succeed/specification/forall.mlcfg b/creusot/tests/should_succeed/specification/forall.mlcfg
index 99a5bb5cbe..d2905b36d8 100644
--- a/creusot/tests/should_succeed/specification/forall.mlcfg
+++ b/creusot/tests/should_succeed/specification/forall.mlcfg
@@ -21,5 +21,5 @@ module Forall_Omg_Impl
   constant a  : int
   constant b  : int
   predicate omg [#"../forall.rs" 12 0 12 34] (a : int) (b : int)
-  goal vc_omg : ([#"../forall.rs" 10 11 10 17] a <= b) -> (forall c : int . true)
+  goal vc_omg : [#"../forall.rs" 11 10 11 14] true
 end
diff --git a/creusot/tests/should_succeed/specification/forall/why3shapes.gz b/creusot/tests/should_succeed/specification/forall/why3shapes.gz
index 9ff2ddc6e36df8c0633d32a7113b85bbfa3c2b46..0fa81b2f15b4d274f0360289a015054ece32221c 100644
GIT binary patch
literal 137
zcmV;40CxW$iwFP!00000|6R*54#F@DK+)Z&@Ccn8Crx5D#8NK6irh994A82HkhndF
z5&h{6f7fBX=~^nj%2w~o^MDb%J+$Lr=LVM(+OnZRgYsD0`}#Wph$K4AIq~Q+dDgF$
r%x6l>aW3cv0uv31`&qK4V2;!W9n&=VNPQ47^aH~O>7Y~njsO4vmEb?q

literal 144
zcmV;B0B`>viwFP!00000|6Po`3c^4T0Q>!lEj88N!@E_q5J8e3u$8?RvCxFvA^7(O
zOPOk5m`#UulsQ*?=cPWT*8v@NTWIG$h6c9_mTAEP?K;TuBq9Owb8eseZvjBGcS@MO
y4vNWWSzV|YCa<+i8C6dZVlXMOw`5r<x3k5VHOx^|bRl{)y@oF$5AJQ300028mObJC

diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
index 4fc70650a8..d724bcec3c 100644
--- a/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
+++ b/creusot/tests/should_succeed/syntax/06_logic_function_contracts.mlcfg
@@ -24,7 +24,11 @@ module C06LogicFunctionContracts_AllZero_Impl
   predicate all_zero [#"../06_logic_function_contracts.rs" 22 0 22 38] (seq : Seq.seq int)
   goal vc_all_zero : match Seq.length seq = 0 with
     | True -> true
-    | False -> Seq.get seq (Seq.length seq - 1) = 0 -> 0 <= ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq) /\ ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length (SeqExt.subsequence seq 0 (Seq.length seq - 1))) < ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq)
+    | False -> if Seq.get seq (Seq.length seq - 1) = 0 then
+      0 <= ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq) /\ ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length (SeqExt.subsequence seq 0 (Seq.length seq - 1))) < ([#"../06_logic_function_contracts.rs" 21 10 21 19] Seq.length seq)
+    else
+      true
+    
     end
 end
 module C06LogicFunctionContracts_Stupid_Impl
diff --git a/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3shapes.gz b/creusot/tests/should_succeed/syntax/06_logic_function_contracts/why3shapes.gz
index d1d155b8bc9bc3a16cdc49fa61610bfa66662772..5bd94da32eaf16c2f9990e0af55be75b919974a0 100644
GIT binary patch
literal 244
zcmV<Q01N*giwFP!00000|E*5TPQx$|y!$J1gi1(u){g`whpH0d1GuAcvu-Vw(AExu
zzsE`o6oJGA?O}IkXJ+SWQKc>RoT?W-ruaPGR<>GPi&e(Mabk4X@wmxbq{$~fOgyd`
zWmrqxe4fgxE|w*_zTCe6++mkEp4!Q`zZ6TsPy77#I4Ajd9rHgu@3G-LPv1p_^=Gbg
zmKD0fj%V*UWBFJ0YpI`j*CQ4;!7>ng9fBl=qoG#H1E65IZU|JVdnrJGwaStKIS*qR
u<&5;LQ6W(4nnJ3DrU7KQ(bhOQv~V>Wt7|O-yFein5{Y;7<b%=O0RRAGICLQZ

literal 244
zcmV<Q01N*giwFP!00000|E*3<O9L?wz2{fts0AU(<fALQhf)x|dzaZ{rVZ4!ZFWWf
zy<uClqTog5Ff(u7d-JXqvTSirMZVIp<d@-Adbzk3>k%K16Jd)x8aCq=%hVS-Of*Eo
zIz)vxpQpO&i)DpvSMOf{-r=rLKDCo?cPUnap7-PX)12ggUq94O8ye>n-&K|NXRLFS
zHMW(V&*pi?#$VNMwSMAlhq<~5QVi5vW(9-+lF_<HL|{i|2?$c(E1@}3(|h(QHAzKa
u024KM6{1VN36*4og@oW}X}t?7H5d#zZ;e$<fq}V_KzsmVaFXZT0RRBl-EfKk

diff --git a/why3/src/exp.rs b/why3/src/exp.rs
index 309461d708..2dab563a5f 100644
--- a/why3/src/exp.rs
+++ b/why3/src/exp.rs
@@ -433,6 +433,23 @@ impl Exp {
         }
     }
 
+    pub fn if_(cond: Self, then: Self, else_: Self) -> Self {
+        if then.is_true() && else_.is_true() {
+            then
+        } else if cond.is_true() {
+            then
+        } else if cond.is_false() {
+            else_
+        } else {
+            Exp::IfThenElse(Box::new(cond), Box::new(then), Box::new(else_))
+        }
+    }
+
+    /// Build an implication
+    ///
+    /// Performs the following simplifications
+    /// - True -> A <-> A
+    /// - A -> True <-> True
     pub fn implies(self, other: Self) -> Self {
         if self.is_true() {
             other
@@ -443,10 +460,20 @@ impl Exp {
         }
     }
 
+    /// Builds a quantifier with explicit trigger
+    ///
+    /// Simplfies ∀ x, True into True
     pub fn forall_trig(bound: Vec<(Ident, Type)>, trigger: Trigger, body: Exp) -> Self {
-        Exp::Forall(bound, trigger, Box::new(body))
+        if body.is_true() {
+            body
+        } else {
+            Exp::Forall(bound, trigger, Box::new(body))
+        }
     }
 
+    /// Builds a quantifier
+    ///
+    /// Simplfies ∀ x, True into True
     pub fn forall(bound: Vec<(Ident, Type)>, body: Exp) -> Self {
         Exp::forall_trig(bound, Trigger::NONE, body)
     }
@@ -469,6 +496,16 @@ impl Exp {
         }
     }
 
+    pub fn is_false(&self) -> bool {
+        if let Exp::Const(Constant::Bool(false)) = self {
+            true
+        } else if let Exp::Attr(_, e) = self {
+            e.is_false()
+        } else {
+            false
+        }
+    }
+
     pub fn mk_true() -> Self {
         Exp::Const(Constant::const_true())
     }

From 7cc7f8b066d93c467885ecd2ad448eb783e02be8 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sat, 9 Mar 2024 18:55:08 +0100
Subject: [PATCH 55/66] Fix zip

---
 creusot/src/backend/logic/vcgen.rs            |   2 +-
 .../iterators/12_zip/why3session.xml          |  58 +++++++++---------
 .../iterators/12_zip/why3shapes.gz            | Bin 2105 -> 2127 bytes
 .../should_succeed/syntax/02_operators.mlcfg  |   2 +-
 .../syntax/02_operators/why3shapes.gz         | Bin 713 -> 708 bytes
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index 0ec034d868..3b613fdd02 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -283,7 +283,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 //     Ok(Exp::if_(lhs, k(Exp::mk_true())?, self.build_vc(rhs, k)?,))
                 // }),
                 BinOp::Div => self.build_vc(&lhs, &|lhs| {
-                    self.build_vc(rhs, &|rhs| Ok(Exp::pure_var("div").app(vec![lhs.clone(), rhs])))
+                    self.build_vc(rhs, &|rhs| k(Exp::pure_var("div").app(vec![lhs.clone(), rhs])))
                 }),
                 _ => self.build_vc(&lhs, &|lhs| {
                     self.build_vc(rhs, &|rhs| {
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
index 5c63b0250b..87581fa2d5 100644
--- a/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/12_zip/why3session.xml
@@ -7,49 +7,49 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="12_zip.mlcfg"/>
 <theory name="C12Zip_Impl0_ProducesRefl_Impl" proved="true">
- <goal name="postcondition" proved="true">
+ <goal name="vc_produces_refl" proved="true">
  <proof prover="2" timelimit="5" memlimit="2000"><result status="valid" time="0.017139" steps="274"/></proof>
  </goal>
 </theory>
 <theory name="C12Zip_Impl0_ProducesTrans_Impl" proved="true">
- <goal name="postcondition" proved="true">
+ <goal name="vc_produces_trans" proved="true">
  <transf name="split_vc" proved="true" >
-  <goal name="postcondition.0" proved="true">
+  <goal name="vc_produces_trans.0" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
-   <goal name="postcondition.0.0" proved="true">
+   <goal name="vc_produces_trans.0.0" proved="true">
    <transf name="unfold" proved="true" arg1="produces0">
-    <goal name="postcondition.0.0.0" proved="true">
-    <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="pre_0,pre_1">
-     <goal name="postcondition.0.0.0.0" proved="true">
-     <transf name="destruct_rec" proved="true" arg1="pre_1">
-      <goal name="postcondition.0.0.0.0.0" proved="true">
-      <transf name="destruct_rec" proved="true" arg1="pre_0">
-       <goal name="postcondition.0.0.0.0.0.0" proved="true">
-       <transf name="exists" proved="true" arg1="(p21++p2)">
-        <goal name="postcondition.0.0.0.0.0.0.0" proved="true">
-        <transf name="exists" proved="true" arg1="(p11++p1)">
-         <goal name="postcondition.0.0.0.0.0.0.0.0" proved="true">
+    <goal name="vc_produces_trans.0.0.0" proved="true">
+    <transf name="unfold" proved="true" arg1="produces0" arg2="in" arg3="H,H1">
+     <goal name="vc_produces_trans.0.0.0.0" proved="true">
+     <transf name="destruct_rec" proved="true" arg1="H">
+      <goal name="vc_produces_trans.0.0.0.0.0" proved="true">
+      <transf name="destruct_rec" proved="true" arg1="H7">
+       <goal name="vc_produces_trans.0.0.0.0.0.0" proved="true">
+       <transf name="exists" proved="true" arg1="(p2 ++p21)">
+        <goal name="vc_produces_trans.0.0.0.0.0.0.0" proved="true">
+        <transf name="exists" proved="true" arg1="(p1 ++ p11)">
+         <goal name="vc_produces_trans.0.0.0.0.0.0.0.0" proved="true">
          <transf name="split_vc" proved="true" >
-          <goal name="postcondition.0.0.0.0.0.0.0.0.0" proved="true">
-          <proof prover="2"><result status="valid" time="0.011443" steps="36"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.0" proved="true">
+          <proof prover="2"><result status="valid" time="0.011385" steps="36"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.1" proved="true">
-          <proof prover="2"><result status="valid" time="0.011081" steps="36"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.1" proved="true">
+          <proof prover="2"><result status="valid" time="0.011496" steps="36"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.2" proved="true">
-          <proof prover="2"><result status="valid" time="0.012099" steps="39"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.2" proved="true">
+          <proof prover="2"><result status="valid" time="0.011830" steps="39"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.3" proved="true">
-          <proof prover="2"><result status="valid" time="0.011603" steps="39"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.3" proved="true">
+          <proof prover="2"><result status="valid" time="0.011861" steps="39"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.4" proved="true">
-          <proof prover="2"><result status="valid" time="0.023011" steps="249"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.4" proved="true">
+          <proof prover="2"><result status="valid" time="0.023607" steps="249"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.5" proved="true">
-          <proof prover="2"><result status="valid" time="0.014035" steps="95"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.5" proved="true">
+          <proof prover="2"><result status="valid" time="0.013565" steps="95"/></proof>
           </goal>
-          <goal name="postcondition.0.0.0.0.0.0.0.0.6" proved="true">
-          <proof prover="2"><result status="valid" time="0.013065" steps="94"/></proof>
+          <goal name="vc_produces_trans.0.0.0.0.0.0.0.0.6" proved="true">
+          <proof prover="2"><result status="valid" time="0.013294" steps="94"/></proof>
           </goal>
          </transf>
          </goal>
diff --git a/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz b/creusot/tests/should_succeed/iterators/12_zip/why3shapes.gz
index 1af6949cd06f4dd64b291f5e224d65e0efc69657..6eed7c329a6f33b15680e0515941188a592ac2ec 100644
GIT binary patch
literal 2127
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
F008PQGK&BJ

literal 2105
zcmV-92*&pxiwFP!00000|Fu{_bLFTJzWZ1Bmh8+08fYN3KD=^07rrEiq;$w3E|Add
ztM%B9?VU;T>(d~R(0j5yJ3Dr{tX2cv{e9gu$bbHD{`8A~h)?HV;^Wid{_Zd5c>dw1
zv*&;N!`&Czv8y7Aj#m*ns3Pyg)tP^IydQq+;}dk!fBe{~PIu;dT0cE`r^`E*cU9iy
zb+a0$g^f9~g)0Zv$IlPX|Lts9Z<|rxahCjZ5-41GUE-buAZ67+)$poe*R2_-23phE
zF0B2j5)N0@kgC+s{1keU{8PLgmvz(ov~n8C;!RFOS*;f4<-)vJn1|PySLF$Xc~zK)
z!o2!}%&WJVmrV*p)j-wos`)X@%Z7QLnV++ur!0VffGi0Az|Z`Jzm0dFo{4fkOVFyJ
zN<Jj@r}#`#$BqBTZx6Q-vf_a!MV2UVBJk(*KCj#PpD%ifz_g+J{~aD~JpDXWF*G!1
zRY;>%40H5+4u2hg17I}(^FZh;gwS`~t|9QGnJ^?VgRslW3c_xH2-*82_opaAj$xAf
zvK4%Oa$j(<^5i+jtmq5ij~^2W3+(jHkHF8mRslyu%(_NFu_cEInm^FfA5I4+#_BuG
zXlPp;ALjST$6+hi%k&q?@{Ns|vTvBQ`xbY*BQPDXO*Bcrf<uZ_5Trh$r<4V-tKBy+
zz5AAw?T+%iJE?>3qa#KCA`iUbfhH!!5dl0CumNczfd5Vc)?Bv8Y2+C4egkub^Agxs
zk`61dJSi${$SC0@lyLPDf)jXrnO1R?RFY=DiHMqJ=@?sxs2i1bvs)VRs(@)qsa!I3
zQnGU+UKQ(6r(V={nNZ^Aw#3g(ihtvbST)#HO{FuU)D)c&$Hml^(RO=%y}Q2BDN-_D
zD--c@naEX{h@{98#V>RG@})A7t1{WBre#np(`uQBS|+enCZT(6mxqeCL6oqF6&6T}
zTKpno5vREjS6lUb6hABzYWz^+=i6mYyuFqY^>RjVg+e7omLy3T1-_IKTw&Qr+%l+^
zX%&&Gh-8b1r86e9_ZBuCk(+fmZ|+Uh^X7izjCy^Gzji7$8+`-y+uOZGJzoa;de>yj
zMcpnJb+cU5b-JieB6jj>zTd0me!sqG>vWSg)3tYfTekVOoHe#6OnKMs<=xiBjZv~_
zS8h1e8}xi9hvs8XEFT(NHaBavzJ_DI_UkD-*VB!=2q^|zRNTxeT~)Zc<eO@uHJ&Z6
zZqI2uPGJMD?)Y-q2beDVm}>aa_xGQvexBoyHnqRJ`Rn~%Z1VXbX`c>vpJ>kgUD^Qu
zn&$oe{&Vb7v%9?X7irf_OLzV;KHcAbiS*f9j_NEFE$hV80caS?lFJt?h)(F;R0v5Z
zTKevqwjO;L*Ck_#=W8CD1CX`ZB;kU_Iw|&bt!S}RjP@8i5O&fo*k!_==S|qFF_G2T
z1Nd<N_;~*{4uAUmD^2|8;h~dkS~ec;{4H_e4+H((m(ebHVQI0joiO{f?a~B8mVb$l
zhv%EakaqM<UezZcX+`Z9Y4JX<rahG6S$M|EGv;xuaSOHIS9$!J^FhOuWK!Iu{Oo5o
z%NVi4_thG2d81m>$Gq`WGrHvsQ_bj^w`z=Kb@sqcdCP+xRNkoOhyf5SZ|N|+$g{BW
zMos>dHxNCac%$K|lcvS{zg=FAOAXFqEyfgW>8_pToz7%vl5@I9qjI|Fy+hnL1&X#5
z8Rn|Mxn$6+s7IBDu~Ls}p+1exg^cyo$BY<Nhq4wj%5@<l+bU$zE(y`%th+oP?;p?a
z;(wm!#><w*%a_L6G`yzYHSMnXZ%*5!88zvt3pIVWQC>|o(A8e2kJh#gep`RFYX?&E
zZWX1$S1+Y}O?kKFowK4ia`T6+U8SG1ReL?zDXF`*8^u!1FWaOZwdVTwS>bHk%+;>_
zXBQ;G&oqN!G^5vE86&j^Ce1i9HI9g6N1k);ICIt+ryV-wq!SJtckC>L9+}i*k0_aj
zF+>AoCEx&lBui;2N++2U)(PW;b^;xOL+*fnnd8=R<G6Ml9aoM^$A#nYj+S|lO7qbu
z9=%6U5yvQ@AHWO&SQx+Gax^RsLV1bOT5ok2sbOiZ`Jns0SD8o@-(y*zqz=&!qZd97
z(S`t?juePigC|O|Wp->?S*OGsmbDdL25PWW0x^tYltO5x0ux+=9xz!}=ESmgivB96
zqyzdTFYvZ6j|j$k(fdJZHueJ@3RHMN;>eis*%uu963PjxIN=01!JS|ZtOMgfJ3t3&
z3E++F;1IkJ5=W3c^ifhx@xdAcGW3!S**kwP@5+yyp#h;79{_C_M>`lkMz0Y^ku#`H
zGWessW8X6`81{OwVz6UM14yHMu$GNBGcVr_y9pvnR6W;3z4qFUeIJ4X%b6XO)Y<#H
z<y|ph49B1%ZTy}~27z{^isLvSu@bZQlU@0vy!Sz?Frw)h_tF|32C0?CfE;@tnabWz
zy3LRBE;P|=8I^aSnh(^}18C*xTW$y@n%t43b`qUb@5TTk0~<vTwEeZ@hBDx-XWVGZ
zsQ_~fCmrTTc@K<_+9IW!`aPr1FrXGNP&*YS+OqGYeJ}5W6uqH*k2o4525ARxsIw{=
zH7IL`bHklsPFttxaMezu)5>Y-v~U`n=1wz*)}e7oXD=NV>WoXn3~gIFu2GBueSje<
zA~$*w1?G-z=&&}<XlKwF<&1PjI0I)kFsW!4^az1ULX33SM^s7<GO94-y<pk)TIL7V
j2Mk<L^`f=3p|qqEG$_kdWG1iW+iU+1T7)d@J{<r6#BeDh

diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
index 1bec1d5b15..52a2159d64 100644
--- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg
+++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
@@ -183,7 +183,7 @@ module C02Operators_ExpressionLogic_Impl
   constant y  : usize
   constant z  : usize
   function expression_logic [#"../02_operators.rs" 83 0 83 57] (x : usize) (y : usize) (z : usize) : bool
-  goal vc_expression_logic : div x y
+  goal vc_expression_logic : [#"../02_operators.rs" 82 10 82 16] div x y * z = div x y * z
 end
 module C02Operators_X_Type
   use prelude.UIntSize
diff --git a/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz b/creusot/tests/should_succeed/syntax/02_operators/why3shapes.gz
index dc0fe1513a03905677e5830afd76818dde1c3ea9..38f6afe3ad6e1d2136f2121101a9230360513419 100644
GIT binary patch
delta 692
zcmV;l0!#hL1;hoA9DgAeO@N?)A#b`Wv^9n=RDc~hmK-Gg`cjJH$a0gWyKZc9IJ&%Z
zIONBRqWekP*cJD2*EQ|!mqHg8pBOc_E7$ICLr0;xr+stVYxyDn)_gh<H{a>%B;ffn
zhiarByM4TQ87_xWLkn7WaSY^nPF^gZ{+H)6!$J)?;hOq(HGf1Q=d=1-k=k96T{VN>
zsnbmx{zIqP)qcJ2rbaJbwFyi5dX?7?I{YYj7|@0uCer(L-)z^9Q|-&YXkWfln?jh%
zett{#`YNxV$xaw_d&e>*P)EX`W{Arg<j8m!%pjL1`^oWpSpzO+d4Q*AL7W`b;^wt8
zm?e%I<RgW%4S(Rx>tIiIcr$a}j`q-wz+d|DFdp6T87_P1NPE_iPm$V=9Xa4M^D4|~
z@%o*R^cf>vtGTv%vuu1fAe;lj10earM;`IW867;(!81Bfks3!j<5e46ymlpOF})i%
zf4<=HVY`dn(_{23__8BCOec@i$*+G(W^uFaA6MgZ&3^{#uc711{^)JHYc@^a+{cw~
zH(S~@-RQFBHQWu)){&r?5zGmTql#<W^(x-6e%U{V+I3j<vFjNNV3d=k5hZY6dIKU^
zZ6lSMf&p0;P;q8CkHJ{)ZRw1O#&KyRftQh^1g;CL1dBeRv{oe$(SZUYlp#{SoFzrH
zP^d~WX@7!<feX@TOH?V56&_4Pk7Rs+!c>}pQdW_3Ng2s?D#>EhfYHUojgPjlRmlj!
zaOE7giG#K1Wv;=aMUpnjWD0-^ICHrQ6fS9JrB)8fiNIsz+z20q)dgS$f=LKg*%X~L
zM1jlbb8%?B%yJ_8EI?HtnZ~>$@Zfb>av!8JNiF&k&~Qr-5ehIBXlAU&j6lj@gG@0b
aa*zxv;4z^P8LF+IWWNE%3J*NL2LJ%D?oovR

delta 697
zcmV;q0!IDB1<3`F9Di9f0fGXC3=~}z+8TVK0_@1K<RIzSmy%USmK!(Sbz_sm(dC^(
z4&PrD?GL++ZSfd)ZQa~|Dr9l>f!O+f<(mC{Xl<w;?Y_S6B!8EGD>|L9yKna9B;e^X
zhbpw+cl&tvGF<kf+Ai$6jYA;MbMj(&_+OsO^a~Z_gj?G+tA9QUIiFNtiq!0i?5ghl
zPMvO=@E<zOuJ-GFJ2iUss!dqh&o_B})S*YgabP$0X(GK}clCDtJk`Gbi}v*!wQUGf
z*^ifGZ*TJYne2o?yLTj00&ye^Vun~(zz4?tU<O&A?8k@ic?Gzb<pG|e1$J^&i@Vp(
zV3s&+kdGA3Hh+MN?O;xJxR^P=j%K`$Kws|TI3C>487?#4NON{050T0YH?qg6=2fWE
z;^iA5$umZ>5_4^Fv21)ZAe;lj5fFdj!;g6Qj1G=;@QltOQsF>nXtmzOYb{Z+X>Z*9
zxxwSpb{E^jV{}s;&g|={p>dlRANFZFd7e&w{!=oEn}2Qhyc!;H(iij^P`d1nj<>sd
zQ+M@aT={0RwY$0<y;tziKW0a+Y{oSwERHI!Y1XUwK)Pl3JJhVhs*7z$NB|`q*NSPN
zUV8;B8EK-`(gp=w7f@1SD2+iG?~Qg!Mdc`0+=AzkA_po9EE$PDA~!}PV9|j9YmtX&
zbIWQQ(SJZ8N=~>6EC$M~M59rpWDWD6B6_sS2Pjl22?$|?buJ0TsZ81$j1n-qn5gp6
z6sFX~A}A`Hqb5->20hO;cr<9aNj#|npae>|pezY(B-L3hDe4%ace!RMlS5emmcR&y
zV1!B0ab<0wJo;Q58qc#F%RUPbC2%4!?+7$_sWLV7feV$m*MN!|3lX6JRe~hSNX!U0
f4<_&wL$VH%LIE@;WGq89C1~;s_E-<X)dv6oOd(8t


From cfbd16195f3863237de33c1560d02b0afadd8954 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sun, 10 Mar 2024 11:01:56 +0100
Subject: [PATCH 56/66] Remove 'impure' term lowering

---
 creusot/src/backend/clone_map/elaborator.rs   |   4 +-
 creusot/src/backend/constant.rs               |   4 +-
 creusot/src/backend/program.rs                |   7 +-
 creusot/src/backend/term.rs                   |  10 -
 .../bug/01_resolve_unsoundness.mlcfg          |   8 +-
 creusot/tests/should_fail/bug/222.mlcfg       |   2 +-
 creusot/tests/should_fail/bug/492.mlcfg       |   8 +-
 creusot/tests/should_fail/bug/692.mlcfg       |  12 +-
 creusot/tests/should_fail/bug/695.mlcfg       |  14 +-
 creusot/tests/should_fail/bug/869.mlcfg       |   2 +-
 .../tests/should_fail/bug/specialize.mlcfg    |   6 +-
 creusot/tests/should_fail/bug/subregion.mlcfg |   4 +-
 creusot/tests/should_fail/final_borrows.mlcfg |  12 +-
 .../should_fail/opaque_unproveable.mlcfg      |   2 +-
 .../traits/17_impl_refinement.mlcfg           |   2 +-
 creusot/tests/should_succeed/100doors.mlcfg   |  16 +-
 creusot/tests/should_succeed/all_zero.mlcfg   |   4 +-
 creusot/tests/should_succeed/bdd.mlcfg        |  44 +-
 .../tests/should_succeed/binary_search.mlcfg  |  22 +-
 creusot/tests/should_succeed/bug/168.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/173.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/195.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/206.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/235.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/256.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/258.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/271.mlcfg    |  22 +-
 creusot/tests/should_succeed/bug/273.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/387.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/395.mlcfg    |  14 +-
 creusot/tests/should_succeed/bug/463.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/486.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/510.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/511.mlcfg    |  12 +-
 creusot/tests/should_succeed/bug/545.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/552.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/570.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/594.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/641.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/682.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/691.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/693.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/789.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/791.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/949.mlcfg    |   8 +-
 .../should_succeed/bug/final_borrows.mlcfg    |  30 +-
 .../should_succeed/bug/minus_assoc.mlcfg      |   2 +-
 .../tests/should_succeed/bug/two_phase.mlcfg  |   2 +-
 creusot/tests/should_succeed/cell/01.mlcfg    |  10 +-
 creusot/tests/should_succeed/cell/02.mlcfg    |  12 +-
 .../tests/should_succeed/checked_ops.mlcfg    | 572 +++++++++---------
 creusot/tests/should_succeed/clones/01.mlcfg  |   6 +-
 creusot/tests/should_succeed/clones/02.mlcfg  |   2 +-
 creusot/tests/should_succeed/clones/03.mlcfg  |   8 +-
 creusot/tests/should_succeed/clones/04.mlcfg  |   2 +-
 .../should_succeed/closures/01_basic.mlcfg    |  24 +-
 .../should_succeed/closures/02_nested.mlcfg   |   4 +-
 .../closures/03_generic_bound.mlcfg           |   2 +-
 .../closures/04_generic_closure.mlcfg         |   2 +-
 .../should_succeed/closures/06_fn_specs.mlcfg |   2 +-
 .../closures/07_mutable_capture.mlcfg         |   6 +-
 .../closures/08_multiple_calls.mlcfg          |   4 +-
 creusot/tests/should_succeed/drop_pair.mlcfg  |   6 +-
 creusot/tests/should_succeed/duration.mlcfg   |  32 +-
 .../should_succeed/filter_positive.mlcfg      |  34 +-
 .../should_succeed/ghost_ptr_token.mlcfg      |  16 +-
 creusot/tests/should_succeed/hashmap.mlcfg    |  54 +-
 .../should_succeed/heapsort_generic.mlcfg     |  44 +-
 creusot/tests/should_succeed/hillel.mlcfg     |  30 +-
 creusot/tests/should_succeed/immut.mlcfg      |   4 +-
 .../tests/should_succeed/index_range.mlcfg    | 330 +++++-----
 .../inplace_list_reversal.mlcfg               |   2 +-
 creusot/tests/should_succeed/instant.mlcfg    |   8 +-
 .../should_succeed/invariant_moves.mlcfg      |   2 +-
 .../tests/should_succeed/ite_normalize.mlcfg  |   6 +-
 .../should_succeed/iterators/01_range.mlcfg   |   8 +-
 .../iterators/02_iter_mut.mlcfg               |   4 +-
 .../iterators/03_std_iterators.mlcfg          |  46 +-
 .../should_succeed/iterators/04_skip.mlcfg    |   4 +-
 .../iterators/06_map_precond.mlcfg            |  12 +-
 .../iterators/08_collect_extend.mlcfg         |   8 +-
 .../iterators/15_enumerate.mlcfg              |   4 +-
 .../should_succeed/iterators/16_take.mlcfg    |   4 +-
 creusot/tests/should_succeed/knapsack.mlcfg   |  30 +-
 .../tests/should_succeed/knapsack_full.mlcfg  |  26 +-
 .../should_succeed/lang/assoc_type.mlcfg      |   2 +-
 .../should_succeed/lang/branch_borrow_2.mlcfg |  50 +-
 creusot/tests/should_succeed/lang/const.mlcfg |   2 +-
 creusot/tests/should_succeed/lang/empty.mlcfg |   2 +-
 .../tests/should_succeed/lang/float_ops.mlcfg |  12 +-
 .../tests/should_succeed/lang/literals.mlcfg  |  10 +-
 .../should_succeed/lang/module_paths.mlcfg    |   2 +-
 .../tests/should_succeed/lang/modules.mlcfg   |  10 +-
 .../tests/should_succeed/lang/move_path.mlcfg |   6 +-
 .../should_succeed/lang/multiple_scopes.mlcfg |   8 +-
 .../lang/promoted_constants.mlcfg             |  24 +-
 .../tests/should_succeed/lang/unary_op.mlcfg  |   4 +-
 .../tests/should_succeed/lang/unions.mlcfg    |   2 +-
 .../tests/should_succeed/lang/while_let.mlcfg |   4 +-
 .../tests/should_succeed/list_index_mut.mlcfg |  14 +-
 .../should_succeed/list_reversal_lasso.mlcfg  |  28 +-
 creusot/tests/should_succeed/loop.mlcfg       |   8 +-
 .../tests/should_succeed/mapping_test.mlcfg   |   8 +-
 creusot/tests/should_succeed/match_int.mlcfg  |  18 +-
 creusot/tests/should_succeed/mc91.mlcfg       |   6 +-
 creusot/tests/should_succeed/mutex.mlcfg      |  14 +-
 .../should_succeed/one_side_update.mlcfg      |  10 +-
 creusot/tests/should_succeed/option.mlcfg     |  76 +--
 .../should_succeed/projection_toggle.mlcfg    |  12 +-
 .../tests/should_succeed/projections.mlcfg    |  12 +-
 creusot/tests/should_succeed/prophecy.mlcfg   |   6 +-
 .../tests/should_succeed/red_black_tree.mlcfg |  88 +--
 creusot/tests/should_succeed/replace.mlcfg    |   2 +-
 .../tests/should_succeed/resolve_uninit.mlcfg |  16 +-
 creusot/tests/should_succeed/result/own.mlcfg |   2 +-
 .../tests/should_succeed/result/result.mlcfg  | 102 ++--
 .../should_succeed/rusthorn/inc_max.mlcfg     |   4 +-
 .../should_succeed/rusthorn/inc_max_3.mlcfg   |  20 +-
 .../rusthorn/inc_max_many.mlcfg               |   2 +-
 .../rusthorn/inc_max_repeat.mlcfg             |   6 +-
 .../rusthorn/inc_some_2_list.mlcfg            |   6 +-
 .../rusthorn/inc_some_2_tree.mlcfg            |  10 +-
 .../rusthorn/inc_some_list.mlcfg              |   6 +-
 .../rusthorn/inc_some_tree.mlcfg              |   8 +-
 .../selection_sort_generic.mlcfg              |  12 +-
 creusot/tests/should_succeed/slices/01.mlcfg  |  12 +-
 .../tests/should_succeed/slices/02_std.mlcfg  |   4 +-
 .../tests/should_succeed/sparse_array.mlcfg   |  44 +-
 creusot/tests/should_succeed/spec_tests.mlcfg |   2 +-
 .../specification/division.mlcfg              |   2 +-
 .../should_succeed/specification/forall.mlcfg |   2 +-
 .../specification/logic_call.mlcfg            |   2 +-
 .../specification/logic_functions.mlcfg       |   4 +-
 .../should_succeed/specification/loops.mlcfg  |   2 +-
 .../should_succeed/specification/model.mlcfg  |   4 +-
 .../should_succeed/specification/opaque.mlcfg |   2 +-
 .../specification/trusted.mlcfg               |   2 +-
 .../tests/should_succeed/split_borrow.mlcfg   |  26 +-
 creusot/tests/should_succeed/std_types.mlcfg  |   2 +-
 creusot/tests/should_succeed/sum.mlcfg        |   4 +-
 .../tests/should_succeed/sum_of_odds.mlcfg    |  10 +-
 .../tests/should_succeed/swap_borrows.mlcfg   |   6 +-
 creusot/tests/should_succeed/switch.mlcfg     |   4 +-
 .../tests/should_succeed/switch_struct.mlcfg  |   4 +-
 .../should_succeed/syntax/01_idents.mlcfg     |  10 +-
 .../should_succeed/syntax/02_operators.mlcfg  |  12 +-
 .../should_succeed/syntax/04_assoc_prec.mlcfg |   4 +-
 .../syntax/05_annotations.mlcfg               |   2 +-
 .../should_succeed/syntax/05_pearlite.mlcfg   |  10 +-
 .../syntax/07_extern_spec.mlcfg               |   2 +-
 .../should_succeed/syntax/09_maintains.mlcfg  |  10 +-
 .../syntax/10_mutual_rec_types.mlcfg          |   6 +-
 .../syntax/11_array_types.mlcfg               |   8 +-
 .../should_succeed/syntax/12_ghost_code.mlcfg |  24 +-
 .../should_succeed/syntax/13_vec_macro.mlcfg  |   8 +-
 .../should_succeed/syntax/14_const_fns.mlcfg  |   2 +-
 .../should_succeed/syntax/derive_macros.mlcfg |  12 +-
 creusot/tests/should_succeed/trait.mlcfg      |   4 +-
 creusot/tests/should_succeed/trait_impl.mlcfg |   4 +-
 creusot/tests/should_succeed/traits/03.mlcfg  |   4 +-
 creusot/tests/should_succeed/traits/04.mlcfg  |   2 +-
 creusot/tests/should_succeed/traits/06.mlcfg  |   2 +-
 creusot/tests/should_succeed/traits/07.mlcfg  |   2 +-
 creusot/tests/should_succeed/traits/08.mlcfg  |   4 +-
 creusot/tests/should_succeed/traits/09.mlcfg  |   2 +-
 creusot/tests/should_succeed/traits/11.mlcfg  |   2 +-
 .../traits/12_default_method.mlcfg            |   4 +-
 .../traits/15_impl_interfaces.mlcfg           |   2 +-
 .../traits/16_impl_cloning.mlcfg              |   2 +-
 .../tests/should_succeed/two_modules.mlcfg    |   4 +-
 .../should_succeed/type_constructors.mlcfg    |   2 +-
 .../type_invariants/borrows.mlcfg             |  28 +-
 .../type_invariants/generated.mlcfg           |   2 +-
 .../type_invariants/vec_inv.mlcfg             |   2 +-
 .../tests/should_succeed/unused_in_loop.mlcfg |   2 +-
 creusot/tests/should_succeed/vecdeque.mlcfg   |  28 +-
 creusot/tests/should_succeed/vector/01.mlcfg  |   6 +-
 .../should_succeed/vector/02_gnome.mlcfg      |  18 +-
 .../vector/03_knuth_shuffle.mlcfg             |   8 +-
 .../vector/04_binary_search.mlcfg             |  14 +-
 .../vector/05_binary_search_generic.mlcfg     |  14 +-
 .../vector/06_knights_tour.mlcfg              |  44 +-
 .../should_succeed/vector/07_read_write.mlcfg |   2 +-
 .../should_succeed/vector/08_haystack.mlcfg   |   4 +-
 .../should_succeed/vector/09_capacity.mlcfg   |  10 +-
 186 files changed, 1417 insertions(+), 1430 deletions(-)

diff --git a/creusot/src/backend/clone_map/elaborator.rs b/creusot/src/backend/clone_map/elaborator.rs
index bc5982c441..5d6ac35cc8 100644
--- a/creusot/src/backend/clone_map/elaborator.rs
+++ b/creusot/src/backend/clone_map/elaborator.rs
@@ -18,7 +18,7 @@ use crate::{
         dependency::HackedId,
         logic::{lower_logical_defn, lower_pure_defn, sigs, spec_axiom},
         signature::sig_to_why3,
-        term::{lower_impure, lower_pure},
+        term::lower_pure,
         ty_inv::InvariantElaborator,
         TransId, Why3Generator,
     },
@@ -183,7 +183,7 @@ impl<'tcx> SymbolElaborator<'tcx> {
 
             let span = ctx.def_span(def_id);
             let res = crate::constant::from_ty_const(&mut ctx.ctx, constant, param_env, span);
-            let res = lower_impure(ctx, names, &res);
+            let res = lower_pure(ctx, names, &res);
 
             vec![Decl::Let(LetDecl {
                 kind: Some(LetKind::Constant),
diff --git a/creusot/src/backend/constant.rs b/creusot/src/backend/constant.rs
index 1ec964b1ef..28e8cad3f1 100644
--- a/creusot/src/backend/constant.rs
+++ b/creusot/src/backend/constant.rs
@@ -6,7 +6,7 @@ use crate::{ctx::TranslatedItem, translation::constant::from_ty_const};
 use super::{
     clone_map::{CloneMap, CloneSummary},
     signature::signature_of,
-    term::lower_impure,
+    term::lower_pure,
     CloneDepth, Why3Generator,
 };
 
@@ -27,7 +27,7 @@ impl<'tcx> Why3Generator<'tcx> {
         let span = self.def_span(def_id);
         let res = from_ty_const(&mut self.ctx, constant, param_env, span);
         let mut names = CloneMap::new(self.tcx, def_id.into());
-        let _ = lower_impure(self, &mut names, &res);
+        let _ = lower_pure(self, &mut names, &res);
         let _ = signature_of(self, &mut names, def_id);
         let (_, summary) = names.to_clones(self, CloneDepth::Shallow);
 
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index 1094aeb126..32aab91fd7 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -1,8 +1,5 @@
 use super::{
-    clone_map::PreludeModule,
-    dependency::HackedId,
-    signature::signature_of,
-    term::{lower_impure, lower_pure},
+    clone_map::PreludeModule, dependency::HackedId, signature::signature_of, term::lower_pure,
     CloneDepth, CloneSummary, Namer, TransId, Why3Generator,
 };
 use crate::{
@@ -304,7 +301,7 @@ impl<'tcx> Operand<'tcx> {
         match self {
             Operand::Move(pl) => pl.as_rplace(ctx, names, locals),
             Operand::Copy(pl) => pl.as_rplace(ctx, names, locals),
-            Operand::Constant(c) => lower_impure(ctx, names, &c),
+            Operand::Constant(c) => lower_pure(ctx, names, &c),
         }
     }
     fn invalidated_places(&self, places: &mut Vec<fmir::Place<'tcx>>) {
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index ad7976ae3a..6c886700d4 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -25,16 +25,6 @@ pub(crate) fn lower_pure<'tcx, N: Namer<'tcx>>(
     ctx.attach_span(span, term)
 }
 
-pub(crate) fn lower_impure<'tcx, N: Namer<'tcx>>(
-    ctx: &mut Why3Generator<'tcx>,
-    names: &mut N,
-    term: &Term<'tcx>,
-) -> Exp {
-    let mut term = Lower { ctx, names, pure: Purity::Program }.lower_term(term);
-    term.reassociate();
-    term
-}
-
 pub(super) struct Lower<'a, 'tcx, N: Namer<'tcx>> {
     pub(super) ctx: &'a mut Why3Generator<'tcx>,
     pub(super) names: &'a mut N,
diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
index edcae4251c..d78da421e5 100644
--- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
+++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
@@ -127,11 +127,11 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB0
   }
   BB0 {
-    [#"../01_resolve_unsoundness.rs" 10 29 10 39] out <- ([#"../01_resolve_unsoundness.rs" 10 29 10 39] new0 ());
+    [#"../01_resolve_unsoundness.rs" 10 29 10 39] out <- ([#"../01_resolve_unsoundness.rs" 10 29 10 39] new0 ([#"../01_resolve_unsoundness.rs" 10 29 10 39] ()));
     goto BB1
   }
   BB1 {
-    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
+    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] [#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -148,12 +148,12 @@ module C01ResolveUnsoundness_MakeVecOfSize
   BB4 {
     [#"../01_resolve_unsoundness.rs" 14 8 14 11] _13 <- Borrow.borrow_mut out;
     [#"../01_resolve_unsoundness.rs" 14 8 14 11] out <-  ^ _13;
-    [#"../01_resolve_unsoundness.rs" 14 8 14 23] _12 <- ([#"../01_resolve_unsoundness.rs" 14 8 14 23] push0 _13 false);
+    [#"../01_resolve_unsoundness.rs" 14 8 14 23] _12 <- ([#"../01_resolve_unsoundness.rs" 14 8 14 23] push0 _13 ([#"../01_resolve_unsoundness.rs" 14 17 14 22] false));
     _13 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
     goto BB5
   }
   BB5 {
-    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + (1 : usize));
+    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + ([#"../01_resolve_unsoundness.rs" 15 13 15 14] (1 : usize)));
     goto BB2
   }
   BB6 {
diff --git a/creusot/tests/should_fail/bug/222.mlcfg b/creusot/tests/should_fail/bug/222.mlcfg
index 2d61a81f46..a3ba445795 100644
--- a/creusot/tests/should_fail/bug/222.mlcfg
+++ b/creusot/tests/should_fail/bug/222.mlcfg
@@ -106,7 +106,7 @@ module C222_UsesInvariant
     goto BB2
   }
   BB2 {
-    [#"../222.rs" 40 42 42 1] _0 <- ([#"../222.rs" 40 42 42 1] ());
+    [#"../222.rs" 40 42 42 1] _0 <- ([#"../222.rs" 40 42 42 1] [#"../222.rs" 40 42 42 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/492.mlcfg b/creusot/tests/should_fail/bug/492.mlcfg
index 21d7ec792e..e142f65282 100644
--- a/creusot/tests/should_fail/bug/492.mlcfg
+++ b/creusot/tests/should_fail/bug/492.mlcfg
@@ -52,7 +52,7 @@ module C492_ReborrowTuple
     [#"../492.rs" 6 5 6 6] _3 <- Borrow.borrow_final ( * x) (Borrow.get_id x);
     [#"../492.rs" 6 5 6 6] x <- { x with current = ( ^ _3) ; };
     assume { inv0 ( ^ _3) };
-    [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, (32 : uint32)));
+    [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, ([#"../492.rs" 6 8 6 10] (32 : uint32))));
     _3 <- any borrowed t;
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
@@ -119,7 +119,7 @@ module C492_Test
     goto BB0
   }
   BB0 {
-    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] (5 : int32));
+    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] [#"../492.rs" 11 16 11 17] (5 : int32));
     [#"../492.rs" 12 34 12 40] _6 <- Borrow.borrow_mut x;
     [#"../492.rs" 12 34 12 40] x <-  ^ _6;
     [#"../492.rs" 12 34 12 40] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -134,9 +134,9 @@ module C492_Test
     assume { resolve0 _4 };
     assume { resolve1 _6 };
     assert { [@expl:assertion] [#"../492.rs" 13 18 13 30]  ^ res = (5 : int32) };
-    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] (10 : int32)) ; };
+    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] [#"../492.rs" 14 11 14 13] (10 : int32)) ; };
     assume { resolve1 res };
-    [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] ());
+    [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] [#"../492.rs" 10 14 15 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/692.mlcfg b/creusot/tests/should_fail/bug/692.mlcfg
index b38b939b26..1d0e550225 100644
--- a/creusot/tests/should_fail/bug/692.mlcfg
+++ b/creusot/tests/should_fail/bug/692.mlcfg
@@ -157,7 +157,7 @@ module C692_Incorrect
     goto BB1
   }
   BB1 {
-    [#"../692.rs" 8 77 8 79] _0 <- ([#"../692.rs" 8 77 8 79] ());
+    [#"../692.rs" 8 77 8 79] _0 <- ([#"../692.rs" 8 77 8 79] [#"../692.rs" 8 77 8 79] ());
     goto BB2
   }
   BB2 {
@@ -219,18 +219,18 @@ module C692_ValidNormal_Closure2
       end
   }
   BB1 {
-    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] (2 : uint32));
+    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] [#"../692.rs" 16 25 16 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] (1 : uint32));
+    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] [#"../692.rs" 16 36 16 37] (1 : uint32));
     goto BB3
   }
   BB3 {
     [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 =  * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = ([#"../692.rs" 16 14 16 39] _4) ; })) ; };
     _4 <- any uint32;
     assume { resolve0 _1 };
-    [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] ());
+    [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] [#"../692.rs" 16 14 16 39] ());
     [#"../692.rs" 15 17 15 64] _0 <- ([#"../692.rs" 15 17 15 64] res);
     return _0
   }
@@ -267,7 +267,7 @@ module C692_ValidNormal_Closure1
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] field_00 _1 > (7 : uint32));
+    [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] field_00 _1 > ([#"../692.rs" 14 11 14 15] (7 : uint32)));
     [#"../692.rs" 13 15 13 47] _0 <- ([#"../692.rs" 13 15 13 47] res);
     return _0
   }
@@ -341,7 +341,7 @@ module C692_ValidNormal
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] (0 : uint32));
+    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] [#"../692.rs" 12 16 12 20] (0 : uint32));
     [#"../692.rs" 13 15 13 47] cond <- ([#"../692.rs" 13 15 13 47] C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n);
     [#"../692.rs" 15 17 15 64] _7 <- Borrow.borrow_mut r;
     [#"../692.rs" 15 17 15 64] r <-  ^ _7;
diff --git a/creusot/tests/should_fail/bug/695.mlcfg b/creusot/tests/should_fail/bug/695.mlcfg
index d3ed638384..d9987ad85d 100644
--- a/creusot/tests/should_fail/bug/695.mlcfg
+++ b/creusot/tests/should_fail/bug/695.mlcfg
@@ -207,7 +207,7 @@ module C695_InversedIf
   BB4 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 10 8 10 21] _11 <- ([#"../695.rs" 10 8 10 21] (false));
+    [#"../695.rs" 10 8 10 21] _11 <- ([#"../695.rs" 10 8 10 21] (([#"../695.rs" 10 15 10 20] false)));
     [#"../695.rs" 10 8 10 21] _0 <- ([#"../695.rs" 10 8 10 21] call_once0 branch _11);
     branch <- any b;
     _11 <- any bool;
@@ -216,7 +216,7 @@ module C695_InversedIf
   BB5 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 8 8 8 20] _9 <- ([#"../695.rs" 8 8 8 20] (true));
+    [#"../695.rs" 8 8 8 20] _9 <- ([#"../695.rs" 8 8 8 20] (([#"../695.rs" 8 15 8 19] true)));
     [#"../695.rs" 8 8 8 20] _0 <- ([#"../695.rs" 8 8 8 20] call_once0 branch _9);
     branch <- any b;
     _9 <- any bool;
@@ -288,18 +288,18 @@ module C695_Valid_Closure2
       end
   }
   BB1 {
-    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] (2 : uint32));
+    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] [#"../695.rs" 20 25 20 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] (1 : uint32));
+    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] [#"../695.rs" 20 36 20 37] (1 : uint32));
     goto BB3
   }
   BB3 {
     [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 =  * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = ([#"../695.rs" 20 14 20 39] _4) ; })) ; };
     _4 <- any uint32;
     assume { resolve0 _1 };
-    [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] ());
+    [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] [#"../695.rs" 20 14 20 39] ());
     [#"../695.rs" 19 17 19 64] _0 <- ([#"../695.rs" 19 17 19 64] res);
     return _0
   }
@@ -336,7 +336,7 @@ module C695_Valid_Closure1
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] field_00 _1 > (7 : uint32));
+    [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] field_00 _1 > ([#"../695.rs" 18 11 18 15] (7 : uint32)));
     [#"../695.rs" 17 15 17 47] _0 <- ([#"../695.rs" 17 15 17 47] res);
     return _0
   }
@@ -415,7 +415,7 @@ module C695_Valid
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] (0 : uint32));
+    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] [#"../695.rs" 16 16 16 20] (0 : uint32));
     [#"../695.rs" 17 15 17 47] cond <- ([#"../695.rs" 17 15 17 47] C695_Valid_Closure1.C695_Valid_Closure1 n);
     [#"../695.rs" 19 17 19 64] _7 <- Borrow.borrow_mut r;
     [#"../695.rs" 19 17 19 64] r <-  ^ _7;
diff --git a/creusot/tests/should_fail/bug/869.mlcfg b/creusot/tests/should_fail/bug/869.mlcfg
index 336bd0c7c1..3e719f8f9e 100644
--- a/creusot/tests/should_fail/bug/869.mlcfg
+++ b/creusot/tests/should_fail/bug/869.mlcfg
@@ -67,7 +67,7 @@ module C869_Unsound
     assume { resolve0 xm };
     assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( ^ evil)) };
     assert { [@expl:assertion] [#"../869.rs" 20 20 20 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( * evil)) };
-    [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] ());
+    [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] [#"../869.rs" 4 17 21 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg
index 2b62b6f2c4..4575f99212 100644
--- a/creusot/tests/should_fail/bug/specialize.mlcfg
+++ b/creusot/tests/should_fail/bug/specialize.mlcfg
@@ -62,7 +62,7 @@ module Specialize_F
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 24 20 24 25] false };
-    [#"../specialize.rs" 21 18 25 1] _0 <- ([#"../specialize.rs" 21 18 25 1] ());
+    [#"../specialize.rs" 21 18 25 1] _0 <- ([#"../specialize.rs" 21 18 25 1] [#"../specialize.rs" 21 18 25 1] ());
     goto BB2
   }
   BB2 {
@@ -126,7 +126,7 @@ module Specialize_G
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 31 20 31 25] false };
-    [#"../specialize.rs" 27 19 32 1] _0 <- ([#"../specialize.rs" 27 19 32 1] ());
+    [#"../specialize.rs" 27 19 32 1] _0 <- ([#"../specialize.rs" 27 19 32 1] [#"../specialize.rs" 27 19 32 1] ());
     goto BB2
   }
   BB2 {
@@ -191,7 +191,7 @@ module Specialize_H
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 37 20 37 25] false };
-    [#"../specialize.rs" 34 18 38 1] _0 <- ([#"../specialize.rs" 34 18 38 1] ());
+    [#"../specialize.rs" 34 18 38 1] _0 <- ([#"../specialize.rs" 34 18 38 1] [#"../specialize.rs" 34 18 38 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_fail/bug/subregion.mlcfg b/creusot/tests/should_fail/bug/subregion.mlcfg
index f5199bad20..372f9de375 100644
--- a/creusot/tests/should_fail/bug/subregion.mlcfg
+++ b/creusot/tests/should_fail/bug/subregion.mlcfg
@@ -15,7 +15,7 @@ module Subregion_ListReversalH
     goto BB0
   }
   BB0 {
-    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] (0 : usize));
+    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] [#"../subregion.rs" 4 16 4 17] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -23,7 +23,7 @@ module Subregion_ListReversalH
     goto BB2
   }
   BB2 {
-    [#"../subregion.rs" 6 10 6 16] _7 <- ([#"../subregion.rs" 6 10 6 16] l <> (0 : usize));
+    [#"../subregion.rs" 6 10 6 16] _7 <- ([#"../subregion.rs" 6 10 6 16] l <> ([#"../subregion.rs" 6 15 6 16] (0 : usize)));
     switch (_7)
       | False -> goto BB4
       | True -> goto BB3
diff --git a/creusot/tests/should_fail/final_borrows.mlcfg b/creusot/tests/should_fail/final_borrows.mlcfg
index a4d8b7fa04..11796ac7e4 100644
--- a/creusot/tests/should_fail/final_borrows.mlcfg
+++ b/creusot/tests/should_fail/final_borrows.mlcfg
@@ -48,7 +48,7 @@ module FinalBorrows_NotFinalBorrow
     assume { inv0 ( ^ _b2) };
     assert { [@expl:type invariant] inv1 _b2 };
     assume { resolve0 _b2 };
-    [#"../final_borrows.rs" 5 40 9 1] _0 <- ([#"../final_borrows.rs" 5 40 9 1] ());
+    [#"../final_borrows.rs" 5 40 9 1] _0 <- ([#"../final_borrows.rs" 5 40 9 1] [#"../final_borrows.rs" 5 40 9 1] ());
     assert { [@expl:type invariant] inv1 bor };
     assume { resolve0 bor };
     return _0
@@ -116,7 +116,7 @@ module FinalBorrows_StoreChangesProphecy
   }
   BB3 {
     assert { [@expl:assertion] [#"../final_borrows.rs" 15 18 15 27] b1 = bor };
-    [#"../final_borrows.rs" 11 52 16 1] _0 <- ([#"../final_borrows.rs" 11 52 16 1] ());
+    [#"../final_borrows.rs" 11 52 16 1] _0 <- ([#"../final_borrows.rs" 11 52 16 1] [#"../final_borrows.rs" 11 52 16 1] ());
     goto BB4
   }
   BB4 {
@@ -134,7 +134,7 @@ module FinalBorrows_CallChangesProphecy_Inner
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] (2 : int32));
+    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] [#"../final_borrows.rs" 20 8 20 9] (2 : int32));
     return _0
   }
   
@@ -163,7 +163,7 @@ module FinalBorrows_CallChangesProphecy
     [#"../final_borrows.rs" 22 13 22 22] b1 <- Borrow.borrow_final ( * bor) (Borrow.get_id bor);
     [#"../final_borrows.rs" 22 13 22 22] bor <- { bor with current = ( ^ b1) ; };
     assume { resolve0 b1 };
-    [#"../final_borrows.rs" 24 11 24 18] _3 <- ([#"../final_borrows.rs" 24 11 24 18] inner0 ());
+    [#"../final_borrows.rs" 24 11 24 18] _3 <- ([#"../final_borrows.rs" 24 11 24 18] inner0 ([#"../final_borrows.rs" 24 11 24 18] ()));
     goto BB1
   }
   BB1 {
@@ -171,7 +171,7 @@ module FinalBorrows_CallChangesProphecy
     _3 <- any int32;
     assume { resolve0 bor };
     assert { [@expl:assertion] [#"../final_borrows.rs" 25 18 25 27] b1 = bor };
-    [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] ());
+    [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] [#"../final_borrows.rs" 18 44 26 1] ());
     return _0
   }
   
@@ -368,7 +368,7 @@ module FinalBorrows_Indexing
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] (0 : usize));
+    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] [#"../final_borrows.rs" 38 11 38 12] (0 : usize));
     [#"../final_borrows.rs" 38 9 38 13] _7 <- ([#"../final_borrows.rs" 38 9 38 13] Slice.length ( * x));
     [#"../final_borrows.rs" 38 9 38 13] _8 <- ([#"../final_borrows.rs" 38 9 38 13] _6 < _7);
     assert { [@expl:index in bounds] [#"../final_borrows.rs" 38 9 38 13] _8 };
diff --git a/creusot/tests/should_fail/opaque_unproveable.mlcfg b/creusot/tests/should_fail/opaque_unproveable.mlcfg
index 3e329c822b..d16c6770d3 100644
--- a/creusot/tests/should_fail/opaque_unproveable.mlcfg
+++ b/creusot/tests/should_fail/opaque_unproveable.mlcfg
@@ -12,7 +12,7 @@ module OpaqueUnproveable_Test
   }
   BB0 {
     assert { [@expl:assertion] [#"../opaque_unproveable.rs" 16 18 16 29] opaque0 () };
-    [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- ([#"../opaque_unproveable.rs" 14 14 17 1] ());
+    [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- ([#"../opaque_unproveable.rs" 14 14 17 1] [#"../opaque_unproveable.rs" 14 14 17 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
index 2b137a4f8b..ce8e7c4efe 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
@@ -14,7 +14,7 @@ module C17ImplRefinement_Impl0_MyFunction
     goto BB0
   }
   BB0 {
-    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
+    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] [#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index 81005bcef7..3feda16990 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -379,11 +379,11 @@ module C100doors_F
     goto BB0
   }
   BB0 {
-    [#"../100doors.rs" 19 35 19 51] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 false (100 : usize));
+    [#"../100doors.rs" 19 35 19 51] door_open <- ([#"../100doors.rs" 19 35 19 51] from_elem0 ([#"../100doors.rs" 19 40 19 45] false) ([#"../100doors.rs" 19 47 19 50] (100 : usize)));
     goto BB1
   }
   BB1 {
-    [#"../100doors.rs" 21 16 21 22] _3 <- ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range (1 : usize) (101 : usize));
+    [#"../100doors.rs" 21 16 21 22] _3 <- ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range ([#"../100doors.rs" 21 16 21 17] (1 : usize)) ([#"../100doors.rs" 21 19 21 22] (101 : usize)));
     [#"../100doors.rs" 20 4 20 41] iter <- ([#"../100doors.rs" 20 4 20 41] into_iter0 _3);
     _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
@@ -426,7 +426,7 @@ module C100doors_F
   }
   BB9 {
     assume { resolve2 door_open };
-    [#"../100doors.rs" 20 4 20 41] _0 <- ([#"../100doors.rs" 20 4 20 41] ());
+    [#"../100doors.rs" 20 4 20 41] _0 <- ([#"../100doors.rs" 20 4 20 41] [#"../100doors.rs" 20 4 20 41] ());
     goto BB21
   }
   BB10 {
@@ -458,14 +458,14 @@ module C100doors_F
     goto BB16
   }
   BB16 {
-    [#"../100doors.rs" 25 14 25 25] _23 <- ([#"../100doors.rs" 25 14 25 25] door <= (100 : usize));
+    [#"../100doors.rs" 25 14 25 25] _23 <- ([#"../100doors.rs" 25 14 25 25] door <= ([#"../100doors.rs" 25 22 25 25] (100 : usize)));
     switch (_23)
       | False -> goto BB20
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../100doors.rs" 26 45 26 53] _28 <- ([#"../100doors.rs" 26 45 26 53] door - (1 : usize));
+    [#"../100doors.rs" 26 45 26 53] _28 <- ([#"../100doors.rs" 26 45 26 53] door - ([#"../100doors.rs" 26 52 26 53] (1 : usize)));
     [#"../100doors.rs" 26 44 26 54] _26 <- ([#"../100doors.rs" 26 44 26 54] index0 door_open _28);
     _28 <- any usize;
     goto BB18
@@ -473,7 +473,7 @@ module C100doors_F
   BB18 {
     [#"../100doors.rs" 26 12 26 21] _31 <- Borrow.borrow_mut door_open;
     [#"../100doors.rs" 26 12 26 21] door_open <-  ^ _31;
-    [#"../100doors.rs" 26 22 26 30] _32 <- ([#"../100doors.rs" 26 22 26 30] door - (1 : usize));
+    [#"../100doors.rs" 26 22 26 30] _32 <- ([#"../100doors.rs" 26 22 26 30] door - ([#"../100doors.rs" 26 29 26 30] (1 : usize)));
     [#"../100doors.rs" 26 21 26 31] _30 <- ([#"../100doors.rs" 26 21 26 31] index_mut0 _31 _32);
     _31 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
     _32 <- any usize;
@@ -483,11 +483,11 @@ module C100doors_F
     [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = ([#"../100doors.rs" 26 12 26 54] not _26) ; };
     assume { resolve1 _30 };
     [#"../100doors.rs" 27 12 27 24] door <- ([#"../100doors.rs" 27 12 27 24] door + pass);
-    [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] ());
+    [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] [#"../100doors.rs" 25 26 28 9] ());
     goto BB15
   }
   BB20 {
-    [#"../100doors.rs" 25 8 28 9] _11 <- ([#"../100doors.rs" 25 8 28 9] ());
+    [#"../100doors.rs" 25 8 28 9] _11 <- ([#"../100doors.rs" 25 8 28 9] [#"../100doors.rs" 25 8 28 9] ());
     goto BB6
   }
   BB21 {
diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg
index a5d2f172c2..bf65798d44 100644
--- a/creusot/tests/should_succeed/all_zero.mlcfg
+++ b/creusot/tests/should_succeed/all_zero.mlcfg
@@ -108,7 +108,7 @@ module AllZero_AllZero
     [#"../all_zero.rs" 43 19 43 24] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons ( ^ value) x1) ; };
     [#"../all_zero.rs" 43 26 43 30] next <- Borrow.borrow_final (AllZero_List_Type.cons_1 ( * loop_l)) (Borrow.inherit_id (Borrow.get_id loop_l) 2);
     [#"../all_zero.rs" 43 26 43 30] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons x0 ( ^ next)) ; };
-    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] (0 : uint32)) ; };
+    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] [#"../all_zero.rs" 44 17 44 18] (0 : uint32)) ; };
     assume { resolve0 value };
     [#"../all_zero.rs" 45 17 45 21] _13 <- Borrow.borrow_mut ( * next);
     [#"../all_zero.rs" 45 17 45 21] next <- { next with current = ( ^ _13) ; };
@@ -120,7 +120,7 @@ module AllZero_AllZero
   }
   BB6 {
     assume { resolve1 loop_l };
-    [#"../all_zero.rs" 43 4 46 5] _0 <- ([#"../all_zero.rs" 43 4 46 5] ());
+    [#"../all_zero.rs" 43 4 46 5] _0 <- ([#"../all_zero.rs" 43 4 46 5] [#"../all_zero.rs" 43 4 46 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 5f5e1a999c..7f98870d18 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -151,7 +151,7 @@ module Bdd_Hashmap_Impl2_Hash
     goto BB2
   }
   BB2 {
-    [#"../bdd.rs" 77 39 77 69] _5 <- ([#"../bdd.rs" 77 39 77 69] wrapping_mul0 _6 (17 : uint64));
+    [#"../bdd.rs" 77 39 77 69] _5 <- ([#"../bdd.rs" 77 39 77 69] wrapping_mul0 _6 ([#"../bdd.rs" 77 66 77 68] (17 : uint64)));
     _6 <- any uint64;
     goto BB3
   }
@@ -218,7 +218,7 @@ module Bdd_Impl13_AssertReceiverIsTotalEq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 90 9 90 11] _0 <- ([#"../bdd.rs" 90 9 90 11] ());
+    [#"../bdd.rs" 90 9 90 11] _0 <- ([#"../bdd.rs" 90 9 90 11] [#"../bdd.rs" 90 9 90 11] ());
     return _0
   }
   
@@ -371,7 +371,7 @@ module Bdd_Impl14_Eq
   }
   BB3 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
     goto BB22
   }
   BB4 {
@@ -394,12 +394,12 @@ module Bdd_Impl14_Eq
   }
   BB8 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB9 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB10 {
@@ -440,7 +440,7 @@ module Bdd_Impl14_Eq
       end
   }
   BB16 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
     goto BB21
   }
   BB17 {
@@ -453,7 +453,7 @@ module Bdd_Impl14_Eq
     goto BB20
   }
   BB20 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
     goto BB21
   }
   BB21 {
@@ -578,7 +578,7 @@ module Bdd_Impl19_AssertReceiverIsTotalEq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 104 15 104 17] _0 <- ([#"../bdd.rs" 104 15 104 17] ());
+    [#"../bdd.rs" 104 15 104 17] _0 <- ([#"../bdd.rs" 104 15 104 17] [#"../bdd.rs" 104 15 104 17] ());
     return _0
   }
   
@@ -673,7 +673,7 @@ module Bdd_Impl1_Hash
     [#"../bdd.rs" 120 17 120 18] v <- ([#"../bdd.rs" 120 17 120 18] Bdd_Node_Type.if_v self);
     [#"../bdd.rs" 120 20 120 26] childt <- ([#"../bdd.rs" 120 20 120 26] Bdd_Node_Type.if_childt self);
     [#"../bdd.rs" 120 28 120 34] childf <- ([#"../bdd.rs" 120 28 120 34] Bdd_Node_Type.if_childf self);
-    [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childt) (5 : uint64));
+    [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childt) ([#"../bdd.rs" 121 53 121 54] (5 : uint64)));
     goto BB7
   }
   BB4 {
@@ -681,11 +681,11 @@ module Bdd_Impl1_Hash
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] (1 : uint64));
+    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] [#"../bdd.rs" 118 21 118 22] (1 : uint64));
     goto BB11
   }
   BB6 {
-    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] (2 : uint64));
+    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] [#"../bdd.rs" 119 20 119 21] (2 : uint64));
     goto BB11
   }
   BB7 {
@@ -694,7 +694,7 @@ module Bdd_Impl1_Hash
     goto BB8
   }
   BB8 {
-    [#"../bdd.rs" 121 70 121 94] _11 <- ([#"../bdd.rs" 121 70 121 94] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childf) (7 : uint64));
+    [#"../bdd.rs" 121 70 121 94] _11 <- ([#"../bdd.rs" 121 70 121 94] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childf) ([#"../bdd.rs" 121 92 121 93] (7 : uint64)));
     goto BB9
   }
   BB9 {
@@ -1743,9 +1743,9 @@ module Bdd_Impl11_New
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] promoted0);
+    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] [#"../bdd.rs" 425 16 425 21] promoted0);
     [#"../bdd.rs" 425 16 425 21] t <- ([#"../bdd.rs" 425 16 425 21] _10);
-    [#"../bdd.rs" 428 22 428 47] _5 <- ([#"../bdd.rs" 428 22 428 47] new0 ());
+    [#"../bdd.rs" 428 22 428 47] _5 <- ([#"../bdd.rs" 428 22 428 47] new0 ([#"../bdd.rs" 428 22 428 47] ()));
     goto BB1
   }
   BB1 {
@@ -1753,15 +1753,15 @@ module Bdd_Impl11_New
     goto BB2
   }
   BB2 {
-    [#"../bdd.rs" 430 22 430 47] _8 <- ([#"../bdd.rs" 430 22 430 47] new2 ());
+    [#"../bdd.rs" 430 22 430 47] _8 <- ([#"../bdd.rs" 430 22 430 47] new2 ([#"../bdd.rs" 430 22 430 47] ()));
     goto BB3
   }
   BB3 {
-    [#"../bdd.rs" 431 22 431 47] _9 <- ([#"../bdd.rs" 431 22 431 47] new3 ());
+    [#"../bdd.rs" 431 22 431 47] _9 <- ([#"../bdd.rs" 431 22 431 47] new3 ([#"../bdd.rs" 431 22 431 47] ()));
     goto BB4
   }
   BB4 {
-    [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 (0 : uint64));
+    [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 ([#"../bdd.rs" 432 17 432 18] (0 : uint64)));
     _5 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd);
     _6 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
     _8 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
@@ -2086,7 +2086,7 @@ module Bdd_Impl11_Hashcons
   BB7 {
     [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 77] _27) x3 x4 x5) ; };
     _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
-    [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 34] (18446744073709551615 : uint64) - (1 : uint64));
+    [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 34] ([#"../bdd.rs" 448 22 448 30] (18446744073709551615 : uint64)) - ([#"../bdd.rs" 448 33 448 34] (1 : uint64)));
     [#"../bdd.rs" 448 11 448 34] _30 <- ([#"../bdd.rs" 448 11 448 34] Bdd_Context_Type.context_cnt ( * self) > _32);
     _32 <- any uint64;
     switch (_30)
@@ -2105,7 +2105,7 @@ module Bdd_Impl11_Hashcons
     goto BB9
   }
   BB11 {
-    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + (1 : uint64))) ; };
+    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + ([#"../bdd.rs" 454 20 454 21] (1 : uint64)))) ; };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     [#"../bdd.rs" 455 8 455 9] _0 <- ([#"../bdd.rs" 455 8 455 9] r1);
@@ -3869,7 +3869,7 @@ module Bdd_Impl11_And
   BB25 {
     [#"../bdd.rs" 544 24 544 53] childf <- ([#"../bdd.rs" 544 24 544 53] _52);
     _52 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] ());
+    [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] [#"../bdd.rs" 541 31 545 21] ());
     goto BB31
   }
   BB26 {
@@ -3894,7 +3894,7 @@ module Bdd_Impl11_And
   BB28 {
     [#"../bdd.rs" 549 24 549 53] childf <- ([#"../bdd.rs" 549 24 549 53] _61);
     _61 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] ());
+    [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] [#"../bdd.rs" 546 28 550 21] ());
     goto BB31
   }
   BB29 {
@@ -3910,7 +3910,7 @@ module Bdd_Impl11_And
   BB30 {
     [#"../bdd.rs" 554 24 554 59] childf <- ([#"../bdd.rs" 554 24 554 59] _70);
     _70 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] ());
+    [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] [#"../bdd.rs" 551 29 555 21] ());
     goto BB31
   }
   BB31 {
diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg
index 1edf5a7ab8..535ec75ad4 100644
--- a/creusot/tests/should_succeed/binary_search.mlcfg
+++ b/creusot/tests/should_succeed/binary_search.mlcfg
@@ -162,7 +162,7 @@ module BinarySearch_Impl0_Index
     [#"../binary_search.rs" 51 26 51 28] ls <- ([#"../binary_search.rs" 51 26 51 28] BinarySearch_List_Type.cons_1 l);
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 52 15 52 21] _14 <- ([#"../binary_search.rs" 52 15 52 21] ix > (0 : usize));
+    [#"../binary_search.rs" 52 15 52 21] _14 <- ([#"../binary_search.rs" 52 15 52 21] ix > ([#"../binary_search.rs" 52 20 52 21] (0 : usize)));
     switch (_14)
       | False -> goto BB6
       | True -> goto BB5
@@ -177,7 +177,7 @@ module BinarySearch_Impl0_Index
     assert { [@expl:type invariant] inv1 _17 };
     assume { resolve1 _17 };
     [#"../binary_search.rs" 53 16 53 24] l <- ([#"../binary_search.rs" 53 16 53 24] _17);
-    [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - (1 : usize));
+    [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - ([#"../binary_search.rs" 54 22 54 23] (1 : usize)));
     goto BB1
   }
   BB6 {
@@ -264,7 +264,7 @@ module BinarySearch_Impl0_Len
     goto BB0
   }
   BB0 {
-    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] (0 : usize));
+    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] [#"../binary_search.rs" 67 29 67 30] (0 : usize));
     [#"../binary_search.rs" 68 20 68 24] l <- ([#"../binary_search.rs" 68 20 68 24] self);
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
@@ -287,7 +287,7 @@ module BinarySearch_Impl0_Len
     [#"../binary_search.rs" 70 26 70 28] ls <- ([#"../binary_search.rs" 70 26 70 28] BinarySearch_List_Type.cons_1 l);
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + (1 : usize));
+    [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + ([#"../binary_search.rs" 71 19 71 20] (1 : usize)));
     assert { [@expl:type invariant] inv1 ls };
     assume { resolve1 ls };
     [#"../binary_search.rs" 72 12 72 18] l <- ([#"../binary_search.rs" 72 12 72 18] ls);
@@ -432,7 +432,7 @@ module BinarySearch_BinarySearch
     goto BB1
   }
   BB1 {
-    [#"../binary_search.rs" 110 7 110 21] _9 <- ([#"../binary_search.rs" 110 7 110 21] _10 = (0 : usize));
+    [#"../binary_search.rs" 110 7 110 21] _9 <- ([#"../binary_search.rs" 110 7 110 21] _10 = ([#"../binary_search.rs" 110 20 110 21] (0 : usize)));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB3
@@ -440,7 +440,7 @@ module BinarySearch_BinarySearch
       end
   }
   BB2 {
-    [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err (0 : usize));
+    [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 111 19 111 20] (0 : usize)));
     goto BB21
   }
   BB3 {
@@ -448,7 +448,7 @@ module BinarySearch_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] (0 : usize));
+    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] [#"../binary_search.rs" 114 19 114 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -458,19 +458,19 @@ module BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    [#"../binary_search.rs" 119 10 119 18] _21 <- ([#"../binary_search.rs" 119 10 119 18] size > (1 : usize));
+    [#"../binary_search.rs" 119 10 119 18] _21 <- ([#"../binary_search.rs" 119 10 119 18] size > ([#"../binary_search.rs" 119 17 119 18] (1 : usize)));
     switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] (2 : usize) = (0 : usize));
+    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] ([#"../binary_search.rs" 120 26 120 27] (2 : usize)) = ([#"../binary_search.rs" 120 19 120 27] (0 : usize)));
     assert { [@expl:division by zero] [#"../binary_search.rs" 120 19 120 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] size / (2 : usize));
+    [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] size / ([#"../binary_search.rs" 120 26 120 27] (2 : usize)));
     [#"../binary_search.rs" 121 18 121 29] mid <- ([#"../binary_search.rs" 121 18 121 29] base + half);
     [#"../binary_search.rs" 123 19 123 33] _32 <- ([#"../binary_search.rs" 123 19 123 33] index0 arr mid);
     goto BB9
@@ -520,7 +520,7 @@ module BinarySearch_BinarySearch
       end
   }
   BB17 {
-    [#"../binary_search.rs" 131 12 131 20] _51 <- ([#"../binary_search.rs" 131 12 131 20] base + (1 : usize));
+    [#"../binary_search.rs" 131 12 131 20] _51 <- ([#"../binary_search.rs" 131 12 131 20] base + ([#"../binary_search.rs" 131 19 131 20] (1 : usize)));
     [#"../binary_search.rs" 131 8 131 21] _0 <- ([#"../binary_search.rs" 131 8 131 21] Core_Result_Result_Type.C_Err _51);
     _51 <- any usize;
     goto BB19
diff --git a/creusot/tests/should_succeed/bug/168.mlcfg b/creusot/tests/should_succeed/bug/168.mlcfg
index 44d49dffa9..90ce3d79d0 100644
--- a/creusot/tests/should_succeed/bug/168.mlcfg
+++ b/creusot/tests/should_succeed/bug/168.mlcfg
@@ -9,7 +9,7 @@ module C168_MaxInt
     goto BB0
   }
   BB0 {
-    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
+    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] [#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/173.mlcfg b/creusot/tests/should_succeed/bug/173.mlcfg
index ddd9bd8528..a4b853638f 100644
--- a/creusot/tests/should_succeed/bug/173.mlcfg
+++ b/creusot/tests/should_succeed/bug/173.mlcfg
@@ -12,11 +12,11 @@ module C173_Test233
     goto BB0
   }
   BB0 {
-    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] (17 : int32));
+    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] [#"../173.rs" 20 12 20 14] (17 : int32));
     assert { [@expl:assertion] [#"../173.rs" 21 19 21 27] Int32.to_int x = 17 };
-    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] (42 : int32));
+    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] [#"../173.rs" 22 12 22 14] (42 : int32));
     assert { [@expl:assertion] [#"../173.rs" 23 19 23 27] Int32.to_int x1 = 42 };
-    [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] ());
+    [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] [#"../173.rs" 19 18 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/195.mlcfg b/creusot/tests/should_succeed/bug/195.mlcfg
index dba60edf38..92cf7439f1 100644
--- a/creusot/tests/should_succeed/bug/195.mlcfg
+++ b/creusot/tests/should_succeed/bug/195.mlcfg
@@ -9,7 +9,7 @@ module C195_Example
     goto BB0
   }
   BB0 {
-    [#"../195.rs" 4 41 4 43] _0 <- ([#"../195.rs" 4 41 4 43] ());
+    [#"../195.rs" 4 41 4 43] _0 <- ([#"../195.rs" 4 41 4 43] [#"../195.rs" 4 41 4 43] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg
index 345c839ced..27260b8ca6 100644
--- a/creusot/tests/should_succeed/bug/206.mlcfg
+++ b/creusot/tests/should_succeed/bug/206.mlcfg
@@ -151,7 +151,7 @@ module C206_Ex
     goto BB0
   }
   BB0 {
-    [#"../206.rs" 20 17 20 19] _0 <- ([#"../206.rs" 20 17 20 19] ());
+    [#"../206.rs" 20 17 20 19] _0 <- ([#"../206.rs" 20 17 20 19] [#"../206.rs" 20 17 20 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/235.mlcfg b/creusot/tests/should_succeed/bug/235.mlcfg
index 7ff0fc105d..2a925a016e 100644
--- a/creusot/tests/should_succeed/bug/235.mlcfg
+++ b/creusot/tests/should_succeed/bug/235.mlcfg
@@ -15,7 +15,7 @@ module C235_F
     goto BB2
   }
   BB2 {
-    switch (true)
+    switch ([#"../235.rs" 8 10 8 14] true)
       | False -> goto BB4
       | True -> goto BB3
       end
@@ -24,7 +24,7 @@ module C235_F
     goto BB1
   }
   BB4 {
-    [#"../235.rs" 8 4 8 17] _0 <- ([#"../235.rs" 8 4 8 17] ());
+    [#"../235.rs" 8 4 8 17] _0 <- ([#"../235.rs" 8 4 8 17] [#"../235.rs" 8 4 8 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/256.mlcfg b/creusot/tests/should_succeed/bug/256.mlcfg
index 30e3140e33..b843973f09 100644
--- a/creusot/tests/should_succeed/bug/256.mlcfg
+++ b/creusot/tests/should_succeed/bug/256.mlcfg
@@ -11,8 +11,8 @@ module C256_U8Safe
     goto BB0
   }
   BB0 {
-    [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] u + (0 : uint8));
-    [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] ());
+    [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] u + ([#"../256.rs" 4 16 4 17] (0 : uint8)));
+    [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] [#"../256.rs" 3 22 5 1] ());
     return _0
   }
   
@@ -75,7 +75,7 @@ module C256_Bug256
     goto BB0
   }
   BB0 {
-    [#"../256.rs" 8 27 8 29] _0 <- ([#"../256.rs" 8 27 8 29] ());
+    [#"../256.rs" 8 27 8 29] _0 <- ([#"../256.rs" 8 27 8 29] [#"../256.rs" 8 27 8 29] ());
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/258.mlcfg b/creusot/tests/should_succeed/bug/258.mlcfg
index 52cd1f2235..132780b4ca 100644
--- a/creusot/tests/should_succeed/bug/258.mlcfg
+++ b/creusot/tests/should_succeed/bug/258.mlcfg
@@ -9,7 +9,7 @@ module C258_Err
     goto BB0
   }
   BB0 {
-    [#"../258.rs" 3 23 3 25] _0 <- ([#"../258.rs" 3 23 3 25] ());
+    [#"../258.rs" 3 23 3 25] _0 <- ([#"../258.rs" 3 23 3 25] [#"../258.rs" 3 23 3 25] ());
     return _0
   }
   
@@ -24,7 +24,7 @@ module C258_Err2
     goto BB0
   }
   BB0 {
-    [#"../258.rs" 5 25 5 27] _0 <- ([#"../258.rs" 5 25 5 27] ());
+    [#"../258.rs" 5 25 5 27] _0 <- ([#"../258.rs" 5 25 5 27] [#"../258.rs" 5 25 5 27] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/271.mlcfg b/creusot/tests/should_succeed/bug/271.mlcfg
index 1834729226..c38fe9480a 100644
--- a/creusot/tests/should_succeed/bug/271.mlcfg
+++ b/creusot/tests/should_succeed/bug/271.mlcfg
@@ -10,15 +10,15 @@ module C271_Ex
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] (0 : int32));
+    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] [#"../271.rs" 6 12 6 13] (0 : int32));
     goto BB2
   }
   BB1 {
-    [#"../271.rs" 9 13 9 15] _0 <- ([#"../271.rs" 9 13 9 15] ());
+    [#"../271.rs" 9 13 9 15] _0 <- ([#"../271.rs" 9 13 9 15] [#"../271.rs" 9 13 9 15] ());
     goto BB3
   }
   BB2 {
-    [#"../271.rs" 8 13 8 15] _0 <- ([#"../271.rs" 8 13 8 15] ());
+    [#"../271.rs" 8 13 8 15] _0 <- ([#"../271.rs" 8 13 8 15] [#"../271.rs" 8 13 8 15] ());
     goto BB3
   }
   BB3 {
@@ -37,7 +37,7 @@ module C271_Ex2
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] (0 : int32));
+    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] [#"../271.rs" 14 12 14 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
@@ -56,15 +56,15 @@ module C271_Ex2
     goto BB6
   }
   BB4 {
-    [#"../271.rs" 18 13 18 15] _0 <- ([#"../271.rs" 18 13 18 15] ());
+    [#"../271.rs" 18 13 18 15] _0 <- ([#"../271.rs" 18 13 18 15] [#"../271.rs" 18 13 18 15] ());
     goto BB7
   }
   BB5 {
-    [#"../271.rs" 16 17 16 19] _0 <- ([#"../271.rs" 16 17 16 19] ());
+    [#"../271.rs" 16 17 16 19] _0 <- ([#"../271.rs" 16 17 16 19] [#"../271.rs" 16 17 16 19] ());
     goto BB7
   }
   BB6 {
-    [#"../271.rs" 17 13 17 15] _0 <- ([#"../271.rs" 17 13 17 15] ());
+    [#"../271.rs" 17 13 17 15] _0 <- ([#"../271.rs" 17 13 17 15] [#"../271.rs" 17 13 17 15] ());
     goto BB7
   }
   BB7 {
@@ -89,7 +89,7 @@ module C271_Ex3
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] (0 : int32));
+    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] [#"../271.rs" 23 12 23 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
@@ -114,15 +114,15 @@ module C271_Ex3
     goto BB7
   }
   BB5 {
-    [#"../271.rs" 27 13 27 15] _0 <- ([#"../271.rs" 27 13 27 15] ());
+    [#"../271.rs" 27 13 27 15] _0 <- ([#"../271.rs" 27 13 27 15] [#"../271.rs" 27 13 27 15] ());
     goto BB8
   }
   BB6 {
-    [#"../271.rs" 25 17 25 19] _0 <- ([#"../271.rs" 25 17 25 19] ());
+    [#"../271.rs" 25 17 25 19] _0 <- ([#"../271.rs" 25 17 25 19] [#"../271.rs" 25 17 25 19] ());
     goto BB8
   }
   BB7 {
-    [#"../271.rs" 26 17 26 19] _0 <- ([#"../271.rs" 26 17 26 19] ());
+    [#"../271.rs" 26 17 26 19] _0 <- ([#"../271.rs" 26 17 26 19] [#"../271.rs" 26 17 26 19] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/bug/273.mlcfg b/creusot/tests/should_succeed/bug/273.mlcfg
index 3e369b934c..89d513cad7 100644
--- a/creusot/tests/should_succeed/bug/273.mlcfg
+++ b/creusot/tests/should_succeed/bug/273.mlcfg
@@ -21,7 +21,7 @@ module C273_Ex
     goto BB0
   }
   BB0 {
-    [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some true);
+    [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some ([#"../273.rs" 5 26 5 30] true));
     switch (_1)
       | Core_Option_Option_Type.C_Some _ -> goto BB1
       | _ -> goto BB3
@@ -33,11 +33,11 @@ module C273_Ex
   BB2 {
     [#"../273.rs" 5 16 5 17] b <- ([#"../273.rs" 5 16 5 17] Core_Option_Option_Type.some_0 _1);
     assert { [@expl:assertion] [#"../273.rs" 6 22 6 23] b };
-    [#"../273.rs" 5 32 7 5] _0 <- ([#"../273.rs" 5 32 7 5] ());
+    [#"../273.rs" 5 32 7 5] _0 <- ([#"../273.rs" 5 32 7 5] [#"../273.rs" 5 32 7 5] ());
     goto BB4
   }
   BB3 {
-    [#"../273.rs" 7 5 7 5] _0 <- ([#"../273.rs" 7 5 7 5] ());
+    [#"../273.rs" 7 5 7 5] _0 <- ([#"../273.rs" 7 5 7 5] [#"../273.rs" 7 5 7 5] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/bug/387.mlcfg b/creusot/tests/should_succeed/bug/387.mlcfg
index e909861af9..5433b79dfe 100644
--- a/creusot/tests/should_succeed/bug/387.mlcfg
+++ b/creusot/tests/should_succeed/bug/387.mlcfg
@@ -46,7 +46,7 @@ module C387_UseTree
     goto BB0
   }
   BB0 {
-    [#"../387.rs" 13 26 13 28] _0 <- ([#"../387.rs" 13 26 13 28] ());
+    [#"../387.rs" 13 26 13 28] _0 <- ([#"../387.rs" 13 26 13 28] [#"../387.rs" 13 26 13 28] ());
     return _0
   }
   
@@ -126,7 +126,7 @@ module C387_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] (0 : uint64));
+    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] [#"../387.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
@@ -140,7 +140,7 @@ module C387_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + (1 : uint64));
+    [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + ([#"../387.rs" 19 69 19 70] (1 : uint64)));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/bug/395.mlcfg b/creusot/tests/should_succeed/bug/395.mlcfg
index 997c4c4fe2..631cc017ea 100644
--- a/creusot/tests/should_succeed/bug/395.mlcfg
+++ b/creusot/tests/should_succeed/bug/395.mlcfg
@@ -19,17 +19,17 @@ module C395_SignedDivision
     goto BB0
   }
   BB0 {
-    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] (10 : int32));
-    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] (1 : int32));
+    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] [#"../395.rs" 4 12 4 14] (10 : int32));
+    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] [#"../395.rs" 5 12 5 13] (1 : int32));
     [#"../395.rs" 7 12 7 13] _6 <- ([#"../395.rs" 7 12 7 13] x);
     [#"../395.rs" 7 16 7 17] _7 <- ([#"../395.rs" 7 16 7 17] y);
-    [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = (0 : int32));
+    [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] (0 : int32)));
     assert { [@expl:division by zero] [#"../395.rs" 7 12 7 17] not _8 };
     goto BB1
   }
   BB1 {
-    [#"../395.rs" 7 12 7 17] _9 <- ([#"../395.rs" 7 12 7 17] _7 = (-1 : int32));
-    [#"../395.rs" 7 12 7 17] _10 <- ([#"../395.rs" 7 12 7 17] _6 = (-2147483648 : int32));
+    [#"../395.rs" 7 12 7 17] _9 <- ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] (-1 : int32)));
+    [#"../395.rs" 7 12 7 17] _10 <- ([#"../395.rs" 7 12 7 17] _6 = ([#"../395.rs" 7 12 7 17] (-2147483648 : int32)));
     [#"../395.rs" 7 12 7 17] _11 <- ([#"../395.rs" 7 12 7 17] _9 && _10);
     _9 <- any bool;
     _10 <- any bool;
@@ -40,7 +40,7 @@ module C395_SignedDivision
     [#"../395.rs" 7 12 7 17] _5 <- ([#"../395.rs" 7 12 7 17] _6 / _7);
     _6 <- any int32;
     _7 <- any int32;
-    [#"../395.rs" 7 12 7 23] _4 <- ([#"../395.rs" 7 12 7 23] _5 = (10 : int32));
+    [#"../395.rs" 7 12 7 23] _4 <- ([#"../395.rs" 7 12 7 23] _5 = ([#"../395.rs" 7 21 7 23] (10 : int32)));
     _5 <- any int32;
     switch (_4)
       | False -> goto BB4
@@ -48,7 +48,7 @@ module C395_SignedDivision
       end
   }
   BB3 {
-    [#"../395.rs" 3 25 8 1] _0 <- ([#"../395.rs" 3 25 8 1] ());
+    [#"../395.rs" 3 25 8 1] _0 <- ([#"../395.rs" 3 25 8 1] [#"../395.rs" 3 25 8 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/bug/463.mlcfg b/creusot/tests/should_succeed/bug/463.mlcfg
index 1d867edcc7..ef92830735 100644
--- a/creusot/tests/should_succeed/bug/463.mlcfg
+++ b/creusot/tests/should_succeed/bug/463.mlcfg
@@ -26,7 +26,7 @@ module C463_Test_Closure0
     goto BB0
   }
   BB0 {
-    [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] x + (1 : usize));
+    [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] x + ([#"../463.rs" 7 23 7 24] (1 : usize)));
     [#"../463.rs" 5 8 5 30] res <- ([#"../463.rs" 5 8 5 30] res1);
     [#"../463.rs" 6 8 6 37] _0 <- ([#"../463.rs" 6 8 6 37] res);
     return _0
@@ -57,7 +57,7 @@ module C463_Test
   }
   BB0 {
     [#"../463.rs" 6 8 6 37] c <- ([#"../463.rs" 6 8 6 37] C463_Test_Closure0.C463_Test_Closure0);
-    [#"../463.rs" 9 12 9 16] _4 <- ([#"../463.rs" 9 12 9 16] ((2 : usize)));
+    [#"../463.rs" 9 12 9 16] _4 <- ([#"../463.rs" 9 12 9 16] (([#"../463.rs" 9 14 9 15] (2 : usize))));
     [#"../463.rs" 9 12 9 16] y <- ([#"../463.rs" 9 12 9 16] let (a) = _4 in closure00 c a);
     _4 <- any usize;
     goto BB1
@@ -65,7 +65,7 @@ module C463_Test
   BB1 {
     assume { resolve0 c };
     assert { [@expl:assertion] [#"../463.rs" 10 18 10 25] UIntSize.to_int y = 3 };
-    [#"../463.rs" 10 4 10 26] _0 <- ([#"../463.rs" 10 4 10 26] ());
+    [#"../463.rs" 10 4 10 26] _0 <- ([#"../463.rs" 10 4 10 26] [#"../463.rs" 10 4 10 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/486.mlcfg b/creusot/tests/should_succeed/bug/486.mlcfg
index 086796c83b..46947df410 100644
--- a/creusot/tests/should_succeed/bug/486.mlcfg
+++ b/creusot/tests/should_succeed/bug/486.mlcfg
@@ -25,8 +25,8 @@ module C486_Test
     goto BB0
   }
   BB0 {
-    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] (5 : uint32)) ; }));
-    [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] ());
+    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] [#"../486.rs" 8 11 8 12] (5 : uint32)) ; }));
+    [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] [#"../486.rs" 8 4 8 12] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/510.mlcfg b/creusot/tests/should_succeed/bug/510.mlcfg
index 9a9062e921..ec0642925c 100644
--- a/creusot/tests/should_succeed/bug/510.mlcfg
+++ b/creusot/tests/should_succeed/bug/510.mlcfg
@@ -13,7 +13,7 @@ module C510_TestBool
   }
   BB0 {
     [#"../510.rs" 4 16 4 25] _bing <- ([#"../510.rs" 4 16 4 25] UInt8.of_int (Bool.to_int inp));
-    [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] ());
+    [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] [#"../510.rs" 3 28 5 1] ());
     return _0
   }
   
@@ -30,8 +30,8 @@ module C510_TestChar
     goto BB0
   }
   BB0 {
-    [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int (22 : uint8)));
-    [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] ());
+    [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int ([#"../510.rs" 8 4 8 6] (22 : uint8))));
+    [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] [#"../510.rs" 7 19 9 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/511.mlcfg b/creusot/tests/should_succeed/bug/511.mlcfg
index ad7981a790..be539a3f29 100644
--- a/creusot/tests/should_succeed/bug/511.mlcfg
+++ b/creusot/tests/should_succeed/bug/511.mlcfg
@@ -13,7 +13,7 @@ module C511_TestU8
   }
   BB0 {
     [#"../511.rs" 4 16 4 28] _bing <- ([#"../511.rs" 4 16 4 28] UIntSize.of_int (UInt8.to_int inp));
-    [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] ());
+    [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] [#"../511.rs" 3 24 5 1] ());
     return _0
   }
   
@@ -32,7 +32,7 @@ module C511_TestU16
   }
   BB0 {
     [#"../511.rs" 8 16 8 28] _bing <- ([#"../511.rs" 8 16 8 28] UIntSize.of_int (UInt16.to_int inp));
-    [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] ());
+    [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] [#"../511.rs" 7 26 9 1] ());
     return _0
   }
   
@@ -51,7 +51,7 @@ module C511_TestU128
   }
   BB0 {
     [#"../511.rs" 12 16 12 28] _bing <- ([#"../511.rs" 12 16 12 28] UIntSize.of_int (UInt128.to_int inp));
-    [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] ());
+    [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] [#"../511.rs" 11 28 13 1] ());
     return _0
   }
   
@@ -70,7 +70,7 @@ module C511_TestI8
   }
   BB0 {
     [#"../511.rs" 16 16 16 28] _bing <- ([#"../511.rs" 16 16 16 28] UIntSize.of_int (Int8.to_int inp));
-    [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] ());
+    [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] [#"../511.rs" 15 24 17 1] ());
     return _0
   }
   
@@ -89,7 +89,7 @@ module C511_TestI16
   }
   BB0 {
     [#"../511.rs" 20 16 20 28] _bing <- ([#"../511.rs" 20 16 20 28] UIntSize.of_int (Int16.to_int inp));
-    [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] ());
+    [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] [#"../511.rs" 19 26 21 1] ());
     return _0
   }
   
@@ -108,7 +108,7 @@ module C511_TestI128
   }
   BB0 {
     [#"../511.rs" 24 16 24 28] _bing <- ([#"../511.rs" 24 16 24 28] UIntSize.of_int (Int128.to_int inp));
-    [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] ());
+    [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] [#"../511.rs" 23 28 25 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/545.mlcfg b/creusot/tests/should_succeed/bug/545.mlcfg
index 7df3e0458e..23677ff4f7 100644
--- a/creusot/tests/should_succeed/bug/545.mlcfg
+++ b/creusot/tests/should_succeed/bug/545.mlcfg
@@ -10,7 +10,7 @@ module C545_NegativeIsNegative
   }
   BB0 {
     assert { [@expl:assertion] [#"../545.rs" 5 18 5 32] (0 : int32) > (-100 : int32) };
-    [#"../545.rs" 4 30 6 1] _0 <- ([#"../545.rs" 4 30 6 1] ());
+    [#"../545.rs" 4 30 6 1] _0 <- ([#"../545.rs" 4 30 6 1] [#"../545.rs" 4 30 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/552.mlcfg b/creusot/tests/should_succeed/bug/552.mlcfg
index af756ed851..13540ef45e 100644
--- a/creusot/tests/should_succeed/bug/552.mlcfg
+++ b/creusot/tests/should_succeed/bug/552.mlcfg
@@ -66,7 +66,7 @@ module C552_Impl0_Step
   }
   BB1 {
     assume { resolve0 self };
-    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] false);
+    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] [#"../552.rs" 25 8 25 13] false);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/570.mlcfg b/creusot/tests/should_succeed/bug/570.mlcfg
index 1306d8bdf8..9647f01c42 100644
--- a/creusot/tests/should_succeed/bug/570.mlcfg
+++ b/creusot/tests/should_succeed/bug/570.mlcfg
@@ -31,7 +31,7 @@ module C570_TestProgram
     goto BB0
   }
   BB0 {
-    [#"../570.rs" 12 27 14 1] _0 <- ([#"../570.rs" 12 27 14 1] ());
+    [#"../570.rs" 12 27 14 1] _0 <- ([#"../570.rs" 12 27 14 1] [#"../570.rs" 12 27 14 1] ());
     return _0
   }
   
@@ -50,8 +50,8 @@ module C570_TestAssign
     goto BB0
   }
   BB0 {
-    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] (2 : int32))));
-    [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] ());
+    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] [#"../570.rs" 17 13 17 14] (2 : int32))));
+    [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] [#"../570.rs" 16 30 18 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/594.mlcfg b/creusot/tests/should_succeed/bug/594.mlcfg
index 0e34c01bc4..123639733d 100644
--- a/creusot/tests/should_succeed/bug/594.mlcfg
+++ b/creusot/tests/should_succeed/bug/594.mlcfg
@@ -164,8 +164,8 @@ module C594_TestClosure
   BB0 {
     [#"../594.rs" 16 14 16 37] cl1 <- ([#"../594.rs" 16 14 16 37] C594_TestClosure_Closure0.C594_TestClosure_Closure0);
     [#"../594.rs" 18 14 18 37] cl2 <- ([#"../594.rs" 18 14 18 37] C594_TestClosure_Closure1.C594_TestClosure_Closure1);
-    [#"../594.rs" 20 22 20 28] _6 <- ([#"../594.rs" 20 22 20 28] ((0 : int32), (3 : int32)));
-    [#"../594.rs" 20 13 20 29] _5 <- ([#"../594.rs" 20 13 20 29] ((4 : int32), _6));
+    [#"../594.rs" 20 22 20 28] _6 <- ([#"../594.rs" 20 22 20 28] (([#"../594.rs" 20 23 20 24] (0 : int32)), ([#"../594.rs" 20 26 20 27] (3 : int32))));
+    [#"../594.rs" 20 13 20 29] _5 <- ([#"../594.rs" 20 13 20 29] (([#"../594.rs" 20 19 20 20] (4 : int32)), _6));
     _6 <- any (int32, int32);
     [#"../594.rs" 20 13 20 29] _a <- ([#"../594.rs" 20 13 20 29] let (a, b) = _5 in closure00 cl1 a b);
     _5 <- any (int32, (int32, int32));
@@ -173,7 +173,7 @@ module C594_TestClosure
   }
   BB1 {
     assume { resolve0 cl1 };
-    [#"../594.rs" 21 19 21 25] _10 <- ([#"../594.rs" 21 19 21 25] ((0 : int32), (4 : int32)));
+    [#"../594.rs" 21 19 21 25] _10 <- ([#"../594.rs" 21 19 21 25] (([#"../594.rs" 21 20 21 21] (0 : int32)), ([#"../594.rs" 21 23 21 24] (4 : int32))));
     [#"../594.rs" 21 13 21 26] _9 <- ([#"../594.rs" 21 13 21 26] (_10));
     _10 <- any (int32, int32);
     [#"../594.rs" 21 13 21 26] _b <- ([#"../594.rs" 21 13 21 26] let (a) = _9 in closure10 cl2 a);
@@ -182,7 +182,7 @@ module C594_TestClosure
   }
   BB2 {
     assume { resolve1 cl2 };
-    [#"../594.rs" 15 22 22 1] _0 <- ([#"../594.rs" 15 22 22 1] ());
+    [#"../594.rs" 15 22 22 1] _0 <- ([#"../594.rs" 15 22 22 1] [#"../594.rs" 15 22 22 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/641.mlcfg b/creusot/tests/should_succeed/bug/641.mlcfg
index 99b5272429..c3eeffd50d 100644
--- a/creusot/tests/should_succeed/bug/641.mlcfg
+++ b/creusot/tests/should_succeed/bug/641.mlcfg
@@ -15,7 +15,7 @@ module C641_TestMaintains
     goto BB0
   }
   BB0 {
-    [#"../641.rs" 16 24 16 26] _0 <- ([#"../641.rs" 16 24 16 26] ());
+    [#"../641.rs" 16 24 16 26] _0 <- ([#"../641.rs" 16 24 16 26] [#"../641.rs" 16 24 16 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/682.mlcfg b/creusot/tests/should_succeed/bug/682.mlcfg
index 488137d7b9..a486542f6f 100644
--- a/creusot/tests/should_succeed/bug/682.mlcfg
+++ b/creusot/tests/should_succeed/bug/682.mlcfg
@@ -21,9 +21,9 @@ module C682_AddSome
     goto BB0
   }
   BB0 {
-    [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11]  * a + (1 : uint64)) ; };
+    [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11]  * a + ([#"../682.rs" 7 10 7 11] (1 : uint64))) ; };
     assume { resolve0 a };
-    [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] ());
+    [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] [#"../682.rs" 6 25 8 1] ());
     return _0
   }
   
@@ -73,7 +73,7 @@ module C682_Foo
   BB2 {
     assume { resolve0 a };
     assert { [@expl:assertion] [#"../682.rs" 15 18 15 27]  * a > Snapshot.inner a_p };
-    [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] ());
+    [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] [#"../682.rs" 12 24 16 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/691.mlcfg b/creusot/tests/should_succeed/bug/691.mlcfg
index ef2abb420e..bdeccc4419 100644
--- a/creusot/tests/should_succeed/bug/691.mlcfg
+++ b/creusot/tests/should_succeed/bug/691.mlcfg
@@ -65,10 +65,10 @@ module C691_Example
     goto BB0
   }
   BB0 {
-    [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo (2 : uint32));
+    [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo ([#"../691.rs" 9 23 9 27] (2 : uint32)));
     [#"../691.rs" 10 12 10 39] _2 <- ([#"../691.rs" 10 12 10 39] C691_Example_Closure0.C691_Example_Closure0 c);
     assume { resolve0 _2 };
-    [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] ());
+    [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] [#"../691.rs" 8 17 12 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/693.mlcfg b/creusot/tests/should_succeed/bug/693.mlcfg
index 43a517f18b..40582b400a 100644
--- a/creusot/tests/should_succeed/bug/693.mlcfg
+++ b/creusot/tests/should_succeed/bug/693.mlcfg
@@ -24,7 +24,7 @@ module C693_F
     goto BB0
   }
   BB0 {
-    [#"../693.rs" 3 22 3 24] _0 <- ([#"../693.rs" 3 22 3 24] ());
+    [#"../693.rs" 3 22 3 24] _0 <- ([#"../693.rs" 3 22 3 24] [#"../693.rs" 3 22 3 24] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
@@ -57,7 +57,7 @@ module C693_G
     goto BB0
   }
   BB0 {
-    [#"../693.rs" 6 4 6 8] _0 <- ([#"../693.rs" 6 4 6 8] f0 (0 : int32));
+    [#"../693.rs" 6 4 6 8] _0 <- ([#"../693.rs" 6 4 6 8] f0 ([#"../693.rs" 6 6 6 7] (0 : int32)));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/789.mlcfg b/creusot/tests/should_succeed/bug/789.mlcfg
index 18928f3795..582e83e6ea 100644
--- a/creusot/tests/should_succeed/bug/789.mlcfg
+++ b/creusot/tests/should_succeed/bug/789.mlcfg
@@ -9,7 +9,7 @@ module C789_Meta
     goto BB0
   }
   BB0 {
-    [#"../789.rs" 3 23 3 25] _0 <- ([#"../789.rs" 3 23 3 25] ());
+    [#"../789.rs" 3 23 3 25] _0 <- ([#"../789.rs" 3 23 3 25] [#"../789.rs" 3 23 3 25] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/791.mlcfg b/creusot/tests/should_succeed/bug/791.mlcfg
index b0383fbf44..ec8305f0e0 100644
--- a/creusot/tests/should_succeed/bug/791.mlcfg
+++ b/creusot/tests/should_succeed/bug/791.mlcfg
@@ -7,7 +7,7 @@ module C791_ILoveFloats
     goto BB0
   }
   BB0 {
-    [#"../791.rs" 3 23 6 1] _0 <- ([#"../791.rs" 3 23 6 1] ());
+    [#"../791.rs" 3 23 6 1] _0 <- ([#"../791.rs" 3 23 6 1] [#"../791.rs" 3 23 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index 76a9249439..b98cced6ef 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -287,7 +287,7 @@ module C874_CanExtend
     goto BB0
   }
   BB0 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB1
   }
   BB1 {
@@ -299,7 +299,7 @@ module C874_CanExtend
     goto BB3
   }
   BB3 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (6 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB4
   }
   BB4 {
@@ -320,7 +320,7 @@ module C874_CanExtend
   }
   BB7 {
     assume { resolve0 v };
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Seq.get (__arr_temp.elts) 3 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 4 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 5 = (6 : int32)}; assume {Slice.length __arr_temp = 6}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp);
     goto BB8
   }
   BB8 {
@@ -337,7 +337,7 @@ module C874_CanExtend
     goto BB11
   }
   BB11 {
-    [#"../874.rs" 4 20 11 1] _0 <- ([#"../874.rs" 4 20 11 1] ());
+    [#"../874.rs" 4 20 11 1] _0 <- ([#"../874.rs" 4 20 11 1] [#"../874.rs" 4 20 11 1] ());
     goto BB12
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
index 837e58198d..87c81dd3af 100644
--- a/creusot/tests/should_succeed/bug/949.mlcfg
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -249,11 +249,11 @@ module C949_Main
     goto BB0
   }
   BB0 {
-    [#"../949.rs" 5 18 5 38] tok <- ([#"../949.rs" 5 18 5 38] new0 ());
+    [#"../949.rs" 5 18 5 38] tok <- ([#"../949.rs" 5 18 5 38] new0 ([#"../949.rs" 5 18 5 38] ()));
     goto BB1
   }
   BB1 {
-    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 12 6 23] (1 : int32));
+    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 12 6 23] [#"../949.rs" 6 21 6 22] (1 : int32));
     goto BB2
   }
   BB2 {
@@ -272,9 +272,9 @@ module C949_Main
     goto BB4
   }
   BB4 {
-    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + (5 : int32));
+    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + ([#"../949.rs" 9 10 9 11] (5 : int32)));
     assume { resolve0 r };
-    [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] ());
+    [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] [#"../949.rs" 4 14 10 1] ());
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/bug/final_borrows.mlcfg b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
index fb1ab311ec..cf7120e40d 100644
--- a/creusot/tests/should_succeed/bug/final_borrows.mlcfg
+++ b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
@@ -569,9 +569,9 @@ module FinalBorrows_Set7
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] (7 : int32)) ; };
+    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] [#"../final_borrows.rs" 49 9 49 10] (7 : int32)) ; };
     assume { resolve0 r };
-    [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] ());
+    [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] [#"../final_borrows.rs" 48 22 50 1] ());
     return _0
   }
   
@@ -604,7 +604,7 @@ module FinalBorrows_NotFinalBorrowWorks
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] (1 : int32));
+    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] [#"../final_borrows.rs" 54 16 54 20] (1 : int32));
     [#"../final_borrows.rs" 55 12 55 18] r <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 55 12 55 18] x <-  ^ r;
     [#"../final_borrows.rs" 56 13 56 20] r1 <- Borrow.borrow_final ( * r) (Borrow.get_id r);
@@ -618,7 +618,7 @@ module FinalBorrows_NotFinalBorrowWorks
   BB1 {
     assume { resolve0 r1 };
     [#"../final_borrows.rs" 58 12 58 14] y <- ([#"../final_borrows.rs" 58 12 58 14]  * r);
-    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] (2 : int32)) ; };
+    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] [#"../final_borrows.rs" 59 9 59 10] (2 : int32)) ; };
     assume { resolve0 r };
     [#"../final_borrows.rs" 60 11 60 16] _0 <- ([#"../final_borrows.rs" 60 11 60 16] x + y);
     return _0
@@ -653,7 +653,7 @@ module FinalBorrows_Branching
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] (3 : int32));
+    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] [#"../final_borrows.rs" 65 16 65 17] (3 : int32));
     [#"../final_borrows.rs" 67 17 67 23] r1 <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 67 17 67 23] x <-  ^ r1;
     [#"../final_borrows.rs" 69 13 69 21] r2 <- Borrow.borrow_mut ( * r1);
@@ -676,7 +676,7 @@ module FinalBorrows_Branching
     assume { resolve0 _11 };
     assume { resolve0 r1 };
     [#"../final_borrows.rs" 74 8 74 15] y <- ([#"../final_borrows.rs" 74 8 74 15]  * r1);
-    [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] ());
+    [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] [#"../final_borrows.rs" 71 9 75 5] ());
     goto BB3
   }
   BB2 {
@@ -685,7 +685,7 @@ module FinalBorrows_Branching
     assume { resolve0 r21 };
     [#"../final_borrows.rs" 78 8 78 15] y <- ([#"../final_borrows.rs" 78 8 78 15]  * r21);
     assume { resolve0 r1 };
-    [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] ());
+    [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] [#"../final_borrows.rs" 75 11 79 5] ());
     goto BB3
   }
   BB3 {
@@ -927,7 +927,7 @@ module FinalBorrows_BoxReborrowDirect
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 101 4 103 5] _0 <- ([#"../final_borrows.rs" 101 4 103 5] ());
+    [#"../final_borrows.rs" 101 4 103 5] _0 <- ([#"../final_borrows.rs" 101 4 103 5] [#"../final_borrows.rs" 101 4 103 5] ());
     goto BB2
   }
   BB2 {
@@ -1297,7 +1297,7 @@ module FinalBorrows_SharedBorrowNoGen
     assert { [@expl:type invariant] inv1 bor };
     assume { resolve0 bor };
     assert { [@expl:assertion] [#"../final_borrows.rs" 152 18 152 27] b1 = bor };
-    [#"../final_borrows.rs" 149 44 153 1] _0 <- ([#"../final_borrows.rs" 149 44 153 1] ());
+    [#"../final_borrows.rs" 149 44 153 1] _0 <- ([#"../final_borrows.rs" 149 44 153 1] [#"../final_borrows.rs" 149 44 153 1] ());
     return _0
   }
   
@@ -1371,12 +1371,12 @@ module FinalBorrows_InspectNoGen
       end
   }
   BB5 {
-    [#"../final_borrows.rs" 159 8 159 14] _0 <- ([#"../final_borrows.rs" 159 8 159 14] ());
+    [#"../final_borrows.rs" 159 8 159 14] _0 <- ([#"../final_borrows.rs" 159 8 159 14] [#"../final_borrows.rs" 159 8 159 14] ());
     goto BB7
   }
   BB6 {
     assert { [@expl:assertion] [#"../final_borrows.rs" 161 18 161 24] r = x };
-    [#"../final_borrows.rs" 155 44 162 1] _0 <- ([#"../final_borrows.rs" 155 44 162 1] ());
+    [#"../final_borrows.rs" 155 44 162 1] _0 <- ([#"../final_borrows.rs" 155 44 162 1] [#"../final_borrows.rs" 155 44 162 1] ());
     goto BB7
   }
   BB7 {
@@ -1430,7 +1430,7 @@ module FinalBorrows_PlaceMentionNoGen
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
     assert { [@expl:assertion] [#"../final_borrows.rs" 167 18 167 25] _r = x };
-    [#"../final_borrows.rs" 164 50 168 1] _0 <- ([#"../final_borrows.rs" 164 50 168 1] ());
+    [#"../final_borrows.rs" 164 50 168 1] _0 <- ([#"../final_borrows.rs" 164 50 168 1] [#"../final_borrows.rs" 164 50 168 1] ());
     return _0
   }
   
@@ -1467,7 +1467,7 @@ module FinalBorrows_ShallowBorrowNoGen
       end
   }
   BB1 {
-    [#"../final_borrows.rs" 177 13 177 15] _0 <- ([#"../final_borrows.rs" 177 13 177 15] ());
+    [#"../final_borrows.rs" 177 13 177 15] _0 <- ([#"../final_borrows.rs" 177 13 177 15] [#"../final_borrows.rs" 177 13 177 15] ());
     goto BB6
   }
   BB2 {
@@ -1476,7 +1476,7 @@ module FinalBorrows_ShallowBorrowNoGen
   BB3 {
     [#"../final_borrows.rs" 174 13 174 22] inner <- ([#"../final_borrows.rs" 174 13 174 22] Core_Option_Option_Type.some_0 ( * x));
     [#"../final_borrows.rs" 174 13 174 22] inner1 <- ([#"../final_borrows.rs" 174 13 174 22] inner);
-    [#"../final_borrows.rs" 174 27 174 38] _8 <- ([#"../final_borrows.rs" 174 27 174 38] inner1 = (2 : int32));
+    [#"../final_borrows.rs" 174 27 174 38] _8 <- ([#"../final_borrows.rs" 174 27 174 38] inner1 = ([#"../final_borrows.rs" 174 37 174 38] (2 : int32)));
     switch (_8)
       | False -> goto BB5
       | True -> goto BB4
@@ -1485,7 +1485,7 @@ module FinalBorrows_ShallowBorrowNoGen
   BB4 {
     assume { resolve0 x };
     assert { [@expl:assertion] [#"../final_borrows.rs" 175 26 175 33] _r = x };
-    [#"../final_borrows.rs" 174 42 176 9] _0 <- ([#"../final_borrows.rs" 174 42 176 9] ());
+    [#"../final_borrows.rs" 174 42 176 9] _0 <- ([#"../final_borrows.rs" 174 42 176 9] [#"../final_borrows.rs" 174 42 176 9] ());
     goto BB6
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
index be93d0ef42..397bfc7dc5 100644
--- a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
+++ b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
@@ -10,7 +10,7 @@ module MinusAssoc_F
     goto BB0
   }
   BB0 {
-    [#"../minus_assoc.rs" 6 11 6 13] _0 <- ([#"../minus_assoc.rs" 6 11 6 13] ());
+    [#"../minus_assoc.rs" 6 11 6 13] _0 <- ([#"../minus_assoc.rs" 6 11 6 13] [#"../minus_assoc.rs" 6 11 6 13] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg
index 925a87c903..5312c5a4c8 100644
--- a/creusot/tests/should_succeed/bug/two_phase.mlcfg
+++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg
@@ -166,7 +166,7 @@ module TwoPhase_Test
   }
   BB2 {
     assume { resolve0 v };
-    [#"../two_phase.rs" 6 32 8 1] _0 <- ([#"../two_phase.rs" 6 32 8 1] ());
+    [#"../two_phase.rs" 6 32 8 1] _0 <- ([#"../two_phase.rs" 6 32 8 1] [#"../two_phase.rs" 6 32 8 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/cell/01.mlcfg b/creusot/tests/should_succeed/cell/01.mlcfg
index 1a0d454d08..9029454c1c 100644
--- a/creusot/tests/should_succeed/cell/01.mlcfg
+++ b/creusot/tests/should_succeed/cell/01.mlcfg
@@ -86,28 +86,28 @@ module C01_AddsTwo
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 43 7 43 17] _4 <- ([#"../01.rs" 43 7 43 17] v < (100000 : uint32));
+    [#"../01.rs" 43 7 43 17] _4 <- ([#"../01.rs" 43 7 43 17] v < ([#"../01.rs" 43 11 43 17] (100000 : uint32)));
     switch (_4)
       | False -> goto BB4
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../01.rs" 44 14 44 19] _8 <- ([#"../01.rs" 44 14 44 19] v + (2 : uint32));
+    [#"../01.rs" 44 14 44 19] _8 <- ([#"../01.rs" 44 14 44 19] v + ([#"../01.rs" 44 18 44 19] (2 : uint32)));
     [#"../01.rs" 44 8 44 20] _6 <- ([#"../01.rs" 44 8 44 20] set0 c _8);
     _8 <- any uint32;
     goto BB3
   }
   BB3 {
-    [#"../01.rs" 43 18 45 5] _0 <- ([#"../01.rs" 43 18 45 5] ());
+    [#"../01.rs" 43 18 45 5] _0 <- ([#"../01.rs" 43 18 45 5] [#"../01.rs" 43 18 45 5] ());
     goto BB6
   }
   BB4 {
-    [#"../01.rs" 46 8 46 16] _10 <- ([#"../01.rs" 46 8 46 16] set0 c (0 : uint32));
+    [#"../01.rs" 46 8 46 16] _10 <- ([#"../01.rs" 46 8 46 16] set0 c ([#"../01.rs" 46 14 46 15] (0 : uint32)));
     goto BB5
   }
   BB5 {
-    [#"../01.rs" 45 11 47 5] _0 <- ([#"../01.rs" 45 11 47 5] ());
+    [#"../01.rs" 45 11 47 5] _0 <- ([#"../01.rs" 45 11 47 5] [#"../01.rs" 45 11 47 5] ());
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index 817b08adf8..d950baf96b 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -339,7 +339,7 @@ module C02_FibMemo
       end
   }
   BB3 {
-    [#"../02.rs" 99 27 99 33] _15 <- ([#"../02.rs" 99 27 99 33] i = (0 : usize));
+    [#"../02.rs" 99 27 99 33] _15 <- ([#"../02.rs" 99 27 99 33] i = ([#"../02.rs" 99 32 99 33] (0 : usize)));
     switch (_15)
       | False -> goto BB8
       | True -> goto BB7
@@ -358,18 +358,18 @@ module C02_FibMemo
     goto BB19
   }
   BB7 {
-    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] (0 : usize));
+    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] [#"../02.rs" 100 16 100 17] (0 : usize));
     goto BB16
   }
   BB8 {
-    [#"../02.rs" 101 22 101 28] _17 <- ([#"../02.rs" 101 22 101 28] i = (1 : usize));
+    [#"../02.rs" 101 22 101 28] _17 <- ([#"../02.rs" 101 22 101 28] i = ([#"../02.rs" 101 27 101 28] (1 : usize)));
     switch (_17)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] (1 : usize));
+    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] [#"../02.rs" 102 16 102 17] (1 : usize));
     goto BB15
   }
   BB10 {
@@ -381,13 +381,13 @@ module C02_FibMemo
     goto BB12
   }
   BB12 {
-    [#"../02.rs" 106 30 106 35] _25 <- ([#"../02.rs" 106 30 106 35] i - (1 : usize));
+    [#"../02.rs" 106 30 106 35] _25 <- ([#"../02.rs" 106 30 106 35] i - ([#"../02.rs" 106 34 106 35] (1 : usize)));
     [#"../02.rs" 106 16 106 36] _23 <- ([#"../02.rs" 106 16 106 36] fib_memo mem _25);
     _25 <- any usize;
     goto BB13
   }
   BB13 {
-    [#"../02.rs" 106 53 106 58] _29 <- ([#"../02.rs" 106 53 106 58] i - (2 : usize));
+    [#"../02.rs" 106 53 106 58] _29 <- ([#"../02.rs" 106 53 106 58] i - ([#"../02.rs" 106 57 106 58] (2 : usize)));
     [#"../02.rs" 106 39 106 59] _27 <- ([#"../02.rs" 106 39 106 59] fib_memo mem _29);
     _29 <- any usize;
     goto BB14
diff --git a/creusot/tests/should_succeed/checked_ops.mlcfg b/creusot/tests/should_succeed/checked_ops.mlcfg
index 9125f4b762..83d5837fe0 100644
--- a/creusot/tests/should_succeed/checked_ops.mlcfg
+++ b/creusot/tests/should_succeed/checked_ops.mlcfg
@@ -126,7 +126,7 @@ module CheckedOps_TestU8AddExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 6 12 6 31] _4 <- ([#"../checked_ops.rs" 6 12 6 31] checked_add0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 6 12 6 31] _4 <- ([#"../checked_ops.rs" 6 12 6 31] checked_add0 ([#"../checked_ops.rs" 6 12 6 15] (5 : uint8)) ([#"../checked_ops.rs" 6 28 6 30] (10 : uint8)));
     goto BB1
   }
   BB1 {
@@ -135,7 +135,7 @@ module CheckedOps_TestU8AddExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 6 12 6 46] _2 <- ([#"../checked_ops.rs" 6 12 6 46] _3 = (15 : uint8));
+    [#"../checked_ops.rs" 6 12 6 46] _2 <- ([#"../checked_ops.rs" 6 12 6 46] _3 = ([#"../checked_ops.rs" 6 44 6 46] (15 : uint8)));
     _3 <- any uint8;
     switch (_2)
       | False -> goto BB4
@@ -143,7 +143,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 7 12 7 33] _9 <- ([#"../checked_ops.rs" 7 12 7 33] checked_add0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 7 12 7 33] _9 <- ([#"../checked_ops.rs" 7 12 7 33] checked_add0 ([#"../checked_ops.rs" 7 12 7 17] (250 : uint8)) ([#"../checked_ops.rs" 7 30 7 32] (10 : uint8)));
     goto BB5
   }
   BB4 {
@@ -161,7 +161,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 9 12 9 32] _13 <- ([#"../checked_ops.rs" 9 12 9 32] wrapping_add0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 9 12 9 32] _13 <- ([#"../checked_ops.rs" 9 12 9 32] wrapping_add0 ([#"../checked_ops.rs" 9 12 9 15] (5 : uint8)) ([#"../checked_ops.rs" 9 29 9 31] (10 : uint8)));
     goto BB9
   }
   BB8 {
@@ -169,7 +169,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 9 12 9 38] _12 <- ([#"../checked_ops.rs" 9 12 9 38] _13 = (15 : uint8));
+    [#"../checked_ops.rs" 9 12 9 38] _12 <- ([#"../checked_ops.rs" 9 12 9 38] _13 = ([#"../checked_ops.rs" 9 36 9 38] (15 : uint8)));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -177,7 +177,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 10 12 10 34] _17 <- ([#"../checked_ops.rs" 10 12 10 34] wrapping_add0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 10 12 10 34] _17 <- ([#"../checked_ops.rs" 10 12 10 34] wrapping_add0 ([#"../checked_ops.rs" 10 12 10 17] (250 : uint8)) ([#"../checked_ops.rs" 10 31 10 33] (10 : uint8)));
     goto BB12
   }
   BB11 {
@@ -185,7 +185,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 10 12 10 39] _16 <- ([#"../checked_ops.rs" 10 12 10 39] _17 = (4 : uint8));
+    [#"../checked_ops.rs" 10 12 10 39] _16 <- ([#"../checked_ops.rs" 10 12 10 39] _17 = ([#"../checked_ops.rs" 10 38 10 39] (4 : uint8)));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -193,7 +193,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 12 12 12 34] _21 <- ([#"../checked_ops.rs" 12 12 12 34] saturating_add0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 12 12 12 34] _21 <- ([#"../checked_ops.rs" 12 12 12 34] saturating_add0 ([#"../checked_ops.rs" 12 12 12 15] (5 : uint8)) ([#"../checked_ops.rs" 12 31 12 33] (10 : uint8)));
     goto BB15
   }
   BB14 {
@@ -201,7 +201,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 12 12 12 40] _20 <- ([#"../checked_ops.rs" 12 12 12 40] _21 = (15 : uint8));
+    [#"../checked_ops.rs" 12 12 12 40] _20 <- ([#"../checked_ops.rs" 12 12 12 40] _21 = ([#"../checked_ops.rs" 12 38 12 40] (15 : uint8)));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -209,7 +209,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 13 12 13 36] _25 <- ([#"../checked_ops.rs" 13 12 13 36] saturating_add0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 13 12 13 36] _25 <- ([#"../checked_ops.rs" 13 12 13 36] saturating_add0 ([#"../checked_ops.rs" 13 12 13 17] (250 : uint8)) ([#"../checked_ops.rs" 13 33 13 35] (10 : uint8)));
     goto BB18
   }
   BB17 {
@@ -217,7 +217,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 13 12 13 43] _24 <- ([#"../checked_ops.rs" 13 12 13 43] _25 = (255 : uint8));
+    [#"../checked_ops.rs" 13 12 13 43] _24 <- ([#"../checked_ops.rs" 13 12 13 43] _25 = ([#"../checked_ops.rs" 13 40 13 43] (255 : uint8)));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -225,7 +225,7 @@ module CheckedOps_TestU8AddExample
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 15 14 15 37] res <- ([#"../checked_ops.rs" 15 14 15 37] overflowing_add0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 15 14 15 37] res <- ([#"../checked_ops.rs" 15 14 15 37] overflowing_add0 ([#"../checked_ops.rs" 15 14 15 17] (5 : uint8)) ([#"../checked_ops.rs" 15 34 15 36] (10 : uint8)));
     goto BB21
   }
   BB20 {
@@ -233,7 +233,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 16 12 16 23] _29 <- ([#"../checked_ops.rs" 16 12 16 23] (let (a, _) = res in a) = (15 : uint8));
+    [#"../checked_ops.rs" 16 12 16 23] _29 <- ([#"../checked_ops.rs" 16 12 16 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 16 21 16 23] (15 : uint8)));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -241,14 +241,14 @@ module CheckedOps_TestU8AddExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 16 27 16 41] _31 <- ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 16 27 16 41] _31 <- ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 16 36 16 41] false));
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 17 14 17 39] res1 <- ([#"../checked_ops.rs" 17 14 17 39] overflowing_add0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 17 14 17 39] res1 <- ([#"../checked_ops.rs" 17 14 17 39] overflowing_add0 ([#"../checked_ops.rs" 17 14 17 19] (250 : uint8)) ([#"../checked_ops.rs" 17 36 17 38] (10 : uint8)));
     goto BB27
   }
   BB24 {
@@ -263,7 +263,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 18 12 18 22] _36 <- ([#"../checked_ops.rs" 18 12 18 22] (let (a, _) = res1 in a) = (4 : uint8));
+    [#"../checked_ops.rs" 18 12 18 22] _36 <- ([#"../checked_ops.rs" 18 12 18 22] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 18 21 18 22] (4 : uint8)));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -271,14 +271,14 @@ module CheckedOps_TestU8AddExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 18 26 18 39] _38 <- ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb (let (_, a) = res1 in a) true);
+    [#"../checked_ops.rs" 18 26 18 39] _38 <- ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 18 35 18 39] true));
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 5 29 19 1] _0 <- ([#"../checked_ops.rs" 5 29 19 1] ());
+    [#"../checked_ops.rs" 5 29 19 1] _0 <- ([#"../checked_ops.rs" 5 29 19 1] [#"../checked_ops.rs" 5 29 19 1] ());
     return _0
   }
   BB30 {
@@ -383,7 +383,7 @@ module CheckedOps_TestU8AddOverflow
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 24 12 24 32] _6 <- ([#"../checked_ops.rs" 24 12 24 32] checked_add0 (255 : uint8) a);
+    [#"../checked_ops.rs" 24 12 24 32] _6 <- ([#"../checked_ops.rs" 24 12 24 32] checked_add0 ([#"../checked_ops.rs" 24 12 24 17] (255 : uint8)) a);
     goto BB1
   }
   BB1 {
@@ -397,7 +397,7 @@ module CheckedOps_TestU8AddOverflow
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 25 12 25 33] _11 <- ([#"../checked_ops.rs" 25 12 25 33] wrapping_add0 (255 : uint8) a);
+    [#"../checked_ops.rs" 25 12 25 33] _11 <- ([#"../checked_ops.rs" 25 12 25 33] wrapping_add0 ([#"../checked_ops.rs" 25 12 25 17] (255 : uint8)) a);
     goto BB5
   }
   BB4 {
@@ -405,7 +405,7 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 25 37 25 42] _13 <- ([#"../checked_ops.rs" 25 37 25 42] a - (1 : uint8));
+    [#"../checked_ops.rs" 25 37 25 42] _13 <- ([#"../checked_ops.rs" 25 37 25 42] a - ([#"../checked_ops.rs" 25 41 25 42] (1 : uint8)));
     [#"../checked_ops.rs" 25 12 25 42] _10 <- ([#"../checked_ops.rs" 25 12 25 42] _11 = _13);
     _11 <- any uint8;
     _13 <- any uint8;
@@ -415,7 +415,7 @@ module CheckedOps_TestU8AddOverflow
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 26 12 26 35] _18 <- ([#"../checked_ops.rs" 26 12 26 35] saturating_add0 (255 : uint8) a);
+    [#"../checked_ops.rs" 26 12 26 35] _18 <- ([#"../checked_ops.rs" 26 12 26 35] saturating_add0 ([#"../checked_ops.rs" 26 12 26 17] (255 : uint8)) a);
     goto BB8
   }
   BB7 {
@@ -423,7 +423,7 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 26 12 26 42] _17 <- ([#"../checked_ops.rs" 26 12 26 42] _18 = (255 : uint8));
+    [#"../checked_ops.rs" 26 12 26 42] _17 <- ([#"../checked_ops.rs" 26 12 26 42] _18 = ([#"../checked_ops.rs" 26 39 26 42] (255 : uint8)));
     _18 <- any uint8;
     switch (_17)
       | False -> goto BB10
@@ -431,7 +431,7 @@ module CheckedOps_TestU8AddOverflow
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 27 14 27 38] res <- ([#"../checked_ops.rs" 27 14 27 38] overflowing_add0 (255 : uint8) a);
+    [#"../checked_ops.rs" 27 14 27 38] res <- ([#"../checked_ops.rs" 27 14 27 38] overflowing_add0 ([#"../checked_ops.rs" 27 14 27 19] (255 : uint8)) a);
     goto BB11
   }
   BB10 {
@@ -439,7 +439,7 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 28 21 28 26] _26 <- ([#"../checked_ops.rs" 28 21 28 26] a - (1 : uint8));
+    [#"../checked_ops.rs" 28 21 28 26] _26 <- ([#"../checked_ops.rs" 28 21 28 26] a - ([#"../checked_ops.rs" 28 25 28 26] (1 : uint8)));
     [#"../checked_ops.rs" 28 12 28 26] _24 <- ([#"../checked_ops.rs" 28 12 28 26] (let (a, _) = res in a) = _26);
     _26 <- any uint8;
     switch (_24)
@@ -449,14 +449,14 @@ module CheckedOps_TestU8AddOverflow
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 28 30 28 43] _28 <- ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 28 30 28 43] _28 <- ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 28 39 28 43] true));
     switch (_28)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 23 35 29 1] _0 <- ([#"../checked_ops.rs" 23 35 29 1] ());
+    [#"../checked_ops.rs" 23 35 29 1] _0 <- ([#"../checked_ops.rs" 23 35 29 1] [#"../checked_ops.rs" 23 35 29 1] ());
     return _0
   }
   BB14 {
@@ -633,7 +633,7 @@ module CheckedOps_TestU8OverflowingAdd
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 39 45 42 1] _0 <- ([#"../checked_ops.rs" 39 45 42 1] ());
+    [#"../checked_ops.rs" 39 45 42 1] _0 <- ([#"../checked_ops.rs" 39 45 42 1] [#"../checked_ops.rs" 39 45 42 1] ());
     return _0
   }
   BB9 {
@@ -763,7 +763,7 @@ module CheckedOps_TestU8SubExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 46 12 46 31] _4 <- ([#"../checked_ops.rs" 46 12 46 31] checked_sub0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 46 12 46 31] _4 <- ([#"../checked_ops.rs" 46 12 46 31] checked_sub0 ([#"../checked_ops.rs" 46 12 46 15] (5 : uint8)) ([#"../checked_ops.rs" 46 28 46 30] (10 : uint8)));
     goto BB1
   }
   BB1 {
@@ -777,7 +777,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 47 12 47 33] _9 <- ([#"../checked_ops.rs" 47 12 47 33] checked_sub0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 47 12 47 33] _9 <- ([#"../checked_ops.rs" 47 12 47 33] checked_sub0 ([#"../checked_ops.rs" 47 12 47 17] (250 : uint8)) ([#"../checked_ops.rs" 47 30 47 32] (10 : uint8)));
     goto BB5
   }
   BB4 {
@@ -790,7 +790,7 @@ module CheckedOps_TestU8SubExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 47 12 47 49] _7 <- ([#"../checked_ops.rs" 47 12 47 49] _8 = (240 : uint8));
+    [#"../checked_ops.rs" 47 12 47 49] _7 <- ([#"../checked_ops.rs" 47 12 47 49] _8 = ([#"../checked_ops.rs" 47 46 47 49] (240 : uint8)));
     _8 <- any uint8;
     switch (_7)
       | False -> goto BB8
@@ -798,7 +798,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 49 12 49 32] _13 <- ([#"../checked_ops.rs" 49 12 49 32] wrapping_sub0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 49 12 49 32] _13 <- ([#"../checked_ops.rs" 49 12 49 32] wrapping_sub0 ([#"../checked_ops.rs" 49 12 49 15] (5 : uint8)) ([#"../checked_ops.rs" 49 29 49 31] (10 : uint8)));
     goto BB9
   }
   BB8 {
@@ -806,7 +806,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 49 12 49 39] _12 <- ([#"../checked_ops.rs" 49 12 49 39] _13 = (251 : uint8));
+    [#"../checked_ops.rs" 49 12 49 39] _12 <- ([#"../checked_ops.rs" 49 12 49 39] _13 = ([#"../checked_ops.rs" 49 36 49 39] (251 : uint8)));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -814,7 +814,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 50 12 50 34] _17 <- ([#"../checked_ops.rs" 50 12 50 34] wrapping_sub0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 50 12 50 34] _17 <- ([#"../checked_ops.rs" 50 12 50 34] wrapping_sub0 ([#"../checked_ops.rs" 50 12 50 17] (250 : uint8)) ([#"../checked_ops.rs" 50 31 50 33] (10 : uint8)));
     goto BB12
   }
   BB11 {
@@ -822,7 +822,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 50 12 50 41] _16 <- ([#"../checked_ops.rs" 50 12 50 41] _17 = (240 : uint8));
+    [#"../checked_ops.rs" 50 12 50 41] _16 <- ([#"../checked_ops.rs" 50 12 50 41] _17 = ([#"../checked_ops.rs" 50 38 50 41] (240 : uint8)));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -830,7 +830,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 52 12 52 34] _21 <- ([#"../checked_ops.rs" 52 12 52 34] saturating_sub0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 52 12 52 34] _21 <- ([#"../checked_ops.rs" 52 12 52 34] saturating_sub0 ([#"../checked_ops.rs" 52 12 52 15] (5 : uint8)) ([#"../checked_ops.rs" 52 31 52 33] (10 : uint8)));
     goto BB15
   }
   BB14 {
@@ -838,7 +838,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 52 12 52 39] _20 <- ([#"../checked_ops.rs" 52 12 52 39] _21 = (0 : uint8));
+    [#"../checked_ops.rs" 52 12 52 39] _20 <- ([#"../checked_ops.rs" 52 12 52 39] _21 = ([#"../checked_ops.rs" 52 38 52 39] (0 : uint8)));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -846,7 +846,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 53 12 53 36] _25 <- ([#"../checked_ops.rs" 53 12 53 36] saturating_sub0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 53 12 53 36] _25 <- ([#"../checked_ops.rs" 53 12 53 36] saturating_sub0 ([#"../checked_ops.rs" 53 12 53 17] (250 : uint8)) ([#"../checked_ops.rs" 53 33 53 35] (10 : uint8)));
     goto BB18
   }
   BB17 {
@@ -854,7 +854,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 53 12 53 43] _24 <- ([#"../checked_ops.rs" 53 12 53 43] _25 = (240 : uint8));
+    [#"../checked_ops.rs" 53 12 53 43] _24 <- ([#"../checked_ops.rs" 53 12 53 43] _25 = ([#"../checked_ops.rs" 53 40 53 43] (240 : uint8)));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -862,7 +862,7 @@ module CheckedOps_TestU8SubExample
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 55 14 55 37] res <- ([#"../checked_ops.rs" 55 14 55 37] overflowing_sub0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 55 14 55 37] res <- ([#"../checked_ops.rs" 55 14 55 37] overflowing_sub0 ([#"../checked_ops.rs" 55 14 55 17] (5 : uint8)) ([#"../checked_ops.rs" 55 34 55 36] (10 : uint8)));
     goto BB21
   }
   BB20 {
@@ -870,7 +870,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 56 12 56 24] _29 <- ([#"../checked_ops.rs" 56 12 56 24] (let (a, _) = res in a) = (251 : uint8));
+    [#"../checked_ops.rs" 56 12 56 24] _29 <- ([#"../checked_ops.rs" 56 12 56 24] (let (a, _) = res in a) = ([#"../checked_ops.rs" 56 21 56 24] (251 : uint8)));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -878,14 +878,14 @@ module CheckedOps_TestU8SubExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 56 28 56 41] _31 <- ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 56 28 56 41] _31 <- ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 56 37 56 41] true));
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 57 14 57 39] res1 <- ([#"../checked_ops.rs" 57 14 57 39] overflowing_sub0 (250 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 57 14 57 39] res1 <- ([#"../checked_ops.rs" 57 14 57 39] overflowing_sub0 ([#"../checked_ops.rs" 57 14 57 19] (250 : uint8)) ([#"../checked_ops.rs" 57 36 57 38] (10 : uint8)));
     goto BB27
   }
   BB24 {
@@ -900,7 +900,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 58 12 58 24] _36 <- ([#"../checked_ops.rs" 58 12 58 24] (let (a, _) = res1 in a) = (240 : uint8));
+    [#"../checked_ops.rs" 58 12 58 24] _36 <- ([#"../checked_ops.rs" 58 12 58 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 58 21 58 24] (240 : uint8)));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -908,14 +908,14 @@ module CheckedOps_TestU8SubExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 58 28 58 42] _38 <- ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb (let (_, a) = res1 in a) false);
+    [#"../checked_ops.rs" 58 28 58 42] _38 <- ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 58 37 58 42] false));
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 45 29 59 1] _0 <- ([#"../checked_ops.rs" 45 29 59 1] ());
+    [#"../checked_ops.rs" 45 29 59 1] _0 <- ([#"../checked_ops.rs" 45 29 59 1] [#"../checked_ops.rs" 45 29 59 1] ());
     return _0
   }
   BB30 {
@@ -1022,7 +1022,7 @@ module CheckedOps_TestU8SubOverflow
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 64 12 64 30] _6 <- ([#"../checked_ops.rs" 64 12 64 30] checked_sub0 (0 : uint8) a);
+    [#"../checked_ops.rs" 64 12 64 30] _6 <- ([#"../checked_ops.rs" 64 12 64 30] checked_sub0 ([#"../checked_ops.rs" 64 12 64 15] (0 : uint8)) a);
     goto BB1
   }
   BB1 {
@@ -1036,7 +1036,7 @@ module CheckedOps_TestU8SubOverflow
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 65 12 65 31] _11 <- ([#"../checked_ops.rs" 65 12 65 31] wrapping_sub0 (0 : uint8) a);
+    [#"../checked_ops.rs" 65 12 65 31] _11 <- ([#"../checked_ops.rs" 65 12 65 31] wrapping_sub0 ([#"../checked_ops.rs" 65 12 65 15] (0 : uint8)) a);
     goto BB5
   }
   BB4 {
@@ -1044,8 +1044,8 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 42] (255 : uint8) - a);
-    [#"../checked_ops.rs" 65 35 65 46] _13 <- ([#"../checked_ops.rs" 65 35 65 46] _14 + (1 : uint8));
+    [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 42] ([#"../checked_ops.rs" 65 35 65 38] (255 : uint8)) - a);
+    [#"../checked_ops.rs" 65 35 65 46] _13 <- ([#"../checked_ops.rs" 65 35 65 46] _14 + ([#"../checked_ops.rs" 65 45 65 46] (1 : uint8)));
     _14 <- any uint8;
     [#"../checked_ops.rs" 65 12 65 46] _10 <- ([#"../checked_ops.rs" 65 12 65 46] _11 = _13);
     _11 <- any uint8;
@@ -1056,7 +1056,7 @@ module CheckedOps_TestU8SubOverflow
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 66 12 66 33] _19 <- ([#"../checked_ops.rs" 66 12 66 33] saturating_sub0 (0 : uint8) a);
+    [#"../checked_ops.rs" 66 12 66 33] _19 <- ([#"../checked_ops.rs" 66 12 66 33] saturating_sub0 ([#"../checked_ops.rs" 66 12 66 15] (0 : uint8)) a);
     goto BB8
   }
   BB7 {
@@ -1064,7 +1064,7 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 66 12 66 38] _18 <- ([#"../checked_ops.rs" 66 12 66 38] _19 = (0 : uint8));
+    [#"../checked_ops.rs" 66 12 66 38] _18 <- ([#"../checked_ops.rs" 66 12 66 38] _19 = ([#"../checked_ops.rs" 66 37 66 38] (0 : uint8)));
     _19 <- any uint8;
     switch (_18)
       | False -> goto BB10
@@ -1072,7 +1072,7 @@ module CheckedOps_TestU8SubOverflow
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 67 14 67 36] res <- ([#"../checked_ops.rs" 67 14 67 36] overflowing_sub0 (0 : uint8) a);
+    [#"../checked_ops.rs" 67 14 67 36] res <- ([#"../checked_ops.rs" 67 14 67 36] overflowing_sub0 ([#"../checked_ops.rs" 67 14 67 17] (0 : uint8)) a);
     goto BB11
   }
   BB10 {
@@ -1080,8 +1080,8 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 28] (255 : uint8) - a);
-    [#"../checked_ops.rs" 68 21 68 32] _27 <- ([#"../checked_ops.rs" 68 21 68 32] _28 + (1 : uint8));
+    [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 28] ([#"../checked_ops.rs" 68 21 68 24] (255 : uint8)) - a);
+    [#"../checked_ops.rs" 68 21 68 32] _27 <- ([#"../checked_ops.rs" 68 21 68 32] _28 + ([#"../checked_ops.rs" 68 31 68 32] (1 : uint8)));
     _28 <- any uint8;
     [#"../checked_ops.rs" 68 12 68 32] _25 <- ([#"../checked_ops.rs" 68 12 68 32] (let (a, _) = res in a) = _27);
     _27 <- any uint8;
@@ -1092,14 +1092,14 @@ module CheckedOps_TestU8SubOverflow
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 68 36 68 49] _30 <- ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 68 36 68 49] _30 <- ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 68 45 68 49] true));
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 63 35 69 1] _0 <- ([#"../checked_ops.rs" 63 35 69 1] ());
+    [#"../checked_ops.rs" 63 35 69 1] _0 <- ([#"../checked_ops.rs" 63 35 69 1] [#"../checked_ops.rs" 63 35 69 1] ());
     return _0
   }
   BB14 {
@@ -1276,7 +1276,7 @@ module CheckedOps_TestU8OverflowingSub
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 79 45 82 1] _0 <- ([#"../checked_ops.rs" 79 45 82 1] ());
+    [#"../checked_ops.rs" 79 45 82 1] _0 <- ([#"../checked_ops.rs" 79 45 82 1] [#"../checked_ops.rs" 79 45 82 1] ());
     return _0
   }
   BB9 {
@@ -1406,7 +1406,7 @@ module CheckedOps_TestU8MulExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 86 12 86 31] _4 <- ([#"../checked_ops.rs" 86 12 86 31] checked_mul0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 86 12 86 31] _4 <- ([#"../checked_ops.rs" 86 12 86 31] checked_mul0 ([#"../checked_ops.rs" 86 12 86 15] (5 : uint8)) ([#"../checked_ops.rs" 86 28 86 30] (10 : uint8)));
     goto BB1
   }
   BB1 {
@@ -1415,7 +1415,7 @@ module CheckedOps_TestU8MulExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 86 12 86 46] _2 <- ([#"../checked_ops.rs" 86 12 86 46] _3 = (50 : uint8));
+    [#"../checked_ops.rs" 86 12 86 46] _2 <- ([#"../checked_ops.rs" 86 12 86 46] _3 = ([#"../checked_ops.rs" 86 44 86 46] (50 : uint8)));
     _3 <- any uint8;
     switch (_2)
       | False -> goto BB4
@@ -1423,7 +1423,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 87 12 87 32] _9 <- ([#"../checked_ops.rs" 87 12 87 32] checked_mul0 (50 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 87 12 87 32] _9 <- ([#"../checked_ops.rs" 87 12 87 32] checked_mul0 ([#"../checked_ops.rs" 87 12 87 16] (50 : uint8)) ([#"../checked_ops.rs" 87 29 87 31] (10 : uint8)));
     goto BB5
   }
   BB4 {
@@ -1441,7 +1441,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 89 12 89 32] _13 <- ([#"../checked_ops.rs" 89 12 89 32] wrapping_mul0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 89 12 89 32] _13 <- ([#"../checked_ops.rs" 89 12 89 32] wrapping_mul0 ([#"../checked_ops.rs" 89 12 89 15] (5 : uint8)) ([#"../checked_ops.rs" 89 29 89 31] (10 : uint8)));
     goto BB9
   }
   BB8 {
@@ -1449,7 +1449,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 89 12 89 38] _12 <- ([#"../checked_ops.rs" 89 12 89 38] _13 = (50 : uint8));
+    [#"../checked_ops.rs" 89 12 89 38] _12 <- ([#"../checked_ops.rs" 89 12 89 38] _13 = ([#"../checked_ops.rs" 89 36 89 38] (50 : uint8)));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -1457,7 +1457,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 90 12 90 33] _17 <- ([#"../checked_ops.rs" 90 12 90 33] wrapping_mul0 (50 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 90 12 90 33] _17 <- ([#"../checked_ops.rs" 90 12 90 33] wrapping_mul0 ([#"../checked_ops.rs" 90 12 90 16] (50 : uint8)) ([#"../checked_ops.rs" 90 30 90 32] (10 : uint8)));
     goto BB12
   }
   BB11 {
@@ -1465,7 +1465,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 90 12 90 40] _16 <- ([#"../checked_ops.rs" 90 12 90 40] _17 = (244 : uint8));
+    [#"../checked_ops.rs" 90 12 90 40] _16 <- ([#"../checked_ops.rs" 90 12 90 40] _17 = ([#"../checked_ops.rs" 90 37 90 40] (244 : uint8)));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -1473,7 +1473,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 92 12 92 34] _21 <- ([#"../checked_ops.rs" 92 12 92 34] saturating_mul0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 92 12 92 34] _21 <- ([#"../checked_ops.rs" 92 12 92 34] saturating_mul0 ([#"../checked_ops.rs" 92 12 92 15] (5 : uint8)) ([#"../checked_ops.rs" 92 31 92 33] (10 : uint8)));
     goto BB15
   }
   BB14 {
@@ -1481,7 +1481,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 92 12 92 40] _20 <- ([#"../checked_ops.rs" 92 12 92 40] _21 = (50 : uint8));
+    [#"../checked_ops.rs" 92 12 92 40] _20 <- ([#"../checked_ops.rs" 92 12 92 40] _21 = ([#"../checked_ops.rs" 92 38 92 40] (50 : uint8)));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -1489,7 +1489,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB16 {
-    [#"../checked_ops.rs" 93 12 93 35] _25 <- ([#"../checked_ops.rs" 93 12 93 35] saturating_mul0 (50 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 93 12 93 35] _25 <- ([#"../checked_ops.rs" 93 12 93 35] saturating_mul0 ([#"../checked_ops.rs" 93 12 93 16] (50 : uint8)) ([#"../checked_ops.rs" 93 32 93 34] (10 : uint8)));
     goto BB18
   }
   BB17 {
@@ -1497,7 +1497,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 93 12 93 42] _24 <- ([#"../checked_ops.rs" 93 12 93 42] _25 = (255 : uint8));
+    [#"../checked_ops.rs" 93 12 93 42] _24 <- ([#"../checked_ops.rs" 93 12 93 42] _25 = ([#"../checked_ops.rs" 93 39 93 42] (255 : uint8)));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -1505,7 +1505,7 @@ module CheckedOps_TestU8MulExample
       end
   }
   BB19 {
-    [#"../checked_ops.rs" 95 14 95 37] res <- ([#"../checked_ops.rs" 95 14 95 37] overflowing_mul0 (5 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 95 14 95 37] res <- ([#"../checked_ops.rs" 95 14 95 37] overflowing_mul0 ([#"../checked_ops.rs" 95 14 95 17] (5 : uint8)) ([#"../checked_ops.rs" 95 34 95 36] (10 : uint8)));
     goto BB21
   }
   BB20 {
@@ -1513,7 +1513,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 96 12 96 23] _29 <- ([#"../checked_ops.rs" 96 12 96 23] (let (a, _) = res in a) = (50 : uint8));
+    [#"../checked_ops.rs" 96 12 96 23] _29 <- ([#"../checked_ops.rs" 96 12 96 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 96 21 96 23] (50 : uint8)));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -1521,14 +1521,14 @@ module CheckedOps_TestU8MulExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 96 27 96 41] _31 <- ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 96 27 96 41] _31 <- ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 96 36 96 41] false));
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 97 14 97 38] res1 <- ([#"../checked_ops.rs" 97 14 97 38] overflowing_mul0 (50 : uint8) (10 : uint8));
+    [#"../checked_ops.rs" 97 14 97 38] res1 <- ([#"../checked_ops.rs" 97 14 97 38] overflowing_mul0 ([#"../checked_ops.rs" 97 14 97 18] (50 : uint8)) ([#"../checked_ops.rs" 97 35 97 37] (10 : uint8)));
     goto BB27
   }
   BB24 {
@@ -1543,7 +1543,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 98 12 98 24] _36 <- ([#"../checked_ops.rs" 98 12 98 24] (let (a, _) = res1 in a) = (244 : uint8));
+    [#"../checked_ops.rs" 98 12 98 24] _36 <- ([#"../checked_ops.rs" 98 12 98 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 98 21 98 24] (244 : uint8)));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -1551,14 +1551,14 @@ module CheckedOps_TestU8MulExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 98 28 98 41] _38 <- ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb (let (_, a) = res1 in a) true);
+    [#"../checked_ops.rs" 98 28 98 41] _38 <- ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 98 37 98 41] true));
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 85 29 99 1] _0 <- ([#"../checked_ops.rs" 85 29 99 1] ());
+    [#"../checked_ops.rs" 85 29 99 1] _0 <- ([#"../checked_ops.rs" 85 29 99 1] [#"../checked_ops.rs" 85 29 99 1] ());
     return _0
   }
   BB30 {
@@ -1672,7 +1672,7 @@ module CheckedOps_TestU8MulZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 103 12 103 30] _5 <- ([#"../checked_ops.rs" 103 12 103 30] checked_mul0 (0 : uint8) a);
+    [#"../checked_ops.rs" 103 12 103 30] _5 <- ([#"../checked_ops.rs" 103 12 103 30] checked_mul0 ([#"../checked_ops.rs" 103 12 103 15] (0 : uint8)) a);
     goto BB1
   }
   BB1 {
@@ -1681,7 +1681,7 @@ module CheckedOps_TestU8MulZero
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 103 12 103 44] _3 <- ([#"../checked_ops.rs" 103 12 103 44] _4 = (0 : uint8));
+    [#"../checked_ops.rs" 103 12 103 44] _3 <- ([#"../checked_ops.rs" 103 12 103 44] _4 = ([#"../checked_ops.rs" 103 43 103 44] (0 : uint8)));
     _4 <- any uint8;
     switch (_3)
       | False -> goto BB4
@@ -1689,7 +1689,7 @@ module CheckedOps_TestU8MulZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 104 12 104 31] _10 <- ([#"../checked_ops.rs" 104 12 104 31] wrapping_mul0 (0 : uint8) a);
+    [#"../checked_ops.rs" 104 12 104 31] _10 <- ([#"../checked_ops.rs" 104 12 104 31] wrapping_mul0 ([#"../checked_ops.rs" 104 12 104 15] (0 : uint8)) a);
     goto BB5
   }
   BB4 {
@@ -1697,7 +1697,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 104 12 104 36] _9 <- ([#"../checked_ops.rs" 104 12 104 36] _10 = (0 : uint8));
+    [#"../checked_ops.rs" 104 12 104 36] _9 <- ([#"../checked_ops.rs" 104 12 104 36] _10 = ([#"../checked_ops.rs" 104 35 104 36] (0 : uint8)));
     _10 <- any uint8;
     switch (_9)
       | False -> goto BB7
@@ -1705,7 +1705,7 @@ module CheckedOps_TestU8MulZero
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 105 12 105 33] _15 <- ([#"../checked_ops.rs" 105 12 105 33] saturating_mul0 (0 : uint8) a);
+    [#"../checked_ops.rs" 105 12 105 33] _15 <- ([#"../checked_ops.rs" 105 12 105 33] saturating_mul0 ([#"../checked_ops.rs" 105 12 105 15] (0 : uint8)) a);
     goto BB8
   }
   BB7 {
@@ -1713,7 +1713,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 105 12 105 38] _14 <- ([#"../checked_ops.rs" 105 12 105 38] _15 = (0 : uint8));
+    [#"../checked_ops.rs" 105 12 105 38] _14 <- ([#"../checked_ops.rs" 105 12 105 38] _15 = ([#"../checked_ops.rs" 105 37 105 38] (0 : uint8)));
     _15 <- any uint8;
     switch (_14)
       | False -> goto BB10
@@ -1721,7 +1721,7 @@ module CheckedOps_TestU8MulZero
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 106 14 106 36] res <- ([#"../checked_ops.rs" 106 14 106 36] overflowing_mul0 (0 : uint8) a);
+    [#"../checked_ops.rs" 106 14 106 36] res <- ([#"../checked_ops.rs" 106 14 106 36] overflowing_mul0 ([#"../checked_ops.rs" 106 14 106 17] (0 : uint8)) a);
     goto BB11
   }
   BB10 {
@@ -1729,7 +1729,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 107 12 107 22] _21 <- ([#"../checked_ops.rs" 107 12 107 22] (let (a, _) = res in a) = (0 : uint8));
+    [#"../checked_ops.rs" 107 12 107 22] _21 <- ([#"../checked_ops.rs" 107 12 107 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 107 21 107 22] (0 : uint8)));
     switch (_21)
       | False -> goto BB15
       | True -> goto BB12
@@ -1737,14 +1737,14 @@ module CheckedOps_TestU8MulZero
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 107 26 107 40] _23 <- ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 107 26 107 40] _23 <- ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 107 35 107 40] false));
     switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 102 31 108 1] _0 <- ([#"../checked_ops.rs" 102 31 108 1] ());
+    [#"../checked_ops.rs" 102 31 108 1] _0 <- ([#"../checked_ops.rs" 102 31 108 1] [#"../checked_ops.rs" 102 31 108 1] ());
     return _0
   }
   BB14 {
@@ -1882,7 +1882,7 @@ module CheckedOps_TestU8OverflowingMul
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 111 45 114 1] _0 <- ([#"../checked_ops.rs" 111 45 114 1] ());
+    [#"../checked_ops.rs" 111 45 114 1] _0 <- ([#"../checked_ops.rs" 111 45 114 1] [#"../checked_ops.rs" 111 45 114 1] ());
     return _0
   }
   BB9 {
@@ -1995,7 +1995,7 @@ module CheckedOps_TestU8DivExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 118 12 118 30] _4 <- ([#"../checked_ops.rs" 118 12 118 30] checked_div0 (5 : uint8) (0 : uint8));
+    [#"../checked_ops.rs" 118 12 118 30] _4 <- ([#"../checked_ops.rs" 118 12 118 30] checked_div0 ([#"../checked_ops.rs" 118 12 118 15] (5 : uint8)) ([#"../checked_ops.rs" 118 28 118 29] (0 : uint8)));
     goto BB1
   }
   BB1 {
@@ -2009,7 +2009,7 @@ module CheckedOps_TestU8DivExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 119 12 119 30] _9 <- ([#"../checked_ops.rs" 119 12 119 30] checked_div0 (5 : uint8) (2 : uint8));
+    [#"../checked_ops.rs" 119 12 119 30] _9 <- ([#"../checked_ops.rs" 119 12 119 30] checked_div0 ([#"../checked_ops.rs" 119 12 119 15] (5 : uint8)) ([#"../checked_ops.rs" 119 28 119 29] (2 : uint8)));
     goto BB5
   }
   BB4 {
@@ -2022,7 +2022,7 @@ module CheckedOps_TestU8DivExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 119 12 119 44] _7 <- ([#"../checked_ops.rs" 119 12 119 44] _8 = (2 : uint8));
+    [#"../checked_ops.rs" 119 12 119 44] _7 <- ([#"../checked_ops.rs" 119 12 119 44] _8 = ([#"../checked_ops.rs" 119 43 119 44] (2 : uint8)));
     _8 <- any uint8;
     switch (_7)
       | False -> goto BB8
@@ -2030,7 +2030,7 @@ module CheckedOps_TestU8DivExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 120 12 120 31] _13 <- ([#"../checked_ops.rs" 120 12 120 31] wrapping_div0 (5 : uint8) (2 : uint8));
+    [#"../checked_ops.rs" 120 12 120 31] _13 <- ([#"../checked_ops.rs" 120 12 120 31] wrapping_div0 ([#"../checked_ops.rs" 120 12 120 15] (5 : uint8)) ([#"../checked_ops.rs" 120 29 120 30] (2 : uint8)));
     goto BB9
   }
   BB8 {
@@ -2038,7 +2038,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 120 12 120 36] _12 <- ([#"../checked_ops.rs" 120 12 120 36] _13 = (2 : uint8));
+    [#"../checked_ops.rs" 120 12 120 36] _12 <- ([#"../checked_ops.rs" 120 12 120 36] _13 = ([#"../checked_ops.rs" 120 35 120 36] (2 : uint8)));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -2046,7 +2046,7 @@ module CheckedOps_TestU8DivExample
       end
   }
   BB10 {
-    [#"../checked_ops.rs" 121 12 121 33] _17 <- ([#"../checked_ops.rs" 121 12 121 33] saturating_div0 (5 : uint8) (2 : uint8));
+    [#"../checked_ops.rs" 121 12 121 33] _17 <- ([#"../checked_ops.rs" 121 12 121 33] saturating_div0 ([#"../checked_ops.rs" 121 12 121 15] (5 : uint8)) ([#"../checked_ops.rs" 121 31 121 32] (2 : uint8)));
     goto BB12
   }
   BB11 {
@@ -2054,7 +2054,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 121 12 121 38] _16 <- ([#"../checked_ops.rs" 121 12 121 38] _17 = (2 : uint8));
+    [#"../checked_ops.rs" 121 12 121 38] _16 <- ([#"../checked_ops.rs" 121 12 121 38] _17 = ([#"../checked_ops.rs" 121 37 121 38] (2 : uint8)));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -2062,7 +2062,7 @@ module CheckedOps_TestU8DivExample
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 122 14 122 36] res <- ([#"../checked_ops.rs" 122 14 122 36] overflowing_div0 (5 : uint8) (2 : uint8));
+    [#"../checked_ops.rs" 122 14 122 36] res <- ([#"../checked_ops.rs" 122 14 122 36] overflowing_div0 ([#"../checked_ops.rs" 122 14 122 17] (5 : uint8)) ([#"../checked_ops.rs" 122 34 122 35] (2 : uint8)));
     goto BB15
   }
   BB14 {
@@ -2070,7 +2070,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 123 12 123 22] _21 <- ([#"../checked_ops.rs" 123 12 123 22] (let (a, _) = res in a) = (2 : uint8));
+    [#"../checked_ops.rs" 123 12 123 22] _21 <- ([#"../checked_ops.rs" 123 12 123 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 123 21 123 22] (2 : uint8)));
     switch (_21)
       | False -> goto BB19
       | True -> goto BB16
@@ -2078,14 +2078,14 @@ module CheckedOps_TestU8DivExample
   }
   BB16 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 123 26 123 40] _23 <- ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 123 26 123 40] _23 <- ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 123 35 123 40] false));
     switch (_23)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 117 29 124 1] _0 <- ([#"../checked_ops.rs" 117 29 124 1] ());
+    [#"../checked_ops.rs" 117 29 124 1] _0 <- ([#"../checked_ops.rs" 117 29 124 1] [#"../checked_ops.rs" 117 29 124 1] ());
     return _0
   }
   BB18 {
@@ -2213,7 +2213,7 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB2 {
     [#"../checked_ops.rs" 129 45 129 46] _12 <- ([#"../checked_ops.rs" 129 45 129 46] b);
-    [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = (0 : uint8));
+    [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = ([#"../checked_ops.rs" 129 41 129 46] (0 : uint8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 129 41 129 46] not _13 };
     goto BB3
   }
@@ -2238,7 +2238,7 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB6 {
     [#"../checked_ops.rs" 130 37 130 38] _22 <- ([#"../checked_ops.rs" 130 37 130 38] b);
-    [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = (0 : uint8));
+    [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = ([#"../checked_ops.rs" 130 33 130 38] (0 : uint8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 130 33 130 38] not _23 };
     goto BB7
   }
@@ -2263,7 +2263,7 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB10 {
     [#"../checked_ops.rs" 131 39 131 40] _32 <- ([#"../checked_ops.rs" 131 39 131 40] b);
-    [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = (0 : uint8));
+    [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = ([#"../checked_ops.rs" 131 35 131 40] (0 : uint8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 131 35 131 40] not _33 };
     goto BB11
   }
@@ -2288,7 +2288,7 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB14 {
     [#"../checked_ops.rs" 133 25 133 26] _43 <- ([#"../checked_ops.rs" 133 25 133 26] b);
-    [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = (0 : uint8));
+    [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = ([#"../checked_ops.rs" 133 21 133 26] (0 : uint8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 133 21 133 26] not _44 };
     goto BB15
   }
@@ -2304,14 +2304,14 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB16 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 133 30 133 44] _45 <- ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 133 30 133 44] _45 <- ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 133 39 133 44] false));
     switch (_45)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 128 45 134 1] _0 <- ([#"../checked_ops.rs" 128 45 134 1] ());
+    [#"../checked_ops.rs" 128 45 134 1] _0 <- ([#"../checked_ops.rs" 128 45 134 1] [#"../checked_ops.rs" 128 45 134 1] ());
     return _0
   }
   BB18 {
@@ -2364,7 +2364,7 @@ module CheckedOps_TestU8DivZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 138 12 138 28] _5 <- ([#"../checked_ops.rs" 138 12 138 28] checked_div0 a (0 : uint8));
+    [#"../checked_ops.rs" 138 12 138 28] _5 <- ([#"../checked_ops.rs" 138 12 138 28] checked_div0 a ([#"../checked_ops.rs" 138 26 138 27] (0 : uint8)));
     goto BB1
   }
   BB1 {
@@ -2378,7 +2378,7 @@ module CheckedOps_TestU8DivZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 137 31 139 1] _0 <- ([#"../checked_ops.rs" 137 31 139 1] ());
+    [#"../checked_ops.rs" 137 31 139 1] _0 <- ([#"../checked_ops.rs" 137 31 139 1] [#"../checked_ops.rs" 137 31 139 1] ());
     return _0
   }
   BB4 {
@@ -2517,7 +2517,7 @@ module CheckedOps_TestI8AddExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 143 12 143 31] _4 <- ([#"../checked_ops.rs" 143 12 143 31] checked_add0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 143 12 143 31] _4 <- ([#"../checked_ops.rs" 143 12 143 31] checked_add0 ([#"../checked_ops.rs" 143 12 143 15] (5 : int8)) ([#"../checked_ops.rs" 143 28 143 30] (10 : int8)));
     goto BB1
   }
   BB1 {
@@ -2526,7 +2526,7 @@ module CheckedOps_TestI8AddExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 143 12 143 46] _2 <- ([#"../checked_ops.rs" 143 12 143 46] _3 = (15 : int8));
+    [#"../checked_ops.rs" 143 12 143 46] _2 <- ([#"../checked_ops.rs" 143 12 143 46] _3 = ([#"../checked_ops.rs" 143 44 143 46] (15 : int8)));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -2534,7 +2534,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 144 12 144 33] _9 <- ([#"../checked_ops.rs" 144 12 144 33] checked_add0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 144 12 144 33] _9 <- ([#"../checked_ops.rs" 144 12 144 33] checked_add0 ([#"../checked_ops.rs" 144 12 144 17] (120 : int8)) ([#"../checked_ops.rs" 144 30 144 32] (10 : int8)));
     goto BB5
   }
   BB4 {
@@ -2552,7 +2552,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 145 12 145 37] _14 <- ([#"../checked_ops.rs" 145 12 145 37] checked_add0 (-120 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 145 12 145 37] _14 <- ([#"../checked_ops.rs" 145 12 145 37] checked_add0 ([#"../checked_ops.rs" 145 12 145 20] (-120 : int8)) ([#"../checked_ops.rs" 145 33 145 36] (-10 : int8)));
     goto BB9
   }
   BB8 {
@@ -2570,7 +2570,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 147 12 147 32] _18 <- ([#"../checked_ops.rs" 147 12 147 32] wrapping_add0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 147 12 147 32] _18 <- ([#"../checked_ops.rs" 147 12 147 32] wrapping_add0 ([#"../checked_ops.rs" 147 12 147 15] (5 : int8)) ([#"../checked_ops.rs" 147 29 147 31] (10 : int8)));
     goto BB13
   }
   BB12 {
@@ -2578,7 +2578,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 147 12 147 38] _17 <- ([#"../checked_ops.rs" 147 12 147 38] _18 = (15 : int8));
+    [#"../checked_ops.rs" 147 12 147 38] _17 <- ([#"../checked_ops.rs" 147 12 147 38] _18 = ([#"../checked_ops.rs" 147 36 147 38] (15 : int8)));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -2586,7 +2586,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 148 12 148 34] _22 <- ([#"../checked_ops.rs" 148 12 148 34] wrapping_add0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 148 12 148 34] _22 <- ([#"../checked_ops.rs" 148 12 148 34] wrapping_add0 ([#"../checked_ops.rs" 148 12 148 17] (120 : int8)) ([#"../checked_ops.rs" 148 31 148 33] (10 : int8)));
     goto BB16
   }
   BB15 {
@@ -2594,7 +2594,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 148 12 148 42] _21 <- ([#"../checked_ops.rs" 148 12 148 42] _22 = (-126 : int8));
+    [#"../checked_ops.rs" 148 12 148 42] _21 <- ([#"../checked_ops.rs" 148 12 148 42] _22 = ([#"../checked_ops.rs" 148 38 148 42] (-126 : int8)));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -2602,7 +2602,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 149 12 149 38] _26 <- ([#"../checked_ops.rs" 149 12 149 38] wrapping_add0 (-120 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 149 12 149 38] _26 <- ([#"../checked_ops.rs" 149 12 149 38] wrapping_add0 ([#"../checked_ops.rs" 149 12 149 20] (-120 : int8)) ([#"../checked_ops.rs" 149 34 149 37] (-10 : int8)));
     goto BB19
   }
   BB18 {
@@ -2610,7 +2610,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 149 12 149 45] _25 <- ([#"../checked_ops.rs" 149 12 149 45] _26 = (126 : int8));
+    [#"../checked_ops.rs" 149 12 149 45] _25 <- ([#"../checked_ops.rs" 149 12 149 45] _26 = ([#"../checked_ops.rs" 149 42 149 45] (126 : int8)));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -2618,7 +2618,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 151 12 151 34] _30 <- ([#"../checked_ops.rs" 151 12 151 34] saturating_add0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 151 12 151 34] _30 <- ([#"../checked_ops.rs" 151 12 151 34] saturating_add0 ([#"../checked_ops.rs" 151 12 151 15] (5 : int8)) ([#"../checked_ops.rs" 151 31 151 33] (10 : int8)));
     goto BB22
   }
   BB21 {
@@ -2626,7 +2626,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 151 12 151 40] _29 <- ([#"../checked_ops.rs" 151 12 151 40] _30 = (15 : int8));
+    [#"../checked_ops.rs" 151 12 151 40] _29 <- ([#"../checked_ops.rs" 151 12 151 40] _30 = ([#"../checked_ops.rs" 151 38 151 40] (15 : int8)));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -2634,7 +2634,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 152 12 152 36] _34 <- ([#"../checked_ops.rs" 152 12 152 36] saturating_add0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 152 12 152 36] _34 <- ([#"../checked_ops.rs" 152 12 152 36] saturating_add0 ([#"../checked_ops.rs" 152 12 152 17] (120 : int8)) ([#"../checked_ops.rs" 152 33 152 35] (10 : int8)));
     goto BB25
   }
   BB24 {
@@ -2642,7 +2642,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 152 12 152 43] _33 <- ([#"../checked_ops.rs" 152 12 152 43] _34 = (127 : int8));
+    [#"../checked_ops.rs" 152 12 152 43] _33 <- ([#"../checked_ops.rs" 152 12 152 43] _34 = ([#"../checked_ops.rs" 152 40 152 43] (127 : int8)));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -2650,7 +2650,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 153 12 153 40] _38 <- ([#"../checked_ops.rs" 153 12 153 40] saturating_add0 (-120 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 153 12 153 40] _38 <- ([#"../checked_ops.rs" 153 12 153 40] saturating_add0 ([#"../checked_ops.rs" 153 12 153 20] (-120 : int8)) ([#"../checked_ops.rs" 153 36 153 39] (-10 : int8)));
     goto BB28
   }
   BB27 {
@@ -2658,7 +2658,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 153 12 153 48] _37 <- ([#"../checked_ops.rs" 153 12 153 48] _38 = (-128 : int8));
+    [#"../checked_ops.rs" 153 12 153 48] _37 <- ([#"../checked_ops.rs" 153 12 153 48] _38 = ([#"../checked_ops.rs" 153 44 153 48] (-128 : int8)));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -2666,7 +2666,7 @@ module CheckedOps_TestI8AddExample
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 155 14 155 37] res <- ([#"../checked_ops.rs" 155 14 155 37] overflowing_add0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 155 14 155 37] res <- ([#"../checked_ops.rs" 155 14 155 37] overflowing_add0 ([#"../checked_ops.rs" 155 14 155 17] (5 : int8)) ([#"../checked_ops.rs" 155 34 155 36] (10 : int8)));
     goto BB31
   }
   BB30 {
@@ -2674,7 +2674,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 156 12 156 23] _42 <- ([#"../checked_ops.rs" 156 12 156 23] (let (a, _) = res in a) = (15 : int8));
+    [#"../checked_ops.rs" 156 12 156 23] _42 <- ([#"../checked_ops.rs" 156 12 156 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 156 21 156 23] (15 : int8)));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -2682,14 +2682,14 @@ module CheckedOps_TestI8AddExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 156 27 156 41] _44 <- ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 156 27 156 41] _44 <- ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 156 36 156 41] false));
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 157 14 157 39] res1 <- ([#"../checked_ops.rs" 157 14 157 39] overflowing_add0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 157 14 157 39] res1 <- ([#"../checked_ops.rs" 157 14 157 39] overflowing_add0 ([#"../checked_ops.rs" 157 14 157 19] (120 : int8)) ([#"../checked_ops.rs" 157 36 157 38] (10 : int8)));
     goto BB37
   }
   BB34 {
@@ -2704,7 +2704,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 158 12 158 25] _49 <- ([#"../checked_ops.rs" 158 12 158 25] (let (a, _) = res1 in a) = (-126 : int8));
+    [#"../checked_ops.rs" 158 12 158 25] _49 <- ([#"../checked_ops.rs" 158 12 158 25] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 158 21 158 25] (-126 : int8)));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -2712,14 +2712,14 @@ module CheckedOps_TestI8AddExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 158 29 158 42] _51 <- ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb (let (_, a) = res1 in a) true);
+    [#"../checked_ops.rs" 158 29 158 42] _51 <- ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 158 38 158 42] true));
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 159 14 159 43] res2 <- ([#"../checked_ops.rs" 159 14 159 43] overflowing_add0 (-120 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 159 14 159 43] res2 <- ([#"../checked_ops.rs" 159 14 159 43] overflowing_add0 ([#"../checked_ops.rs" 159 14 159 22] (-120 : int8)) ([#"../checked_ops.rs" 159 39 159 42] (-10 : int8)));
     goto BB43
   }
   BB40 {
@@ -2734,7 +2734,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 160 12 160 24] _56 <- ([#"../checked_ops.rs" 160 12 160 24] (let (a, _) = res2 in a) = (126 : int8));
+    [#"../checked_ops.rs" 160 12 160 24] _56 <- ([#"../checked_ops.rs" 160 12 160 24] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 160 21 160 24] (126 : int8)));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -2742,14 +2742,14 @@ module CheckedOps_TestI8AddExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 160 28 160 41] _58 <- ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb (let (_, a) = res2 in a) true);
+    [#"../checked_ops.rs" 160 28 160 41] _58 <- ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 160 37 160 41] true));
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 142 29 161 1] _0 <- ([#"../checked_ops.rs" 142 29 161 1] ());
+    [#"../checked_ops.rs" 142 29 161 1] _0 <- ([#"../checked_ops.rs" 142 29 161 1] [#"../checked_ops.rs" 142 29 161 1] ());
     return _0
   }
   BB46 {
@@ -2856,7 +2856,7 @@ module CheckedOps_TestI8AddOverflowPos
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 166 12 166 32] _6 <- ([#"../checked_ops.rs" 166 12 166 32] checked_add0 (127 : int8) a);
+    [#"../checked_ops.rs" 166 12 166 32] _6 <- ([#"../checked_ops.rs" 166 12 166 32] checked_add0 ([#"../checked_ops.rs" 166 12 166 17] (127 : int8)) a);
     goto BB1
   }
   BB1 {
@@ -2870,7 +2870,7 @@ module CheckedOps_TestI8AddOverflowPos
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 167 12 167 33] _11 <- ([#"../checked_ops.rs" 167 12 167 33] wrapping_add0 (127 : int8) a);
+    [#"../checked_ops.rs" 167 12 167 33] _11 <- ([#"../checked_ops.rs" 167 12 167 33] wrapping_add0 ([#"../checked_ops.rs" 167 12 167 17] (127 : int8)) a);
     goto BB5
   }
   BB4 {
@@ -2878,8 +2878,8 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 167 37 167 44] _14 <- ([#"../checked_ops.rs" 167 37 167 44] a - (127 : int8));
-    [#"../checked_ops.rs" 167 37 167 48] _13 <- ([#"../checked_ops.rs" 167 37 167 48] _14 - (2 : int8));
+    [#"../checked_ops.rs" 167 37 167 44] _14 <- ([#"../checked_ops.rs" 167 37 167 44] a - ([#"../checked_ops.rs" 167 41 167 44] (127 : int8)));
+    [#"../checked_ops.rs" 167 37 167 48] _13 <- ([#"../checked_ops.rs" 167 37 167 48] _14 - ([#"../checked_ops.rs" 167 47 167 48] (2 : int8)));
     _14 <- any int8;
     [#"../checked_ops.rs" 167 12 167 48] _10 <- ([#"../checked_ops.rs" 167 12 167 48] _11 = _13);
     _11 <- any int8;
@@ -2890,7 +2890,7 @@ module CheckedOps_TestI8AddOverflowPos
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 168 12 168 35] _19 <- ([#"../checked_ops.rs" 168 12 168 35] saturating_add0 (127 : int8) a);
+    [#"../checked_ops.rs" 168 12 168 35] _19 <- ([#"../checked_ops.rs" 168 12 168 35] saturating_add0 ([#"../checked_ops.rs" 168 12 168 17] (127 : int8)) a);
     goto BB8
   }
   BB7 {
@@ -2898,7 +2898,7 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 168 12 168 42] _18 <- ([#"../checked_ops.rs" 168 12 168 42] _19 = (127 : int8));
+    [#"../checked_ops.rs" 168 12 168 42] _18 <- ([#"../checked_ops.rs" 168 12 168 42] _19 = ([#"../checked_ops.rs" 168 39 168 42] (127 : int8)));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -2906,7 +2906,7 @@ module CheckedOps_TestI8AddOverflowPos
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 169 14 169 38] res <- ([#"../checked_ops.rs" 169 14 169 38] overflowing_add0 (127 : int8) a);
+    [#"../checked_ops.rs" 169 14 169 38] res <- ([#"../checked_ops.rs" 169 14 169 38] overflowing_add0 ([#"../checked_ops.rs" 169 14 169 19] (127 : int8)) a);
     goto BB11
   }
   BB10 {
@@ -2914,8 +2914,8 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 170 21 170 28] _28 <- ([#"../checked_ops.rs" 170 21 170 28] a - (127 : int8));
-    [#"../checked_ops.rs" 170 21 170 32] _27 <- ([#"../checked_ops.rs" 170 21 170 32] _28 - (2 : int8));
+    [#"../checked_ops.rs" 170 21 170 28] _28 <- ([#"../checked_ops.rs" 170 21 170 28] a - ([#"../checked_ops.rs" 170 25 170 28] (127 : int8)));
+    [#"../checked_ops.rs" 170 21 170 32] _27 <- ([#"../checked_ops.rs" 170 21 170 32] _28 - ([#"../checked_ops.rs" 170 31 170 32] (2 : int8)));
     _28 <- any int8;
     [#"../checked_ops.rs" 170 12 170 32] _25 <- ([#"../checked_ops.rs" 170 12 170 32] (let (a, _) = res in a) = _27);
     _27 <- any int8;
@@ -2926,14 +2926,14 @@ module CheckedOps_TestI8AddOverflowPos
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 170 36 170 49] _30 <- ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 170 36 170 49] _30 <- ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 170 45 170 49] true));
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 165 39 171 1] _0 <- ([#"../checked_ops.rs" 165 39 171 1] ());
+    [#"../checked_ops.rs" 165 39 171 1] _0 <- ([#"../checked_ops.rs" 165 39 171 1] [#"../checked_ops.rs" 165 39 171 1] ());
     return _0
   }
   BB14 {
@@ -3040,7 +3040,7 @@ module CheckedOps_TestI8AddOverflowNeg
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 176 12 176 35] _6 <- ([#"../checked_ops.rs" 176 12 176 35] checked_add0 (-128 : int8) a);
+    [#"../checked_ops.rs" 176 12 176 35] _6 <- ([#"../checked_ops.rs" 176 12 176 35] checked_add0 ([#"../checked_ops.rs" 176 12 176 20] (-128 : int8)) a);
     goto BB1
   }
   BB1 {
@@ -3054,7 +3054,7 @@ module CheckedOps_TestI8AddOverflowNeg
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 177 12 177 36] _11 <- ([#"../checked_ops.rs" 177 12 177 36] wrapping_add0 (-128 : int8) a);
+    [#"../checked_ops.rs" 177 12 177 36] _11 <- ([#"../checked_ops.rs" 177 12 177 36] wrapping_add0 ([#"../checked_ops.rs" 177 12 177 20] (-128 : int8)) a);
     goto BB5
   }
   BB4 {
@@ -3062,8 +3062,8 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 177 40 177 47] _14 <- ([#"../checked_ops.rs" 177 40 177 47] a + (127 : int8));
-    [#"../checked_ops.rs" 177 40 177 51] _13 <- ([#"../checked_ops.rs" 177 40 177 51] _14 + (1 : int8));
+    [#"../checked_ops.rs" 177 40 177 47] _14 <- ([#"../checked_ops.rs" 177 40 177 47] a + ([#"../checked_ops.rs" 177 44 177 47] (127 : int8)));
+    [#"../checked_ops.rs" 177 40 177 51] _13 <- ([#"../checked_ops.rs" 177 40 177 51] _14 + ([#"../checked_ops.rs" 177 50 177 51] (1 : int8)));
     _14 <- any int8;
     [#"../checked_ops.rs" 177 12 177 51] _10 <- ([#"../checked_ops.rs" 177 12 177 51] _11 = _13);
     _11 <- any int8;
@@ -3074,7 +3074,7 @@ module CheckedOps_TestI8AddOverflowNeg
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 178 12 178 38] _19 <- ([#"../checked_ops.rs" 178 12 178 38] saturating_add0 (-128 : int8) a);
+    [#"../checked_ops.rs" 178 12 178 38] _19 <- ([#"../checked_ops.rs" 178 12 178 38] saturating_add0 ([#"../checked_ops.rs" 178 12 178 20] (-128 : int8)) a);
     goto BB8
   }
   BB7 {
@@ -3082,7 +3082,7 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 178 12 178 46] _18 <- ([#"../checked_ops.rs" 178 12 178 46] _19 = (-128 : int8));
+    [#"../checked_ops.rs" 178 12 178 46] _18 <- ([#"../checked_ops.rs" 178 12 178 46] _19 = ([#"../checked_ops.rs" 178 42 178 46] (-128 : int8)));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -3090,7 +3090,7 @@ module CheckedOps_TestI8AddOverflowNeg
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 179 14 179 41] res <- ([#"../checked_ops.rs" 179 14 179 41] overflowing_add0 (-128 : int8) a);
+    [#"../checked_ops.rs" 179 14 179 41] res <- ([#"../checked_ops.rs" 179 14 179 41] overflowing_add0 ([#"../checked_ops.rs" 179 14 179 22] (-128 : int8)) a);
     goto BB11
   }
   BB10 {
@@ -3098,8 +3098,8 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 180 21 180 28] _28 <- ([#"../checked_ops.rs" 180 21 180 28] a + (127 : int8));
-    [#"../checked_ops.rs" 180 21 180 32] _27 <- ([#"../checked_ops.rs" 180 21 180 32] _28 + (1 : int8));
+    [#"../checked_ops.rs" 180 21 180 28] _28 <- ([#"../checked_ops.rs" 180 21 180 28] a + ([#"../checked_ops.rs" 180 25 180 28] (127 : int8)));
+    [#"../checked_ops.rs" 180 21 180 32] _27 <- ([#"../checked_ops.rs" 180 21 180 32] _28 + ([#"../checked_ops.rs" 180 31 180 32] (1 : int8)));
     _28 <- any int8;
     [#"../checked_ops.rs" 180 12 180 32] _25 <- ([#"../checked_ops.rs" 180 12 180 32] (let (a, _) = res in a) = _27);
     _27 <- any int8;
@@ -3110,14 +3110,14 @@ module CheckedOps_TestI8AddOverflowNeg
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 180 36 180 49] _30 <- ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 180 36 180 49] _30 <- ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 180 45 180 49] true));
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 175 39 181 1] _0 <- ([#"../checked_ops.rs" 175 39 181 1] ());
+    [#"../checked_ops.rs" 175 39 181 1] _0 <- ([#"../checked_ops.rs" 175 39 181 1] [#"../checked_ops.rs" 175 39 181 1] ());
     return _0
   }
   BB14 {
@@ -3294,7 +3294,7 @@ module CheckedOps_TestI8OverflowingAdd
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 191 45 194 1] _0 <- ([#"../checked_ops.rs" 191 45 194 1] ());
+    [#"../checked_ops.rs" 191 45 194 1] _0 <- ([#"../checked_ops.rs" 191 45 194 1] [#"../checked_ops.rs" 191 45 194 1] ());
     return _0
   }
   BB9 {
@@ -3434,7 +3434,7 @@ module CheckedOps_TestI8SubExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 198 12 198 31] _4 <- ([#"../checked_ops.rs" 198 12 198 31] checked_sub0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 198 12 198 31] _4 <- ([#"../checked_ops.rs" 198 12 198 31] checked_sub0 ([#"../checked_ops.rs" 198 12 198 15] (5 : int8)) ([#"../checked_ops.rs" 198 28 198 30] (10 : int8)));
     goto BB1
   }
   BB1 {
@@ -3443,7 +3443,7 @@ module CheckedOps_TestI8SubExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 198 12 198 46] _2 <- ([#"../checked_ops.rs" 198 12 198 46] _3 = (-5 : int8));
+    [#"../checked_ops.rs" 198 12 198 46] _2 <- ([#"../checked_ops.rs" 198 12 198 46] _3 = ([#"../checked_ops.rs" 198 44 198 46] (-5 : int8)));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -3451,7 +3451,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 199 12 199 33] _9 <- ([#"../checked_ops.rs" 199 12 199 33] checked_sub0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 199 12 199 33] _9 <- ([#"../checked_ops.rs" 199 12 199 33] checked_sub0 ([#"../checked_ops.rs" 199 12 199 17] (120 : int8)) ([#"../checked_ops.rs" 199 30 199 32] (10 : int8)));
     goto BB5
   }
   BB4 {
@@ -3464,7 +3464,7 @@ module CheckedOps_TestI8SubExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 199 12 199 49] _7 <- ([#"../checked_ops.rs" 199 12 199 49] _8 = (110 : int8));
+    [#"../checked_ops.rs" 199 12 199 49] _7 <- ([#"../checked_ops.rs" 199 12 199 49] _8 = ([#"../checked_ops.rs" 199 46 199 49] (110 : int8)));
     _8 <- any int8;
     switch (_7)
       | False -> goto BB8
@@ -3472,7 +3472,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 200 12 200 36] _14 <- ([#"../checked_ops.rs" 200 12 200 36] checked_sub0 (-120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 200 12 200 36] _14 <- ([#"../checked_ops.rs" 200 12 200 36] checked_sub0 ([#"../checked_ops.rs" 200 12 200 20] (-120 : int8)) ([#"../checked_ops.rs" 200 33 200 35] (10 : int8)));
     goto BB9
   }
   BB8 {
@@ -3490,7 +3490,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 202 12 202 32] _18 <- ([#"../checked_ops.rs" 202 12 202 32] wrapping_sub0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 202 12 202 32] _18 <- ([#"../checked_ops.rs" 202 12 202 32] wrapping_sub0 ([#"../checked_ops.rs" 202 12 202 15] (5 : int8)) ([#"../checked_ops.rs" 202 29 202 31] (10 : int8)));
     goto BB13
   }
   BB12 {
@@ -3498,7 +3498,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 202 12 202 38] _17 <- ([#"../checked_ops.rs" 202 12 202 38] _18 = (-5 : int8));
+    [#"../checked_ops.rs" 202 12 202 38] _17 <- ([#"../checked_ops.rs" 202 12 202 38] _18 = ([#"../checked_ops.rs" 202 36 202 38] (-5 : int8)));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -3506,7 +3506,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 203 12 203 34] _22 <- ([#"../checked_ops.rs" 203 12 203 34] wrapping_sub0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 203 12 203 34] _22 <- ([#"../checked_ops.rs" 203 12 203 34] wrapping_sub0 ([#"../checked_ops.rs" 203 12 203 17] (120 : int8)) ([#"../checked_ops.rs" 203 31 203 33] (10 : int8)));
     goto BB16
   }
   BB15 {
@@ -3514,7 +3514,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 203 12 203 41] _21 <- ([#"../checked_ops.rs" 203 12 203 41] _22 = (110 : int8));
+    [#"../checked_ops.rs" 203 12 203 41] _21 <- ([#"../checked_ops.rs" 203 12 203 41] _22 = ([#"../checked_ops.rs" 203 38 203 41] (110 : int8)));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -3522,7 +3522,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 204 12 204 37] _26 <- ([#"../checked_ops.rs" 204 12 204 37] wrapping_sub0 (-120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 204 12 204 37] _26 <- ([#"../checked_ops.rs" 204 12 204 37] wrapping_sub0 ([#"../checked_ops.rs" 204 12 204 20] (-120 : int8)) ([#"../checked_ops.rs" 204 34 204 36] (10 : int8)));
     goto BB19
   }
   BB18 {
@@ -3530,7 +3530,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 204 12 204 44] _25 <- ([#"../checked_ops.rs" 204 12 204 44] _26 = (126 : int8));
+    [#"../checked_ops.rs" 204 12 204 44] _25 <- ([#"../checked_ops.rs" 204 12 204 44] _26 = ([#"../checked_ops.rs" 204 41 204 44] (126 : int8)));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -3538,7 +3538,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 206 12 206 34] _30 <- ([#"../checked_ops.rs" 206 12 206 34] saturating_sub0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 206 12 206 34] _30 <- ([#"../checked_ops.rs" 206 12 206 34] saturating_sub0 ([#"../checked_ops.rs" 206 12 206 15] (5 : int8)) ([#"../checked_ops.rs" 206 31 206 33] (10 : int8)));
     goto BB22
   }
   BB21 {
@@ -3546,7 +3546,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 206 12 206 40] _29 <- ([#"../checked_ops.rs" 206 12 206 40] _30 = (-5 : int8));
+    [#"../checked_ops.rs" 206 12 206 40] _29 <- ([#"../checked_ops.rs" 206 12 206 40] _30 = ([#"../checked_ops.rs" 206 38 206 40] (-5 : int8)));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -3554,7 +3554,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 207 12 207 36] _34 <- ([#"../checked_ops.rs" 207 12 207 36] saturating_sub0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 207 12 207 36] _34 <- ([#"../checked_ops.rs" 207 12 207 36] saturating_sub0 ([#"../checked_ops.rs" 207 12 207 17] (120 : int8)) ([#"../checked_ops.rs" 207 33 207 35] (10 : int8)));
     goto BB25
   }
   BB24 {
@@ -3562,7 +3562,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 207 12 207 43] _33 <- ([#"../checked_ops.rs" 207 12 207 43] _34 = (110 : int8));
+    [#"../checked_ops.rs" 207 12 207 43] _33 <- ([#"../checked_ops.rs" 207 12 207 43] _34 = ([#"../checked_ops.rs" 207 40 207 43] (110 : int8)));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -3570,7 +3570,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 208 12 208 39] _38 <- ([#"../checked_ops.rs" 208 12 208 39] saturating_sub0 (-120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 208 12 208 39] _38 <- ([#"../checked_ops.rs" 208 12 208 39] saturating_sub0 ([#"../checked_ops.rs" 208 12 208 20] (-120 : int8)) ([#"../checked_ops.rs" 208 36 208 38] (10 : int8)));
     goto BB28
   }
   BB27 {
@@ -3578,7 +3578,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 208 12 208 47] _37 <- ([#"../checked_ops.rs" 208 12 208 47] _38 = (-128 : int8));
+    [#"../checked_ops.rs" 208 12 208 47] _37 <- ([#"../checked_ops.rs" 208 12 208 47] _38 = ([#"../checked_ops.rs" 208 43 208 47] (-128 : int8)));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -3586,7 +3586,7 @@ module CheckedOps_TestI8SubExample
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 210 14 210 37] res <- ([#"../checked_ops.rs" 210 14 210 37] overflowing_sub0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 210 14 210 37] res <- ([#"../checked_ops.rs" 210 14 210 37] overflowing_sub0 ([#"../checked_ops.rs" 210 14 210 17] (5 : int8)) ([#"../checked_ops.rs" 210 34 210 36] (10 : int8)));
     goto BB31
   }
   BB30 {
@@ -3594,7 +3594,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 211 12 211 23] _42 <- ([#"../checked_ops.rs" 211 12 211 23] (let (a, _) = res in a) = (-5 : int8));
+    [#"../checked_ops.rs" 211 12 211 23] _42 <- ([#"../checked_ops.rs" 211 12 211 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 211 21 211 23] (-5 : int8)));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -3602,14 +3602,14 @@ module CheckedOps_TestI8SubExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 211 27 211 41] _44 <- ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 211 27 211 41] _44 <- ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 211 36 211 41] false));
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 212 14 212 39] res1 <- ([#"../checked_ops.rs" 212 14 212 39] overflowing_sub0 (120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 212 14 212 39] res1 <- ([#"../checked_ops.rs" 212 14 212 39] overflowing_sub0 ([#"../checked_ops.rs" 212 14 212 19] (120 : int8)) ([#"../checked_ops.rs" 212 36 212 38] (10 : int8)));
     goto BB37
   }
   BB34 {
@@ -3624,7 +3624,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 213 12 213 24] _49 <- ([#"../checked_ops.rs" 213 12 213 24] (let (a, _) = res1 in a) = (110 : int8));
+    [#"../checked_ops.rs" 213 12 213 24] _49 <- ([#"../checked_ops.rs" 213 12 213 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 213 21 213 24] (110 : int8)));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -3632,14 +3632,14 @@ module CheckedOps_TestI8SubExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 213 28 213 42] _51 <- ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb (let (_, a) = res1 in a) false);
+    [#"../checked_ops.rs" 213 28 213 42] _51 <- ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 213 37 213 42] false));
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 214 14 214 42] res2 <- ([#"../checked_ops.rs" 214 14 214 42] overflowing_sub0 (-120 : int8) (10 : int8));
+    [#"../checked_ops.rs" 214 14 214 42] res2 <- ([#"../checked_ops.rs" 214 14 214 42] overflowing_sub0 ([#"../checked_ops.rs" 214 14 214 22] (-120 : int8)) ([#"../checked_ops.rs" 214 39 214 41] (10 : int8)));
     goto BB43
   }
   BB40 {
@@ -3654,7 +3654,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 215 12 215 24] _56 <- ([#"../checked_ops.rs" 215 12 215 24] (let (a, _) = res2 in a) = (126 : int8));
+    [#"../checked_ops.rs" 215 12 215 24] _56 <- ([#"../checked_ops.rs" 215 12 215 24] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 215 21 215 24] (126 : int8)));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -3662,14 +3662,14 @@ module CheckedOps_TestI8SubExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 215 28 215 41] _58 <- ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb (let (_, a) = res2 in a) true);
+    [#"../checked_ops.rs" 215 28 215 41] _58 <- ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 215 37 215 41] true));
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 197 29 216 1] _0 <- ([#"../checked_ops.rs" 197 29 216 1] ());
+    [#"../checked_ops.rs" 197 29 216 1] _0 <- ([#"../checked_ops.rs" 197 29 216 1] [#"../checked_ops.rs" 197 29 216 1] ());
     return _0
   }
   BB46 {
@@ -3776,7 +3776,7 @@ module CheckedOps_TestI8SubOverflowPos
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 221 12 221 35] _6 <- ([#"../checked_ops.rs" 221 12 221 35] checked_sub0 (-128 : int8) a);
+    [#"../checked_ops.rs" 221 12 221 35] _6 <- ([#"../checked_ops.rs" 221 12 221 35] checked_sub0 ([#"../checked_ops.rs" 221 12 221 20] (-128 : int8)) a);
     goto BB1
   }
   BB1 {
@@ -3790,7 +3790,7 @@ module CheckedOps_TestI8SubOverflowPos
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 222 12 222 36] _11 <- ([#"../checked_ops.rs" 222 12 222 36] wrapping_sub0 (-128 : int8) a);
+    [#"../checked_ops.rs" 222 12 222 36] _11 <- ([#"../checked_ops.rs" 222 12 222 36] wrapping_sub0 ([#"../checked_ops.rs" 222 12 222 20] (-128 : int8)) a);
     goto BB5
   }
   BB4 {
@@ -3798,8 +3798,8 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 47] (127 : int8) - a);
-    [#"../checked_ops.rs" 222 40 222 51] _13 <- ([#"../checked_ops.rs" 222 40 222 51] _14 + (1 : int8));
+    [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 47] ([#"../checked_ops.rs" 222 40 222 43] (127 : int8)) - a);
+    [#"../checked_ops.rs" 222 40 222 51] _13 <- ([#"../checked_ops.rs" 222 40 222 51] _14 + ([#"../checked_ops.rs" 222 50 222 51] (1 : int8)));
     _14 <- any int8;
     [#"../checked_ops.rs" 222 12 222 51] _10 <- ([#"../checked_ops.rs" 222 12 222 51] _11 = _13);
     _11 <- any int8;
@@ -3810,7 +3810,7 @@ module CheckedOps_TestI8SubOverflowPos
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 223 12 223 38] _19 <- ([#"../checked_ops.rs" 223 12 223 38] saturating_sub0 (-128 : int8) a);
+    [#"../checked_ops.rs" 223 12 223 38] _19 <- ([#"../checked_ops.rs" 223 12 223 38] saturating_sub0 ([#"../checked_ops.rs" 223 12 223 20] (-128 : int8)) a);
     goto BB8
   }
   BB7 {
@@ -3818,7 +3818,7 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 223 12 223 46] _18 <- ([#"../checked_ops.rs" 223 12 223 46] _19 = (-128 : int8));
+    [#"../checked_ops.rs" 223 12 223 46] _18 <- ([#"../checked_ops.rs" 223 12 223 46] _19 = ([#"../checked_ops.rs" 223 42 223 46] (-128 : int8)));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -3826,7 +3826,7 @@ module CheckedOps_TestI8SubOverflowPos
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 224 14 224 41] res <- ([#"../checked_ops.rs" 224 14 224 41] overflowing_sub0 (-128 : int8) a);
+    [#"../checked_ops.rs" 224 14 224 41] res <- ([#"../checked_ops.rs" 224 14 224 41] overflowing_sub0 ([#"../checked_ops.rs" 224 14 224 22] (-128 : int8)) a);
     goto BB11
   }
   BB10 {
@@ -3834,8 +3834,8 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 28] (127 : int8) - a);
-    [#"../checked_ops.rs" 225 21 225 32] _27 <- ([#"../checked_ops.rs" 225 21 225 32] _28 + (1 : int8));
+    [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 28] ([#"../checked_ops.rs" 225 21 225 24] (127 : int8)) - a);
+    [#"../checked_ops.rs" 225 21 225 32] _27 <- ([#"../checked_ops.rs" 225 21 225 32] _28 + ([#"../checked_ops.rs" 225 31 225 32] (1 : int8)));
     _28 <- any int8;
     [#"../checked_ops.rs" 225 12 225 32] _25 <- ([#"../checked_ops.rs" 225 12 225 32] (let (a, _) = res in a) = _27);
     _27 <- any int8;
@@ -3846,14 +3846,14 @@ module CheckedOps_TestI8SubOverflowPos
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 225 36 225 49] _30 <- ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 225 36 225 49] _30 <- ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 225 45 225 49] true));
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 220 39 226 1] _0 <- ([#"../checked_ops.rs" 220 39 226 1] ());
+    [#"../checked_ops.rs" 220 39 226 1] _0 <- ([#"../checked_ops.rs" 220 39 226 1] [#"../checked_ops.rs" 220 39 226 1] ());
     return _0
   }
   BB14 {
@@ -3962,7 +3962,7 @@ module CheckedOps_TestI8SubOverflowNeg
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 231 12 231 32] _6 <- ([#"../checked_ops.rs" 231 12 231 32] checked_sub0 (127 : int8) a);
+    [#"../checked_ops.rs" 231 12 231 32] _6 <- ([#"../checked_ops.rs" 231 12 231 32] checked_sub0 ([#"../checked_ops.rs" 231 12 231 17] (127 : int8)) a);
     goto BB1
   }
   BB1 {
@@ -3976,7 +3976,7 @@ module CheckedOps_TestI8SubOverflowNeg
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 232 12 232 33] _11 <- ([#"../checked_ops.rs" 232 12 232 33] wrapping_sub0 (127 : int8) a);
+    [#"../checked_ops.rs" 232 12 232 33] _11 <- ([#"../checked_ops.rs" 232 12 232 33] wrapping_sub0 ([#"../checked_ops.rs" 232 12 232 17] (127 : int8)) a);
     goto BB5
   }
   BB4 {
@@ -3984,10 +3984,10 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 38 232 45] (2 : int8) + a);
+    [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 38 232 45] ([#"../checked_ops.rs" 232 39 232 40] (2 : int8)) + a);
     [#"../checked_ops.rs" 232 37 232 45] _14 <- ([#"../checked_ops.rs" 232 37 232 45] - _15);
     _15 <- any int8;
-    [#"../checked_ops.rs" 232 37 232 51] _13 <- ([#"../checked_ops.rs" 232 37 232 51] _14 - (127 : int8));
+    [#"../checked_ops.rs" 232 37 232 51] _13 <- ([#"../checked_ops.rs" 232 37 232 51] _14 - ([#"../checked_ops.rs" 232 48 232 51] (127 : int8)));
     _14 <- any int8;
     [#"../checked_ops.rs" 232 12 232 51] _10 <- ([#"../checked_ops.rs" 232 12 232 51] _11 = _13);
     _11 <- any int8;
@@ -3998,7 +3998,7 @@ module CheckedOps_TestI8SubOverflowNeg
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 233 12 233 35] _20 <- ([#"../checked_ops.rs" 233 12 233 35] saturating_sub0 (127 : int8) a);
+    [#"../checked_ops.rs" 233 12 233 35] _20 <- ([#"../checked_ops.rs" 233 12 233 35] saturating_sub0 ([#"../checked_ops.rs" 233 12 233 17] (127 : int8)) a);
     goto BB8
   }
   BB7 {
@@ -4006,7 +4006,7 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 233 12 233 42] _19 <- ([#"../checked_ops.rs" 233 12 233 42] _20 = (127 : int8));
+    [#"../checked_ops.rs" 233 12 233 42] _19 <- ([#"../checked_ops.rs" 233 12 233 42] _20 = ([#"../checked_ops.rs" 233 39 233 42] (127 : int8)));
     _20 <- any int8;
     switch (_19)
       | False -> goto BB10
@@ -4014,7 +4014,7 @@ module CheckedOps_TestI8SubOverflowNeg
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 234 14 234 38] res <- ([#"../checked_ops.rs" 234 14 234 38] overflowing_sub0 (127 : int8) a);
+    [#"../checked_ops.rs" 234 14 234 38] res <- ([#"../checked_ops.rs" 234 14 234 38] overflowing_sub0 ([#"../checked_ops.rs" 234 14 234 19] (127 : int8)) a);
     goto BB11
   }
   BB10 {
@@ -4022,10 +4022,10 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 22 235 29] (2 : int8) + a);
+    [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 22 235 29] ([#"../checked_ops.rs" 235 23 235 24] (2 : int8)) + a);
     [#"../checked_ops.rs" 235 21 235 29] _29 <- ([#"../checked_ops.rs" 235 21 235 29] - _30);
     _30 <- any int8;
-    [#"../checked_ops.rs" 235 21 235 35] _28 <- ([#"../checked_ops.rs" 235 21 235 35] _29 - (127 : int8));
+    [#"../checked_ops.rs" 235 21 235 35] _28 <- ([#"../checked_ops.rs" 235 21 235 35] _29 - ([#"../checked_ops.rs" 235 32 235 35] (127 : int8)));
     _29 <- any int8;
     [#"../checked_ops.rs" 235 12 235 35] _26 <- ([#"../checked_ops.rs" 235 12 235 35] (let (a, _) = res in a) = _28);
     _28 <- any int8;
@@ -4036,14 +4036,14 @@ module CheckedOps_TestI8SubOverflowNeg
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 235 39 235 52] _32 <- ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb (let (_, a) = res in a) true);
+    [#"../checked_ops.rs" 235 39 235 52] _32 <- ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 235 48 235 52] true));
     switch (_32)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 230 39 236 1] _0 <- ([#"../checked_ops.rs" 230 39 236 1] ());
+    [#"../checked_ops.rs" 230 39 236 1] _0 <- ([#"../checked_ops.rs" 230 39 236 1] [#"../checked_ops.rs" 230 39 236 1] ());
     return _0
   }
   BB14 {
@@ -4220,7 +4220,7 @@ module CheckedOps_TestI8OverflowingSub
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 246 45 249 1] _0 <- ([#"../checked_ops.rs" 246 45 249 1] ());
+    [#"../checked_ops.rs" 246 45 249 1] _0 <- ([#"../checked_ops.rs" 246 45 249 1] [#"../checked_ops.rs" 246 45 249 1] ());
     return _0
   }
   BB9 {
@@ -4359,7 +4359,7 @@ module CheckedOps_TestI8MulExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 253 12 253 31] _4 <- ([#"../checked_ops.rs" 253 12 253 31] checked_mul0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 253 12 253 31] _4 <- ([#"../checked_ops.rs" 253 12 253 31] checked_mul0 ([#"../checked_ops.rs" 253 12 253 15] (5 : int8)) ([#"../checked_ops.rs" 253 28 253 30] (10 : int8)));
     goto BB1
   }
   BB1 {
@@ -4368,7 +4368,7 @@ module CheckedOps_TestI8MulExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 253 12 253 46] _2 <- ([#"../checked_ops.rs" 253 12 253 46] _3 = (50 : int8));
+    [#"../checked_ops.rs" 253 12 253 46] _2 <- ([#"../checked_ops.rs" 253 12 253 46] _3 = ([#"../checked_ops.rs" 253 44 253 46] (50 : int8)));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -4376,7 +4376,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 254 12 254 32] _9 <- ([#"../checked_ops.rs" 254 12 254 32] checked_mul0 (50 : int8) (10 : int8));
+    [#"../checked_ops.rs" 254 12 254 32] _9 <- ([#"../checked_ops.rs" 254 12 254 32] checked_mul0 ([#"../checked_ops.rs" 254 12 254 16] (50 : int8)) ([#"../checked_ops.rs" 254 29 254 31] (10 : int8)));
     goto BB5
   }
   BB4 {
@@ -4394,7 +4394,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 255 12 255 33] _14 <- ([#"../checked_ops.rs" 255 12 255 33] checked_mul0 (50 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 255 12 255 33] _14 <- ([#"../checked_ops.rs" 255 12 255 33] checked_mul0 ([#"../checked_ops.rs" 255 12 255 16] (50 : int8)) ([#"../checked_ops.rs" 255 29 255 32] (-10 : int8)));
     goto BB9
   }
   BB8 {
@@ -4412,7 +4412,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 257 12 257 32] _18 <- ([#"../checked_ops.rs" 257 12 257 32] wrapping_mul0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 257 12 257 32] _18 <- ([#"../checked_ops.rs" 257 12 257 32] wrapping_mul0 ([#"../checked_ops.rs" 257 12 257 15] (5 : int8)) ([#"../checked_ops.rs" 257 29 257 31] (10 : int8)));
     goto BB13
   }
   BB12 {
@@ -4420,7 +4420,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 257 12 257 38] _17 <- ([#"../checked_ops.rs" 257 12 257 38] _18 = (50 : int8));
+    [#"../checked_ops.rs" 257 12 257 38] _17 <- ([#"../checked_ops.rs" 257 12 257 38] _18 = ([#"../checked_ops.rs" 257 36 257 38] (50 : int8)));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -4428,7 +4428,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB14 {
-    [#"../checked_ops.rs" 258 12 258 33] _22 <- ([#"../checked_ops.rs" 258 12 258 33] wrapping_mul0 (50 : int8) (10 : int8));
+    [#"../checked_ops.rs" 258 12 258 33] _22 <- ([#"../checked_ops.rs" 258 12 258 33] wrapping_mul0 ([#"../checked_ops.rs" 258 12 258 16] (50 : int8)) ([#"../checked_ops.rs" 258 30 258 32] (10 : int8)));
     goto BB16
   }
   BB15 {
@@ -4436,7 +4436,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 258 12 258 40] _21 <- ([#"../checked_ops.rs" 258 12 258 40] _22 = (-12 : int8));
+    [#"../checked_ops.rs" 258 12 258 40] _21 <- ([#"../checked_ops.rs" 258 12 258 40] _22 = ([#"../checked_ops.rs" 258 37 258 40] (-12 : int8)));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -4444,7 +4444,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 259 12 259 34] _26 <- ([#"../checked_ops.rs" 259 12 259 34] wrapping_mul0 (50 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 259 12 259 34] _26 <- ([#"../checked_ops.rs" 259 12 259 34] wrapping_mul0 ([#"../checked_ops.rs" 259 12 259 16] (50 : int8)) ([#"../checked_ops.rs" 259 30 259 33] (-10 : int8)));
     goto BB19
   }
   BB18 {
@@ -4452,7 +4452,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 259 12 259 40] _25 <- ([#"../checked_ops.rs" 259 12 259 40] _26 = (12 : int8));
+    [#"../checked_ops.rs" 259 12 259 40] _25 <- ([#"../checked_ops.rs" 259 12 259 40] _26 = ([#"../checked_ops.rs" 259 38 259 40] (12 : int8)));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -4460,7 +4460,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB20 {
-    [#"../checked_ops.rs" 261 12 261 34] _30 <- ([#"../checked_ops.rs" 261 12 261 34] saturating_mul0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 261 12 261 34] _30 <- ([#"../checked_ops.rs" 261 12 261 34] saturating_mul0 ([#"../checked_ops.rs" 261 12 261 15] (5 : int8)) ([#"../checked_ops.rs" 261 31 261 33] (10 : int8)));
     goto BB22
   }
   BB21 {
@@ -4468,7 +4468,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 261 12 261 40] _29 <- ([#"../checked_ops.rs" 261 12 261 40] _30 = (50 : int8));
+    [#"../checked_ops.rs" 261 12 261 40] _29 <- ([#"../checked_ops.rs" 261 12 261 40] _30 = ([#"../checked_ops.rs" 261 38 261 40] (50 : int8)));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -4476,7 +4476,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB23 {
-    [#"../checked_ops.rs" 262 12 262 35] _34 <- ([#"../checked_ops.rs" 262 12 262 35] saturating_mul0 (50 : int8) (10 : int8));
+    [#"../checked_ops.rs" 262 12 262 35] _34 <- ([#"../checked_ops.rs" 262 12 262 35] saturating_mul0 ([#"../checked_ops.rs" 262 12 262 16] (50 : int8)) ([#"../checked_ops.rs" 262 32 262 34] (10 : int8)));
     goto BB25
   }
   BB24 {
@@ -4484,7 +4484,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 262 12 262 42] _33 <- ([#"../checked_ops.rs" 262 12 262 42] _34 = (127 : int8));
+    [#"../checked_ops.rs" 262 12 262 42] _33 <- ([#"../checked_ops.rs" 262 12 262 42] _34 = ([#"../checked_ops.rs" 262 39 262 42] (127 : int8)));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -4492,7 +4492,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB26 {
-    [#"../checked_ops.rs" 263 12 263 36] _38 <- ([#"../checked_ops.rs" 263 12 263 36] saturating_mul0 (50 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 263 12 263 36] _38 <- ([#"../checked_ops.rs" 263 12 263 36] saturating_mul0 ([#"../checked_ops.rs" 263 12 263 16] (50 : int8)) ([#"../checked_ops.rs" 263 32 263 35] (-10 : int8)));
     goto BB28
   }
   BB27 {
@@ -4500,7 +4500,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 263 12 263 44] _37 <- ([#"../checked_ops.rs" 263 12 263 44] _38 = (-128 : int8));
+    [#"../checked_ops.rs" 263 12 263 44] _37 <- ([#"../checked_ops.rs" 263 12 263 44] _38 = ([#"../checked_ops.rs" 263 40 263 44] (-128 : int8)));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -4508,7 +4508,7 @@ module CheckedOps_TestI8MulExample
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 265 14 265 37] res <- ([#"../checked_ops.rs" 265 14 265 37] overflowing_mul0 (5 : int8) (10 : int8));
+    [#"../checked_ops.rs" 265 14 265 37] res <- ([#"../checked_ops.rs" 265 14 265 37] overflowing_mul0 ([#"../checked_ops.rs" 265 14 265 17] (5 : int8)) ([#"../checked_ops.rs" 265 34 265 36] (10 : int8)));
     goto BB31
   }
   BB30 {
@@ -4516,7 +4516,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 266 12 266 23] _42 <- ([#"../checked_ops.rs" 266 12 266 23] (let (a, _) = res in a) = (50 : int8));
+    [#"../checked_ops.rs" 266 12 266 23] _42 <- ([#"../checked_ops.rs" 266 12 266 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 266 21 266 23] (50 : int8)));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -4524,14 +4524,14 @@ module CheckedOps_TestI8MulExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 266 27 266 41] _44 <- ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 266 27 266 41] _44 <- ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 266 36 266 41] false));
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 267 14 267 38] res1 <- ([#"../checked_ops.rs" 267 14 267 38] overflowing_mul0 (50 : int8) (10 : int8));
+    [#"../checked_ops.rs" 267 14 267 38] res1 <- ([#"../checked_ops.rs" 267 14 267 38] overflowing_mul0 ([#"../checked_ops.rs" 267 14 267 18] (50 : int8)) ([#"../checked_ops.rs" 267 35 267 37] (10 : int8)));
     goto BB37
   }
   BB34 {
@@ -4546,7 +4546,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 268 12 268 24] _49 <- ([#"../checked_ops.rs" 268 12 268 24] (let (a, _) = res1 in a) = (-12 : int8));
+    [#"../checked_ops.rs" 268 12 268 24] _49 <- ([#"../checked_ops.rs" 268 12 268 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 268 21 268 24] (-12 : int8)));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -4554,14 +4554,14 @@ module CheckedOps_TestI8MulExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 268 28 268 41] _51 <- ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb (let (_, a) = res1 in a) true);
+    [#"../checked_ops.rs" 268 28 268 41] _51 <- ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 268 37 268 41] true));
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
       end
   }
   BB39 {
-    [#"../checked_ops.rs" 269 14 269 39] res2 <- ([#"../checked_ops.rs" 269 14 269 39] overflowing_mul0 (50 : int8) (-10 : int8));
+    [#"../checked_ops.rs" 269 14 269 39] res2 <- ([#"../checked_ops.rs" 269 14 269 39] overflowing_mul0 ([#"../checked_ops.rs" 269 14 269 18] (50 : int8)) ([#"../checked_ops.rs" 269 35 269 38] (-10 : int8)));
     goto BB43
   }
   BB40 {
@@ -4576,7 +4576,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 270 12 270 23] _56 <- ([#"../checked_ops.rs" 270 12 270 23] (let (a, _) = res2 in a) = (12 : int8));
+    [#"../checked_ops.rs" 270 12 270 23] _56 <- ([#"../checked_ops.rs" 270 12 270 23] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 270 21 270 23] (12 : int8)));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -4584,14 +4584,14 @@ module CheckedOps_TestI8MulExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 270 27 270 40] _58 <- ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb (let (_, a) = res2 in a) true);
+    [#"../checked_ops.rs" 270 27 270 40] _58 <- ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 270 36 270 40] true));
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 252 29 271 1] _0 <- ([#"../checked_ops.rs" 252 29 271 1] ());
+    [#"../checked_ops.rs" 252 29 271 1] _0 <- ([#"../checked_ops.rs" 252 29 271 1] [#"../checked_ops.rs" 252 29 271 1] ());
     return _0
   }
   BB46 {
@@ -4705,7 +4705,7 @@ module CheckedOps_TestI8MulZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 275 12 275 30] _5 <- ([#"../checked_ops.rs" 275 12 275 30] checked_mul0 (0 : int8) a);
+    [#"../checked_ops.rs" 275 12 275 30] _5 <- ([#"../checked_ops.rs" 275 12 275 30] checked_mul0 ([#"../checked_ops.rs" 275 12 275 15] (0 : int8)) a);
     goto BB1
   }
   BB1 {
@@ -4714,7 +4714,7 @@ module CheckedOps_TestI8MulZero
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 275 12 275 44] _3 <- ([#"../checked_ops.rs" 275 12 275 44] _4 = (0 : int8));
+    [#"../checked_ops.rs" 275 12 275 44] _3 <- ([#"../checked_ops.rs" 275 12 275 44] _4 = ([#"../checked_ops.rs" 275 43 275 44] (0 : int8)));
     _4 <- any int8;
     switch (_3)
       | False -> goto BB4
@@ -4722,7 +4722,7 @@ module CheckedOps_TestI8MulZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 276 12 276 31] _10 <- ([#"../checked_ops.rs" 276 12 276 31] wrapping_mul0 (0 : int8) a);
+    [#"../checked_ops.rs" 276 12 276 31] _10 <- ([#"../checked_ops.rs" 276 12 276 31] wrapping_mul0 ([#"../checked_ops.rs" 276 12 276 15] (0 : int8)) a);
     goto BB5
   }
   BB4 {
@@ -4730,7 +4730,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 276 12 276 36] _9 <- ([#"../checked_ops.rs" 276 12 276 36] _10 = (0 : int8));
+    [#"../checked_ops.rs" 276 12 276 36] _9 <- ([#"../checked_ops.rs" 276 12 276 36] _10 = ([#"../checked_ops.rs" 276 35 276 36] (0 : int8)));
     _10 <- any int8;
     switch (_9)
       | False -> goto BB7
@@ -4738,7 +4738,7 @@ module CheckedOps_TestI8MulZero
       end
   }
   BB6 {
-    [#"../checked_ops.rs" 277 12 277 33] _15 <- ([#"../checked_ops.rs" 277 12 277 33] saturating_mul0 (0 : int8) a);
+    [#"../checked_ops.rs" 277 12 277 33] _15 <- ([#"../checked_ops.rs" 277 12 277 33] saturating_mul0 ([#"../checked_ops.rs" 277 12 277 15] (0 : int8)) a);
     goto BB8
   }
   BB7 {
@@ -4746,7 +4746,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 277 12 277 38] _14 <- ([#"../checked_ops.rs" 277 12 277 38] _15 = (0 : int8));
+    [#"../checked_ops.rs" 277 12 277 38] _14 <- ([#"../checked_ops.rs" 277 12 277 38] _15 = ([#"../checked_ops.rs" 277 37 277 38] (0 : int8)));
     _15 <- any int8;
     switch (_14)
       | False -> goto BB10
@@ -4754,7 +4754,7 @@ module CheckedOps_TestI8MulZero
       end
   }
   BB9 {
-    [#"../checked_ops.rs" 278 14 278 36] res <- ([#"../checked_ops.rs" 278 14 278 36] overflowing_mul0 (0 : int8) a);
+    [#"../checked_ops.rs" 278 14 278 36] res <- ([#"../checked_ops.rs" 278 14 278 36] overflowing_mul0 ([#"../checked_ops.rs" 278 14 278 17] (0 : int8)) a);
     goto BB11
   }
   BB10 {
@@ -4762,7 +4762,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 279 12 279 22] _21 <- ([#"../checked_ops.rs" 279 12 279 22] (let (a, _) = res in a) = (0 : int8));
+    [#"../checked_ops.rs" 279 12 279 22] _21 <- ([#"../checked_ops.rs" 279 12 279 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 279 21 279 22] (0 : int8)));
     switch (_21)
       | False -> goto BB15
       | True -> goto BB12
@@ -4770,14 +4770,14 @@ module CheckedOps_TestI8MulZero
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 279 26 279 40] _23 <- ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 279 26 279 40] _23 <- ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 279 35 279 40] false));
     switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 274 31 280 1] _0 <- ([#"../checked_ops.rs" 274 31 280 1] ());
+    [#"../checked_ops.rs" 274 31 280 1] _0 <- ([#"../checked_ops.rs" 274 31 280 1] [#"../checked_ops.rs" 274 31 280 1] ());
     return _0
   }
   BB14 {
@@ -4915,7 +4915,7 @@ module CheckedOps_TestI8OverflowingMul
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 283 45 286 1] _0 <- ([#"../checked_ops.rs" 283 45 286 1] ());
+    [#"../checked_ops.rs" 283 45 286 1] _0 <- ([#"../checked_ops.rs" 283 45 286 1] [#"../checked_ops.rs" 283 45 286 1] ());
     return _0
   }
   BB9 {
@@ -5047,7 +5047,7 @@ module CheckedOps_TestI8DivExample
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 290 12 290 30] _4 <- ([#"../checked_ops.rs" 290 12 290 30] checked_div0 (5 : int8) (0 : int8));
+    [#"../checked_ops.rs" 290 12 290 30] _4 <- ([#"../checked_ops.rs" 290 12 290 30] checked_div0 ([#"../checked_ops.rs" 290 12 290 15] (5 : int8)) ([#"../checked_ops.rs" 290 28 290 29] (0 : int8)));
     goto BB1
   }
   BB1 {
@@ -5061,7 +5061,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 291 12 291 30] _9 <- ([#"../checked_ops.rs" 291 12 291 30] checked_div0 (5 : int8) (2 : int8));
+    [#"../checked_ops.rs" 291 12 291 30] _9 <- ([#"../checked_ops.rs" 291 12 291 30] checked_div0 ([#"../checked_ops.rs" 291 12 291 15] (5 : int8)) ([#"../checked_ops.rs" 291 28 291 29] (2 : int8)));
     goto BB5
   }
   BB4 {
@@ -5074,7 +5074,7 @@ module CheckedOps_TestI8DivExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 291 12 291 44] _7 <- ([#"../checked_ops.rs" 291 12 291 44] _8 = (2 : int8));
+    [#"../checked_ops.rs" 291 12 291 44] _7 <- ([#"../checked_ops.rs" 291 12 291 44] _8 = ([#"../checked_ops.rs" 291 43 291 44] (2 : int8)));
     _8 <- any int8;
     switch (_7)
       | False -> goto BB8
@@ -5082,7 +5082,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB7 {
-    [#"../checked_ops.rs" 292 12 292 31] _14 <- ([#"../checked_ops.rs" 292 12 292 31] checked_div0 (5 : int8) (-2 : int8));
+    [#"../checked_ops.rs" 292 12 292 31] _14 <- ([#"../checked_ops.rs" 292 12 292 31] checked_div0 ([#"../checked_ops.rs" 292 12 292 15] (5 : int8)) ([#"../checked_ops.rs" 292 28 292 30] (-2 : int8)));
     goto BB9
   }
   BB8 {
@@ -5095,7 +5095,7 @@ module CheckedOps_TestI8DivExample
     goto BB10
   }
   BB10 {
-    [#"../checked_ops.rs" 292 12 292 46] _12 <- ([#"../checked_ops.rs" 292 12 292 46] _13 = (-2 : int8));
+    [#"../checked_ops.rs" 292 12 292 46] _12 <- ([#"../checked_ops.rs" 292 12 292 46] _13 = ([#"../checked_ops.rs" 292 44 292 46] (-2 : int8)));
     _13 <- any int8;
     switch (_12)
       | False -> goto BB12
@@ -5103,7 +5103,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB11 {
-    [#"../checked_ops.rs" 293 12 293 36] _19 <- ([#"../checked_ops.rs" 293 12 293 36] checked_div0 (-128 : int8) (-1 : int8));
+    [#"../checked_ops.rs" 293 12 293 36] _19 <- ([#"../checked_ops.rs" 293 12 293 36] checked_div0 ([#"../checked_ops.rs" 293 12 293 20] (-128 : int8)) ([#"../checked_ops.rs" 293 33 293 35] (-1 : int8)));
     goto BB13
   }
   BB12 {
@@ -5121,7 +5121,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB15 {
-    [#"../checked_ops.rs" 295 12 295 31] _23 <- ([#"../checked_ops.rs" 295 12 295 31] wrapping_div0 (5 : int8) (2 : int8));
+    [#"../checked_ops.rs" 295 12 295 31] _23 <- ([#"../checked_ops.rs" 295 12 295 31] wrapping_div0 ([#"../checked_ops.rs" 295 12 295 15] (5 : int8)) ([#"../checked_ops.rs" 295 29 295 30] (2 : int8)));
     goto BB17
   }
   BB16 {
@@ -5129,7 +5129,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB17 {
-    [#"../checked_ops.rs" 295 12 295 36] _22 <- ([#"../checked_ops.rs" 295 12 295 36] _23 = (2 : int8));
+    [#"../checked_ops.rs" 295 12 295 36] _22 <- ([#"../checked_ops.rs" 295 12 295 36] _23 = ([#"../checked_ops.rs" 295 35 295 36] (2 : int8)));
     _23 <- any int8;
     switch (_22)
       | False -> goto BB19
@@ -5137,7 +5137,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB18 {
-    [#"../checked_ops.rs" 296 12 296 32] _27 <- ([#"../checked_ops.rs" 296 12 296 32] wrapping_div0 (5 : int8) (-2 : int8));
+    [#"../checked_ops.rs" 296 12 296 32] _27 <- ([#"../checked_ops.rs" 296 12 296 32] wrapping_div0 ([#"../checked_ops.rs" 296 12 296 15] (5 : int8)) ([#"../checked_ops.rs" 296 29 296 31] (-2 : int8)));
     goto BB20
   }
   BB19 {
@@ -5145,7 +5145,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB20 {
-    [#"../checked_ops.rs" 296 12 296 38] _26 <- ([#"../checked_ops.rs" 296 12 296 38] _27 = (-2 : int8));
+    [#"../checked_ops.rs" 296 12 296 38] _26 <- ([#"../checked_ops.rs" 296 12 296 38] _27 = ([#"../checked_ops.rs" 296 36 296 38] (-2 : int8)));
     _27 <- any int8;
     switch (_26)
       | False -> goto BB22
@@ -5153,7 +5153,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB21 {
-    [#"../checked_ops.rs" 297 12 297 37] _31 <- ([#"../checked_ops.rs" 297 12 297 37] wrapping_div0 (-128 : int8) (-1 : int8));
+    [#"../checked_ops.rs" 297 12 297 37] _31 <- ([#"../checked_ops.rs" 297 12 297 37] wrapping_div0 ([#"../checked_ops.rs" 297 12 297 20] (-128 : int8)) ([#"../checked_ops.rs" 297 34 297 36] (-1 : int8)));
     goto BB23
   }
   BB22 {
@@ -5161,7 +5161,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB23 {
-    [#"../checked_ops.rs" 297 12 297 45] _30 <- ([#"../checked_ops.rs" 297 12 297 45] _31 = (-128 : int8));
+    [#"../checked_ops.rs" 297 12 297 45] _30 <- ([#"../checked_ops.rs" 297 12 297 45] _31 = ([#"../checked_ops.rs" 297 41 297 45] (-128 : int8)));
     _31 <- any int8;
     switch (_30)
       | False -> goto BB25
@@ -5169,7 +5169,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB24 {
-    [#"../checked_ops.rs" 299 12 299 33] _35 <- ([#"../checked_ops.rs" 299 12 299 33] saturating_div0 (5 : int8) (2 : int8));
+    [#"../checked_ops.rs" 299 12 299 33] _35 <- ([#"../checked_ops.rs" 299 12 299 33] saturating_div0 ([#"../checked_ops.rs" 299 12 299 15] (5 : int8)) ([#"../checked_ops.rs" 299 31 299 32] (2 : int8)));
     goto BB26
   }
   BB25 {
@@ -5177,7 +5177,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB26 {
-    [#"../checked_ops.rs" 299 12 299 38] _34 <- ([#"../checked_ops.rs" 299 12 299 38] _35 = (2 : int8));
+    [#"../checked_ops.rs" 299 12 299 38] _34 <- ([#"../checked_ops.rs" 299 12 299 38] _35 = ([#"../checked_ops.rs" 299 37 299 38] (2 : int8)));
     _35 <- any int8;
     switch (_34)
       | False -> goto BB28
@@ -5185,7 +5185,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB27 {
-    [#"../checked_ops.rs" 300 12 300 34] _39 <- ([#"../checked_ops.rs" 300 12 300 34] saturating_div0 (5 : int8) (-2 : int8));
+    [#"../checked_ops.rs" 300 12 300 34] _39 <- ([#"../checked_ops.rs" 300 12 300 34] saturating_div0 ([#"../checked_ops.rs" 300 12 300 15] (5 : int8)) ([#"../checked_ops.rs" 300 31 300 33] (-2 : int8)));
     goto BB29
   }
   BB28 {
@@ -5193,7 +5193,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB29 {
-    [#"../checked_ops.rs" 300 12 300 40] _38 <- ([#"../checked_ops.rs" 300 12 300 40] _39 = (-2 : int8));
+    [#"../checked_ops.rs" 300 12 300 40] _38 <- ([#"../checked_ops.rs" 300 12 300 40] _39 = ([#"../checked_ops.rs" 300 38 300 40] (-2 : int8)));
     _39 <- any int8;
     switch (_38)
       | False -> goto BB31
@@ -5201,7 +5201,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB30 {
-    [#"../checked_ops.rs" 301 12 301 39] _43 <- ([#"../checked_ops.rs" 301 12 301 39] saturating_div0 (-128 : int8) (-1 : int8));
+    [#"../checked_ops.rs" 301 12 301 39] _43 <- ([#"../checked_ops.rs" 301 12 301 39] saturating_div0 ([#"../checked_ops.rs" 301 12 301 20] (-128 : int8)) ([#"../checked_ops.rs" 301 36 301 38] (-1 : int8)));
     goto BB32
   }
   BB31 {
@@ -5209,7 +5209,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB32 {
-    [#"../checked_ops.rs" 301 12 301 47] _42 <- ([#"../checked_ops.rs" 301 12 301 47] _43 = (-128 : int8));
+    [#"../checked_ops.rs" 301 12 301 47] _42 <- ([#"../checked_ops.rs" 301 12 301 47] _43 = ([#"../checked_ops.rs" 301 43 301 47] (-128 : int8)));
     _43 <- any int8;
     switch (_42)
       | False -> goto BB34
@@ -5217,7 +5217,7 @@ module CheckedOps_TestI8DivExample
       end
   }
   BB33 {
-    [#"../checked_ops.rs" 303 14 303 36] res <- ([#"../checked_ops.rs" 303 14 303 36] overflowing_div0 (5 : int8) (2 : int8));
+    [#"../checked_ops.rs" 303 14 303 36] res <- ([#"../checked_ops.rs" 303 14 303 36] overflowing_div0 ([#"../checked_ops.rs" 303 14 303 17] (5 : int8)) ([#"../checked_ops.rs" 303 34 303 35] (2 : int8)));
     goto BB35
   }
   BB34 {
@@ -5225,7 +5225,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB35 {
-    [#"../checked_ops.rs" 304 12 304 22] _47 <- ([#"../checked_ops.rs" 304 12 304 22] (let (a, _) = res in a) = (2 : int8));
+    [#"../checked_ops.rs" 304 12 304 22] _47 <- ([#"../checked_ops.rs" 304 12 304 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 304 21 304 22] (2 : int8)));
     switch (_47)
       | False -> goto BB39
       | True -> goto BB36
@@ -5233,14 +5233,14 @@ module CheckedOps_TestI8DivExample
   }
   BB36 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 304 26 304 40] _49 <- ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 304 26 304 40] _49 <- ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 304 35 304 40] false));
     switch (_49)
       | False -> goto BB38
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../checked_ops.rs" 305 14 305 37] res1 <- ([#"../checked_ops.rs" 305 14 305 37] overflowing_div0 (5 : int8) (-2 : int8));
+    [#"../checked_ops.rs" 305 14 305 37] res1 <- ([#"../checked_ops.rs" 305 14 305 37] overflowing_div0 ([#"../checked_ops.rs" 305 14 305 17] (5 : int8)) ([#"../checked_ops.rs" 305 34 305 36] (-2 : int8)));
     goto BB41
   }
   BB38 {
@@ -5255,7 +5255,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB41 {
-    [#"../checked_ops.rs" 306 12 306 23] _54 <- ([#"../checked_ops.rs" 306 12 306 23] (let (a, _) = res1 in a) = (-2 : int8));
+    [#"../checked_ops.rs" 306 12 306 23] _54 <- ([#"../checked_ops.rs" 306 12 306 23] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 306 21 306 23] (-2 : int8)));
     switch (_54)
       | False -> goto BB45
       | True -> goto BB42
@@ -5263,14 +5263,14 @@ module CheckedOps_TestI8DivExample
   }
   BB42 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 306 27 306 41] _56 <- ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb (let (_, a) = res1 in a) false);
+    [#"../checked_ops.rs" 306 27 306 41] _56 <- ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 306 36 306 41] false));
     switch (_56)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../checked_ops.rs" 307 14 307 42] res2 <- ([#"../checked_ops.rs" 307 14 307 42] overflowing_div0 (-128 : int8) (-1 : int8));
+    [#"../checked_ops.rs" 307 14 307 42] res2 <- ([#"../checked_ops.rs" 307 14 307 42] overflowing_div0 ([#"../checked_ops.rs" 307 14 307 22] (-128 : int8)) ([#"../checked_ops.rs" 307 39 307 41] (-1 : int8)));
     goto BB47
   }
   BB44 {
@@ -5285,7 +5285,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB47 {
-    [#"../checked_ops.rs" 308 12 308 25] _61 <- ([#"../checked_ops.rs" 308 12 308 25] (let (a, _) = res2 in a) = (-128 : int8));
+    [#"../checked_ops.rs" 308 12 308 25] _61 <- ([#"../checked_ops.rs" 308 12 308 25] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 308 21 308 25] (-128 : int8)));
     switch (_61)
       | False -> goto BB51
       | True -> goto BB48
@@ -5293,14 +5293,14 @@ module CheckedOps_TestI8DivExample
   }
   BB48 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 308 29 308 42] _63 <- ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb (let (_, a) = res2 in a) true);
+    [#"../checked_ops.rs" 308 29 308 42] _63 <- ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 308 38 308 42] true));
     switch (_63)
       | False -> goto BB50
       | True -> goto BB49
       end
   }
   BB49 {
-    [#"../checked_ops.rs" 289 29 309 1] _0 <- ([#"../checked_ops.rs" 289 29 309 1] ());
+    [#"../checked_ops.rs" 289 29 309 1] _0 <- ([#"../checked_ops.rs" 289 29 309 1] [#"../checked_ops.rs" 289 29 309 1] ());
     return _0
   }
   BB50 {
@@ -5445,13 +5445,13 @@ module CheckedOps_TestI8DivNoOverflow
   BB2 {
     [#"../checked_ops.rs" 314 41 314 42] _11 <- ([#"../checked_ops.rs" 314 41 314 42] a);
     [#"../checked_ops.rs" 314 45 314 46] _12 <- ([#"../checked_ops.rs" 314 45 314 46] b);
-    [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (0 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] (0 : int8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 314 41 314 46] not _13 };
     goto BB3
   }
   BB3 {
-    [#"../checked_ops.rs" 314 41 314 46] _14 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (-1 : int8));
-    [#"../checked_ops.rs" 314 41 314 46] _15 <- ([#"../checked_ops.rs" 314 41 314 46] _11 = (-128 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _14 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] (-1 : int8)));
+    [#"../checked_ops.rs" 314 41 314 46] _15 <- ([#"../checked_ops.rs" 314 41 314 46] _11 = ([#"../checked_ops.rs" 314 41 314 46] (-128 : int8)));
     [#"../checked_ops.rs" 314 41 314 46] _16 <- ([#"../checked_ops.rs" 314 41 314 46] _14 && _15);
     _14 <- any bool;
     _15 <- any bool;
@@ -5481,13 +5481,13 @@ module CheckedOps_TestI8DivNoOverflow
   BB7 {
     [#"../checked_ops.rs" 315 33 315 34] _24 <- ([#"../checked_ops.rs" 315 33 315 34] a);
     [#"../checked_ops.rs" 315 37 315 38] _25 <- ([#"../checked_ops.rs" 315 37 315 38] b);
-    [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (0 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] (0 : int8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 315 33 315 38] not _26 };
     goto BB8
   }
   BB8 {
-    [#"../checked_ops.rs" 315 33 315 38] _27 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (-1 : int8));
-    [#"../checked_ops.rs" 315 33 315 38] _28 <- ([#"../checked_ops.rs" 315 33 315 38] _24 = (-128 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _27 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] (-1 : int8)));
+    [#"../checked_ops.rs" 315 33 315 38] _28 <- ([#"../checked_ops.rs" 315 33 315 38] _24 = ([#"../checked_ops.rs" 315 33 315 38] (-128 : int8)));
     [#"../checked_ops.rs" 315 33 315 38] _29 <- ([#"../checked_ops.rs" 315 33 315 38] _27 && _28);
     _27 <- any bool;
     _28 <- any bool;
@@ -5517,13 +5517,13 @@ module CheckedOps_TestI8DivNoOverflow
   BB12 {
     [#"../checked_ops.rs" 316 35 316 36] _37 <- ([#"../checked_ops.rs" 316 35 316 36] a);
     [#"../checked_ops.rs" 316 39 316 40] _38 <- ([#"../checked_ops.rs" 316 39 316 40] b);
-    [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (0 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] (0 : int8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 316 35 316 40] not _39 };
     goto BB13
   }
   BB13 {
-    [#"../checked_ops.rs" 316 35 316 40] _40 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (-1 : int8));
-    [#"../checked_ops.rs" 316 35 316 40] _41 <- ([#"../checked_ops.rs" 316 35 316 40] _37 = (-128 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _40 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] (-1 : int8)));
+    [#"../checked_ops.rs" 316 35 316 40] _41 <- ([#"../checked_ops.rs" 316 35 316 40] _37 = ([#"../checked_ops.rs" 316 35 316 40] (-128 : int8)));
     [#"../checked_ops.rs" 316 35 316 40] _42 <- ([#"../checked_ops.rs" 316 35 316 40] _40 && _41);
     _40 <- any bool;
     _41 <- any bool;
@@ -5553,13 +5553,13 @@ module CheckedOps_TestI8DivNoOverflow
   BB17 {
     [#"../checked_ops.rs" 318 21 318 22] _51 <- ([#"../checked_ops.rs" 318 21 318 22] a);
     [#"../checked_ops.rs" 318 25 318 26] _52 <- ([#"../checked_ops.rs" 318 25 318 26] b);
-    [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (0 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] (0 : int8)));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 318 21 318 26] not _53 };
     goto BB18
   }
   BB18 {
-    [#"../checked_ops.rs" 318 21 318 26] _54 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (-1 : int8));
-    [#"../checked_ops.rs" 318 21 318 26] _55 <- ([#"../checked_ops.rs" 318 21 318 26] _51 = (-128 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _54 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] (-1 : int8)));
+    [#"../checked_ops.rs" 318 21 318 26] _55 <- ([#"../checked_ops.rs" 318 21 318 26] _51 = ([#"../checked_ops.rs" 318 21 318 26] (-128 : int8)));
     [#"../checked_ops.rs" 318 21 318 26] _56 <- ([#"../checked_ops.rs" 318 21 318 26] _54 && _55);
     _54 <- any bool;
     _55 <- any bool;
@@ -5579,14 +5579,14 @@ module CheckedOps_TestI8DivNoOverflow
   }
   BB20 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 318 30 318 44] _57 <- ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb (let (_, a) = res in a) false);
+    [#"../checked_ops.rs" 318 30 318 44] _57 <- ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 318 39 318 44] false));
     switch (_57)
       | False -> goto BB22
       | True -> goto BB21
       end
   }
   BB21 {
-    [#"../checked_ops.rs" 313 45 319 1] _0 <- ([#"../checked_ops.rs" 313 45 319 1] ());
+    [#"../checked_ops.rs" 313 45 319 1] _0 <- ([#"../checked_ops.rs" 313 45 319 1] [#"../checked_ops.rs" 313 45 319 1] ());
     return _0
   }
   BB22 {
@@ -5639,7 +5639,7 @@ module CheckedOps_TestI8DivZero
     goto BB0
   }
   BB0 {
-    [#"../checked_ops.rs" 323 12 323 28] _5 <- ([#"../checked_ops.rs" 323 12 323 28] checked_div0 a (0 : int8));
+    [#"../checked_ops.rs" 323 12 323 28] _5 <- ([#"../checked_ops.rs" 323 12 323 28] checked_div0 a ([#"../checked_ops.rs" 323 26 323 27] (0 : int8)));
     goto BB1
   }
   BB1 {
@@ -5653,7 +5653,7 @@ module CheckedOps_TestI8DivZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 322 31 324 1] _0 <- ([#"../checked_ops.rs" 322 31 324 1] ());
+    [#"../checked_ops.rs" 322 31 324 1] _0 <- ([#"../checked_ops.rs" 322 31 324 1] [#"../checked_ops.rs" 322 31 324 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/clones/01.mlcfg b/creusot/tests/should_succeed/clones/01.mlcfg
index 4f78788119..a70fee1e4c 100644
--- a/creusot/tests/should_succeed/clones/01.mlcfg
+++ b/creusot/tests/should_succeed/clones/01.mlcfg
@@ -7,7 +7,7 @@ module C01_Func1
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 6 11 6 13] _0 <- ([#"../01.rs" 6 11 6 13] ());
+    [#"../01.rs" 6 11 6 13] _0 <- ([#"../01.rs" 6 11 6 13] [#"../01.rs" 6 11 6 13] ());
     return _0
   }
   
@@ -21,7 +21,7 @@ module C01_Func2
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 9 4 9 11] _0 <- ([#"../01.rs" 9 4 9 11] func10 ());
+    [#"../01.rs" 9 4 9 11] _0 <- ([#"../01.rs" 9 4 9 11] func10 ([#"../01.rs" 9 4 9 11] ()));
     goto BB1
   }
   BB1 {
@@ -38,7 +38,7 @@ module C01_Func3
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 13 4 13 11] _0 <- ([#"../01.rs" 13 4 13 11] func20 ());
+    [#"../01.rs" 13 4 13 11] _0 <- ([#"../01.rs" 13 4 13 11] func20 ([#"../01.rs" 13 4 13 11] ()));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/clones/02.mlcfg b/creusot/tests/should_succeed/clones/02.mlcfg
index 0562b05b45..6e247c4b82 100644
--- a/creusot/tests/should_succeed/clones/02.mlcfg
+++ b/creusot/tests/should_succeed/clones/02.mlcfg
@@ -20,7 +20,7 @@ module C02_Program
     goto BB0
   }
   BB0 {
-    [#"../02.rs" 20 17 20 19] _0 <- ([#"../02.rs" 20 17 20 19] ());
+    [#"../02.rs" 20 17 20 19] _0 <- ([#"../02.rs" 20 17 20 19] [#"../02.rs" 20 17 20 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/clones/03.mlcfg b/creusot/tests/should_succeed/clones/03.mlcfg
index 3700068abf..08767dbdb7 100644
--- a/creusot/tests/should_succeed/clones/03.mlcfg
+++ b/creusot/tests/should_succeed/clones/03.mlcfg
@@ -35,7 +35,7 @@ module C03_Prog
     goto BB1
   }
   BB1 {
-    [#"../03.rs" 11 17 11 19] _0 <- ([#"../03.rs" 11 17 11 19] ());
+    [#"../03.rs" 11 17 11 19] _0 <- ([#"../03.rs" 11 17 11 19] [#"../03.rs" 11 17 11 19] ());
     goto BB2
   }
   BB2 {
@@ -81,11 +81,11 @@ module C03_Prog2
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 15 4 15 11] _2 <- ([#"../03.rs" 15 4 15 11] prog0 (0 : int32));
+    [#"../03.rs" 15 4 15 11] _2 <- ([#"../03.rs" 15 4 15 11] prog0 ([#"../03.rs" 15 9 15 10] (0 : int32)));
     goto BB1
   }
   BB1 {
-    [#"../03.rs" 14 15 16 1] _0 <- ([#"../03.rs" 14 15 16 1] ());
+    [#"../03.rs" 14 15 16 1] _0 <- ([#"../03.rs" 14 15 16 1] [#"../03.rs" 14 15 16 1] ());
     return _0
   }
   
@@ -106,7 +106,7 @@ module C03_Prog3
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 19 15 19 17] _0 <- ([#"../03.rs" 19 15 19 17] ());
+    [#"../03.rs" 19 15 19 17] _0 <- ([#"../03.rs" 19 15 19 17] [#"../03.rs" 19 15 19 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/clones/04.mlcfg b/creusot/tests/should_succeed/clones/04.mlcfg
index ddc9b27915..cc351488ad 100644
--- a/creusot/tests/should_succeed/clones/04.mlcfg
+++ b/creusot/tests/should_succeed/clones/04.mlcfg
@@ -26,7 +26,7 @@ module C04_F
     goto BB0
   }
   BB0 {
-    [#"../04.rs" 21 17 21 19] _0 <- ([#"../04.rs" 21 17 21 19] ());
+    [#"../04.rs" 21 17 21 19] _0 <- ([#"../04.rs" 21 17 21 19] [#"../04.rs" 21 17 21 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/01_basic.mlcfg b/creusot/tests/should_succeed/closures/01_basic.mlcfg
index 6490d5da08..586adb364a 100644
--- a/creusot/tests/should_succeed/closures/01_basic.mlcfg
+++ b/creusot/tests/should_succeed/closures/01_basic.mlcfg
@@ -56,7 +56,7 @@ module C01Basic_UsesClosure
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] true);
+    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] [#"../01_basic.rs" 5 12 5 16] true);
     [#"../01_basic.rs" 6 13 6 19] _4 <- ([#"../01_basic.rs" 6 13 6 19] C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y);
     [#"../01_basic.rs" 6 13 6 21] _6 <- ([#"../01_basic.rs" 6 13 6 21] ());
     [#"../01_basic.rs" 6 13 6 21] _x <- ([#"../01_basic.rs" 6 13 6 21] let () = _6 in closure00 _4);
@@ -65,7 +65,7 @@ module C01Basic_UsesClosure
   }
   BB1 {
     assume { resolve0 _4 };
-    [#"../01_basic.rs" 4 22 7 1] _0 <- ([#"../01_basic.rs" 4 22 7 1] ());
+    [#"../01_basic.rs" 4 22 7 1] _0 <- ([#"../01_basic.rs" 4 22 7 1] [#"../01_basic.rs" 4 22 7 1] ());
     return _0
   }
   
@@ -119,14 +119,14 @@ module C01Basic_MultiArg
   }
   BB0 {
     [#"../01_basic.rs" 10 12 10 24] x <- ([#"../01_basic.rs" 10 12 10 24] C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0);
-    [#"../01_basic.rs" 11 13 11 22] _4 <- ([#"../01_basic.rs" 11 13 11 22] ((0 : int32), (3 : int32)));
+    [#"../01_basic.rs" 11 13 11 22] _4 <- ([#"../01_basic.rs" 11 13 11 22] (([#"../01_basic.rs" 11 17 11 18] (0 : int32)), ([#"../01_basic.rs" 11 20 11 21] (3 : int32))));
     [#"../01_basic.rs" 11 13 11 22] _a <- ([#"../01_basic.rs" 11 13 11 22] let (a, b) = _4 in closure00 x a b);
     _4 <- any (int32, int32);
     goto BB1
   }
   BB1 {
     assume { resolve0 x };
-    [#"../01_basic.rs" 9 19 12 1] _0 <- ([#"../01_basic.rs" 9 19 12 1] ());
+    [#"../01_basic.rs" 9 19 12 1] _0 <- ([#"../01_basic.rs" 9 19 12 1] [#"../01_basic.rs" 9 19 12 1] ());
     return _0
   }
   
@@ -172,9 +172,9 @@ module C01Basic_MoveClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15]  * field_00 ( * _1) + (1 : int32)) ; })) ; };
+    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15]  * field_00 ( * _1) + ([#"../01_basic.rs" 20 14 20 15] (1 : int32))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] ());
+    [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] [#"../01_basic.rs" 19 24 21 5] ());
     return _0
   }
   
@@ -228,7 +228,7 @@ module C01Basic_MoveClosure
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] (0 : int32));
+    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] [#"../01_basic.rs" 17 17 17 21] (0 : int32));
     [#"../01_basic.rs" 17 12 17 21] a <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 17 12 17 21] _2 <-  ^ a;
     [#"../01_basic.rs" 19 16 21 5] x <- ([#"../01_basic.rs" 19 16 21 5] C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a);
@@ -252,7 +252,7 @@ module C01Basic_MoveClosure
   }
   BB2 {
     assume { resolve0 x };
-    [#"../01_basic.rs" 16 22 25 1] _0 <- ([#"../01_basic.rs" 16 22 25 1] ());
+    [#"../01_basic.rs" 16 22 25 1] _0 <- ([#"../01_basic.rs" 16 22 25 1] [#"../01_basic.rs" 16 22 25 1] ());
     return _0
   }
   
@@ -318,7 +318,7 @@ module C01Basic_MoveMut_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 36 12 36 21] _3 <- ([#"../01_basic.rs" 36 12 36 21] new_ref0 ());
+    [#"../01_basic.rs" 36 12 36 21] _3 <- ([#"../01_basic.rs" 36 12 36 21] new_ref0 ([#"../01_basic.rs" 36 12 36 21] ()));
     goto BB1
   }
   BB1 {
@@ -329,7 +329,7 @@ module C01Basic_MoveMut_Closure0
     assume { resolve0 (field_00 ( * _1)) };
     assume { resolve1 _1 };
     assume { resolve0 _3 };
-    [#"../01_basic.rs" 35 24 37 5] _0 <- ([#"../01_basic.rs" 35 24 37 5] ());
+    [#"../01_basic.rs" 35 24 37 5] _0 <- ([#"../01_basic.rs" 35 24 37 5] [#"../01_basic.rs" 35 24 37 5] ());
     return _0
   }
   
@@ -395,7 +395,7 @@ module C01Basic_MoveMut
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] (0 : uint32));
+    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] [#"../01_basic.rs" 33 21 33 25] (0 : uint32));
     [#"../01_basic.rs" 33 16 33 25] x <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 33 16 33 25] _2 <-  ^ x;
     [#"../01_basic.rs" 35 16 37 5] a <- ([#"../01_basic.rs" 35 16 37 5] C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x);
@@ -419,7 +419,7 @@ module C01Basic_MoveMut
   }
   BB2 {
     assume { resolve0 a };
-    [#"../01_basic.rs" 32 18 40 1] _0 <- ([#"../01_basic.rs" 32 18 40 1] ());
+    [#"../01_basic.rs" 32 18 40 1] _0 <- ([#"../01_basic.rs" 32 18 40 1] [#"../01_basic.rs" 32 18 40 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/02_nested.mlcfg b/creusot/tests/should_succeed/closures/02_nested.mlcfg
index 333554df29..1dd5c80699 100644
--- a/creusot/tests/should_succeed/closures/02_nested.mlcfg
+++ b/creusot/tests/should_succeed/closures/02_nested.mlcfg
@@ -128,7 +128,7 @@ module C02Nested_NestedClosure
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] true);
+    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] [#"../02_nested.rs" 4 12 4 16] true);
     [#"../02_nested.rs" 5 13 8 6] _4 <- ([#"../02_nested.rs" 5 13 8 6] C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a);
     [#"../02_nested.rs" 5 13 8 8] _6 <- ([#"../02_nested.rs" 5 13 8 8] ());
     [#"../02_nested.rs" 5 13 8 8] _a <- ([#"../02_nested.rs" 5 13 8 8] let () = _6 in closure00 _4);
@@ -137,7 +137,7 @@ module C02Nested_NestedClosure
   }
   BB1 {
     assume { resolve0 _4 };
-    [#"../02_nested.rs" 3 24 9 1] _0 <- ([#"../02_nested.rs" 3 24 9 1] ());
+    [#"../02_nested.rs" 3 24 9 1] _0 <- ([#"../02_nested.rs" 3 24 9 1] [#"../02_nested.rs" 3 24 9 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
index f68b76137f..3666325a25 100644
--- a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
+++ b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
@@ -147,7 +147,7 @@ module C03GenericBound_ClosureParam
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ([#"../03_generic_bound.rs" 4 4 4 10] ((0 : uint32)));
+    [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ([#"../03_generic_bound.rs" 4 4 4 10] (([#"../03_generic_bound.rs" 4 8 4 9] (0 : uint32))));
     [#"../03_generic_bound.rs" 4 4 4 10] _0 <- ([#"../03_generic_bound.rs" 4 4 4 10] call0 f _3);
     _3 <- any uint32;
     goto BB1
diff --git a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
index 1d07ea19da..984d0a051a 100644
--- a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
+++ b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
@@ -285,7 +285,7 @@ module C04GenericClosure_Mapper
     goto BB1
   }
   BB1 {
-    [#"../04_generic_closure.rs" 7 23 9 1] _0 <- ([#"../04_generic_closure.rs" 7 23 9 1] ());
+    [#"../04_generic_closure.rs" 7 23 9 1] _0 <- ([#"../04_generic_closure.rs" 7 23 9 1] [#"../04_generic_closure.rs" 7 23 9 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
index 421d85590a..3a62306c30 100644
--- a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
+++ b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
@@ -830,7 +830,7 @@ module C06FnSpecs_FnOnceUser
     goto BB1
   }
   BB1 {
-    [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ([#"../06_fn_specs.rs" 45 4 45 8] ((0 : usize)));
+    [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ([#"../06_fn_specs.rs" 45 4 45 8] (([#"../06_fn_specs.rs" 45 6 45 7] (0 : usize))));
     [#"../06_fn_specs.rs" 45 4 45 8] _0 <- ([#"../06_fn_specs.rs" 45 4 45 8] call_once0 f _4);
     f <- any f;
     _4 <- any usize;
diff --git a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
index 6aa30a62af..5626ec403b 100644
--- a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
+++ b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
@@ -47,9 +47,9 @@ module C07MutableCapture_TestFnmut_Closure1
     goto BB0
   }
   BB0 {
-    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18]  * field_00 ( * _1) + (1 : uint32)) ; })) ; };
+    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18]  * field_00 ( * _1) + ([#"../07_mutable_capture.rs" 10 17 10 18] (1 : uint32))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
+    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] [#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
     [#"../07_mutable_capture.rs" 7 8 7 35] res <- ([#"../07_mutable_capture.rs" 7 8 7 35] res1);
     [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- ([#"../07_mutable_capture.rs" 8 8 8 37] res);
     return _0
@@ -136,7 +136,7 @@ module C07MutableCapture_TestFnmut
   BB2 {
     assume { resolve0 c };
     assert { [@expl:assertion] [#"../07_mutable_capture.rs" 17 20 17 33] UInt32.to_int x = 100002 };
-    [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- ([#"../07_mutable_capture.rs" 5 30 18 1] ());
+    [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- ([#"../07_mutable_capture.rs" 5 30 18 1] [#"../07_mutable_capture.rs" 5 30 18 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
index 671707d640..9aedfae435 100644
--- a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
+++ b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
@@ -37,7 +37,7 @@ module C08MultipleCalls_MultiUse_Closure0
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
+    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] [#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
     [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- ([#"../08_multiple_calls.rs" 5 12 5 31] res);
     return _0
   }
@@ -129,7 +129,7 @@ module C08MultipleCalls_MultiUse
   BB1 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- ([#"../08_multiple_calls.rs" 4 27 14 1] ());
+    [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- ([#"../08_multiple_calls.rs" 4 27 14 1] [#"../08_multiple_calls.rs" 4 27 14 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/drop_pair.mlcfg b/creusot/tests/should_succeed/drop_pair.mlcfg
index b4de795411..cf64fb8fea 100644
--- a/creusot/tests/should_succeed/drop_pair.mlcfg
+++ b/creusot/tests/should_succeed/drop_pair.mlcfg
@@ -26,7 +26,7 @@ module DropPair_DropPair
   }
   BB0 {
     assume { resolve0 _x };
-    [#"../drop_pair.rs" 7 43 7 45] _0 <- ([#"../drop_pair.rs" 7 43 7 45] ());
+    [#"../drop_pair.rs" 7 43 7 45] _0 <- ([#"../drop_pair.rs" 7 43 7 45] [#"../drop_pair.rs" 7 43 7 45] ());
     return _0
   }
   
@@ -55,7 +55,7 @@ module DropPair_DropPair2
   }
   BB0 {
     assume { resolve0 x };
-    [#"../drop_pair.rs" 9 43 11 1] _0 <- ([#"../drop_pair.rs" 9 43 11 1] ());
+    [#"../drop_pair.rs" 9 43 11 1] _0 <- ([#"../drop_pair.rs" 9 43 11 1] [#"../drop_pair.rs" 9 43 11 1] ());
     return _0
   }
   
@@ -86,7 +86,7 @@ module DropPair_Drop
     [#"../drop_pair.rs" 16 4 16 10] _x <- ([#"../drop_pair.rs" 16 4 16 10] _3);
     _3 <- any borrowed uint32;
     assume { resolve0 _x };
-    [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] ());
+    [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] [#"../drop_pair.rs" 15 53 17 1] ());
     assume { resolve0 y };
     return _0
   }
diff --git a/creusot/tests/should_succeed/duration.mlcfg b/creusot/tests/should_succeed/duration.mlcfg
index 2b78a75c9e..735b526864 100644
--- a/creusot/tests/should_succeed/duration.mlcfg
+++ b/creusot/tests/should_succeed/duration.mlcfg
@@ -217,7 +217,7 @@ module Duration_TestDuration
     goto BB0
   }
   BB0 {
-    [#"../duration.rs" 8 15 8 34] zero <- ([#"../duration.rs" 8 15 8 34] new0 (0 : uint64) (0 : uint32));
+    [#"../duration.rs" 8 15 8 34] zero <- ([#"../duration.rs" 8 15 8 34] new0 ([#"../duration.rs" 8 29 8 30] (0 : uint64)) ([#"../duration.rs" 8 32 8 33] (0 : uint32)));
     goto BB1
   }
   BB1 {
@@ -226,7 +226,7 @@ module Duration_TestDuration
     goto BB2
   }
   BB2 {
-    [#"../duration.rs" 10 12 10 32] _5 <- ([#"../duration.rs" 10 12 10 32] _6 = (0 : uint128));
+    [#"../duration.rs" 10 12 10 32] _5 <- ([#"../duration.rs" 10 12 10 32] _6 = ([#"../duration.rs" 10 31 10 32] (0 : uint128)));
     _6 <- any uint128;
     switch (_5)
       | False -> goto BB4
@@ -234,7 +234,7 @@ module Duration_TestDuration
       end
   }
   BB3 {
-    [#"../duration.rs" 12 14 12 50] max <- ([#"../duration.rs" 12 14 12 50] new0 (18446744073709551615 : uint64) (999999999 : uint32));
+    [#"../duration.rs" 12 14 12 50] max <- ([#"../duration.rs" 12 14 12 50] new0 ([#"../duration.rs" 12 28 12 36] (18446744073709551615 : uint64)) ([#"../duration.rs" 12 38 12 49] (999999999 : uint32)));
     goto BB5
   }
   BB4 {
@@ -242,22 +242,22 @@ module Duration_TestDuration
     absurd
   }
   BB5 {
-    [#"../duration.rs" 14 17 14 39] d_secs <- ([#"../duration.rs" 14 17 14 39] from_secs0 (1 : uint64));
+    [#"../duration.rs" 14 17 14 39] d_secs <- ([#"../duration.rs" 14 17 14 39] from_secs0 ([#"../duration.rs" 14 37 14 38] (1 : uint64)));
     goto BB6
   }
   BB6 {
     assert { [@expl:assertion] [#"../duration.rs" 15 18 15 42] shallow_model0 d_secs = 1000000000 };
-    [#"../duration.rs" 17 19 17 43] d_millis <- ([#"../duration.rs" 17 19 17 43] from_millis0 (1 : uint64));
+    [#"../duration.rs" 17 19 17 43] d_millis <- ([#"../duration.rs" 17 19 17 43] from_millis0 ([#"../duration.rs" 17 41 17 42] (1 : uint64)));
     goto BB7
   }
   BB7 {
     assert { [@expl:assertion] [#"../duration.rs" 18 18 18 40] shallow_model0 d_millis = 1000000 };
-    [#"../duration.rs" 20 19 20 43] d_micros <- ([#"../duration.rs" 20 19 20 43] from_micros0 (1 : uint64));
+    [#"../duration.rs" 20 19 20 43] d_micros <- ([#"../duration.rs" 20 19 20 43] from_micros0 ([#"../duration.rs" 20 41 20 42] (1 : uint64)));
     goto BB8
   }
   BB8 {
     assert { [@expl:assertion] [#"../duration.rs" 21 18 21 36] shallow_model0 d_micros = 1000 };
-    [#"../duration.rs" 23 18 23 41] d_nanos <- ([#"../duration.rs" 23 18 23 41] from_nanos0 (1 : uint64));
+    [#"../duration.rs" 23 18 23 41] d_nanos <- ([#"../duration.rs" 23 18 23 41] from_nanos0 ([#"../duration.rs" 23 39 23 40] (1 : uint64)));
     goto BB9
   }
   BB9 {
@@ -294,7 +294,7 @@ module Duration_TestDuration
     goto BB16
   }
   BB16 {
-    [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 33] (1 : uint64) = _32);
+    [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 33] ([#"../duration.rs" 29 12 29 13] (1 : uint64)) = _32);
     _32 <- any uint64;
     switch (_31)
       | False -> goto BB18
@@ -310,7 +310,7 @@ module Duration_TestDuration
     absurd
   }
   BB19 {
-    [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 39] (0 : uint32) = _37);
+    [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 39] ([#"../duration.rs" 30 12 30 13] (0 : uint32)) = _37);
     _37 <- any uint32;
     switch (_36)
       | False -> goto BB21
@@ -326,7 +326,7 @@ module Duration_TestDuration
     absurd
   }
   BB22 {
-    [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 39] (0 : uint32) = _42);
+    [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 39] ([#"../duration.rs" 31 12 31 13] (0 : uint32)) = _42);
     _42 <- any uint32;
     switch (_41)
       | False -> goto BB24
@@ -342,7 +342,7 @@ module Duration_TestDuration
     absurd
   }
   BB25 {
-    [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 38] (0 : uint32) = _47);
+    [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 38] ([#"../duration.rs" 32 12 32 13] (0 : uint32)) = _47);
     _47 <- any uint32;
     switch (_46)
       | False -> goto BB27
@@ -491,7 +491,7 @@ module Duration_TestDuration
       end
   }
   BB54 {
-    [#"../duration.rs" 44 12 44 30] _105 <- ([#"../duration.rs" 44 12 44 30] checked_mul0 max (2 : uint32));
+    [#"../duration.rs" 44 12 44 30] _105 <- ([#"../duration.rs" 44 12 44 30] checked_mul0 max ([#"../duration.rs" 44 28 44 29] (2 : uint32)));
     goto BB56
   }
   BB55 {
@@ -509,7 +509,7 @@ module Duration_TestDuration
       end
   }
   BB58 {
-    [#"../duration.rs" 45 12 45 34] _111 <- ([#"../duration.rs" 45 12 45 34] checked_mul0 d_secs (10 : uint32));
+    [#"../duration.rs" 45 12 45 34] _111 <- ([#"../duration.rs" 45 12 45 34] checked_mul0 d_secs ([#"../duration.rs" 45 31 45 33] (10 : uint32)));
     goto BB60
   }
   BB59 {
@@ -527,7 +527,7 @@ module Duration_TestDuration
       end
   }
   BB62 {
-    [#"../duration.rs" 47 12 47 33] _117 <- ([#"../duration.rs" 47 12 47 33] checked_div0 d_secs (0 : uint32));
+    [#"../duration.rs" 47 12 47 33] _117 <- ([#"../duration.rs" 47 12 47 33] checked_div0 d_secs ([#"../duration.rs" 47 31 47 32] (0 : uint32)));
     goto BB64
   }
   BB63 {
@@ -545,7 +545,7 @@ module Duration_TestDuration
       end
   }
   BB66 {
-    [#"../duration.rs" 48 12 48 34] _123 <- ([#"../duration.rs" 48 12 48 34] checked_div0 d_secs (10 : uint32));
+    [#"../duration.rs" 48 12 48 34] _123 <- ([#"../duration.rs" 48 12 48 34] checked_div0 d_secs ([#"../duration.rs" 48 31 48 33] (10 : uint32)));
     goto BB68
   }
   BB67 {
@@ -577,7 +577,7 @@ module Duration_TestDuration
   BB73 {
     assert { [@expl:assertion] [#"../duration.rs" 52 18 52 35] shallow_model0 sum = 1001000 };
     assert { [@expl:assertion] [#"../duration.rs" 53 18 53 39] shallow_model0 difference = 999000 };
-    [#"../duration.rs" 7 23 54 1] _0 <- ([#"../duration.rs" 7 23 54 1] ());
+    [#"../duration.rs" 7 23 54 1] _0 <- ([#"../duration.rs" 7 23 54 1] [#"../duration.rs" 7 23 54 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index fe25709bb5..8ff04c9b95 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -337,8 +337,8 @@ module FilterPositive_M
     goto BB0
   }
   BB0 {
-    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] (0 : usize));
-    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] (0 : usize));
+    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] [#"../filter_positive.rs" 83 27 83 28] (0 : usize));
+    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] [#"../filter_positive.rs" 84 23 84 24] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -370,33 +370,33 @@ module FilterPositive_M
     goto BB7
   }
   BB7 {
-    [#"../filter_positive.rs" 90 11 90 19] _15 <- ([#"../filter_positive.rs" 90 11 90 19] _17 > (0 : int32));
+    [#"../filter_positive.rs" 90 11 90 19] _15 <- ([#"../filter_positive.rs" 90 11 90 19] _17 > ([#"../filter_positive.rs" 90 18 90 19] (0 : int32)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + (1 : usize));
-    [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] ());
+    [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + ([#"../filter_positive.rs" 91 21 91 22] (1 : usize)));
+    [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] [#"../filter_positive.rs" 91 12 91 22] ());
     goto BB10
   }
   BB9 {
-    [#"../filter_positive.rs" 92 9 92 9] _14 <- ([#"../filter_positive.rs" 92 9 92 9] ());
+    [#"../filter_positive.rs" 92 9 92 9] _14 <- ([#"../filter_positive.rs" 92 9 92 9] [#"../filter_positive.rs" 92 9 92 9] ());
     goto BB10
   }
   BB10 {
-    [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + (1 : usize));
-    [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] ());
+    [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + ([#"../filter_positive.rs" 93 13 93 14] (1 : usize)));
+    [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] [#"../filter_positive.rs" 89 22 94 5] ());
     goto BB3
   }
   BB11 {
-    [#"../filter_positive.rs" 95 26 95 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 (0 : int32) count);
+    [#"../filter_positive.rs" 95 26 95 40] u <- ([#"../filter_positive.rs" 95 26 95 40] from_elem0 ([#"../filter_positive.rs" 95 31 95 32] (0 : int32)) count);
     goto BB12
   }
   BB12 {
-    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] (0 : usize));
-    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] (0 : usize));
+    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] [#"../filter_positive.rs" 96 12 96 13] (0 : usize));
+    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] [#"../filter_positive.rs" 98 8 98 9] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -427,7 +427,7 @@ module FilterPositive_M
     goto BB19
   }
   BB19 {
-    [#"../filter_positive.rs" 103 11 103 19] _33 <- ([#"../filter_positive.rs" 103 11 103 19] _35 > (0 : int32));
+    [#"../filter_positive.rs" 103 11 103 19] _33 <- ([#"../filter_positive.rs" 103 11 103 19] _35 > ([#"../filter_positive.rs" 103 18 103 19] (0 : int32)));
     switch (_33)
       | False -> goto BB25
       | True -> goto BB20
@@ -455,17 +455,17 @@ module FilterPositive_M
   BB24 {
     [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = ([#"../filter_positive.rs" 113 12 113 27] _43) ; };
     assume { resolve1 _46 };
-    [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + (1 : usize));
-    [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] ());
+    [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + ([#"../filter_positive.rs" 114 21 114 22] (1 : usize)));
+    [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] [#"../filter_positive.rs" 103 20 115 9] ());
     goto BB26
   }
   BB25 {
-    [#"../filter_positive.rs" 115 9 115 9] _32 <- ([#"../filter_positive.rs" 115 9 115 9] ());
+    [#"../filter_positive.rs" 115 9 115 9] _32 <- ([#"../filter_positive.rs" 115 9 115 9] [#"../filter_positive.rs" 115 9 115 9] ());
     goto BB26
   }
   BB26 {
-    [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + (1 : usize));
-    [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] ());
+    [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + ([#"../filter_positive.rs" 116 13 116 14] (1 : usize)));
+    [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] [#"../filter_positive.rs" 102 22 117 5] ());
     goto BB15
   }
   BB27 {
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index 3f5801cef8..8186e9a003 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -303,13 +303,13 @@ module GhostPtrToken_Test
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () }
     
   let constant promoted0 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
   let constant promoted1 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
   let constant promoted2 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
   let constant promoted3 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
   let rec cfg test [#"../ghost_ptr_token.rs" 3 0 3 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -365,7 +365,7 @@ module GhostPtrToken_Test
     goto BB0
   }
   BB0 {
-    [#"../ghost_ptr_token.rs" 4 20 4 40] token <- ([#"../ghost_ptr_token.rs" 4 20 4 40] new0 ());
+    [#"../ghost_ptr_token.rs" 4 20 4 40] token <- ([#"../ghost_ptr_token.rs" 4 20 4 40] new0 ([#"../ghost_ptr_token.rs" 4 20 4 40] ()));
     goto BB1
   }
   BB1 {
@@ -374,7 +374,7 @@ module GhostPtrToken_Test
     goto BB2
   }
   BB2 {
-    [#"../ghost_ptr_token.rs" 5 15 5 46] ptr1 <- ([#"../ghost_ptr_token.rs" 5 15 5 46] ptr_from_box0 _3 (1 : int32));
+    [#"../ghost_ptr_token.rs" 5 15 5 46] ptr1 <- ([#"../ghost_ptr_token.rs" 5 15 5 46] ptr_from_box0 _3 ([#"../ghost_ptr_token.rs" 5 43 5 44] (1 : int32)));
     _3 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB3
   }
@@ -384,7 +384,7 @@ module GhostPtrToken_Test
     goto BB4
   }
   BB4 {
-    [#"../ghost_ptr_token.rs" 6 15 6 46] ptr2 <- ([#"../ghost_ptr_token.rs" 6 15 6 46] ptr_from_box0 _6 (2 : int32));
+    [#"../ghost_ptr_token.rs" 6 15 6 46] ptr2 <- ([#"../ghost_ptr_token.rs" 6 15 6 46] ptr_from_box0 _6 ([#"../ghost_ptr_token.rs" 6 43 6 44] (2 : int32)));
     _6 <- any borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32);
     goto BB5
   }
@@ -502,7 +502,7 @@ module GhostPtrToken_Test
       end
   }
   BB18 {
-    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ());
+    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] [#"../ghost_ptr_token.rs" 3 14 18 1] ());
     return _0
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index 8decff6f31..f98174ba28 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -766,7 +766,7 @@ module Hashmap_Impl5_Add
     [#"../hashmap.rs" 110 27 110 46] _12 <- ([#"../hashmap.rs" 110 27 110 46] UIntSize.of_int (UInt64.to_int _13));
     _13 <- any uint64;
     [#"../hashmap.rs" 110 49 110 55] _15 <- ([#"../hashmap.rs" 110 49 110 55] length);
-    [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = (0 : usize));
+    [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = ([#"../hashmap.rs" 110 27 110 55] (0 : usize)));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 110 27 110 55] not _16 };
     goto BB4
   }
@@ -858,7 +858,7 @@ module Hashmap_Impl5_Add
     assert { [@expl:type invariant] inv12 self };
     assume { resolve8 self };
     assert { [@expl:assertion] [#"../hashmap.rs" 125 32 125 52] hashmap_inv0 ( * self) };
-    [#"../hashmap.rs" 126 16 126 22] _0 <- ([#"../hashmap.rs" 126 16 126 22] ());
+    [#"../hashmap.rs" 126 16 126 22] _0 <- ([#"../hashmap.rs" 126 16 126 22] [#"../hashmap.rs" 126 16 126 22] ());
     goto BB20
   }
   BB13 {
@@ -915,7 +915,7 @@ module Hashmap_Impl5_Add
     assert { [@expl:type invariant] inv12 self };
     assume { resolve8 self };
     assert { [@expl:assertion] [#"../hashmap.rs" 133 24 133 44] hashmap_inv0 ( * self) };
-    [#"../hashmap.rs" 106 42 134 5] _0 <- ([#"../hashmap.rs" 106 42 134 5] ());
+    [#"../hashmap.rs" 106 42 134 5] _0 <- ([#"../hashmap.rs" 106 42 134 5] [#"../hashmap.rs" 106 42 134 5] ());
     goto BB20
   }
   BB20 {
@@ -1262,7 +1262,7 @@ module Hashmap_Impl5_Get
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = (0 : usize));
+    [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = ([#"../hashmap.rs" 142 27 142 67] (0 : usize)));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 142 27 142 67] not _12 };
     goto BB3
   }
@@ -1753,14 +1753,14 @@ module Hashmap_Impl5_Resize
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 163 32 163 54] _9 <- ([#"../hashmap.rs" 163 32 163 54] _10 * (2 : usize));
+    [#"../hashmap.rs" 163 32 163 54] _9 <- ([#"../hashmap.rs" 163 32 163 54] _10 * ([#"../hashmap.rs" 163 53 163 54] (2 : usize)));
     _10 <- any usize;
     [#"../hashmap.rs" 163 22 163 55] new <- ([#"../hashmap.rs" 163 22 163 55] new1 _9);
     _9 <- any usize;
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] (0 : usize));
+    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] [#"../hashmap.rs" 165 27 165 28] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -1884,7 +1884,7 @@ module Hashmap_Impl5_Resize
     goto BB24
   }
   BB24 {
-    [#"../hashmap.rs" 188 49 191 13] _21 <- ([#"../hashmap.rs" 188 49 191 13] ());
+    [#"../hashmap.rs" 188 49 191 13] _21 <- ([#"../hashmap.rs" 188 49 191 13] [#"../hashmap.rs" 188 49 191 13] ());
     goto BB26
   }
   BB25 {
@@ -1897,8 +1897,8 @@ module Hashmap_Impl5_Resize
     goto BB17
   }
   BB27 {
-    [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + (1 : usize));
-    [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] ());
+    [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + ([#"../hashmap.rs" 193 17 193 18] (1 : usize)));
+    [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] [#"../hashmap.rs" 176 37 194 9] ());
     goto BB28
   }
   BB28 {
@@ -1917,7 +1917,7 @@ module Hashmap_Impl5_Resize
     goto BB32
   }
   BB32 {
-    [#"../hashmap.rs" 161 25 197 5] _0 <- ([#"../hashmap.rs" 161 25 197 5] ());
+    [#"../hashmap.rs" 161 25 197 5] _0 <- ([#"../hashmap.rs" 161 25 197 5] [#"../hashmap.rs" 161 25 197 5] ());
     goto BB33
   }
   BB33 {
@@ -2185,56 +2185,56 @@ module Hashmap_Main
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 224 42 224 60] h1 <- ([#"../hashmap.rs" 224 42 224 60] new0 (17 : usize));
+    [#"../hashmap.rs" 224 42 224 60] h1 <- ([#"../hashmap.rs" 224 42 224 60] new0 ([#"../hashmap.rs" 224 57 224 59] (17 : usize)));
     goto BB1
   }
   BB1 {
-    [#"../hashmap.rs" 225 42 225 60] h2 <- ([#"../hashmap.rs" 225 42 225 60] new0 (42 : usize));
+    [#"../hashmap.rs" 225 42 225 60] h2 <- ([#"../hashmap.rs" 225 42 225 60] new0 ([#"../hashmap.rs" 225 57 225 59] (42 : usize)));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 226 17 226 26] _x <- ([#"../hashmap.rs" 226 17 226 26] get0 h1 (1 : usize));
+    [#"../hashmap.rs" 226 17 226 26] _x <- ([#"../hashmap.rs" 226 17 226 26] get0 h1 ([#"../hashmap.rs" 226 24 226 25] (1 : usize)));
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 227 17 227 26] _y <- ([#"../hashmap.rs" 227 17 227 26] get0 h1 (2 : usize));
+    [#"../hashmap.rs" 227 17 227 26] _y <- ([#"../hashmap.rs" 227 17 227 26] get0 h1 ([#"../hashmap.rs" 227 24 227 25] (2 : usize)));
     goto BB4
   }
   BB4 {
-    [#"../hashmap.rs" 228 17 228 26] _z <- ([#"../hashmap.rs" 228 17 228 26] get0 h2 (1 : usize));
+    [#"../hashmap.rs" 228 17 228 26] _z <- ([#"../hashmap.rs" 228 17 228 26] get0 h2 ([#"../hashmap.rs" 228 24 228 25] (1 : usize)));
     goto BB5
   }
   BB5 {
-    [#"../hashmap.rs" 229 17 229 26] _t <- ([#"../hashmap.rs" 229 17 229 26] get0 h2 (2 : usize));
+    [#"../hashmap.rs" 229 17 229 26] _t <- ([#"../hashmap.rs" 229 17 229 26] get0 h2 ([#"../hashmap.rs" 229 24 229 25] (2 : usize)));
     goto BB6
   }
   BB6 {
     [#"../hashmap.rs" 233 4 233 6] _12 <- Borrow.borrow_mut h1;
     [#"../hashmap.rs" 233 4 233 6] h1 <-  ^ _12;
-    [#"../hashmap.rs" 233 4 233 17] _11 <- ([#"../hashmap.rs" 233 4 233 17] add0 _12 (1 : usize) (17 : isize));
+    [#"../hashmap.rs" 233 4 233 17] _11 <- ([#"../hashmap.rs" 233 4 233 17] add0 _12 ([#"../hashmap.rs" 233 11 233 12] (1 : usize)) ([#"../hashmap.rs" 233 14 233 16] (17 : isize)));
     _12 <- any borrowed (Hashmap_MyHashMap_Type.t_myhashmap usize isize);
     goto BB7
   }
   BB7 {
-    [#"../hashmap.rs" 234 9 234 18] _13 <- ([#"../hashmap.rs" 234 9 234 18] get0 h1 (1 : usize));
+    [#"../hashmap.rs" 234 9 234 18] _13 <- ([#"../hashmap.rs" 234 9 234 18] get0 h1 ([#"../hashmap.rs" 234 16 234 17] (1 : usize)));
     goto BB8
   }
   BB8 {
     [#"../hashmap.rs" 234 4 234 18] _x <- ([#"../hashmap.rs" 234 4 234 18] _13);
     _13 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 h1 (2 : usize));
+    [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 h1 ([#"../hashmap.rs" 235 16 235 17] (2 : usize)));
     goto BB9
   }
   BB9 {
     [#"../hashmap.rs" 235 4 235 18] _y <- ([#"../hashmap.rs" 235 4 235 18] _15);
     _15 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 h2 (1 : usize));
+    [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 h2 ([#"../hashmap.rs" 236 16 236 17] (1 : usize)));
     goto BB10
   }
   BB10 {
     [#"../hashmap.rs" 236 4 236 18] _z <- ([#"../hashmap.rs" 236 4 236 18] _17);
     _17 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 h2 (2 : usize));
+    [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 h2 ([#"../hashmap.rs" 237 16 237 17] (2 : usize)));
     goto BB11
   }
   BB11 {
@@ -2242,36 +2242,36 @@ module Hashmap_Main
     _19 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 240 4 240 6] _22 <- Borrow.borrow_mut h2;
     [#"../hashmap.rs" 240 4 240 6] h2 <-  ^ _22;
-    [#"../hashmap.rs" 240 4 240 17] _21 <- ([#"../hashmap.rs" 240 4 240 17] add0 _22 (1 : usize) (42 : isize));
+    [#"../hashmap.rs" 240 4 240 17] _21 <- ([#"../hashmap.rs" 240 4 240 17] add0 _22 ([#"../hashmap.rs" 240 11 240 12] (1 : usize)) ([#"../hashmap.rs" 240 14 240 16] (42 : isize)));
     _22 <- any borrowed (Hashmap_MyHashMap_Type.t_myhashmap usize isize);
     goto BB12
   }
   BB12 {
-    [#"../hashmap.rs" 241 9 241 18] _23 <- ([#"../hashmap.rs" 241 9 241 18] get0 h1 (1 : usize));
+    [#"../hashmap.rs" 241 9 241 18] _23 <- ([#"../hashmap.rs" 241 9 241 18] get0 h1 ([#"../hashmap.rs" 241 16 241 17] (1 : usize)));
     goto BB13
   }
   BB13 {
     [#"../hashmap.rs" 241 4 241 18] _x <- ([#"../hashmap.rs" 241 4 241 18] _23);
     _23 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 h1 (2 : usize));
+    [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 h1 ([#"../hashmap.rs" 242 16 242 17] (2 : usize)));
     goto BB14
   }
   BB14 {
     [#"../hashmap.rs" 242 4 242 18] _y <- ([#"../hashmap.rs" 242 4 242 18] _25);
     _25 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 h2 (1 : usize));
+    [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 h2 ([#"../hashmap.rs" 243 16 243 17] (1 : usize)));
     goto BB15
   }
   BB15 {
     [#"../hashmap.rs" 243 4 243 18] _z <- ([#"../hashmap.rs" 243 4 243 18] _27);
     _27 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 h2 (2 : usize));
+    [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 h2 ([#"../hashmap.rs" 244 16 244 17] (2 : usize)));
     goto BB16
   }
   BB16 {
     [#"../hashmap.rs" 244 4 244 18] _t <- ([#"../hashmap.rs" 244 4 244 18] _29);
     _29 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] ());
+    [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] [#"../hashmap.rs" 217 14 247 1] ());
     goto BB17
   }
   BB17 {
diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index a94fc218d4..88ce6f7b5a 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -592,12 +592,12 @@ module HeapsortGeneric_SiftDown
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] (2 : usize) = (0 : usize));
+    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)) = ([#"../heapsort_generic.rs" 60 16 60 23] (0 : usize)));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 60 16 60 23] not _28 };
     goto BB4
   }
   BB4 {
-    [#"../heapsort_generic.rs" 60 16 60 23] _26 <- ([#"../heapsort_generic.rs" 60 16 60 23] end' / (2 : usize));
+    [#"../heapsort_generic.rs" 60 16 60 23] _26 <- ([#"../heapsort_generic.rs" 60 16 60 23] end' / ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)));
     [#"../heapsort_generic.rs" 60 11 60 23] _24 <- ([#"../heapsort_generic.rs" 60 11 60 23] i >= _26);
     _26 <- any usize;
     switch (_24)
@@ -608,14 +608,14 @@ module HeapsortGeneric_SiftDown
   BB5 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve3 v };
-    [#"../heapsort_generic.rs" 61 12 61 18] _0 <- ([#"../heapsort_generic.rs" 61 12 61 18] ());
+    [#"../heapsort_generic.rs" 61 12 61 18] _0 <- ([#"../heapsort_generic.rs" 61 12 61 18] [#"../heapsort_generic.rs" 61 12 61 18] ());
     goto BB23
   }
   BB6 {
-    [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 29] (2 : usize) * i);
-    [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] _31 + (1 : usize));
+    [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 29] ([#"../heapsort_generic.rs" 64 24 64 25] (2 : usize)) * i);
+    [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] _31 + ([#"../heapsort_generic.rs" 64 32 64 33] (1 : usize)));
     _31 <- any usize;
-    [#"../heapsort_generic.rs" 65 11 65 20] _35 <- ([#"../heapsort_generic.rs" 65 11 65 20] child + (1 : usize));
+    [#"../heapsort_generic.rs" 65 11 65 20] _35 <- ([#"../heapsort_generic.rs" 65 11 65 20] child + ([#"../heapsort_generic.rs" 65 19 65 20] (1 : usize)));
     [#"../heapsort_generic.rs" 65 11 65 26] _34 <- ([#"../heapsort_generic.rs" 65 11 65 26] _35 < end');
     _35 <- any usize;
     switch (_34)
@@ -633,7 +633,7 @@ module HeapsortGeneric_SiftDown
   BB9 {
     assert { [@expl:type invariant] inv2 _40 };
     assume { resolve1 _40 };
-    [#"../heapsort_generic.rs" 65 43 65 52] _46 <- ([#"../heapsort_generic.rs" 65 43 65 52] child + (1 : usize));
+    [#"../heapsort_generic.rs" 65 43 65 52] _46 <- ([#"../heapsort_generic.rs" 65 43 65 52] child + ([#"../heapsort_generic.rs" 65 51 65 52] (1 : usize)));
     [#"../heapsort_generic.rs" 65 42 65 53] _44 <- ([#"../heapsort_generic.rs" 65 42 65 53] index0 ( * v) _46);
     _46 <- any usize;
     goto BB10
@@ -651,15 +651,15 @@ module HeapsortGeneric_SiftDown
       end
   }
   BB12 {
-    [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + (1 : usize));
-    [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] ());
+    [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + ([#"../heapsort_generic.rs" 66 21 66 22] (1 : usize)));
+    [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] [#"../heapsort_generic.rs" 66 12 66 22] ());
     goto BB15
   }
   BB13 {
     goto BB14
   }
   BB14 {
-    [#"../heapsort_generic.rs" 67 9 67 9] _33 <- ([#"../heapsort_generic.rs" 67 9 67 9] ());
+    [#"../heapsort_generic.rs" 67 9 67 9] _33 <- ([#"../heapsort_generic.rs" 67 9 67 9] [#"../heapsort_generic.rs" 67 9 67 9] ());
     goto BB15
   }
   BB15 {
@@ -687,7 +687,7 @@ module HeapsortGeneric_SiftDown
   BB19 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve3 v };
-    [#"../heapsort_generic.rs" 69 12 69 18] _0 <- ([#"../heapsort_generic.rs" 69 12 69 18] ());
+    [#"../heapsort_generic.rs" 69 12 69 18] _0 <- ([#"../heapsort_generic.rs" 69 12 69 18] [#"../heapsort_generic.rs" 69 12 69 18] ());
     goto BB23
   }
   BB20 {
@@ -1099,12 +1099,12 @@ module HeapsortGeneric_HeapSort
     goto BB2
   }
   BB2 {
-    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] (2 : usize) = (0 : usize));
+    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)) = ([#"../heapsort_generic.rs" 99 20 99 31] (0 : usize)));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 99 20 99 31] not _10 };
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / (2 : usize));
+    [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)));
     _8 <- any usize;
     goto BB4
   }
@@ -1115,14 +1115,14 @@ module HeapsortGeneric_HeapSort
     goto BB5
   }
   BB5 {
-    [#"../heapsort_generic.rs" 103 10 103 19] _16 <- ([#"../heapsort_generic.rs" 103 10 103 19] start > (0 : usize));
+    [#"../heapsort_generic.rs" 103 10 103 19] _16 <- ([#"../heapsort_generic.rs" 103 10 103 19] start > ([#"../heapsort_generic.rs" 103 18 103 19] (0 : usize)));
     switch (_16)
       | False -> goto BB9
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - (1 : usize));
+    [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - ([#"../heapsort_generic.rs" 104 17 104 18] (1 : usize)));
     [#"../heapsort_generic.rs" 105 18 105 19] _19 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 105 18 105 19] v <- { v with current = ( ^ _19) ; };
     assume { inv2 ( ^ _19) };
@@ -1136,7 +1136,7 @@ module HeapsortGeneric_HeapSort
     goto BB8
   }
   BB8 {
-    [#"../heapsort_generic.rs" 103 20 106 5] _15 <- ([#"../heapsort_generic.rs" 103 20 106 5] ());
+    [#"../heapsort_generic.rs" 103 20 106 5] _15 <- ([#"../heapsort_generic.rs" 103 20 106 5] [#"../heapsort_generic.rs" 103 20 106 5] ());
     goto BB4
   }
   BB9 {
@@ -1155,14 +1155,14 @@ module HeapsortGeneric_HeapSort
     goto BB12
   }
   BB12 {
-    [#"../heapsort_generic.rs" 115 10 115 17] _33 <- ([#"../heapsort_generic.rs" 115 10 115 17] end' > (1 : usize));
+    [#"../heapsort_generic.rs" 115 10 115 17] _33 <- ([#"../heapsort_generic.rs" 115 10 115 17] end' > ([#"../heapsort_generic.rs" 115 16 115 17] (1 : usize)));
     switch (_33)
       | False -> goto BB17
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - (1 : usize));
+    [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - ([#"../heapsort_generic.rs" 116 15 116 16] (1 : usize)));
     [#"../heapsort_generic.rs" 117 8 117 9] _38 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 117 8 117 9] v <- { v with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
@@ -1174,7 +1174,7 @@ module HeapsortGeneric_HeapSort
     [#"../heapsort_generic.rs" 117 8 117 9] _36 <- Borrow.borrow_final ( * _37) (Borrow.get_id _37);
     [#"../heapsort_generic.rs" 117 8 117 9] _37 <- { _37 with current = ( ^ _36) ; };
     assume { inv3 ( ^ _36) };
-    [#"../heapsort_generic.rs" 117 8 117 22] _35 <- ([#"../heapsort_generic.rs" 117 8 117 22] swap0 _36 (0 : usize) end');
+    [#"../heapsort_generic.rs" 117 8 117 22] _35 <- ([#"../heapsort_generic.rs" 117 8 117 22] swap0 _36 ([#"../heapsort_generic.rs" 117 15 117 16] (0 : usize)) end');
     _36 <- any borrowed (slice t);
     goto BB15
   }
@@ -1185,18 +1185,18 @@ module HeapsortGeneric_HeapSort
     [#"../heapsort_generic.rs" 123 18 123 19] _43 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 123 18 123 19] v <- { v with current = ( ^ _43) ; };
     assume { inv2 ( ^ _43) };
-    [#"../heapsort_generic.rs" 123 8 123 28] _42 <- ([#"../heapsort_generic.rs" 123 8 123 28] sift_down0 _43 (0 : usize) end');
+    [#"../heapsort_generic.rs" 123 8 123 28] _42 <- ([#"../heapsort_generic.rs" 123 8 123 28] sift_down0 _43 ([#"../heapsort_generic.rs" 123 21 123 22] (0 : usize)) end');
     _43 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB16
   }
   BB16 {
-    [#"../heapsort_generic.rs" 115 18 124 5] _15 <- ([#"../heapsort_generic.rs" 115 18 124 5] ());
+    [#"../heapsort_generic.rs" 115 18 124 5] _15 <- ([#"../heapsort_generic.rs" 115 18 124 5] [#"../heapsort_generic.rs" 115 18 124 5] ());
     goto BB11
   }
   BB17 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve1 v };
-    [#"../heapsort_generic.rs" 115 4 124 5] _0 <- ([#"../heapsort_generic.rs" 115 4 124 5] ());
+    [#"../heapsort_generic.rs" 115 4 124 5] _0 <- ([#"../heapsort_generic.rs" 115 4 124 5] [#"../heapsort_generic.rs" 115 4 124 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index 1ff97fbf85..95280b1a32 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -239,7 +239,7 @@ module Hillel_RightPad
     assume { resolve1 pad };
     assert { [@expl:type invariant] inv2 str };
     assume { resolve2 str };
-    [#"../hillel.rs" 24 4 26 5] _0 <- ([#"../hillel.rs" 24 4 26 5] ());
+    [#"../hillel.rs" 24 4 26 5] _0 <- ([#"../hillel.rs" 24 4 26 5] [#"../hillel.rs" 24 4 26 5] ());
     return _0
   }
   
@@ -453,7 +453,7 @@ module Hillel_LeftPad
     [#"../hillel.rs" 44 8 44 11] _24 <- Borrow.borrow_mut ( * str);
     [#"../hillel.rs" 44 8 44 11] str <- { str with current = ( ^ _24) ; };
     assume { inv3 ( ^ _24) };
-    [#"../hillel.rs" 44 8 44 26] _23 <- ([#"../hillel.rs" 44 8 44 26] insert0 _24 (0 : usize) pad);
+    [#"../hillel.rs" 44 8 44 26] _23 <- ([#"../hillel.rs" 44 8 44 26] insert0 _24 ([#"../hillel.rs" 44 19 44 20] (0 : usize)) pad);
     _24 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB7
   }
@@ -471,7 +471,7 @@ module Hillel_LeftPad
     assume { resolve1 pad };
     assert { [@expl:type invariant] inv2 str };
     assume { resolve2 str };
-    [#"../hillel.rs" 43 4 46 5] _0 <- ([#"../hillel.rs" 43 4 46 5] ());
+    [#"../hillel.rs" 43 4 46 5] _0 <- ([#"../hillel.rs" 43 4 46 5] [#"../hillel.rs" 43 4 46 5] ());
     return _0
   }
   
@@ -1115,7 +1115,7 @@ module Hillel_InsertUnique
     goto BB22
   }
   BB22 {
-    [#"../hillel.rs" 89 12 89 18] _0 <- ([#"../hillel.rs" 89 12 89 18] ());
+    [#"../hillel.rs" 89 12 89 18] _0 <- ([#"../hillel.rs" 89 12 89 18] [#"../hillel.rs" 89 12 89 18] ());
     goto BB26
   }
   BB23 {
@@ -1137,7 +1137,7 @@ module Hillel_InsertUnique
   BB25 {
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve10 vec };
-    [#"../hillel.rs" 79 63 95 1] _0 <- ([#"../hillel.rs" 79 63 95 1] ());
+    [#"../hillel.rs" 79 63 95 1] _0 <- ([#"../hillel.rs" 79 63 95 1] [#"../hillel.rs" 79 63 95 1] ());
     goto BB26
   }
   BB26 {
@@ -1523,7 +1523,7 @@ module Hillel_Unique
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 101 21 101 31] unique <- ([#"../hillel.rs" 101 21 101 31] new0 ());
+    [#"../hillel.rs" 101 21 101 31] unique <- ([#"../hillel.rs" 101 21 101 31] new0 ([#"../hillel.rs" 101 21 101 31] ()));
     goto BB1
   }
   BB1 {
@@ -1537,7 +1537,7 @@ module Hillel_Unique
     goto BB3
   }
   BB3 {
-    [#"../hillel.rs" 107 13 107 25] _10 <- ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range (0 : usize) _11);
+    [#"../hillel.rs" 107 13 107 25] _10 <- ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 107 13 107 14] (0 : usize)) _11);
     _11 <- any usize;
     [#"../hillel.rs" 104 4 104 48] iter <- ([#"../hillel.rs" 104 4 104 48] into_iter0 _10);
     _10 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -2123,7 +2123,7 @@ module Hillel_Fulcrum
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] (0 : uint32));
+    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] [#"../hillel.rs" 157 25 157 26] (0 : uint32));
     [#"../hillel.rs" 159 4 159 60] iter <- ([#"../hillel.rs" 159 4 159 60] into_iter0 s);
     goto BB1
   }
@@ -2163,9 +2163,9 @@ module Hillel_Fulcrum
   }
   BB7 {
     assert { [@expl:assertion] [#"../hillel.rs" 165 20 165 56] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) };
-    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] (0 : usize));
+    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] [#"../hillel.rs" 167 27 167 28] (0 : usize));
     [#"../hillel.rs" 168 28 168 33] min_dist <- ([#"../hillel.rs" 168 28 168 33] total);
-    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] (0 : uint32));
+    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] [#"../hillel.rs" 170 23 170 24] (0 : uint32));
     [#"../hillel.rs" 176 16 176 23] _37 <- ([#"../hillel.rs" 176 16 176 23] len2 s);
     goto BB12
   }
@@ -2186,11 +2186,11 @@ module Hillel_Fulcrum
     _24 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../hillel.rs" 161 9 161 10] x <- ([#"../hillel.rs" 161 9 161 10] __creusot_proc_iter_elem);
     [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + x);
-    [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] ());
+    [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] [#"../hillel.rs" 161 16 163 5] ());
     goto BB4
   }
   BB12 {
-    [#"../hillel.rs" 176 13 176 23] _36 <- ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _37);
+    [#"../hillel.rs" 176 13 176 23] _36 <- ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 176 13 176 14] (0 : usize)) _37);
     _37 <- any usize;
     [#"../hillel.rs" 171 4 171 58] iter1 <- ([#"../hillel.rs" 171 4 171 58] into_iter1 _36);
     _36 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -2264,11 +2264,11 @@ module Hillel_Fulcrum
   BB24 {
     [#"../hillel.rs" 179 12 179 21] min_i <- ([#"../hillel.rs" 179 12 179 21] i);
     [#"../hillel.rs" 180 12 180 27] min_dist <- ([#"../hillel.rs" 180 12 180 27] dist);
-    [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] ());
+    [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] [#"../hillel.rs" 178 27 181 9] ());
     goto BB26
   }
   BB25 {
-    [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] ());
+    [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] [#"../hillel.rs" 181 9 181 9] ());
     goto BB26
   }
   BB26 {
@@ -2280,7 +2280,7 @@ module Hillel_Fulcrum
   }
   BB27 {
     [#"../hillel.rs" 183 8 183 19] sum <- ([#"../hillel.rs" 183 8 183 19] sum + Slice.get s _70);
-    [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] ());
+    [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] [#"../hillel.rs" 176 24 184 5] ());
     goto BB16
   }
   BB29 {
diff --git a/creusot/tests/should_succeed/immut.mlcfg b/creusot/tests/should_succeed/immut.mlcfg
index ef59f377ef..ff8a0d5922 100644
--- a/creusot/tests/should_succeed/immut.mlcfg
+++ b/creusot/tests/should_succeed/immut.mlcfg
@@ -18,11 +18,11 @@ module Immut_F
     goto BB0
   }
   BB0 {
-    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] (10 : uint32));
+    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] [#"../immut.rs" 4 16 4 18] (10 : uint32));
     [#"../immut.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../immut.rs" 5 12 5 18] a <-  ^ b;
     [#"../immut.rs" 6 19 6 20] _c <- ([#"../immut.rs" 6 19 6 20]  * b);
-    [#"../immut.rs" 3 11 7 1] _0 <- ([#"../immut.rs" 3 11 7 1] ());
+    [#"../immut.rs" 3 11 7 1] _0 <- ([#"../immut.rs" 3 11 7 1] [#"../immut.rs" 3 11 7 1] ());
     assume { resolve0 b };
     return _0
   }
diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg
index c17e4d2486..9a386a260e 100644
--- a/creusot/tests/should_succeed/index_range.mlcfg
+++ b/creusot/tests/should_succeed/index_range.mlcfg
@@ -142,41 +142,41 @@ module IndexRange_CreateArr
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 15 18 15 28] arr <- ([#"../index_range.rs" 15 18 15 28] new0 ());
+    [#"../index_range.rs" 15 18 15 28] arr <- ([#"../index_range.rs" 15 18 15 28] new0 ([#"../index_range.rs" 15 18 15 28] ()));
     goto BB1
   }
   BB1 {
     [#"../index_range.rs" 17 4 17 7] _4 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 17 4 17 7] arr <-  ^ _4;
-    [#"../index_range.rs" 17 4 17 15] _3 <- ([#"../index_range.rs" 17 4 17 15] push0 _4 (0 : int32));
+    [#"../index_range.rs" 17 4 17 15] _3 <- ([#"../index_range.rs" 17 4 17 15] push0 _4 ([#"../index_range.rs" 17 13 17 14] (0 : int32)));
     _4 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB2
   }
   BB2 {
     [#"../index_range.rs" 18 4 18 7] _6 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 18 4 18 7] arr <-  ^ _6;
-    [#"../index_range.rs" 18 4 18 15] _5 <- ([#"../index_range.rs" 18 4 18 15] push0 _6 (1 : int32));
+    [#"../index_range.rs" 18 4 18 15] _5 <- ([#"../index_range.rs" 18 4 18 15] push0 _6 ([#"../index_range.rs" 18 13 18 14] (1 : int32)));
     _6 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB3
   }
   BB3 {
     [#"../index_range.rs" 19 4 19 7] _8 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 19 4 19 7] arr <-  ^ _8;
-    [#"../index_range.rs" 19 4 19 15] _7 <- ([#"../index_range.rs" 19 4 19 15] push0 _8 (2 : int32));
+    [#"../index_range.rs" 19 4 19 15] _7 <- ([#"../index_range.rs" 19 4 19 15] push0 _8 ([#"../index_range.rs" 19 13 19 14] (2 : int32)));
     _8 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB4
   }
   BB4 {
     [#"../index_range.rs" 20 4 20 7] _10 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 20 4 20 7] arr <-  ^ _10;
-    [#"../index_range.rs" 20 4 20 15] _9 <- ([#"../index_range.rs" 20 4 20 15] push0 _10 (3 : int32));
+    [#"../index_range.rs" 20 4 20 15] _9 <- ([#"../index_range.rs" 20 4 20 15] push0 _10 ([#"../index_range.rs" 20 13 20 14] (3 : int32)));
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB5
   }
   BB5 {
     [#"../index_range.rs" 21 4 21 7] _12 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 21 4 21 7] arr <-  ^ _12;
-    [#"../index_range.rs" 21 4 21 15] _11 <- ([#"../index_range.rs" 21 4 21 15] push0 _12 (4 : int32));
+    [#"../index_range.rs" 21 4 21 15] _11 <- ([#"../index_range.rs" 21 4 21 15] push0 _12 ([#"../index_range.rs" 21 13 21 14] (4 : int32)));
     _12 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB6
   }
@@ -563,11 +563,11 @@ module IndexRange_TestRange
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 29 18 29 30] arr <- ([#"../index_range.rs" 29 18 29 30] create_arr0 ());
+    [#"../index_range.rs" 29 18 29 30] arr <- ([#"../index_range.rs" 29 18 29 30] create_arr0 ([#"../index_range.rs" 29 18 29 30] ()));
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 34 17 34 21] _5 <- ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range (0 : usize) (2 : usize));
+    [#"../index_range.rs" 34 17 34 21] _5 <- ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 34 17 34 18] (0 : usize)) ([#"../index_range.rs" 34 20 34 21] (2 : usize)));
     [#"../index_range.rs" 34 16 34 22] _3 <- ([#"../index_range.rs" 34 16 34 22] index0 arr _5);
     _5 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
@@ -578,7 +578,7 @@ module IndexRange_TestRange
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 35 12 35 24] _7 <- ([#"../index_range.rs" 35 12 35 24] _8 = (2 : usize));
+    [#"../index_range.rs" 35 12 35 24] _7 <- ([#"../index_range.rs" 35 12 35 24] _8 = ([#"../index_range.rs" 35 23 35 24] (2 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -586,35 +586,35 @@ module IndexRange_TestRange
       end
   }
   BB4 {
-    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] (0 : usize));
+    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] [#"../index_range.rs" 35 30 35 31] (0 : usize));
     [#"../index_range.rs" 35 28 35 32] _13 <- ([#"../index_range.rs" 35 28 35 32] Slice.length s);
     [#"../index_range.rs" 35 28 35 32] _14 <- ([#"../index_range.rs" 35 28 35 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 28 35 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 35 28 35 37] _10 <- ([#"../index_range.rs" 35 28 35 37] Slice.get s _12 = (0 : int32));
+    [#"../index_range.rs" 35 28 35 37] _10 <- ([#"../index_range.rs" 35 28 35 37] Slice.get s _12 = ([#"../index_range.rs" 35 36 35 37] (0 : int32)));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] (1 : usize));
+    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] [#"../index_range.rs" 35 43 35 44] (1 : usize));
     [#"../index_range.rs" 35 41 35 45] _18 <- ([#"../index_range.rs" 35 41 35 45] Slice.length s);
     [#"../index_range.rs" 35 41 35 45] _19 <- ([#"../index_range.rs" 35 41 35 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 41 35 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 35 41 35 50] _15 <- ([#"../index_range.rs" 35 41 35 50] Slice.get s _17 = (1 : int32));
+    [#"../index_range.rs" 35 41 35 50] _15 <- ([#"../index_range.rs" 35 41 35 50] Slice.get s _17 = ([#"../index_range.rs" 35 49 35 50] (1 : int32)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 37 17 37 21] _24 <- ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range (3 : usize) (5 : usize));
+    [#"../index_range.rs" 37 17 37 21] _24 <- ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 37 17 37 18] (3 : usize)) ([#"../index_range.rs" 37 20 37 21] (5 : usize)));
     [#"../index_range.rs" 37 16 37 22] _22 <- ([#"../index_range.rs" 37 16 37 22] index0 arr _24);
     _24 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB13
@@ -641,7 +641,7 @@ module IndexRange_TestRange
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 38 12 38 24] _26 <- ([#"../index_range.rs" 38 12 38 24] _27 = (2 : usize));
+    [#"../index_range.rs" 38 12 38 24] _26 <- ([#"../index_range.rs" 38 12 38 24] _27 = ([#"../index_range.rs" 38 23 38 24] (2 : usize)));
     _27 <- any usize;
     switch (_26)
       | False -> goto BB22
@@ -649,35 +649,35 @@ module IndexRange_TestRange
       end
   }
   BB15 {
-    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] (0 : usize));
+    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] [#"../index_range.rs" 38 30 38 31] (0 : usize));
     [#"../index_range.rs" 38 28 38 32] _32 <- ([#"../index_range.rs" 38 28 38 32] Slice.length s1);
     [#"../index_range.rs" 38 28 38 32] _33 <- ([#"../index_range.rs" 38 28 38 32] _31 < _32);
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 28 38 32] _33 };
     goto BB16
   }
   BB16 {
-    [#"../index_range.rs" 38 28 38 37] _29 <- ([#"../index_range.rs" 38 28 38 37] Slice.get s1 _31 = (3 : int32));
+    [#"../index_range.rs" 38 28 38 37] _29 <- ([#"../index_range.rs" 38 28 38 37] Slice.get s1 _31 = ([#"../index_range.rs" 38 36 38 37] (3 : int32)));
     switch (_29)
       | False -> goto BB21
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] (1 : usize));
+    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] [#"../index_range.rs" 38 43 38 44] (1 : usize));
     [#"../index_range.rs" 38 41 38 45] _37 <- ([#"../index_range.rs" 38 41 38 45] Slice.length s1);
     [#"../index_range.rs" 38 41 38 45] _38 <- ([#"../index_range.rs" 38 41 38 45] _36 < _37);
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 41 38 45] _38 };
     goto BB18
   }
   BB18 {
-    [#"../index_range.rs" 38 41 38 50] _34 <- ([#"../index_range.rs" 38 41 38 50] Slice.get s1 _36 = (4 : int32));
+    [#"../index_range.rs" 38 41 38 50] _34 <- ([#"../index_range.rs" 38 41 38 50] Slice.get s1 _36 = ([#"../index_range.rs" 38 49 38 50] (4 : int32)));
     switch (_34)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../index_range.rs" 43 16 43 20] _46 <- ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range (2 : usize) (2 : usize));
+    [#"../index_range.rs" 43 16 43 20] _46 <- ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 43 16 43 17] (2 : usize)) ([#"../index_range.rs" 43 19 43 20] (2 : usize)));
     [#"../index_range.rs" 43 15 43 21] _44 <- ([#"../index_range.rs" 43 15 43 21] index0 arr _46);
     _46 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB24
@@ -703,7 +703,7 @@ module IndexRange_TestRange
     goto BB25
   }
   BB25 {
-    [#"../index_range.rs" 43 12 43 32] _41 <- ([#"../index_range.rs" 43 12 43 32] _42 = (0 : usize));
+    [#"../index_range.rs" 43 12 43 32] _41 <- ([#"../index_range.rs" 43 12 43 32] _42 = ([#"../index_range.rs" 43 31 43 32] (0 : usize)));
     _42 <- any usize;
     switch (_41)
       | False -> goto BB27
@@ -711,7 +711,7 @@ module IndexRange_TestRange
       end
   }
   BB26 {
-    [#"../index_range.rs" 45 16 45 20] _54 <- ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range (5 : usize) (5 : usize));
+    [#"../index_range.rs" 45 16 45 20] _54 <- ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 45 16 45 17] (5 : usize)) ([#"../index_range.rs" 45 19 45 20] (5 : usize)));
     [#"../index_range.rs" 45 15 45 21] _52 <- ([#"../index_range.rs" 45 15 45 21] index0 arr _54);
     _54 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB28
@@ -726,7 +726,7 @@ module IndexRange_TestRange
     goto BB29
   }
   BB29 {
-    [#"../index_range.rs" 45 12 45 32] _49 <- ([#"../index_range.rs" 45 12 45 32] _50 = (0 : usize));
+    [#"../index_range.rs" 45 12 45 32] _49 <- ([#"../index_range.rs" 45 12 45 32] _50 = ([#"../index_range.rs" 45 31 45 32] (0 : usize)));
     _50 <- any usize;
     switch (_49)
       | False -> goto BB31
@@ -743,7 +743,7 @@ module IndexRange_TestRange
     absurd
   }
   BB32 {
-    [#"../index_range.rs" 50 20 50 24] _63 <- ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (6 : usize));
+    [#"../index_range.rs" 50 20 50 24] _63 <- ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 50 20 50 21] (2 : usize)) ([#"../index_range.rs" 50 23 50 24] (6 : usize)));
     [#"../index_range.rs" 50 12 50 25] _59 <- ([#"../index_range.rs" 50 12 50 25] get0 _61 _63);
     _63 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB33
@@ -768,7 +768,7 @@ module IndexRange_TestRange
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 52 20 52 24] _72 <- ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (1 : usize));
+    [#"../index_range.rs" 52 20 52 24] _72 <- ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 52 20 52 21] (2 : usize)) ([#"../index_range.rs" 52 23 52 24] (1 : usize)));
     [#"../index_range.rs" 52 12 52 25] _68 <- ([#"../index_range.rs" 52 12 52 25] get0 _70 _72);
     _72 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB38
@@ -793,7 +793,7 @@ module IndexRange_TestRange
     absurd
   }
   BB42 {
-    [#"../index_range.rs" 54 20 54 24] _81 <- ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range (6 : usize) (6 : usize));
+    [#"../index_range.rs" 54 20 54 24] _81 <- ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 54 20 54 21] (6 : usize)) ([#"../index_range.rs" 54 23 54 24] (6 : usize)));
     [#"../index_range.rs" 54 12 54 25] _77 <- ([#"../index_range.rs" 54 12 54 25] get0 _79 _81);
     _81 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB43
@@ -818,7 +818,7 @@ module IndexRange_TestRange
     absurd
   }
   BB47 {
-    [#"../index_range.rs" 56 20 56 26] _90 <- ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range (10 : usize) (10 : usize));
+    [#"../index_range.rs" 56 20 56 26] _90 <- ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 56 20 56 22] (10 : usize)) ([#"../index_range.rs" 56 24 56 26] (10 : usize)));
     [#"../index_range.rs" 56 12 56 27] _86 <- ([#"../index_range.rs" 56 12 56 27] get0 _88 _90);
     _90 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB48
@@ -836,7 +836,7 @@ module IndexRange_TestRange
   BB50 {
     [#"../index_range.rs" 59 17 59 20] _94 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 59 17 59 20] arr <-  ^ _94;
-    [#"../index_range.rs" 59 21 59 25] _95 <- ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range (1 : usize) (4 : usize));
+    [#"../index_range.rs" 59 21 59 25] _95 <- ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 59 21 59 22] (1 : usize)) ([#"../index_range.rs" 59 24 59 25] (4 : usize)));
     [#"../index_range.rs" 59 20 59 26] _93 <- ([#"../index_range.rs" 59 20 59 26] index_mut0 _94 _95);
     _94 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _95 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -854,7 +854,7 @@ module IndexRange_TestRange
     goto BB53
   }
   BB53 {
-    [#"../index_range.rs" 60 12 60 24] _97 <- ([#"../index_range.rs" 60 12 60 24] _98 = (3 : usize));
+    [#"../index_range.rs" 60 12 60 24] _97 <- ([#"../index_range.rs" 60 12 60 24] _98 = ([#"../index_range.rs" 60 23 60 24] (3 : usize)));
     _98 <- any usize;
     switch (_97)
       | False -> goto BB55
@@ -862,7 +862,7 @@ module IndexRange_TestRange
       end
   }
   BB54 {
-    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] (0 : usize));
+    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] [#"../index_range.rs" 61 6 61 7] (0 : usize));
     [#"../index_range.rs" 61 4 61 8] _102 <- ([#"../index_range.rs" 61 4 61 8] Slice.length ( * s2));
     [#"../index_range.rs" 61 4 61 8] _103 <- ([#"../index_range.rs" 61 4 61 8] _101 < _102);
     assert { [@expl:index in bounds] [#"../index_range.rs" 61 4 61 8] _103 };
@@ -876,16 +876,16 @@ module IndexRange_TestRange
     absurd
   }
   BB56 {
-    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] (1 : usize));
+    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] [#"../index_range.rs" 61 11 61 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] [#"../index_range.rs" 62 6 62 7] (1 : usize));
     [#"../index_range.rs" 62 4 62 8] _105 <- ([#"../index_range.rs" 62 4 62 8] Slice.length ( * s2));
     [#"../index_range.rs" 62 4 62 8] _106 <- ([#"../index_range.rs" 62 4 62 8] _104 < _105);
     assert { [@expl:index in bounds] [#"../index_range.rs" 62 4 62 8] _106 };
     goto BB57
   }
   BB57 {
-    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] (2 : usize));
+    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] [#"../index_range.rs" 62 11 62 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] [#"../index_range.rs" 67 14 67 15] (2 : usize));
     [#"../index_range.rs" 67 12 67 16] _111 <- ([#"../index_range.rs" 67 12 67 16] Slice.length ( * s2));
     [#"../index_range.rs" 67 12 67 16] _112 <- ([#"../index_range.rs" 67 12 67 16] _110 < _111);
     assert { [@expl:index in bounds] [#"../index_range.rs" 67 12 67 16] _112 };
@@ -893,7 +893,7 @@ module IndexRange_TestRange
   }
   BB58 {
     assume { resolve1 s2 };
-    [#"../index_range.rs" 67 12 67 21] _108 <- ([#"../index_range.rs" 67 12 67 21] Slice.get ( * s2) _110 = (3 : int32));
+    [#"../index_range.rs" 67 12 67 21] _108 <- ([#"../index_range.rs" 67 12 67 21] Slice.get ( * s2) _110 = ([#"../index_range.rs" 67 20 67 21] (3 : int32)));
     assume { resolve1 _93 };
     switch (_108)
       | False -> goto BB60
@@ -910,7 +910,7 @@ module IndexRange_TestRange
     absurd
   }
   BB61 {
-    [#"../index_range.rs" 69 12 69 26] _115 <- ([#"../index_range.rs" 69 12 69 26] _116 = (5 : usize));
+    [#"../index_range.rs" 69 12 69 26] _115 <- ([#"../index_range.rs" 69 12 69 26] _116 = ([#"../index_range.rs" 69 25 69 26] (5 : usize)));
     _116 <- any usize;
     switch (_115)
       | False -> goto BB63
@@ -918,7 +918,7 @@ module IndexRange_TestRange
       end
   }
   BB62 {
-    [#"../index_range.rs" 70 15 70 18] _122 <- ([#"../index_range.rs" 70 15 70 18] index1 arr (0 : usize));
+    [#"../index_range.rs" 70 15 70 18] _122 <- ([#"../index_range.rs" 70 15 70 18] index1 arr ([#"../index_range.rs" 70 16 70 17] (0 : usize)));
     goto BB64
   }
   BB63 {
@@ -927,14 +927,14 @@ module IndexRange_TestRange
     absurd
   }
   BB64 {
-    [#"../index_range.rs" 70 12 70 23] _120 <- ([#"../index_range.rs" 70 12 70 23] _122 = (0 : int32));
+    [#"../index_range.rs" 70 12 70 23] _120 <- ([#"../index_range.rs" 70 12 70 23] _122 = ([#"../index_range.rs" 70 22 70 23] (0 : int32)));
     switch (_120)
       | False -> goto BB66
       | True -> goto BB65
       end
   }
   BB65 {
-    [#"../index_range.rs" 71 15 71 18] _128 <- ([#"../index_range.rs" 71 15 71 18] index1 arr (1 : usize));
+    [#"../index_range.rs" 71 15 71 18] _128 <- ([#"../index_range.rs" 71 15 71 18] index1 arr ([#"../index_range.rs" 71 16 71 17] (1 : usize)));
     goto BB67
   }
   BB66 {
@@ -943,14 +943,14 @@ module IndexRange_TestRange
     absurd
   }
   BB67 {
-    [#"../index_range.rs" 71 12 71 24] _126 <- ([#"../index_range.rs" 71 12 71 24] _128 = (-1 : int32));
+    [#"../index_range.rs" 71 12 71 24] _126 <- ([#"../index_range.rs" 71 12 71 24] _128 = ([#"../index_range.rs" 71 22 71 24] (-1 : int32)));
     switch (_126)
       | False -> goto BB69
       | True -> goto BB68
       end
   }
   BB68 {
-    [#"../index_range.rs" 72 15 72 18] _134 <- ([#"../index_range.rs" 72 15 72 18] index1 arr (2 : usize));
+    [#"../index_range.rs" 72 15 72 18] _134 <- ([#"../index_range.rs" 72 15 72 18] index1 arr ([#"../index_range.rs" 72 16 72 17] (2 : usize)));
     goto BB70
   }
   BB69 {
@@ -959,14 +959,14 @@ module IndexRange_TestRange
     absurd
   }
   BB70 {
-    [#"../index_range.rs" 72 12 72 24] _132 <- ([#"../index_range.rs" 72 12 72 24] _134 = (-1 : int32));
+    [#"../index_range.rs" 72 12 72 24] _132 <- ([#"../index_range.rs" 72 12 72 24] _134 = ([#"../index_range.rs" 72 22 72 24] (-1 : int32)));
     switch (_132)
       | False -> goto BB72
       | True -> goto BB71
       end
   }
   BB71 {
-    [#"../index_range.rs" 73 15 73 18] _140 <- ([#"../index_range.rs" 73 15 73 18] index1 arr (3 : usize));
+    [#"../index_range.rs" 73 15 73 18] _140 <- ([#"../index_range.rs" 73 15 73 18] index1 arr ([#"../index_range.rs" 73 16 73 17] (3 : usize)));
     goto BB73
   }
   BB72 {
@@ -975,14 +975,14 @@ module IndexRange_TestRange
     absurd
   }
   BB73 {
-    [#"../index_range.rs" 73 12 73 23] _138 <- ([#"../index_range.rs" 73 12 73 23] _140 = (3 : int32));
+    [#"../index_range.rs" 73 12 73 23] _138 <- ([#"../index_range.rs" 73 12 73 23] _140 = ([#"../index_range.rs" 73 22 73 23] (3 : int32)));
     switch (_138)
       | False -> goto BB75
       | True -> goto BB74
       end
   }
   BB74 {
-    [#"../index_range.rs" 74 15 74 18] _146 <- ([#"../index_range.rs" 74 15 74 18] index1 arr (4 : usize));
+    [#"../index_range.rs" 74 15 74 18] _146 <- ([#"../index_range.rs" 74 15 74 18] index1 arr ([#"../index_range.rs" 74 16 74 17] (4 : usize)));
     goto BB76
   }
   BB75 {
@@ -992,14 +992,14 @@ module IndexRange_TestRange
   }
   BB76 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 74 12 74 23] _144 <- ([#"../index_range.rs" 74 12 74 23] _146 = (4 : int32));
+    [#"../index_range.rs" 74 12 74 23] _144 <- ([#"../index_range.rs" 74 12 74 23] _146 = ([#"../index_range.rs" 74 22 74 23] (4 : int32)));
     switch (_144)
       | False -> goto BB78
       | True -> goto BB77
       end
   }
   BB77 {
-    [#"../index_range.rs" 27 20 75 1] _0 <- ([#"../index_range.rs" 27 20 75 1] ());
+    [#"../index_range.rs" 27 20 75 1] _0 <- ([#"../index_range.rs" 27 20 75 1] [#"../index_range.rs" 27 20 75 1] ());
     goto BB79
   }
   BB78 {
@@ -1345,11 +1345,11 @@ module IndexRange_TestRangeTo
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 80 18 80 30] arr <- ([#"../index_range.rs" 80 18 80 30] create_arr0 ());
+    [#"../index_range.rs" 80 18 80 30] arr <- ([#"../index_range.rs" 80 18 80 30] create_arr0 ([#"../index_range.rs" 80 18 80 30] ()));
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 85 17 85 20] _5 <- ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo (2 : usize));
+    [#"../index_range.rs" 85 17 85 20] _5 <- ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 85 19 85 20] (2 : usize)));
     [#"../index_range.rs" 85 16 85 21] _3 <- ([#"../index_range.rs" 85 16 85 21] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB2
@@ -1360,7 +1360,7 @@ module IndexRange_TestRangeTo
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 86 12 86 24] _7 <- ([#"../index_range.rs" 86 12 86 24] _8 = (2 : usize));
+    [#"../index_range.rs" 86 12 86 24] _7 <- ([#"../index_range.rs" 86 12 86 24] _8 = ([#"../index_range.rs" 86 23 86 24] (2 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -1368,35 +1368,35 @@ module IndexRange_TestRangeTo
       end
   }
   BB4 {
-    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] (0 : usize));
+    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] [#"../index_range.rs" 86 30 86 31] (0 : usize));
     [#"../index_range.rs" 86 28 86 32] _13 <- ([#"../index_range.rs" 86 28 86 32] Slice.length s);
     [#"../index_range.rs" 86 28 86 32] _14 <- ([#"../index_range.rs" 86 28 86 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 28 86 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 86 28 86 37] _10 <- ([#"../index_range.rs" 86 28 86 37] Slice.get s _12 = (0 : int32));
+    [#"../index_range.rs" 86 28 86 37] _10 <- ([#"../index_range.rs" 86 28 86 37] Slice.get s _12 = ([#"../index_range.rs" 86 36 86 37] (0 : int32)));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] (1 : usize));
+    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] [#"../index_range.rs" 86 43 86 44] (1 : usize));
     [#"../index_range.rs" 86 41 86 45] _18 <- ([#"../index_range.rs" 86 41 86 45] Slice.length s);
     [#"../index_range.rs" 86 41 86 45] _19 <- ([#"../index_range.rs" 86 41 86 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 41 86 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 86 41 86 50] _15 <- ([#"../index_range.rs" 86 41 86 50] Slice.get s _17 = (1 : int32));
+    [#"../index_range.rs" 86 41 86 50] _15 <- ([#"../index_range.rs" 86 41 86 50] Slice.get s _17 = ([#"../index_range.rs" 86 49 86 50] (1 : int32)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 91 16 91 19] _27 <- ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo (0 : usize));
+    [#"../index_range.rs" 91 16 91 19] _27 <- ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 91 18 91 19] (0 : usize)));
     [#"../index_range.rs" 91 15 91 20] _25 <- ([#"../index_range.rs" 91 15 91 20] index0 arr _27);
     _27 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB13
@@ -1422,7 +1422,7 @@ module IndexRange_TestRangeTo
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 91 12 91 31] _22 <- ([#"../index_range.rs" 91 12 91 31] _23 = (0 : usize));
+    [#"../index_range.rs" 91 12 91 31] _22 <- ([#"../index_range.rs" 91 12 91 31] _23 = ([#"../index_range.rs" 91 30 91 31] (0 : usize)));
     _23 <- any usize;
     switch (_22)
       | False -> goto BB16
@@ -1439,7 +1439,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 96 20 96 23] _36 <- ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo (6 : usize));
+    [#"../index_range.rs" 96 20 96 23] _36 <- ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 96 22 96 23] (6 : usize)));
     [#"../index_range.rs" 96 12 96 24] _32 <- ([#"../index_range.rs" 96 12 96 24] get0 _34 _36);
     _36 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB18
@@ -1457,7 +1457,7 @@ module IndexRange_TestRangeTo
   BB20 {
     [#"../index_range.rs" 99 17 99 20] _40 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 99 17 99 20] arr <-  ^ _40;
-    [#"../index_range.rs" 99 21 99 24] _41 <- ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo (3 : usize));
+    [#"../index_range.rs" 99 21 99 24] _41 <- ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 99 23 99 24] (3 : usize)));
     [#"../index_range.rs" 99 20 99 25] _39 <- ([#"../index_range.rs" 99 20 99 25] index_mut0 _40 _41);
     _40 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _41 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
@@ -1475,7 +1475,7 @@ module IndexRange_TestRangeTo
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 100 12 100 24] _43 <- ([#"../index_range.rs" 100 12 100 24] _44 = (3 : usize));
+    [#"../index_range.rs" 100 12 100 24] _43 <- ([#"../index_range.rs" 100 12 100 24] _44 = ([#"../index_range.rs" 100 23 100 24] (3 : usize)));
     _44 <- any usize;
     switch (_43)
       | False -> goto BB25
@@ -1483,7 +1483,7 @@ module IndexRange_TestRangeTo
       end
   }
   BB24 {
-    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] (0 : usize));
+    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] [#"../index_range.rs" 101 6 101 7] (0 : usize));
     [#"../index_range.rs" 101 4 101 8] _48 <- ([#"../index_range.rs" 101 4 101 8] Slice.length ( * s1));
     [#"../index_range.rs" 101 4 101 8] _49 <- ([#"../index_range.rs" 101 4 101 8] _47 < _48);
     assert { [@expl:index in bounds] [#"../index_range.rs" 101 4 101 8] _49 };
@@ -1497,16 +1497,16 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] (2 : usize));
+    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] [#"../index_range.rs" 101 11 101 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] [#"../index_range.rs" 102 6 102 7] (2 : usize));
     [#"../index_range.rs" 102 4 102 8] _51 <- ([#"../index_range.rs" 102 4 102 8] Slice.length ( * s1));
     [#"../index_range.rs" 102 4 102 8] _52 <- ([#"../index_range.rs" 102 4 102 8] _50 < _51);
     assert { [@expl:index in bounds] [#"../index_range.rs" 102 4 102 8] _52 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] (1 : usize));
+    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] [#"../index_range.rs" 102 11 102 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] [#"../index_range.rs" 104 14 104 15] (1 : usize));
     [#"../index_range.rs" 104 12 104 16] _57 <- ([#"../index_range.rs" 104 12 104 16] Slice.length ( * s1));
     [#"../index_range.rs" 104 12 104 16] _58 <- ([#"../index_range.rs" 104 12 104 16] _56 < _57);
     assert { [@expl:index in bounds] [#"../index_range.rs" 104 12 104 16] _58 };
@@ -1514,7 +1514,7 @@ module IndexRange_TestRangeTo
   }
   BB28 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 104 12 104 21] _54 <- ([#"../index_range.rs" 104 12 104 21] Slice.get ( * s1) _56 = (1 : int32));
+    [#"../index_range.rs" 104 12 104 21] _54 <- ([#"../index_range.rs" 104 12 104 21] Slice.get ( * s1) _56 = ([#"../index_range.rs" 104 20 104 21] (1 : int32)));
     assume { resolve1 _39 };
     switch (_54)
       | False -> goto BB30
@@ -1531,7 +1531,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 106 12 106 26] _61 <- ([#"../index_range.rs" 106 12 106 26] _62 = (5 : usize));
+    [#"../index_range.rs" 106 12 106 26] _61 <- ([#"../index_range.rs" 106 12 106 26] _62 = ([#"../index_range.rs" 106 25 106 26] (5 : usize)));
     _62 <- any usize;
     switch (_61)
       | False -> goto BB33
@@ -1539,7 +1539,7 @@ module IndexRange_TestRangeTo
       end
   }
   BB32 {
-    [#"../index_range.rs" 107 15 107 18] _68 <- ([#"../index_range.rs" 107 15 107 18] index1 arr (0 : usize));
+    [#"../index_range.rs" 107 15 107 18] _68 <- ([#"../index_range.rs" 107 15 107 18] index1 arr ([#"../index_range.rs" 107 16 107 17] (0 : usize)));
     goto BB34
   }
   BB33 {
@@ -1548,14 +1548,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB34 {
-    [#"../index_range.rs" 107 12 107 24] _66 <- ([#"../index_range.rs" 107 12 107 24] _68 = (-1 : int32));
+    [#"../index_range.rs" 107 12 107 24] _66 <- ([#"../index_range.rs" 107 12 107 24] _68 = ([#"../index_range.rs" 107 22 107 24] (-1 : int32)));
     switch (_66)
       | False -> goto BB36
       | True -> goto BB35
       end
   }
   BB35 {
-    [#"../index_range.rs" 108 15 108 18] _74 <- ([#"../index_range.rs" 108 15 108 18] index1 arr (1 : usize));
+    [#"../index_range.rs" 108 15 108 18] _74 <- ([#"../index_range.rs" 108 15 108 18] index1 arr ([#"../index_range.rs" 108 16 108 17] (1 : usize)));
     goto BB37
   }
   BB36 {
@@ -1564,14 +1564,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 108 12 108 23] _72 <- ([#"../index_range.rs" 108 12 108 23] _74 = (1 : int32));
+    [#"../index_range.rs" 108 12 108 23] _72 <- ([#"../index_range.rs" 108 12 108 23] _74 = ([#"../index_range.rs" 108 22 108 23] (1 : int32)));
     switch (_72)
       | False -> goto BB39
       | True -> goto BB38
       end
   }
   BB38 {
-    [#"../index_range.rs" 109 15 109 18] _80 <- ([#"../index_range.rs" 109 15 109 18] index1 arr (2 : usize));
+    [#"../index_range.rs" 109 15 109 18] _80 <- ([#"../index_range.rs" 109 15 109 18] index1 arr ([#"../index_range.rs" 109 16 109 17] (2 : usize)));
     goto BB40
   }
   BB39 {
@@ -1580,14 +1580,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB40 {
-    [#"../index_range.rs" 109 12 109 24] _78 <- ([#"../index_range.rs" 109 12 109 24] _80 = (-1 : int32));
+    [#"../index_range.rs" 109 12 109 24] _78 <- ([#"../index_range.rs" 109 12 109 24] _80 = ([#"../index_range.rs" 109 22 109 24] (-1 : int32)));
     switch (_78)
       | False -> goto BB42
       | True -> goto BB41
       end
   }
   BB41 {
-    [#"../index_range.rs" 110 15 110 18] _86 <- ([#"../index_range.rs" 110 15 110 18] index1 arr (3 : usize));
+    [#"../index_range.rs" 110 15 110 18] _86 <- ([#"../index_range.rs" 110 15 110 18] index1 arr ([#"../index_range.rs" 110 16 110 17] (3 : usize)));
     goto BB43
   }
   BB42 {
@@ -1596,14 +1596,14 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB43 {
-    [#"../index_range.rs" 110 12 110 23] _84 <- ([#"../index_range.rs" 110 12 110 23] _86 = (3 : int32));
+    [#"../index_range.rs" 110 12 110 23] _84 <- ([#"../index_range.rs" 110 12 110 23] _86 = ([#"../index_range.rs" 110 22 110 23] (3 : int32)));
     switch (_84)
       | False -> goto BB45
       | True -> goto BB44
       end
   }
   BB44 {
-    [#"../index_range.rs" 111 15 111 18] _92 <- ([#"../index_range.rs" 111 15 111 18] index1 arr (4 : usize));
+    [#"../index_range.rs" 111 15 111 18] _92 <- ([#"../index_range.rs" 111 15 111 18] index1 arr ([#"../index_range.rs" 111 16 111 17] (4 : usize)));
     goto BB46
   }
   BB45 {
@@ -1613,14 +1613,14 @@ module IndexRange_TestRangeTo
   }
   BB46 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 111 12 111 23] _90 <- ([#"../index_range.rs" 111 12 111 23] _92 = (4 : int32));
+    [#"../index_range.rs" 111 12 111 23] _90 <- ([#"../index_range.rs" 111 12 111 23] _92 = ([#"../index_range.rs" 111 22 111 23] (4 : int32)));
     switch (_90)
       | False -> goto BB48
       | True -> goto BB47
       end
   }
   BB47 {
-    [#"../index_range.rs" 78 23 112 1] _0 <- ([#"../index_range.rs" 78 23 112 1] ());
+    [#"../index_range.rs" 78 23 112 1] _0 <- ([#"../index_range.rs" 78 23 112 1] [#"../index_range.rs" 78 23 112 1] ());
     goto BB49
   }
   BB48 {
@@ -1973,11 +1973,11 @@ module IndexRange_TestRangeFrom
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 117 18 117 30] arr <- ([#"../index_range.rs" 117 18 117 30] create_arr0 ());
+    [#"../index_range.rs" 117 18 117 30] arr <- ([#"../index_range.rs" 117 18 117 30] create_arr0 ([#"../index_range.rs" 117 18 117 30] ()));
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 122 17 122 20] _5 <- ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (3 : usize));
+    [#"../index_range.rs" 122 17 122 20] _5 <- ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 122 17 122 18] (3 : usize)));
     [#"../index_range.rs" 122 16 122 21] _3 <- ([#"../index_range.rs" 122 16 122 21] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB2
@@ -1988,7 +1988,7 @@ module IndexRange_TestRangeFrom
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 123 12 123 24] _7 <- ([#"../index_range.rs" 123 12 123 24] _8 = (2 : usize));
+    [#"../index_range.rs" 123 12 123 24] _7 <- ([#"../index_range.rs" 123 12 123 24] _8 = ([#"../index_range.rs" 123 23 123 24] (2 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -1996,35 +1996,35 @@ module IndexRange_TestRangeFrom
       end
   }
   BB4 {
-    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] (0 : usize));
+    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] [#"../index_range.rs" 123 30 123 31] (0 : usize));
     [#"../index_range.rs" 123 28 123 32] _13 <- ([#"../index_range.rs" 123 28 123 32] Slice.length s);
     [#"../index_range.rs" 123 28 123 32] _14 <- ([#"../index_range.rs" 123 28 123 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 28 123 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 123 28 123 37] _10 <- ([#"../index_range.rs" 123 28 123 37] Slice.get s _12 = (3 : int32));
+    [#"../index_range.rs" 123 28 123 37] _10 <- ([#"../index_range.rs" 123 28 123 37] Slice.get s _12 = ([#"../index_range.rs" 123 36 123 37] (3 : int32)));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] (1 : usize));
+    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] [#"../index_range.rs" 123 43 123 44] (1 : usize));
     [#"../index_range.rs" 123 41 123 45] _18 <- ([#"../index_range.rs" 123 41 123 45] Slice.length s);
     [#"../index_range.rs" 123 41 123 45] _19 <- ([#"../index_range.rs" 123 41 123 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 41 123 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 123 41 123 50] _15 <- ([#"../index_range.rs" 123 41 123 50] Slice.get s _17 = (4 : int32));
+    [#"../index_range.rs" 123 41 123 50] _15 <- ([#"../index_range.rs" 123 41 123 50] Slice.get s _17 = ([#"../index_range.rs" 123 49 123 50] (4 : int32)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 128 16 128 19] _27 <- ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (5 : usize));
+    [#"../index_range.rs" 128 16 128 19] _27 <- ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 128 16 128 17] (5 : usize)));
     [#"../index_range.rs" 128 15 128 20] _25 <- ([#"../index_range.rs" 128 15 128 20] index0 arr _27);
     _27 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB13
@@ -2050,7 +2050,7 @@ module IndexRange_TestRangeFrom
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 128 12 128 31] _22 <- ([#"../index_range.rs" 128 12 128 31] _23 = (0 : usize));
+    [#"../index_range.rs" 128 12 128 31] _22 <- ([#"../index_range.rs" 128 12 128 31] _23 = ([#"../index_range.rs" 128 30 128 31] (0 : usize)));
     _23 <- any usize;
     switch (_22)
       | False -> goto BB16
@@ -2067,7 +2067,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 133 20 133 23] _36 <- ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (6 : usize));
+    [#"../index_range.rs" 133 20 133 23] _36 <- ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 133 20 133 21] (6 : usize)));
     [#"../index_range.rs" 133 12 133 24] _32 <- ([#"../index_range.rs" 133 12 133 24] get0 _34 _36);
     _36 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB18
@@ -2092,7 +2092,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 135 20 135 24] _45 <- ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (10 : usize));
+    [#"../index_range.rs" 135 20 135 24] _45 <- ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 135 20 135 22] (10 : usize)));
     [#"../index_range.rs" 135 12 135 25] _41 <- ([#"../index_range.rs" 135 12 135 25] get0 _43 _45);
     _45 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB23
@@ -2110,7 +2110,7 @@ module IndexRange_TestRangeFrom
   BB25 {
     [#"../index_range.rs" 138 17 138 20] _49 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 138 17 138 20] arr <-  ^ _49;
-    [#"../index_range.rs" 138 21 138 24] _50 <- ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (2 : usize));
+    [#"../index_range.rs" 138 21 138 24] _50 <- ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 138 21 138 22] (2 : usize)));
     [#"../index_range.rs" 138 20 138 25] _48 <- ([#"../index_range.rs" 138 20 138 25] index_mut0 _49 _50);
     _49 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _50 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
@@ -2128,7 +2128,7 @@ module IndexRange_TestRangeFrom
     goto BB28
   }
   BB28 {
-    [#"../index_range.rs" 139 12 139 24] _52 <- ([#"../index_range.rs" 139 12 139 24] _53 = (3 : usize));
+    [#"../index_range.rs" 139 12 139 24] _52 <- ([#"../index_range.rs" 139 12 139 24] _53 = ([#"../index_range.rs" 139 23 139 24] (3 : usize)));
     _53 <- any usize;
     switch (_52)
       | False -> goto BB30
@@ -2136,7 +2136,7 @@ module IndexRange_TestRangeFrom
       end
   }
   BB29 {
-    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] (0 : usize));
+    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] [#"../index_range.rs" 140 6 140 7] (0 : usize));
     [#"../index_range.rs" 140 4 140 8] _57 <- ([#"../index_range.rs" 140 4 140 8] Slice.length ( * s1));
     [#"../index_range.rs" 140 4 140 8] _58 <- ([#"../index_range.rs" 140 4 140 8] _56 < _57);
     assert { [@expl:index in bounds] [#"../index_range.rs" 140 4 140 8] _58 };
@@ -2150,16 +2150,16 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] (1 : usize));
+    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] [#"../index_range.rs" 140 11 140 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] [#"../index_range.rs" 141 6 141 7] (1 : usize));
     [#"../index_range.rs" 141 4 141 8] _60 <- ([#"../index_range.rs" 141 4 141 8] Slice.length ( * s1));
     [#"../index_range.rs" 141 4 141 8] _61 <- ([#"../index_range.rs" 141 4 141 8] _59 < _60);
     assert { [@expl:index in bounds] [#"../index_range.rs" 141 4 141 8] _61 };
     goto BB32
   }
   BB32 {
-    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] (2 : usize));
+    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] [#"../index_range.rs" 141 11 141 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] [#"../index_range.rs" 143 14 143 15] (2 : usize));
     [#"../index_range.rs" 143 12 143 16] _66 <- ([#"../index_range.rs" 143 12 143 16] Slice.length ( * s1));
     [#"../index_range.rs" 143 12 143 16] _67 <- ([#"../index_range.rs" 143 12 143 16] _65 < _66);
     assert { [@expl:index in bounds] [#"../index_range.rs" 143 12 143 16] _67 };
@@ -2167,7 +2167,7 @@ module IndexRange_TestRangeFrom
   }
   BB33 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 143 12 143 21] _63 <- ([#"../index_range.rs" 143 12 143 21] Slice.get ( * s1) _65 = (4 : int32));
+    [#"../index_range.rs" 143 12 143 21] _63 <- ([#"../index_range.rs" 143 12 143 21] Slice.get ( * s1) _65 = ([#"../index_range.rs" 143 20 143 21] (4 : int32)));
     assume { resolve1 _48 };
     switch (_63)
       | False -> goto BB35
@@ -2184,7 +2184,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB36 {
-    [#"../index_range.rs" 145 12 145 26] _70 <- ([#"../index_range.rs" 145 12 145 26] _71 = (5 : usize));
+    [#"../index_range.rs" 145 12 145 26] _70 <- ([#"../index_range.rs" 145 12 145 26] _71 = ([#"../index_range.rs" 145 25 145 26] (5 : usize)));
     _71 <- any usize;
     switch (_70)
       | False -> goto BB38
@@ -2192,7 +2192,7 @@ module IndexRange_TestRangeFrom
       end
   }
   BB37 {
-    [#"../index_range.rs" 146 15 146 18] _77 <- ([#"../index_range.rs" 146 15 146 18] index1 arr (0 : usize));
+    [#"../index_range.rs" 146 15 146 18] _77 <- ([#"../index_range.rs" 146 15 146 18] index1 arr ([#"../index_range.rs" 146 16 146 17] (0 : usize)));
     goto BB39
   }
   BB38 {
@@ -2201,14 +2201,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB39 {
-    [#"../index_range.rs" 146 12 146 23] _75 <- ([#"../index_range.rs" 146 12 146 23] _77 = (0 : int32));
+    [#"../index_range.rs" 146 12 146 23] _75 <- ([#"../index_range.rs" 146 12 146 23] _77 = ([#"../index_range.rs" 146 22 146 23] (0 : int32)));
     switch (_75)
       | False -> goto BB41
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../index_range.rs" 147 15 147 18] _83 <- ([#"../index_range.rs" 147 15 147 18] index1 arr (1 : usize));
+    [#"../index_range.rs" 147 15 147 18] _83 <- ([#"../index_range.rs" 147 15 147 18] index1 arr ([#"../index_range.rs" 147 16 147 17] (1 : usize)));
     goto BB42
   }
   BB41 {
@@ -2217,14 +2217,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB42 {
-    [#"../index_range.rs" 147 12 147 23] _81 <- ([#"../index_range.rs" 147 12 147 23] _83 = (1 : int32));
+    [#"../index_range.rs" 147 12 147 23] _81 <- ([#"../index_range.rs" 147 12 147 23] _83 = ([#"../index_range.rs" 147 22 147 23] (1 : int32)));
     switch (_81)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../index_range.rs" 148 15 148 18] _89 <- ([#"../index_range.rs" 148 15 148 18] index1 arr (2 : usize));
+    [#"../index_range.rs" 148 15 148 18] _89 <- ([#"../index_range.rs" 148 15 148 18] index1 arr ([#"../index_range.rs" 148 16 148 17] (2 : usize)));
     goto BB45
   }
   BB44 {
@@ -2233,14 +2233,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB45 {
-    [#"../index_range.rs" 148 12 148 24] _87 <- ([#"../index_range.rs" 148 12 148 24] _89 = (-1 : int32));
+    [#"../index_range.rs" 148 12 148 24] _87 <- ([#"../index_range.rs" 148 12 148 24] _89 = ([#"../index_range.rs" 148 22 148 24] (-1 : int32)));
     switch (_87)
       | False -> goto BB47
       | True -> goto BB46
       end
   }
   BB46 {
-    [#"../index_range.rs" 149 15 149 18] _95 <- ([#"../index_range.rs" 149 15 149 18] index1 arr (3 : usize));
+    [#"../index_range.rs" 149 15 149 18] _95 <- ([#"../index_range.rs" 149 15 149 18] index1 arr ([#"../index_range.rs" 149 16 149 17] (3 : usize)));
     goto BB48
   }
   BB47 {
@@ -2249,14 +2249,14 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB48 {
-    [#"../index_range.rs" 149 12 149 24] _93 <- ([#"../index_range.rs" 149 12 149 24] _95 = (-1 : int32));
+    [#"../index_range.rs" 149 12 149 24] _93 <- ([#"../index_range.rs" 149 12 149 24] _95 = ([#"../index_range.rs" 149 22 149 24] (-1 : int32)));
     switch (_93)
       | False -> goto BB50
       | True -> goto BB49
       end
   }
   BB49 {
-    [#"../index_range.rs" 150 15 150 18] _101 <- ([#"../index_range.rs" 150 15 150 18] index1 arr (4 : usize));
+    [#"../index_range.rs" 150 15 150 18] _101 <- ([#"../index_range.rs" 150 15 150 18] index1 arr ([#"../index_range.rs" 150 16 150 17] (4 : usize)));
     goto BB51
   }
   BB50 {
@@ -2266,14 +2266,14 @@ module IndexRange_TestRangeFrom
   }
   BB51 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 150 12 150 23] _99 <- ([#"../index_range.rs" 150 12 150 23] _101 = (4 : int32));
+    [#"../index_range.rs" 150 12 150 23] _99 <- ([#"../index_range.rs" 150 12 150 23] _101 = ([#"../index_range.rs" 150 22 150 23] (4 : int32)));
     switch (_99)
       | False -> goto BB53
       | True -> goto BB52
       end
   }
   BB52 {
-    [#"../index_range.rs" 115 25 151 1] _0 <- ([#"../index_range.rs" 115 25 151 1] ());
+    [#"../index_range.rs" 115 25 151 1] _0 <- ([#"../index_range.rs" 115 25 151 1] [#"../index_range.rs" 115 25 151 1] ());
     goto BB54
   }
   BB53 {
@@ -2578,7 +2578,7 @@ module IndexRange_TestRangeFull
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 156 18 156 30] arr <- ([#"../index_range.rs" 156 18 156 30] create_arr0 ());
+    [#"../index_range.rs" 156 18 156 30] arr <- ([#"../index_range.rs" 156 18 156 30] create_arr0 ([#"../index_range.rs" 156 18 156 30] ()));
     goto BB1
   }
   BB1 {
@@ -2593,7 +2593,7 @@ module IndexRange_TestRangeFull
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 162 12 162 24] _7 <- ([#"../index_range.rs" 162 12 162 24] _8 = (5 : usize));
+    [#"../index_range.rs" 162 12 162 24] _7 <- ([#"../index_range.rs" 162 12 162 24] _8 = ([#"../index_range.rs" 162 23 162 24] (5 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB20
@@ -2601,70 +2601,70 @@ module IndexRange_TestRangeFull
       end
   }
   BB4 {
-    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] (0 : usize));
+    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] [#"../index_range.rs" 162 30 162 31] (0 : usize));
     [#"../index_range.rs" 162 28 162 32] _13 <- ([#"../index_range.rs" 162 28 162 32] Slice.length s);
     [#"../index_range.rs" 162 28 162 32] _14 <- ([#"../index_range.rs" 162 28 162 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 28 162 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 162 28 162 37] _10 <- ([#"../index_range.rs" 162 28 162 37] Slice.get s _12 = (0 : int32));
+    [#"../index_range.rs" 162 28 162 37] _10 <- ([#"../index_range.rs" 162 28 162 37] Slice.get s _12 = ([#"../index_range.rs" 162 36 162 37] (0 : int32)));
     switch (_10)
       | False -> goto BB19
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] (1 : usize));
+    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] [#"../index_range.rs" 162 43 162 44] (1 : usize));
     [#"../index_range.rs" 162 41 162 45] _18 <- ([#"../index_range.rs" 162 41 162 45] Slice.length s);
     [#"../index_range.rs" 162 41 162 45] _19 <- ([#"../index_range.rs" 162 41 162 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 41 162 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 162 41 162 50] _15 <- ([#"../index_range.rs" 162 41 162 50] Slice.get s _17 = (1 : int32));
+    [#"../index_range.rs" 162 41 162 50] _15 <- ([#"../index_range.rs" 162 41 162 50] Slice.get s _17 = ([#"../index_range.rs" 162 49 162 50] (1 : int32)));
     switch (_15)
       | False -> goto BB18
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] (2 : usize));
+    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] [#"../index_range.rs" 162 56 162 57] (2 : usize));
     [#"../index_range.rs" 162 54 162 58] _23 <- ([#"../index_range.rs" 162 54 162 58] Slice.length s);
     [#"../index_range.rs" 162 54 162 58] _24 <- ([#"../index_range.rs" 162 54 162 58] _22 < _23);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 54 162 58] _24 };
     goto BB9
   }
   BB9 {
-    [#"../index_range.rs" 162 54 162 63] _20 <- ([#"../index_range.rs" 162 54 162 63] Slice.get s _22 = (2 : int32));
+    [#"../index_range.rs" 162 54 162 63] _20 <- ([#"../index_range.rs" 162 54 162 63] Slice.get s _22 = ([#"../index_range.rs" 162 62 162 63] (2 : int32)));
     switch (_20)
       | False -> goto BB17
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] (3 : usize));
+    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] [#"../index_range.rs" 162 69 162 70] (3 : usize));
     [#"../index_range.rs" 162 67 162 71] _28 <- ([#"../index_range.rs" 162 67 162 71] Slice.length s);
     [#"../index_range.rs" 162 67 162 71] _29 <- ([#"../index_range.rs" 162 67 162 71] _27 < _28);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 67 162 71] _29 };
     goto BB11
   }
   BB11 {
-    [#"../index_range.rs" 162 67 162 76] _25 <- ([#"../index_range.rs" 162 67 162 76] Slice.get s _27 = (3 : int32));
+    [#"../index_range.rs" 162 67 162 76] _25 <- ([#"../index_range.rs" 162 67 162 76] Slice.get s _27 = ([#"../index_range.rs" 162 75 162 76] (3 : int32)));
     switch (_25)
       | False -> goto BB16
       | True -> goto BB12
       end
   }
   BB12 {
-    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] (4 : usize));
+    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] [#"../index_range.rs" 162 82 162 83] (4 : usize));
     [#"../index_range.rs" 162 80 162 84] _33 <- ([#"../index_range.rs" 162 80 162 84] Slice.length s);
     [#"../index_range.rs" 162 80 162 84] _34 <- ([#"../index_range.rs" 162 80 162 84] _32 < _33);
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 80 162 84] _34 };
     goto BB13
   }
   BB13 {
-    [#"../index_range.rs" 162 80 162 89] _30 <- ([#"../index_range.rs" 162 80 162 89] Slice.get s _32 = (4 : int32));
+    [#"../index_range.rs" 162 80 162 89] _30 <- ([#"../index_range.rs" 162 80 162 89] Slice.get s _32 = ([#"../index_range.rs" 162 88 162 89] (4 : int32)));
     switch (_30)
       | False -> goto BB15
       | True -> goto BB14
@@ -2714,7 +2714,7 @@ module IndexRange_TestRangeFull
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 166 12 166 24] _41 <- ([#"../index_range.rs" 166 12 166 24] _42 = (5 : usize));
+    [#"../index_range.rs" 166 12 166 24] _41 <- ([#"../index_range.rs" 166 12 166 24] _42 = ([#"../index_range.rs" 166 23 166 24] (5 : usize)));
     _42 <- any usize;
     switch (_41)
       | False -> goto BB25
@@ -2722,7 +2722,7 @@ module IndexRange_TestRangeFull
       end
   }
   BB24 {
-    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] (1 : usize));
+    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] [#"../index_range.rs" 167 6 167 7] (1 : usize));
     [#"../index_range.rs" 167 4 167 8] _46 <- ([#"../index_range.rs" 167 4 167 8] Slice.length ( * s1));
     [#"../index_range.rs" 167 4 167 8] _47 <- ([#"../index_range.rs" 167 4 167 8] _45 < _46);
     assert { [@expl:index in bounds] [#"../index_range.rs" 167 4 167 8] _47 };
@@ -2736,22 +2736,22 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] (3 : usize));
+    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] [#"../index_range.rs" 167 11 167 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] [#"../index_range.rs" 168 6 168 7] (3 : usize));
     [#"../index_range.rs" 168 4 168 8] _49 <- ([#"../index_range.rs" 168 4 168 8] Slice.length ( * s1));
     [#"../index_range.rs" 168 4 168 8] _50 <- ([#"../index_range.rs" 168 4 168 8] _48 < _49);
     assert { [@expl:index in bounds] [#"../index_range.rs" 168 4 168 8] _50 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] [#"../index_range.rs" 168 11 168 13] (-1 : int32)) ; };
     assume { resolve1 s1 };
     assume { resolve1 _37 };
     [#"../index_range.rs" 170 12 170 21] _53 <- ([#"../index_range.rs" 170 12 170 21] len1 arr);
     goto BB28
   }
   BB28 {
-    [#"../index_range.rs" 170 12 170 26] _52 <- ([#"../index_range.rs" 170 12 170 26] _53 = (5 : usize));
+    [#"../index_range.rs" 170 12 170 26] _52 <- ([#"../index_range.rs" 170 12 170 26] _53 = ([#"../index_range.rs" 170 25 170 26] (5 : usize)));
     _53 <- any usize;
     switch (_52)
       | False -> goto BB30
@@ -2759,7 +2759,7 @@ module IndexRange_TestRangeFull
       end
   }
   BB29 {
-    [#"../index_range.rs" 171 15 171 18] _59 <- ([#"../index_range.rs" 171 15 171 18] index1 arr (0 : usize));
+    [#"../index_range.rs" 171 15 171 18] _59 <- ([#"../index_range.rs" 171 15 171 18] index1 arr ([#"../index_range.rs" 171 16 171 17] (0 : usize)));
     goto BB31
   }
   BB30 {
@@ -2768,14 +2768,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 171 12 171 23] _57 <- ([#"../index_range.rs" 171 12 171 23] _59 = (0 : int32));
+    [#"../index_range.rs" 171 12 171 23] _57 <- ([#"../index_range.rs" 171 12 171 23] _59 = ([#"../index_range.rs" 171 22 171 23] (0 : int32)));
     switch (_57)
       | False -> goto BB33
       | True -> goto BB32
       end
   }
   BB32 {
-    [#"../index_range.rs" 172 15 172 18] _65 <- ([#"../index_range.rs" 172 15 172 18] index1 arr (1 : usize));
+    [#"../index_range.rs" 172 15 172 18] _65 <- ([#"../index_range.rs" 172 15 172 18] index1 arr ([#"../index_range.rs" 172 16 172 17] (1 : usize)));
     goto BB34
   }
   BB33 {
@@ -2784,14 +2784,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB34 {
-    [#"../index_range.rs" 172 12 172 24] _63 <- ([#"../index_range.rs" 172 12 172 24] _65 = (-1 : int32));
+    [#"../index_range.rs" 172 12 172 24] _63 <- ([#"../index_range.rs" 172 12 172 24] _65 = ([#"../index_range.rs" 172 22 172 24] (-1 : int32)));
     switch (_63)
       | False -> goto BB36
       | True -> goto BB35
       end
   }
   BB35 {
-    [#"../index_range.rs" 173 15 173 18] _71 <- ([#"../index_range.rs" 173 15 173 18] index1 arr (2 : usize));
+    [#"../index_range.rs" 173 15 173 18] _71 <- ([#"../index_range.rs" 173 15 173 18] index1 arr ([#"../index_range.rs" 173 16 173 17] (2 : usize)));
     goto BB37
   }
   BB36 {
@@ -2800,14 +2800,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 173 12 173 23] _69 <- ([#"../index_range.rs" 173 12 173 23] _71 = (2 : int32));
+    [#"../index_range.rs" 173 12 173 23] _69 <- ([#"../index_range.rs" 173 12 173 23] _71 = ([#"../index_range.rs" 173 22 173 23] (2 : int32)));
     switch (_69)
       | False -> goto BB39
       | True -> goto BB38
       end
   }
   BB38 {
-    [#"../index_range.rs" 174 15 174 18] _77 <- ([#"../index_range.rs" 174 15 174 18] index1 arr (3 : usize));
+    [#"../index_range.rs" 174 15 174 18] _77 <- ([#"../index_range.rs" 174 15 174 18] index1 arr ([#"../index_range.rs" 174 16 174 17] (3 : usize)));
     goto BB40
   }
   BB39 {
@@ -2816,14 +2816,14 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB40 {
-    [#"../index_range.rs" 174 12 174 24] _75 <- ([#"../index_range.rs" 174 12 174 24] _77 = (-1 : int32));
+    [#"../index_range.rs" 174 12 174 24] _75 <- ([#"../index_range.rs" 174 12 174 24] _77 = ([#"../index_range.rs" 174 22 174 24] (-1 : int32)));
     switch (_75)
       | False -> goto BB42
       | True -> goto BB41
       end
   }
   BB41 {
-    [#"../index_range.rs" 175 15 175 18] _83 <- ([#"../index_range.rs" 175 15 175 18] index1 arr (4 : usize));
+    [#"../index_range.rs" 175 15 175 18] _83 <- ([#"../index_range.rs" 175 15 175 18] index1 arr ([#"../index_range.rs" 175 16 175 17] (4 : usize)));
     goto BB43
   }
   BB42 {
@@ -2833,14 +2833,14 @@ module IndexRange_TestRangeFull
   }
   BB43 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 175 12 175 23] _81 <- ([#"../index_range.rs" 175 12 175 23] _83 = (4 : int32));
+    [#"../index_range.rs" 175 12 175 23] _81 <- ([#"../index_range.rs" 175 12 175 23] _83 = ([#"../index_range.rs" 175 22 175 23] (4 : int32)));
     switch (_81)
       | False -> goto BB45
       | True -> goto BB44
       end
   }
   BB44 {
-    [#"../index_range.rs" 154 25 176 1] _0 <- ([#"../index_range.rs" 154 25 176 1] ());
+    [#"../index_range.rs" 154 25 176 1] _0 <- ([#"../index_range.rs" 154 25 176 1] [#"../index_range.rs" 154 25 176 1] ());
     goto BB46
   }
   BB45 {
@@ -3185,11 +3185,11 @@ module IndexRange_TestRangeToInclusive
     goto BB0
   }
   BB0 {
-    [#"../index_range.rs" 181 18 181 30] arr <- ([#"../index_range.rs" 181 18 181 30] create_arr0 ());
+    [#"../index_range.rs" 181 18 181 30] arr <- ([#"../index_range.rs" 181 18 181 30] create_arr0 ([#"../index_range.rs" 181 18 181 30] ()));
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 186 17 186 21] _5 <- ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (1 : usize));
+    [#"../index_range.rs" 186 17 186 21] _5 <- ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 186 20 186 21] (1 : usize)));
     [#"../index_range.rs" 186 16 186 22] _3 <- ([#"../index_range.rs" 186 16 186 22] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB2
@@ -3200,7 +3200,7 @@ module IndexRange_TestRangeToInclusive
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 187 12 187 24] _7 <- ([#"../index_range.rs" 187 12 187 24] _8 = (2 : usize));
+    [#"../index_range.rs" 187 12 187 24] _7 <- ([#"../index_range.rs" 187 12 187 24] _8 = ([#"../index_range.rs" 187 23 187 24] (2 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -3208,28 +3208,28 @@ module IndexRange_TestRangeToInclusive
       end
   }
   BB4 {
-    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] (0 : usize));
+    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] [#"../index_range.rs" 187 30 187 31] (0 : usize));
     [#"../index_range.rs" 187 28 187 32] _13 <- ([#"../index_range.rs" 187 28 187 32] Slice.length s);
     [#"../index_range.rs" 187 28 187 32] _14 <- ([#"../index_range.rs" 187 28 187 32] _12 < _13);
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 28 187 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 187 28 187 37] _10 <- ([#"../index_range.rs" 187 28 187 37] Slice.get s _12 = (0 : int32));
+    [#"../index_range.rs" 187 28 187 37] _10 <- ([#"../index_range.rs" 187 28 187 37] Slice.get s _12 = ([#"../index_range.rs" 187 36 187 37] (0 : int32)));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] (1 : usize));
+    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] [#"../index_range.rs" 187 43 187 44] (1 : usize));
     [#"../index_range.rs" 187 41 187 45] _18 <- ([#"../index_range.rs" 187 41 187 45] Slice.length s);
     [#"../index_range.rs" 187 41 187 45] _19 <- ([#"../index_range.rs" 187 41 187 45] _17 < _18);
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 41 187 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 187 41 187 50] _15 <- ([#"../index_range.rs" 187 41 187 50] Slice.get s _17 = (1 : int32));
+    [#"../index_range.rs" 187 41 187 50] _15 <- ([#"../index_range.rs" 187 41 187 50] Slice.get s _17 = ([#"../index_range.rs" 187 49 187 50] (1 : int32)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
@@ -3256,7 +3256,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 192 20 192 24] _28 <- ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (5 : usize));
+    [#"../index_range.rs" 192 20 192 24] _28 <- ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 192 23 192 24] (5 : usize)));
     [#"../index_range.rs" 192 12 192 25] _24 <- ([#"../index_range.rs" 192 12 192 25] get0 _26 _28);
     _28 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB14
@@ -3274,7 +3274,7 @@ module IndexRange_TestRangeToInclusive
   BB16 {
     [#"../index_range.rs" 195 17 195 20] _32 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 195 17 195 20] arr <-  ^ _32;
-    [#"../index_range.rs" 195 21 195 25] _33 <- ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (2 : usize));
+    [#"../index_range.rs" 195 21 195 25] _33 <- ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 195 24 195 25] (2 : usize)));
     [#"../index_range.rs" 195 20 195 26] _31 <- ([#"../index_range.rs" 195 20 195 26] index_mut0 _32 _33);
     _32 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _33 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
@@ -3292,7 +3292,7 @@ module IndexRange_TestRangeToInclusive
     goto BB19
   }
   BB19 {
-    [#"../index_range.rs" 196 12 196 24] _35 <- ([#"../index_range.rs" 196 12 196 24] _36 = (3 : usize));
+    [#"../index_range.rs" 196 12 196 24] _35 <- ([#"../index_range.rs" 196 12 196 24] _36 = ([#"../index_range.rs" 196 23 196 24] (3 : usize)));
     _36 <- any usize;
     switch (_35)
       | False -> goto BB21
@@ -3300,7 +3300,7 @@ module IndexRange_TestRangeToInclusive
       end
   }
   BB20 {
-    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] (0 : usize));
+    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] [#"../index_range.rs" 197 6 197 7] (0 : usize));
     [#"../index_range.rs" 197 4 197 8] _40 <- ([#"../index_range.rs" 197 4 197 8] Slice.length ( * s1));
     [#"../index_range.rs" 197 4 197 8] _41 <- ([#"../index_range.rs" 197 4 197 8] _39 < _40);
     assert { [@expl:index in bounds] [#"../index_range.rs" 197 4 197 8] _41 };
@@ -3314,16 +3314,16 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] (2 : usize));
+    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] [#"../index_range.rs" 197 11 197 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] [#"../index_range.rs" 198 6 198 7] (2 : usize));
     [#"../index_range.rs" 198 4 198 8] _43 <- ([#"../index_range.rs" 198 4 198 8] Slice.length ( * s1));
     [#"../index_range.rs" 198 4 198 8] _44 <- ([#"../index_range.rs" 198 4 198 8] _42 < _43);
     assert { [@expl:index in bounds] [#"../index_range.rs" 198 4 198 8] _44 };
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] (1 : usize));
+    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] [#"../index_range.rs" 198 11 198 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] [#"../index_range.rs" 200 14 200 15] (1 : usize));
     [#"../index_range.rs" 200 12 200 16] _49 <- ([#"../index_range.rs" 200 12 200 16] Slice.length ( * s1));
     [#"../index_range.rs" 200 12 200 16] _50 <- ([#"../index_range.rs" 200 12 200 16] _48 < _49);
     assert { [@expl:index in bounds] [#"../index_range.rs" 200 12 200 16] _50 };
@@ -3331,7 +3331,7 @@ module IndexRange_TestRangeToInclusive
   }
   BB24 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 200 12 200 21] _46 <- ([#"../index_range.rs" 200 12 200 21] Slice.get ( * s1) _48 = (1 : int32));
+    [#"../index_range.rs" 200 12 200 21] _46 <- ([#"../index_range.rs" 200 12 200 21] Slice.get ( * s1) _48 = ([#"../index_range.rs" 200 20 200 21] (1 : int32)));
     assume { resolve1 _31 };
     switch (_46)
       | False -> goto BB26
@@ -3348,7 +3348,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB27 {
-    [#"../index_range.rs" 202 12 202 26] _53 <- ([#"../index_range.rs" 202 12 202 26] _54 = (5 : usize));
+    [#"../index_range.rs" 202 12 202 26] _53 <- ([#"../index_range.rs" 202 12 202 26] _54 = ([#"../index_range.rs" 202 25 202 26] (5 : usize)));
     _54 <- any usize;
     switch (_53)
       | False -> goto BB29
@@ -3356,7 +3356,7 @@ module IndexRange_TestRangeToInclusive
       end
   }
   BB28 {
-    [#"../index_range.rs" 203 15 203 18] _60 <- ([#"../index_range.rs" 203 15 203 18] index1 arr (0 : usize));
+    [#"../index_range.rs" 203 15 203 18] _60 <- ([#"../index_range.rs" 203 15 203 18] index1 arr ([#"../index_range.rs" 203 16 203 17] (0 : usize)));
     goto BB30
   }
   BB29 {
@@ -3365,14 +3365,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB30 {
-    [#"../index_range.rs" 203 12 203 24] _58 <- ([#"../index_range.rs" 203 12 203 24] _60 = (-1 : int32));
+    [#"../index_range.rs" 203 12 203 24] _58 <- ([#"../index_range.rs" 203 12 203 24] _60 = ([#"../index_range.rs" 203 22 203 24] (-1 : int32)));
     switch (_58)
       | False -> goto BB32
       | True -> goto BB31
       end
   }
   BB31 {
-    [#"../index_range.rs" 204 15 204 18] _66 <- ([#"../index_range.rs" 204 15 204 18] index1 arr (1 : usize));
+    [#"../index_range.rs" 204 15 204 18] _66 <- ([#"../index_range.rs" 204 15 204 18] index1 arr ([#"../index_range.rs" 204 16 204 17] (1 : usize)));
     goto BB33
   }
   BB32 {
@@ -3381,14 +3381,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB33 {
-    [#"../index_range.rs" 204 12 204 23] _64 <- ([#"../index_range.rs" 204 12 204 23] _66 = (1 : int32));
+    [#"../index_range.rs" 204 12 204 23] _64 <- ([#"../index_range.rs" 204 12 204 23] _66 = ([#"../index_range.rs" 204 22 204 23] (1 : int32)));
     switch (_64)
       | False -> goto BB35
       | True -> goto BB34
       end
   }
   BB34 {
-    [#"../index_range.rs" 205 15 205 18] _72 <- ([#"../index_range.rs" 205 15 205 18] index1 arr (2 : usize));
+    [#"../index_range.rs" 205 15 205 18] _72 <- ([#"../index_range.rs" 205 15 205 18] index1 arr ([#"../index_range.rs" 205 16 205 17] (2 : usize)));
     goto BB36
   }
   BB35 {
@@ -3397,14 +3397,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB36 {
-    [#"../index_range.rs" 205 12 205 24] _70 <- ([#"../index_range.rs" 205 12 205 24] _72 = (-1 : int32));
+    [#"../index_range.rs" 205 12 205 24] _70 <- ([#"../index_range.rs" 205 12 205 24] _72 = ([#"../index_range.rs" 205 22 205 24] (-1 : int32)));
     switch (_70)
       | False -> goto BB38
       | True -> goto BB37
       end
   }
   BB37 {
-    [#"../index_range.rs" 206 15 206 18] _78 <- ([#"../index_range.rs" 206 15 206 18] index1 arr (3 : usize));
+    [#"../index_range.rs" 206 15 206 18] _78 <- ([#"../index_range.rs" 206 15 206 18] index1 arr ([#"../index_range.rs" 206 16 206 17] (3 : usize)));
     goto BB39
   }
   BB38 {
@@ -3413,14 +3413,14 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB39 {
-    [#"../index_range.rs" 206 12 206 23] _76 <- ([#"../index_range.rs" 206 12 206 23] _78 = (3 : int32));
+    [#"../index_range.rs" 206 12 206 23] _76 <- ([#"../index_range.rs" 206 12 206 23] _78 = ([#"../index_range.rs" 206 22 206 23] (3 : int32)));
     switch (_76)
       | False -> goto BB41
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../index_range.rs" 207 15 207 18] _84 <- ([#"../index_range.rs" 207 15 207 18] index1 arr (4 : usize));
+    [#"../index_range.rs" 207 15 207 18] _84 <- ([#"../index_range.rs" 207 15 207 18] index1 arr ([#"../index_range.rs" 207 16 207 17] (4 : usize)));
     goto BB42
   }
   BB41 {
@@ -3430,14 +3430,14 @@ module IndexRange_TestRangeToInclusive
   }
   BB42 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 207 12 207 23] _82 <- ([#"../index_range.rs" 207 12 207 23] _84 = (4 : int32));
+    [#"../index_range.rs" 207 12 207 23] _82 <- ([#"../index_range.rs" 207 12 207 23] _84 = ([#"../index_range.rs" 207 22 207 23] (4 : int32)));
     switch (_82)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../index_range.rs" 179 33 208 1] _0 <- ([#"../index_range.rs" 179 33 208 1] ());
+    [#"../index_range.rs" 179 33 208 1] _0 <- ([#"../index_range.rs" 179 33 208 1] [#"../index_range.rs" 179 33 208 1] ());
     goto BB45
   }
   BB44 {
diff --git a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
index bd092d55a1..1faa54ed21 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
+++ b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
@@ -187,7 +187,7 @@ module InplaceListReversal_Rev
     goto BB23
   }
   BB23 {
-    [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- ([#"../inplace_list_reversal.rs" 24 31 36 1] ());
+    [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- ([#"../inplace_list_reversal.rs" 24 31 36 1] [#"../inplace_list_reversal.rs" 24 31 36 1] ());
     goto BB24
   }
   BB24 {
diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg
index 86a7c76238..f1b83118ea 100644
--- a/creusot/tests/should_succeed/instant.mlcfg
+++ b/creusot/tests/should_succeed/instant.mlcfg
@@ -463,11 +463,11 @@ module Instant_TestInstant
     goto BB0
   }
   BB0 {
-    [#"../instant.rs" 8 18 8 32] instant <- ([#"../instant.rs" 8 18 8 32] now0 ());
+    [#"../instant.rs" 8 18 8 32] instant <- ([#"../instant.rs" 8 18 8 32] now0 ([#"../instant.rs" 8 18 8 32] ()));
     goto BB1
   }
   BB1 {
-    [#"../instant.rs" 9 19 9 41] zero_dur <- ([#"../instant.rs" 9 19 9 41] from_secs0 (0 : uint64));
+    [#"../instant.rs" 9 19 9 41] zero_dur <- ([#"../instant.rs" 9 19 9 41] from_secs0 ([#"../instant.rs" 9 39 9 40] (0 : uint64)));
     goto BB2
   }
   BB2 {
@@ -526,7 +526,7 @@ module Instant_TestInstant
       end
   }
   BB14 {
-    [#"../instant.rs" 14 24 14 46] three_seconds <- ([#"../instant.rs" 14 24 14 46] from_secs0 (3 : uint64));
+    [#"../instant.rs" 14 24 14 46] three_seconds <- ([#"../instant.rs" 14 24 14 46] from_secs0 ([#"../instant.rs" 14 44 14 45] (3 : uint64)));
     goto BB16
   }
   BB15 {
@@ -748,7 +748,7 @@ module Instant_TestInstant
       end
   }
   BB63 {
-    [#"../instant.rs" 7 22 34 1] _0 <- ([#"../instant.rs" 7 22 34 1] ());
+    [#"../instant.rs" 7 22 34 1] _0 <- ([#"../instant.rs" 7 22 34 1] [#"../instant.rs" 7 22 34 1] ());
     return _0
   }
   BB64 {
diff --git a/creusot/tests/should_succeed/invariant_moves.mlcfg b/creusot/tests/should_succeed/invariant_moves.mlcfg
index 17c84d3f3d..fb368a8e57 100644
--- a/creusot/tests/should_succeed/invariant_moves.mlcfg
+++ b/creusot/tests/should_succeed/invariant_moves.mlcfg
@@ -188,7 +188,7 @@ module InvariantMoves_TestInvariantMove
   }
   BB7 {
     assume { resolve1 x };
-    [#"../invariant_moves.rs" 7 4 7 45] _0 <- ([#"../invariant_moves.rs" 7 4 7 45] ());
+    [#"../invariant_moves.rs" 7 4 7 45] _0 <- ([#"../invariant_moves.rs" 7 4 7 45] [#"../invariant_moves.rs" 7 4 7 45] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/ite_normalize.mlcfg b/creusot/tests/should_succeed/ite_normalize.mlcfg
index 783cbb19b4..a81e0e39cc 100644
--- a/creusot/tests/should_succeed/ite_normalize.mlcfg
+++ b/creusot/tests/should_succeed/ite_normalize.mlcfg
@@ -953,7 +953,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB20 {
     [#"../ite_normalize.rs" 203 28 203 35] _27 <- Borrow.borrow_mut state_t;
     [#"../ite_normalize.rs" 203 28 203 35] state_t <-  ^ _27;
-    [#"../ite_normalize.rs" 203 28 203 51] _26 <- ([#"../ite_normalize.rs" 203 28 203 51] insert0 _27 v true);
+    [#"../ite_normalize.rs" 203 28 203 51] _26 <- ([#"../ite_normalize.rs" 203 28 203 51] insert0 _27 v ([#"../ite_normalize.rs" 203 46 203 50] true));
     _27 <- any borrowed (IteNormalize_BTreeMap_Type.t_btreemap usize bool);
     goto BB21
   }
@@ -971,7 +971,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB23 {
     [#"../ite_normalize.rs" 208 28 208 35] _35 <- Borrow.borrow_mut state_e;
     [#"../ite_normalize.rs" 208 28 208 35] state_e <-  ^ _35;
-    [#"../ite_normalize.rs" 208 28 208 52] _34 <- ([#"../ite_normalize.rs" 208 28 208 52] insert0 _35 v false);
+    [#"../ite_normalize.rs" 208 28 208 52] _34 <- ([#"../ite_normalize.rs" 208 28 208 52] insert0 _35 v ([#"../ite_normalize.rs" 208 46 208 51] false));
     _35 <- any borrowed (IteNormalize_BTreeMap_Type.t_btreemap usize bool);
     goto BB24
   }
@@ -1161,7 +1161,7 @@ module IteNormalize_Impl5_Simplify
     goto BB1
   }
   BB1 {
-    [#"../ite_normalize.rs" 182 29 182 44] _5 <- ([#"../ite_normalize.rs" 182 29 182 44] new0 ());
+    [#"../ite_normalize.rs" 182 29 182 44] _5 <- ([#"../ite_normalize.rs" 182 29 182 44] new0 ([#"../ite_normalize.rs" 182 29 182 44] ()));
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 7976094f5a..8a039a6a18 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -126,7 +126,7 @@ module C01Range_Impl0_Next
   }
   BB2 {
     [#"../01_range.rs" 61 20 61 30] r <- ([#"../01_range.rs" 61 20 61 30] C01Range_Range_Type.range_start ( * self));
-    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + (1 : isize)) x1) ; };
+    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + ([#"../01_range.rs" 62 26 62 27] (1 : isize))) x1) ; };
     assume { resolve0 self };
     [#"../01_range.rs" 63 12 63 19] _0 <- ([#"../01_range.rs" 63 12 63 19] Core_Option_Option_Type.C_Some r);
     goto BB3
@@ -245,8 +245,8 @@ module C01Range_SumRange
     goto BB0
   }
   BB0 {
-    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] (0 : isize));
-    [#"../01_range.rs" 79 17 79 43] _6 <- ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range (0 : isize) n);
+    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] [#"../01_range.rs" 78 16 78 17] (0 : isize));
+    [#"../01_range.rs" 79 17 79 43] _6 <- ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range ([#"../01_range.rs" 79 32 79 33] (0 : isize)) n);
     [#"../01_range.rs" 79 17 79 55] it <- ([#"../01_range.rs" 79 17 79 55] into_iter0 _6);
     _6 <- any C01Range_Range_Type.t_range;
     goto BB1
@@ -300,7 +300,7 @@ module C01Range_SumRange
   BB11 {
     [#"../01_range.rs" 88 16 88 75] produced <- ([#"../01_range.rs" 88 16 88 75] _21);
     _21 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + (1 : isize));
+    [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + ([#"../01_range.rs" 89 21 89 22] (1 : isize)));
     goto BB4
   }
   
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index 87a643ebf1..fbc9be83d4 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -1018,7 +1018,7 @@ module C02IterMut_AllZero
       end
   }
   BB8 {
-    [#"../02_iter_mut.rs" 97 20 97 25] _0 <- ([#"../02_iter_mut.rs" 97 20 97 25] ());
+    [#"../02_iter_mut.rs" 97 20 97 25] _0 <- ([#"../02_iter_mut.rs" 97 20 97 25] [#"../02_iter_mut.rs" 97 20 97 25] ());
     assume { resolve1 v };
     return _0
   }
@@ -1039,7 +1039,7 @@ module C02IterMut_AllZero
   BB12 {
     [#"../02_iter_mut.rs" 94 16 94 75] produced <- ([#"../02_iter_mut.rs" 94 16 94 75] _19);
     _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
-    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] (0 : usize)) ; };
+    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] [#"../02_iter_mut.rs" 95 21 95 22] (0 : usize)) ; };
     assume { resolve0 x };
     goto BB5
   }
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index 1ba4247c45..83fe4f8554 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -268,7 +268,7 @@ module C03StdIterators_SliceIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
+    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] [#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
     assert { [@expl:type invariant] inv0 slice };
     assume { resolve0 slice };
     [#"../03_std_iterators.rs" 9 13 9 25] _7 <- ([#"../03_std_iterators.rs" 9 13 9 25] iter0 slice);
@@ -346,7 +346,7 @@ module C03StdIterators_SliceIter
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + (1 : usize));
+    [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + ([#"../03_std_iterators.rs" 10 13 10 14] (1 : usize)));
     goto BB5
   }
   
@@ -645,7 +645,7 @@ module C03StdIterators_VecIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
+    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] [#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
     assert { [@expl:type invariant] inv0 vec };
     assume { resolve0 vec };
     [#"../03_std_iterators.rs" 19 4 19 38] iter <- ([#"../03_std_iterators.rs" 19 4 19 38] into_iter0 vec);
@@ -718,7 +718,7 @@ module C03StdIterators_VecIter
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + (1 : usize));
+    [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + ([#"../03_std_iterators.rs" 21 13 21 14] (1 : usize)));
     goto BB4
   }
   
@@ -1067,7 +1067,7 @@ module C03StdIterators_AllZero
   }
   BB9 {
     assume { resolve3 iter };
-    [#"../03_std_iterators.rs" 29 4 29 87] _0 <- ([#"../03_std_iterators.rs" 29 4 29 87] ());
+    [#"../03_std_iterators.rs" 29 4 29 87] _0 <- ([#"../03_std_iterators.rs" 29 4 29 87] [#"../03_std_iterators.rs" 29 4 29 87] ());
     assume { resolve4 v };
     return _0
   }
@@ -1091,7 +1091,7 @@ module C03StdIterators_AllZero
     _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     __creusot_proc_iter_elem <- any borrowed usize;
-    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] (0 : usize)) ; };
+    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] [#"../03_std_iterators.rs" 31 13 31 14] (0 : usize)) ; };
     assume { resolve2 x };
     goto BB6
   }
@@ -1409,7 +1409,7 @@ module C03StdIterators_SkipTake
     goto BB5
   }
   BB5 {
-    [#"../03_std_iterators.rs" 35 49 39 1] _0 <- ([#"../03_std_iterators.rs" 35 49 39 1] ());
+    [#"../03_std_iterators.rs" 35 49 39 1] _0 <- ([#"../03_std_iterators.rs" 35 49 39 1] [#"../03_std_iterators.rs" 35 49 39 1] ());
     goto BB6
   }
   BB6 {
@@ -1477,7 +1477,7 @@ module C03StdIterators_Counter_Closure0
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24]  * field_00 ( * _1) + (1 : usize)) ; })) ; };
+    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24]  * field_00 ( * _1) + ([#"../03_std_iterators.rs" 50 23 50 24] (1 : usize))) ; })) ; };
     assume { resolve0 _1 };
     [#"../03_std_iterators.rs" 51 16 51 18] res1 <- ([#"../03_std_iterators.rs" 51 16 51 18] x);
     [#"../03_std_iterators.rs" 47 12 47 67] res <- ([#"../03_std_iterators.rs" 47 12 47 67] res1);
@@ -1972,7 +1972,7 @@ module C03StdIterators_Counter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
+    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] [#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
     [#"../03_std_iterators.rs" 44 22 45 15] _7 <- ([#"../03_std_iterators.rs" 44 22 45 15] deref0 v);
     goto BB1
   }
@@ -2010,7 +2010,7 @@ module C03StdIterators_Counter
     goto BB7
   }
   BB7 {
-    [#"../03_std_iterators.rs" 41 28 59 1] _0 <- ([#"../03_std_iterators.rs" 41 28 59 1] ());
+    [#"../03_std_iterators.rs" 41 28 59 1] _0 <- ([#"../03_std_iterators.rs" 41 28 59 1] [#"../03_std_iterators.rs" 41 28 59 1] ());
     goto BB8
   }
   BB8 {
@@ -2182,8 +2182,8 @@ module C03StdIterators_SumRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
-    [#"../03_std_iterators.rs" 66 13 66 17] _7 <- ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range (0 : isize) n);
+    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] [#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
+    [#"../03_std_iterators.rs" 66 13 66 17] _7 <- ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 66 13 66 14] (0 : isize)) n);
     [#"../03_std_iterators.rs" 65 4 65 48] iter <- ([#"../03_std_iterators.rs" 65 4 65 48] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range isize;
     goto BB1
@@ -2240,7 +2240,7 @@ module C03StdIterators_SumRange
   BB11 {
     [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] _22);
     _22 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + (1 : isize));
+    [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + ([#"../03_std_iterators.rs" 67 13 67 14] (1 : isize)));
     goto BB4
   }
   
@@ -2529,7 +2529,7 @@ module C03StdIterators_EnumerateRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 74 19 74 26] _3 <- ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range (0 : usize) (10 : usize));
+    [#"../03_std_iterators.rs" 74 19 74 26] _3 <- ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 74 20 74 21] (0 : usize)) ([#"../03_std_iterators.rs" 74 23 74 25] (10 : usize)));
     [#"../03_std_iterators.rs" 74 19 74 38] _2 <- ([#"../03_std_iterators.rs" 74 19 74 38] enumerate0 _3);
     _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB1
@@ -2578,7 +2578,7 @@ module C03StdIterators_EnumerateRange
   BB8 {
     assert { [@expl:type invariant] inv0 iter };
     assume { resolve2 iter };
-    [#"../03_std_iterators.rs" 73 4 73 96] _0 <- ([#"../03_std_iterators.rs" 73 4 73 96] ());
+    [#"../03_std_iterators.rs" 73 4 73 96] _0 <- ([#"../03_std_iterators.rs" 73 4 73 96] [#"../03_std_iterators.rs" 73 4 73 96] ());
     return _0
   }
   BB9 {
@@ -3034,21 +3034,21 @@ module C03StdIterators_MyReverse
   BB2 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] (2 : usize) = (0 : usize));
+    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)) = ([#"../03_std_iterators.rs" 101 22 101 27] (0 : usize)));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 22 101 27] not _12 };
     goto BB3
   }
   BB3 {
-    [#"../03_std_iterators.rs" 101 22 101 27] _10 <- ([#"../03_std_iterators.rs" 101 22 101 27] n / (2 : usize));
-    [#"../03_std_iterators.rs" 101 18 101 28] _9 <- ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) _10);
+    [#"../03_std_iterators.rs" 101 22 101 27] _10 <- ([#"../03_std_iterators.rs" 101 22 101 27] n / ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)));
+    [#"../03_std_iterators.rs" 101 18 101 28] _9 <- ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 19 101 20] (0 : usize)) _10);
     _10 <- any usize;
-    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] (2 : usize) = (0 : usize));
+    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)) = ([#"../03_std_iterators.rs" 101 36 101 41] (0 : usize)));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 36 101 41] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../03_std_iterators.rs" 101 36 101 41] _14 <- ([#"../03_std_iterators.rs" 101 36 101 41] n / (2 : usize));
-    [#"../03_std_iterators.rs" 101 33 101 41] _13 <- ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range (0 : usize) _14);
+    [#"../03_std_iterators.rs" 101 36 101 41] _14 <- ([#"../03_std_iterators.rs" 101 36 101 41] n / ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)));
+    [#"../03_std_iterators.rs" 101 33 101 41] _13 <- ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 33 101 34] (0 : usize)) _14);
     _14 <- any usize;
     [#"../03_std_iterators.rs" 101 18 101 42] _8 <- ([#"../03_std_iterators.rs" 101 18 101 42] zip0 _9 _13);
     _9 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -3099,7 +3099,7 @@ module C03StdIterators_MyReverse
   BB12 {
     assert { [@expl:type invariant] inv3 slice };
     assume { resolve3 slice };
-    [#"../03_std_iterators.rs" 97 4 97 36] _0 <- ([#"../03_std_iterators.rs" 97 4 97 36] ());
+    [#"../03_std_iterators.rs" 97 4 97 36] _0 <- ([#"../03_std_iterators.rs" 97 4 97 36] [#"../03_std_iterators.rs" 97 4 97 36] ());
     return _0
   }
   BB13 {
@@ -3126,7 +3126,7 @@ module C03StdIterators_MyReverse
     [#"../03_std_iterators.rs" 102 8 102 13] slice <- { slice with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
     [#"../03_std_iterators.rs" 102 22 102 27] _41 <- ([#"../03_std_iterators.rs" 102 22 102 27] n - j);
-    [#"../03_std_iterators.rs" 102 22 102 31] _40 <- ([#"../03_std_iterators.rs" 102 22 102 31] _41 - (1 : usize));
+    [#"../03_std_iterators.rs" 102 22 102 31] _40 <- ([#"../03_std_iterators.rs" 102 22 102 31] _41 - ([#"../03_std_iterators.rs" 102 30 102 31] (1 : usize)));
     _41 <- any usize;
     [#"../03_std_iterators.rs" 102 8 102 32] _37 <- ([#"../03_std_iterators.rs" 102 8 102 32] swap0 _38 i _40);
     _38 <- any borrowed (slice t);
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index dae14f3d07..fb4c64a4b7 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -450,7 +450,7 @@ module C04Skip_Impl0_Next
     goto BB6
   }
   BB6 {
-    [#"../04_skip.rs" 74 15 74 21] _20 <- ([#"../04_skip.rs" 74 15 74 21] n = (0 : usize));
+    [#"../04_skip.rs" 74 15 74 21] _20 <- ([#"../04_skip.rs" 74 15 74 21] n = ([#"../04_skip.rs" 74 20 74 21] (0 : usize)));
     switch (_20)
       | False -> goto BB8
       | True -> goto BB7
@@ -494,7 +494,7 @@ module C04Skip_Impl0_Next
     _25 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 skipped };
     assume { resolve2 skipped };
-    [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - (1 : usize));
+    [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - ([#"../04_skip.rs" 79 21 79 22] (1 : usize)));
     goto BB13
   }
   BB13 {
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 7843747f96..cf3837888a 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -2249,7 +2249,7 @@ module C06MapPrecond_Identity
     goto BB2
   }
   BB2 {
-    [#"../06_map_precond.rs" 177 38 179 1] _0 <- ([#"../06_map_precond.rs" 177 38 179 1] ());
+    [#"../06_map_precond.rs" 177 38 179 1] _0 <- ([#"../06_map_precond.rs" 177 38 179 1] [#"../06_map_precond.rs" 177 38 179 1] ());
     goto BB3
   }
   BB3 {
@@ -2301,7 +2301,7 @@ module C06MapPrecond_Increment_Closure2
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] x + (1 : uint32));
+    [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] x + ([#"../06_map_precond.rs" 190 24 190 25] (1 : uint32)));
     [#"../06_map_precond.rs" 188 8 188 29] res <- ([#"../06_map_precond.rs" 188 8 188 29] res1);
     [#"../06_map_precond.rs" 189 8 189 35] _0 <- ([#"../06_map_precond.rs" 189 8 189 35] res);
     return _0
@@ -2573,7 +2573,7 @@ module C06MapPrecond_Increment
     goto BB3
   }
   BB3 {
-    [#"../06_map_precond.rs" 185 51 197 1] _0 <- ([#"../06_map_precond.rs" 185 51 197 1] ());
+    [#"../06_map_precond.rs" 185 51 197 1] _0 <- ([#"../06_map_precond.rs" 185 51 197 1] [#"../06_map_precond.rs" 185 51 197 1] ());
     goto BB4
   }
   BB4 {
@@ -2642,7 +2642,7 @@ module C06MapPrecond_Counter_Closure2
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20]  * field_00 ( * _1) + (1 : usize)) ; })) ; };
+    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20]  * field_00 ( * _1) + ([#"../06_map_precond.rs" 208 19 208 20] (1 : usize))) ; })) ; };
     assume { resolve0 _1 };
     [#"../06_map_precond.rs" 209 12 209 13] res1 <- ([#"../06_map_precond.rs" 209 12 209 13] x);
     [#"../06_map_precond.rs" 205 8 205 63] res <- ([#"../06_map_precond.rs" 205 8 205 63] res1);
@@ -2864,7 +2864,7 @@ module C06MapPrecond_Counter
     goto BB1
   }
   BB1 {
-    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
+    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] [#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
     [#"../06_map_precond.rs" 206 8 206 41] _8 <- Borrow.borrow_mut cnt;
     [#"../06_map_precond.rs" 206 8 206 41] cnt <-  ^ _8;
     [#"../06_map_precond.rs" 206 8 206 41] _7 <- ([#"../06_map_precond.rs" 206 8 206 41] C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8);
@@ -2880,7 +2880,7 @@ module C06MapPrecond_Counter
     goto BB3
   }
   BB3 {
-    [#"../06_map_precond.rs" 201 49 212 1] _0 <- ([#"../06_map_precond.rs" 201 49 212 1] ());
+    [#"../06_map_precond.rs" 201 49 212 1] _0 <- ([#"../06_map_precond.rs" 201 49 212 1] [#"../06_map_precond.rs" 201 49 212 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index 3c9f7a6ccd..6f9a4b9ac4 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -371,7 +371,7 @@ module C08CollectExtend_Extend
     assume { resolve5 iter1 };
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve6 vec };
-    [#"../08_collect_extend.rs" 27 4 27 35] _0 <- ([#"../08_collect_extend.rs" 27 4 27 35] ());
+    [#"../08_collect_extend.rs" 27 4 27 35] _0 <- ([#"../08_collect_extend.rs" 27 4 27 35] [#"../08_collect_extend.rs" 27 4 27 35] ());
     goto BB20
   }
   BB12 {
@@ -677,7 +677,7 @@ module C08CollectExtend_Collect
     goto BB1
   }
   BB1 {
-    [#"../08_collect_extend.rs" 43 18 43 28] res <- ([#"../08_collect_extend.rs" 43 18 43 28] new0 ());
+    [#"../08_collect_extend.rs" 43 18 43 28] res <- ([#"../08_collect_extend.rs" 43 18 43 28] new0 ([#"../08_collect_extend.rs" 43 18 43 28] ()));
     goto BB2
   }
   BB2 {
@@ -1111,7 +1111,7 @@ module C08CollectExtend_ExtendIndex
     goto BB5
   }
   BB5 {
-    [#"../08_collect_extend.rs" 52 52 58 1] _0 <- ([#"../08_collect_extend.rs" 52 52 58 1] ());
+    [#"../08_collect_extend.rs" 52 52 58 1] _0 <- ([#"../08_collect_extend.rs" 52 52 58 1] [#"../08_collect_extend.rs" 52 52 58 1] ());
     goto BB6
   }
   BB6 {
@@ -1256,7 +1256,7 @@ module C08CollectExtend_CollectExample
     goto BB3
   }
   BB3 {
-    [#"../08_collect_extend.rs" 61 57 65 1] _0 <- ([#"../08_collect_extend.rs" 61 57 65 1] ());
+    [#"../08_collect_extend.rs" 61 57 65 1] _0 <- ([#"../08_collect_extend.rs" 61 57 65 1] [#"../08_collect_extend.rs" 61 57 65 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index b2eddf6477..2ab58425ae 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -414,7 +414,7 @@ module C15Enumerate_Impl0_Next
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
     [#"../15_enumerate.rs" 57 24 57 34] n <- ([#"../15_enumerate.rs" 57 24 57 34] C15Enumerate_Enumerate_Type.enumerate_count ( * self));
-    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + (1 : usize))) ; };
+    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + ([#"../15_enumerate.rs" 58 30 58 31] (1 : usize)))) ; };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
     [#"../15_enumerate.rs" 59 21 59 27] _8 <- ([#"../15_enumerate.rs" 59 21 59 27] (n, x));
@@ -552,7 +552,7 @@ module C15Enumerate_Enumerate
     goto BB1
   }
   BB1 {
-    [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate iter (0 : usize));
+    [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate iter ([#"../15_enumerate.rs" 82 29 82 30] (0 : usize)));
     iter <- any i;
     goto BB2
   }
diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg
index 97d8327966..d96ac87670 100644
--- a/creusot/tests/should_succeed/iterators/16_take.mlcfg
+++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg
@@ -295,14 +295,14 @@ module C16Take_Impl0_Next
     goto BB0
   }
   BB0 {
-    [#"../16_take.rs" 54 11 54 22] _3 <- ([#"../16_take.rs" 54 11 54 22] C16Take_Take_Type.take_n ( * self) <> (0 : usize));
+    [#"../16_take.rs" 54 11 54 22] _3 <- ([#"../16_take.rs" 54 11 54 22] C16Take_Take_Type.take_n ( * self) <> ([#"../16_take.rs" 54 21 54 22] (0 : usize)));
     switch (_3)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - (1 : usize))) ; };
+    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - ([#"../16_take.rs" 55 22 55 23] (1 : usize)))) ; };
     [#"../16_take.rs" 56 12 56 21] _5 <- Borrow.borrow_final (C16Take_Take_Type.take_iter ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../16_take.rs" 56 12 56 21] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take ( ^ _5) x1) ; };
     assume { inv1 ( ^ _5) };
diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index a5f688504c..7fe060c320 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -652,8 +652,8 @@ module Knapsack_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack.rs" 49 38 49 52] _8 <- ([#"../knapsack.rs" 49 38 49 52] max_weight + (1 : usize));
-    [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 (0 : usize) _8);
+    [#"../knapsack.rs" 49 38 49 52] _8 <- ([#"../knapsack.rs" 49 38 49 52] max_weight + ([#"../knapsack.rs" 49 51 49 52] (1 : usize)));
+    [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 ([#"../knapsack.rs" 49 35 49 36] (0 : usize)) _8);
     _8 <- any usize;
     goto BB1
   }
@@ -662,7 +662,7 @@ module Knapsack_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../knapsack.rs" 49 55 49 70] _10 <- ([#"../knapsack.rs" 49 55 49 70] _11 + (1 : usize));
+    [#"../knapsack.rs" 49 55 49 70] _10 <- ([#"../knapsack.rs" 49 55 49 70] _11 + ([#"../knapsack.rs" 49 69 49 70] (1 : usize)));
     _11 <- any usize;
     [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 _10);
     _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -670,7 +670,7 @@ module Knapsack_Knapsack01Dyn
     goto BB3
   }
   BB3 {
-    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] (0 : usize));
+    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] [#"../knapsack.rs" 50 16 50 17] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -712,7 +712,7 @@ module Knapsack_Knapsack01Dyn
     [#"../knapsack.rs" 60 17 60 26] it <- ([#"../knapsack.rs" 60 17 60 26] _25);
     assert { [@expl:type invariant] inv1 _25 };
     assume { resolve2 _25 };
-    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] (0 : usize));
+    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] [#"../knapsack.rs" 64 20 64 21] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -794,7 +794,7 @@ module Knapsack_Knapsack01Dyn
   BB30 {
     [#"../knapsack.rs" 77 12 77 22] _69 <- Borrow.borrow_mut best_value;
     [#"../knapsack.rs" 77 12 77 22] best_value <-  ^ _69;
-    [#"../knapsack.rs" 77 23 77 28] _70 <- ([#"../knapsack.rs" 77 23 77 28] i + (1 : usize));
+    [#"../knapsack.rs" 77 23 77 28] _70 <- ([#"../knapsack.rs" 77 23 77 28] i + ([#"../knapsack.rs" 77 27 77 28] (1 : usize)));
     [#"../knapsack.rs" 77 22 77 29] _68 <- ([#"../knapsack.rs" 77 22 77 29] index_mut0 _69 _70);
     _69 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _70 <- any usize;
@@ -812,15 +812,15 @@ module Knapsack_Knapsack01Dyn
     _38 <- any usize;
     assume { resolve3 _66 };
     assume { resolve4 _68 };
-    [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + (1 : usize));
-    [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] ());
+    [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + ([#"../knapsack.rs" 82 17 82 18] (1 : usize)));
+    [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] [#"../knapsack.rs" 82 12 82 18] ());
     goto BB18
   }
   BB33 {
     assert { [@expl:type invariant] inv1 it };
     assume { resolve2 it };
-    [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + (1 : usize));
-    [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] ());
+    [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + ([#"../knapsack.rs" 84 13 84 14] (1 : usize)));
+    [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] [#"../knapsack.rs" 84 8 84 14] ());
     goto BB8
   }
   BB34 {
@@ -846,14 +846,14 @@ module Knapsack_Knapsack01Dyn
     goto BB39
   }
   BB39 {
-    [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 15] (0 : usize) < j);
+    [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 15] ([#"../knapsack.rs" 93 10 93 11] (0 : usize)) < j);
     switch (_88)
       | False -> goto BB50
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - (1 : usize));
+    [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - ([#"../knapsack.rs" 94 13 94 14] (1 : usize)));
     [#"../knapsack.rs" 95 23 95 26] _91 <- ([#"../knapsack.rs" 95 23 95 26] index0 items j);
     goto BB41
   }
@@ -861,7 +861,7 @@ module Knapsack_Knapsack01Dyn
     [#"../knapsack.rs" 95 17 95 26] it1 <- ([#"../knapsack.rs" 95 17 95 26] _91);
     assert { [@expl:type invariant] inv1 _91 };
     assume { resolve2 _91 };
-    [#"../knapsack.rs" 96 22 96 27] _100 <- ([#"../knapsack.rs" 96 22 96 27] j + (1 : usize));
+    [#"../knapsack.rs" 96 22 96 27] _100 <- ([#"../knapsack.rs" 96 22 96 27] j + ([#"../knapsack.rs" 96 26 96 27] (1 : usize)));
     [#"../knapsack.rs" 96 21 96 28] _98 <- ([#"../knapsack.rs" 96 21 96 28] index1 best_value _100);
     _100 <- any usize;
     goto BB42
@@ -897,13 +897,13 @@ module Knapsack_Knapsack01Dyn
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve2 it1 };
     [#"../knapsack.rs" 98 12 98 36] left_weight <- ([#"../knapsack.rs" 98 12 98 36] left_weight - Knapsack_Item_Type.item_weight it1);
-    [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] ());
+    [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] [#"../knapsack.rs" 96 72 99 9] ());
     goto BB49
   }
   BB48 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve2 it1 };
-    [#"../knapsack.rs" 99 9 99 9] _19 <- ([#"../knapsack.rs" 99 9 99 9] ());
+    [#"../knapsack.rs" 99 9 99 9] _19 <- ([#"../knapsack.rs" 99 9 99 9] [#"../knapsack.rs" 99 9 99 9] ());
     goto BB49
   }
   BB49 {
diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 263a186144..5d7b48fbd6 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -1104,8 +1104,8 @@ module KnapsackFull_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack_full.rs" 86 38 86 52] _11 <- ([#"../knapsack_full.rs" 86 38 86 52] max_weight + (1 : usize));
-    [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 (0 : usize) _11);
+    [#"../knapsack_full.rs" 86 38 86 52] _11 <- ([#"../knapsack_full.rs" 86 38 86 52] max_weight + ([#"../knapsack_full.rs" 86 51 86 52] (1 : usize)));
+    [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 ([#"../knapsack_full.rs" 86 35 86 36] (0 : usize)) _11);
     _11 <- any usize;
     goto BB1
   }
@@ -1114,7 +1114,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../knapsack_full.rs" 86 55 86 70] _13 <- ([#"../knapsack_full.rs" 86 55 86 70] _14 + (1 : usize));
+    [#"../knapsack_full.rs" 86 55 86 70] _13 <- ([#"../knapsack_full.rs" 86 55 86 70] _14 + ([#"../knapsack_full.rs" 86 69 86 70] (1 : usize)));
     _14 <- any usize;
     [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 _13);
     _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -1126,7 +1126,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB4
   }
   BB4 {
-    [#"../knapsack_full.rs" 95 13 95 27] _18 <- ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range (0 : usize) _19);
+    [#"../knapsack_full.rs" 95 13 95 27] _18 <- ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range ([#"../knapsack_full.rs" 95 13 95 14] (0 : usize)) _19);
     _19 <- any usize;
     [#"../knapsack_full.rs" 88 4 88 55] iter <- ([#"../knapsack_full.rs" 88 4 88 55] into_iter0 _18);
     _18 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -1207,7 +1207,7 @@ module KnapsackFull_Knapsack01Dyn
     [#"../knapsack_full.rs" 96 17 96 26] it <- ([#"../knapsack_full.rs" 96 17 96 26] _41);
     assert { [@expl:type invariant] inv1 _41 };
     assume { resolve1 _41 };
-    [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 (0 : usize) max_weight);
+    [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 ([#"../knapsack_full.rs" 110 17 110 18] (0 : usize)) max_weight);
     goto BB21
   }
   BB21 {
@@ -1270,7 +1270,7 @@ module KnapsackFull_Knapsack01Dyn
   BB33 {
     assert { [@expl:type invariant] inv1 it };
     assume { resolve1 it };
-    [#"../knapsack_full.rs" 98 8 98 59] _31 <- ([#"../knapsack_full.rs" 98 8 98 59] ());
+    [#"../knapsack_full.rs" 98 8 98 59] _31 <- ([#"../knapsack_full.rs" 98 8 98 59] [#"../knapsack_full.rs" 98 8 98 59] ());
     goto BB12
   }
   BB34 {
@@ -1333,7 +1333,7 @@ module KnapsackFull_Knapsack01Dyn
   BB46 {
     [#"../knapsack_full.rs" 111 12 111 22] _97 <- Borrow.borrow_mut best_value;
     [#"../knapsack_full.rs" 111 12 111 22] best_value <-  ^ _97;
-    [#"../knapsack_full.rs" 111 23 111 28] _98 <- ([#"../knapsack_full.rs" 111 23 111 28] i + (1 : usize));
+    [#"../knapsack_full.rs" 111 23 111 28] _98 <- ([#"../knapsack_full.rs" 111 23 111 28] i + ([#"../knapsack_full.rs" 111 27 111 28] (1 : usize)));
     [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 _98);
     _97 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _98 <- any usize;
@@ -1351,7 +1351,7 @@ module KnapsackFull_Knapsack01Dyn
     _66 <- any usize;
     assume { resolve3 _94 };
     assume { resolve4 _96 };
-    [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] ());
+    [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] [#"../knapsack_full.rs" 110 32 116 9] ());
     goto BB30
   }
   BB49 {
@@ -1385,14 +1385,14 @@ module KnapsackFull_Knapsack01Dyn
     goto BB56
   }
   BB56 {
-    [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 15] (0 : usize) < j);
+    [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 15] ([#"../knapsack_full.rs" 140 10 140 11] (0 : usize)) < j);
     switch (_115)
       | False -> goto BB67
       | True -> goto BB57
       end
   }
   BB57 {
-    [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - (1 : usize));
+    [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - ([#"../knapsack_full.rs" 141 13 141 14] (1 : usize)));
     [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 items j);
     goto BB58
   }
@@ -1400,7 +1400,7 @@ module KnapsackFull_Knapsack01Dyn
     [#"../knapsack_full.rs" 142 17 142 26] it1 <- ([#"../knapsack_full.rs" 142 17 142 26] _118);
     assert { [@expl:type invariant] inv1 _118 };
     assume { resolve1 _118 };
-    [#"../knapsack_full.rs" 143 22 143 27] _127 <- ([#"../knapsack_full.rs" 143 22 143 27] j + (1 : usize));
+    [#"../knapsack_full.rs" 143 22 143 27] _127 <- ([#"../knapsack_full.rs" 143 22 143 27] j + ([#"../knapsack_full.rs" 143 26 143 27] (1 : usize)));
     [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 best_value _127);
     _127 <- any usize;
     goto BB59
@@ -1436,13 +1436,13 @@ module KnapsackFull_Knapsack01Dyn
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
     [#"../knapsack_full.rs" 145 12 145 36] left_weight <- ([#"../knapsack_full.rs" 145 12 145 36] left_weight - KnapsackFull_Item_Type.item_weight it1);
-    [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] ());
+    [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] [#"../knapsack_full.rs" 143 72 146 9] ());
     goto BB66
   }
   BB65 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
-    [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] ());
+    [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] [#"../knapsack_full.rs" 146 9 146 9] ());
     goto BB66
   }
   BB66 {
diff --git a/creusot/tests/should_succeed/lang/assoc_type.mlcfg b/creusot/tests/should_succeed/lang/assoc_type.mlcfg
index f46b83d21a..f559b52a9c 100644
--- a/creusot/tests/should_succeed/lang/assoc_type.mlcfg
+++ b/creusot/tests/should_succeed/lang/assoc_type.mlcfg
@@ -38,7 +38,7 @@ module AssocType_Uses3
     goto BB0
   }
   BB0 {
-    [#"../assoc_type.rs" 36 34 36 36] _0 <- ([#"../assoc_type.rs" 36 34 36 36] ());
+    [#"../assoc_type.rs" 36 34 36 36] _0 <- ([#"../assoc_type.rs" 36 34 36 36] [#"../assoc_type.rs" 36 34 36 36] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
index 93e062ce56..22f2266587 100644
--- a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
+++ b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
@@ -26,18 +26,18 @@ module BranchBorrow2_F
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] [#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] [#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] [#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
     [#"../branch_borrow_2.rs" 8 12 8 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 8 12 8 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 9 12 9 18] y <- Borrow.borrow_mut b;
     [#"../branch_borrow_2.rs" 9 12 9 18] b <-  ^ y;
     [#"../branch_borrow_2.rs" 10 12 10 18] z <- Borrow.borrow_mut c;
     [#"../branch_borrow_2.rs" 10 12 10 18] c <-  ^ z;
-    switch ((3 : int32) = 1)
+    switch (([#"../branch_borrow_2.rs" 13 10 13 11] (3 : int32)) = 1)
       | True -> goto BB1
-      | False -> switch ((3 : int32) = 2)
+      | False -> switch (([#"../branch_borrow_2.rs" 13 10 13 11] (3 : int32)) = 2)
         | True -> goto BB2
         | False -> goto BB12
         end
@@ -50,46 +50,46 @@ module BranchBorrow2_F
     goto BB5
   }
   BB3 {
-    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] (8 : int32)) ; };
+    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] [#"../branch_borrow_2.rs" 23 17 23 18] (8 : int32)) ; };
     [#"../branch_borrow_2.rs" 24 16 24 17] _12 <- Borrow.borrow_final ( * z) (Borrow.get_id z);
     [#"../branch_borrow_2.rs" 24 16 24 17] z <- { z with current = ( ^ _12) ; };
     [#"../branch_borrow_2.rs" 24 12 24 17] w <- ([#"../branch_borrow_2.rs" 24 12 24 17] _12);
     _12 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] ());
+    [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] [#"../branch_borrow_2.rs" 22 13 25 9] ());
     goto BB6
   }
   BB4 {
     assume { resolve0 z };
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] [#"../branch_borrow_2.rs" 15 17 15 18] (6 : int32)) ; };
     [#"../branch_borrow_2.rs" 16 12 16 17] w <- ([#"../branch_borrow_2.rs" 16 12 16 17] x);
     x <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] ());
+    [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] [#"../branch_borrow_2.rs" 14 13 17 9] ());
     goto BB6
   }
   BB5 {
     assume { resolve0 z };
-    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] (7 : int32)) ; };
+    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] [#"../branch_borrow_2.rs" 19 17 19 18] (7 : int32)) ; };
     [#"../branch_borrow_2.rs" 20 16 20 17] _11 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 20 16 20 17] y <- { y with current = ( ^ _11) ; };
     [#"../branch_borrow_2.rs" 20 12 20 17] w <- ([#"../branch_borrow_2.rs" 20 12 20 17] _11);
     _11 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] ());
+    [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] [#"../branch_borrow_2.rs" 18 13 21 9] ());
     goto BB6
   }
   BB6 {
-    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] [#"../branch_borrow_2.rs" 28 9 28 10] (5 : int32)) ; };
     assume { resolve0 w };
     assume { resolve0 z };
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- ([#"../branch_borrow_2.rs" 30 12 30 18] c = (5 : int32));
+    [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- ([#"../branch_borrow_2.rs" 30 12 30 18] c = ([#"../branch_borrow_2.rs" 30 17 30 18] (5 : int32)));
     switch (_14)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- ([#"../branch_borrow_2.rs" 3 11 31 1] ());
+    [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- ([#"../branch_borrow_2.rs" 3 11 31 1] [#"../branch_borrow_2.rs" 3 11 31 1] ());
     return _0
   }
   BB8 {
@@ -160,8 +160,8 @@ module BranchBorrow2_G
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- ([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt (10 : usize));
-    [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt (5 : usize));
+    [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- ([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 23 36 25] (10 : usize)));
+    [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 34 36 35] (5 : usize)));
     [#"../branch_borrow_2.rs" 36 16 36 37] a <- ([#"../branch_borrow_2.rs" 36 16 36 37] (_2, _3));
     _2 <- any BranchBorrow2_MyInt_Type.t_myint;
     _3 <- any BranchBorrow2_MyInt_Type.t_myint;
@@ -175,7 +175,7 @@ module BranchBorrow2_G
     assume { resolve0 d };
     assume { resolve1 b };
     assume { resolve2 a };
-    [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- ([#"../branch_borrow_2.rs" 35 11 43 1] ());
+    [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- ([#"../branch_borrow_2.rs" 35 11 43 1] [#"../branch_borrow_2.rs" 35 11 43 1] ());
     return _0
   }
   
@@ -203,38 +203,38 @@ module BranchBorrow2_H
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] [#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] [#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
     [#"../branch_borrow_2.rs" 49 12 49 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 49 12 49 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 50 12 50 18] y <- Borrow.borrow_mut b;
     [#"../branch_borrow_2.rs" 50 12 50 18] b <-  ^ y;
-    switch (true)
+    switch ([#"../branch_borrow_2.rs" 52 7 52 11] true)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] [#"../branch_borrow_2.rs" 53 13 53 14] (5 : int32)) ; };
     [#"../branch_borrow_2.rs" 54 8 54 13] w <- ([#"../branch_borrow_2.rs" 54 8 54 13] x);
     x <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] ());
+    [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] [#"../branch_borrow_2.rs" 52 12 55 5] ());
     goto BB3
   }
   BB2 {
     assume { resolve0 x };
-    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] [#"../branch_borrow_2.rs" 56 13 56 14] (6 : int32)) ; };
     [#"../branch_borrow_2.rs" 57 12 57 13] _9 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 57 12 57 13] y <- { y with current = ( ^ _9) ; };
     [#"../branch_borrow_2.rs" 57 8 57 13] w <- ([#"../branch_borrow_2.rs" 57 8 57 13] _9);
     _9 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] ());
+    [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] [#"../branch_borrow_2.rs" 55 11 60 5] ());
     goto BB3
   }
   BB3 {
     assume { resolve0 w };
-    [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- ([#"../branch_borrow_2.rs" 45 11 68 1] ());
+    [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- ([#"../branch_borrow_2.rs" 45 11 68 1] [#"../branch_borrow_2.rs" 45 11 68 1] ());
     assume { resolve0 y };
     return _0
   }
diff --git a/creusot/tests/should_succeed/lang/const.mlcfg b/creusot/tests/should_succeed/lang/const.mlcfg
index f70cc9cd93..a792facef9 100644
--- a/creusot/tests/should_succeed/lang/const.mlcfg
+++ b/creusot/tests/should_succeed/lang/const.mlcfg
@@ -11,7 +11,7 @@ module Const_Foo
     goto BB0
   }
   BB0 {
-    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] (42 : usize));
+    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] [#"../const.rs" 9 4 9 7] (42 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/empty.mlcfg b/creusot/tests/should_succeed/lang/empty.mlcfg
index f7c4f28c0a..3bfe289397 100644
--- a/creusot/tests/should_succeed/lang/empty.mlcfg
+++ b/creusot/tests/should_succeed/lang/empty.mlcfg
@@ -7,7 +7,7 @@ module Empty_F
     goto BB0
   }
   BB0 {
-    [#"../empty.rs" 4 4 4 10] _0 <- ([#"../empty.rs" 4 4 4 10] ());
+    [#"../empty.rs" 4 4 4 10] _0 <- ([#"../empty.rs" 4 4 4 10] [#"../empty.rs" 4 4 4 10] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/float_ops.mlcfg b/creusot/tests/should_succeed/lang/float_ops.mlcfg
index fb0bf00ad0..8837b56da2 100644
--- a/creusot/tests/should_succeed/lang/float_ops.mlcfg
+++ b/creusot/tests/should_succeed/lang/float_ops.mlcfg
@@ -10,7 +10,7 @@ module FloatOps_Eq
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] (1.0 : Float64.t) .= (2.0 : Float64.t));
+    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] ([#"../float_ops.rs" 6 4 6 7] (1.0 : Float64.t)) .= ([#"../float_ops.rs" 6 11 6 14] (2.0 : Float64.t)));
     return _0
   }
   
@@ -26,7 +26,7 @@ module FloatOps_Lt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] (1.0 : Float64.t) .< (2.0 : Float64.t));
+    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] ([#"../float_ops.rs" 11 4 11 7] (1.0 : Float64.t)) .< ([#"../float_ops.rs" 11 10 11 13] (2.0 : Float64.t)));
     return _0
   }
   
@@ -42,7 +42,7 @@ module FloatOps_Le
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] (1.0 : Float64.t) .<= (2.0 : Float64.t));
+    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] ([#"../float_ops.rs" 16 4 16 7] (1.0 : Float64.t)) .<= ([#"../float_ops.rs" 16 11 16 14] (2.0 : Float64.t)));
     return _0
   }
   
@@ -58,7 +58,7 @@ module FloatOps_Gt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] (2.0 : Float64.t) .> (1.0 : Float64.t));
+    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] ([#"../float_ops.rs" 21 4 21 7] (2.0 : Float64.t)) .> ([#"../float_ops.rs" 21 10 21 13] (1.0 : Float64.t)));
     return _0
   }
   
@@ -74,7 +74,7 @@ module FloatOps_Ge
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] (2.0 : Float64.t) .>= (1.0 : Float64.t));
+    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] ([#"../float_ops.rs" 26 4 26 7] (2.0 : Float64.t)) .>= ([#"../float_ops.rs" 26 11 26 14] (1.0 : Float64.t)));
     return _0
   }
   
@@ -90,7 +90,7 @@ module FloatOps_Neg
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] (-2.0 : Float64.t) .<= (1.0 : Float64.t));
+    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] ([#"../float_ops.rs" 31 4 31 8] (-2.0 : Float64.t)) .<= ([#"../float_ops.rs" 31 12 31 15] (1.0 : Float64.t)));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/literals.mlcfg b/creusot/tests/should_succeed/lang/literals.mlcfg
index 9d41184fea..8504e3c54b 100644
--- a/creusot/tests/should_succeed/lang/literals.mlcfg
+++ b/creusot/tests/should_succeed/lang/literals.mlcfg
@@ -12,9 +12,9 @@ module Literals_FloatOperation
     goto BB0
   }
   BB0 {
-    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
-    [#"../literals.rs" 6 7 6 17] _3 <- ([#"../literals.rs" 6 7 6 17] x .+ (0x1.020c40000000p0 : Float32.t));
-    [#"../literals.rs" 6 7 6 24] _2 <- ([#"../literals.rs" 6 7 6 24] _3 .= (2.0 : Float32.t));
+    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] [#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
+    [#"../literals.rs" 6 7 6 17] _3 <- ([#"../literals.rs" 6 7 6 17] x .+ ([#"../literals.rs" 6 11 6 17] (0x1.020c40000000p0 : Float32.t)));
+    [#"../literals.rs" 6 7 6 24] _2 <- ([#"../literals.rs" 6 7 6 24] _3 .= ([#"../literals.rs" 6 21 6 24] (2.0 : Float32.t)));
     _3 <- any Float32.t;
     switch (_2)
       | False -> goto BB2
@@ -22,11 +22,11 @@ module Literals_FloatOperation
       end
   }
   BB1 {
-    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] (3.0 : Float32.t) .- (1.0 : Float32.t));
+    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] ([#"../literals.rs" 7 8 7 11] (3.0 : Float32.t)) .- ([#"../literals.rs" 7 14 7 17] (1.0 : Float32.t)));
     goto BB3
   }
   BB2 {
-    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
+    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] [#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/lang/module_paths.mlcfg b/creusot/tests/should_succeed/lang/module_paths.mlcfg
index 2fc2f76563..2025c02aac 100644
--- a/creusot/tests/should_succeed/lang/module_paths.mlcfg
+++ b/creusot/tests/should_succeed/lang/module_paths.mlcfg
@@ -38,7 +38,7 @@ module ModulePaths_Test
     goto BB0
   }
   BB0 {
-    [#"../module_paths.rs" 22 52 22 54] _0 <- ([#"../module_paths.rs" 22 52 22 54] ());
+    [#"../module_paths.rs" 22 52 22 54] _0 <- ([#"../module_paths.rs" 22 52 22 54] [#"../module_paths.rs" 22 52 22 54] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/modules.mlcfg b/creusot/tests/should_succeed/lang/modules.mlcfg
index b99b2775c1..2bd931bd74 100644
--- a/creusot/tests/should_succeed/lang/modules.mlcfg
+++ b/creusot/tests/should_succeed/lang/modules.mlcfg
@@ -25,7 +25,7 @@ module Modules_Nested_InnerFunc
   BB0 {
     [#"../modules.rs" 14 16 14 28] _2 <- ([#"../modules.rs" 14 16 14 28] Modules_Nested_Nested_Type.C_Test);
     assume { resolve0 _2 };
-    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] true);
+    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] [#"../modules.rs" 15 8 15 12] true);
     return _0
   }
   
@@ -38,7 +38,7 @@ module Modules_Nested_Further_Another
     goto BB0
   }
   BB0 {
-    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] false);
+    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] [#"../modules.rs" 20 12 20 17] false);
     return _0
   }
   
@@ -57,15 +57,15 @@ module Modules_F
     goto BB0
   }
   BB0 {
-    [#"../modules.rs" 26 4 26 24] _1 <- ([#"../modules.rs" 26 4 26 24] inner_func0 ());
+    [#"../modules.rs" 26 4 26 24] _1 <- ([#"../modules.rs" 26 4 26 24] inner_func0 ([#"../modules.rs" 26 4 26 24] ()));
     goto BB1
   }
   BB1 {
-    [#"../modules.rs" 28 4 28 13] _2 <- ([#"../modules.rs" 28 4 28 13] another0 ());
+    [#"../modules.rs" 28 4 28 13] _2 <- ([#"../modules.rs" 28 4 28 13] another0 ([#"../modules.rs" 28 4 28 13] ()));
     goto BB2
   }
   BB2 {
-    [#"../modules.rs" 25 11 29 1] _0 <- ([#"../modules.rs" 25 11 29 1] ());
+    [#"../modules.rs" 25 11 29 1] _0 <- ([#"../modules.rs" 25 11 29 1] [#"../modules.rs" 25 11 29 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/move_path.mlcfg b/creusot/tests/should_succeed/lang/move_path.mlcfg
index 47fdd9eba6..52e93c5887 100644
--- a/creusot/tests/should_succeed/lang/move_path.mlcfg
+++ b/creusot/tests/should_succeed/lang/move_path.mlcfg
@@ -19,16 +19,16 @@ module MovePath_F
     goto BB0
   }
   BB0 {
-    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] (1 : int32));
+    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] [#"../move_path.rs" 4 16 4 17] (1 : int32));
     [#"../move_path.rs" 6 12 6 18] y <- Borrow.borrow_mut x;
     [#"../move_path.rs" 6 12 6 18] x <-  ^ y;
     [#"../move_path.rs" 7 12 7 13] d <- ([#"../move_path.rs" 7 12 7 13] y);
     y <- any borrowed int32;
     [#"../move_path.rs" 8 12 8 13] z <- ([#"../move_path.rs" 8 12 8 13] d);
     d <- any borrowed int32;
-    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] (2 : int32)) ; };
+    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] [#"../move_path.rs" 10 17 10 18] (2 : int32)) ; };
     assume { resolve0 z };
-    [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] ());
+    [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] [#"../move_path.rs" 3 11 15 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
index e6ae9886b7..c00be227a7 100644
--- a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
+++ b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
@@ -13,11 +13,11 @@ module MultipleScopes_MultipleScopes
     goto BB0
   }
   BB0 {
-    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
-    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
-    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
+    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] [#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
+    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] [#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
+    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] [#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
     [#"../multiple_scopes.rs" 9 8 9 15] _x <- ([#"../multiple_scopes.rs" 9 8 9 15] _y1);
-    [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] ());
+    [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] [#"../multiple_scopes.rs" 7 4 10 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
index d1c5522c1c..7a9d692899 100644
--- a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
+++ b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
@@ -22,10 +22,10 @@ module PromotedConstants_PromotedNone
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some (43 : int32) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0
+    let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 28 6 30] (43 : int32)) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0
   let constant promoted1 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some (42 : int32) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0
+    let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 17 6 19] (42 : int32)) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0
   let rec cfg promoted_none [#"../promoted_constants.rs" 3 0 3 22] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -38,9 +38,9 @@ module PromotedConstants_PromotedNone
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some (0 : int32));
-    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] promoted1);
-    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] promoted0);
+    [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 4 19 4 20] (0 : int32)));
+    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] [#"../promoted_constants.rs" 6 11 6 20] promoted1);
+    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] [#"../promoted_constants.rs" 6 22 6 31] promoted0);
     [#"../promoted_constants.rs" 6 10 6 32] _2 <- ([#"../promoted_constants.rs" 6 10 6 32] (_11, _10));
     switch (let (a, _) = _2 in a)
       | Core_Option_Option_Type.C_None -> goto BB1
@@ -76,7 +76,7 @@ module PromotedConstants_PromotedInt
   use prelude.Int32
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 12 0 12 21]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _2 = [#"../promoted_constants.rs" 13 15 13 20] (1 : int32) + (5 : int32) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + (10 : int32) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0
+    let _2 = [#"../promoted_constants.rs" 13 15 13 20] ([#"../promoted_constants.rs" 13 15 13 16] (1 : int32)) + ([#"../promoted_constants.rs" 13 19 13 20] (5 : int32)) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + ([#"../promoted_constants.rs" 13 23 13 25] (10 : int32)) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0
   let rec cfg promoted_int [#"../promoted_constants.rs" 12 0 12 21] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -88,9 +88,9 @@ module PromotedConstants_PromotedInt
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] promoted0);
+    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] [#"../promoted_constants.rs" 13 13 13 26] promoted0);
     [#"../promoted_constants.rs" 13 13 13 26] ix <- ([#"../promoted_constants.rs" 13 13 13 26] _9);
-    [#"../promoted_constants.rs" 15 7 15 16] _4 <- ([#"../promoted_constants.rs" 15 7 15 16] ix <> (16 : int32));
+    [#"../promoted_constants.rs" 15 7 15 16] _4 <- ([#"../promoted_constants.rs" 15 7 15 16] ix <> ([#"../promoted_constants.rs" 15 14 15 16] (16 : int32)));
     switch (_4)
       | False -> goto BB2
       | True -> goto BB1
@@ -101,7 +101,7 @@ module PromotedConstants_PromotedInt
     absurd
   }
   BB2 {
-    [#"../promoted_constants.rs" 17 5 17 5] _0 <- ([#"../promoted_constants.rs" 17 5 17 5] ());
+    [#"../promoted_constants.rs" 17 5 17 5] _0 <- ([#"../promoted_constants.rs" 17 5 17 5] [#"../promoted_constants.rs" 17 5 17 5] ());
     return _0
   }
   
@@ -164,7 +164,7 @@ module PromotedConstants_String
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 20 26 20 28] _0 <- ([#"../promoted_constants.rs" 20 26 20 28] ());
+    [#"../promoted_constants.rs" 20 26 20 28] _0 <- ([#"../promoted_constants.rs" 20 26 20 28] [#"../promoted_constants.rs" 20 26 20 28] ());
     goto BB1
   }
   BB1 {
@@ -182,8 +182,8 @@ module PromotedConstants_Str
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
-    [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] ());
+    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] [#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+    [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] [#"../promoted_constants.rs" 22 13 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/unary_op.mlcfg b/creusot/tests/should_succeed/lang/unary_op.mlcfg
index 658fdcaece..f38c881546 100644
--- a/creusot/tests/should_succeed/lang/unary_op.mlcfg
+++ b/creusot/tests/should_succeed/lang/unary_op.mlcfg
@@ -7,7 +7,7 @@ module UnaryOp_F
     goto BB0
   }
   BB0 {
-    switch (false)
+    switch ([#"../unary_op.rs" 5 13 5 18] false)
       | False -> goto BB2
       | True -> goto BB1
       end
@@ -17,7 +17,7 @@ module UnaryOp_F
     absurd
   }
   BB2 {
-    [#"../unary_op.rs" 4 11 6 1] _0 <- ([#"../unary_op.rs" 4 11 6 1] ());
+    [#"../unary_op.rs" 4 11 6 1] _0 <- ([#"../unary_op.rs" 4 11 6 1] [#"../unary_op.rs" 4 11 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/unions.mlcfg b/creusot/tests/should_succeed/lang/unions.mlcfg
index 55e9d71ede..8dbbd1ad18 100644
--- a/creusot/tests/should_succeed/lang/unions.mlcfg
+++ b/creusot/tests/should_succeed/lang/unions.mlcfg
@@ -17,7 +17,7 @@ module Unions_X
     goto BB0
   }
   BB0 {
-    [#"../unions.rs" 10 24 10 26] _0 <- ([#"../unions.rs" 10 24 10 26] ());
+    [#"../unions.rs" 10 24 10 26] _0 <- ([#"../unions.rs" 10 24 10 26] [#"../unions.rs" 10 24 10 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/while_let.mlcfg b/creusot/tests/should_succeed/lang/while_let.mlcfg
index fd16a49e54..2c1180b938 100644
--- a/creusot/tests/should_succeed/lang/while_let.mlcfg
+++ b/creusot/tests/should_succeed/lang/while_let.mlcfg
@@ -25,7 +25,7 @@ module WhileLet_F
     goto BB0
   }
   BB0 {
-    [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some (10 : int32));
+    [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some ([#"../while_let.rs" 5 21 5 23] (10 : int32)));
     [#"../while_let.rs" 6 12 6 18] b <- Borrow.borrow_mut a;
     [#"../while_let.rs" 6 12 6 18] a <-  ^ b;
     goto BB1
@@ -51,7 +51,7 @@ module WhileLet_F
   }
   BB5 {
     assume { resolve0 b };
-    [#"../while_let.rs" 9 4 11 5] _0 <- ([#"../while_let.rs" 9 4 11 5] ());
+    [#"../while_let.rs" 9 4 11 5] _0 <- ([#"../while_let.rs" 9 4 11 5] [#"../while_let.rs" 9 4 11 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg
index 63d4c7f073..88e4b68bbb 100644
--- a/creusot/tests/should_succeed/list_index_mut.mlcfg
+++ b/creusot/tests/should_succeed/list_index_mut.mlcfg
@@ -167,7 +167,7 @@ module ListIndexMut_IndexMut
     goto BB4
   }
   BB4 {
-    [#"../list_index_mut.rs" 49 10 49 16] _20 <- ([#"../list_index_mut.rs" 49 10 49 16] ix > (0 : usize));
+    [#"../list_index_mut.rs" 49 10 49 16] _20 <- ([#"../list_index_mut.rs" 49 10 49 16] ix > ([#"../list_index_mut.rs" 49 15 49 16] (0 : usize)));
     switch (_20)
       | False -> goto BB8
       | True -> goto BB5
@@ -192,7 +192,7 @@ module ListIndexMut_IndexMut
     [#"../list_index_mut.rs" 50 8 50 33] l <- ([#"../list_index_mut.rs" 50 8 50 33] _22);
     _22 <- any borrowed (ListIndexMut_List_Type.t_list);
     assume { resolve2 _23 };
-    [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - (1 : usize));
+    [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - ([#"../list_index_mut.rs" 52 14 52 15] (1 : usize)));
     goto BB3
   }
   BB8 {
@@ -283,7 +283,7 @@ module ListIndexMut_Write
     [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = ([#"../list_index_mut.rs" 64 4 64 25] v) ; };
     assume { resolve0 _9 };
     assume { resolve1 l };
-    [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] ());
+    [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] [#"../list_index_mut.rs" 63 46 65 1] ());
     return _0
   }
   
@@ -344,7 +344,7 @@ module ListIndexMut_F
   }
   BB0 {
     [#"../list_index_mut.rs" 68 47 68 51] _5 <- ([#"../list_index_mut.rs" 68 47 68 51] Core_Option_Option_Type.C_None);
-    [#"../list_index_mut.rs" 68 38 68 52] _4 <- ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List (10 : uint32) _5);
+    [#"../list_index_mut.rs" 68 38 68 52] _4 <- ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 43 68 45] (10 : uint32)) _5);
     _5 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB1
   }
@@ -357,7 +357,7 @@ module ListIndexMut_F
     goto BB3
   }
   BB3 {
-    [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List (1 : uint32) _2);
+    [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 21 68 22] (1 : uint32)) _2);
     _2 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB4
   }
@@ -366,13 +366,13 @@ module ListIndexMut_F
     [#"../list_index_mut.rs" 69 10 69 16] l <-  ^ _8;
     [#"../list_index_mut.rs" 69 10 69 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../list_index_mut.rs" 69 10 69 16] _8 <- { _8 with current = ( ^ _7) ; };
-    [#"../list_index_mut.rs" 69 4 69 23] _6 <- ([#"../list_index_mut.rs" 69 4 69 23] write0 _7 (0 : usize) (2 : uint32));
+    [#"../list_index_mut.rs" 69 4 69 23] _6 <- ([#"../list_index_mut.rs" 69 4 69 23] write0 _7 ([#"../list_index_mut.rs" 69 18 69 19] (0 : usize)) ([#"../list_index_mut.rs" 69 21 69 22] (2 : uint32)));
     _7 <- any borrowed (ListIndexMut_List_Type.t_list);
     goto BB5
   }
   BB5 {
     assume { resolve0 _8 };
-    [#"../list_index_mut.rs" 67 11 72 1] _0 <- ([#"../list_index_mut.rs" 67 11 72 1] ());
+    [#"../list_index_mut.rs" 67 11 72 1] _0 <- ([#"../list_index_mut.rs" 67 11 72 1] [#"../list_index_mut.rs" 67 11 72 1] ());
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index 2ad8c0e9c0..dd254777a5 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -444,7 +444,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     ensures { result = resolve0 self }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
@@ -470,7 +470,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] [#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
     goto BB1
   }
   BB1 {
@@ -480,7 +480,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB2
   }
   BB2 {
-    [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- ([#"../list_reversal_lasso.rs" 71 14 71 23] l <> (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- ([#"../list_reversal_lasso.rs" 71 14 71 23] l <> ([#"../list_reversal_lasso.rs" 71 19 71 23] (18446744073709551615 : usize)));
     switch (_12)
       | False -> goto BB6
       | True -> goto BB3
@@ -608,7 +608,7 @@ module ListReversalLasso_Impl4_ListReversalList
     ensures { result = list_seg0 self first s last l h }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
@@ -671,7 +671,7 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] [#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 101 20 101 35] n <- ([#"../list_reversal_lasso.rs" 101 20 101 35] Snapshot.new 0);
     goto BB1
   }
@@ -685,7 +685,7 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- ([#"../list_reversal_lasso.rs" 107 14 107 23] l <> (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- ([#"../list_reversal_lasso.rs" 107 14 107 23] l <> ([#"../list_reversal_lasso.rs" 107 19 107 23] (18446744073709551615 : usize)));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB4
@@ -877,7 +877,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     ensures { result = index_logic0 self ix }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   use prelude.Snapshot
   use prelude.Snapshot
   let rec cfg list_reversal_loop [#"../list_reversal_lasso.rs" 125 4 125 82] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) (l : usize) (s : Snapshot.snap_ty (Seq.seq usize)) : usize
@@ -906,7 +906,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] [#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 127 20 127 35] n <- ([#"../list_reversal_lasso.rs" 127 20 127 35] Snapshot.new 0);
     goto BB1
   }
@@ -921,7 +921,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- ([#"../list_reversal_lasso.rs" 137 14 137 23] l <> (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- ([#"../list_reversal_lasso.rs" 137 14 137 23] l <> ([#"../list_reversal_lasso.rs" 137 19 137 23] (18446744073709551615 : usize)));
     switch (_17)
       | False -> goto BB9
       | True -> goto BB4
@@ -1113,7 +1113,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     ensures { result = resolve0 self }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   use seq.Reverse
   use prelude.Snapshot
   function index_logic0 [@inline:trivial] (self : Snapshot.snap_ty (Seq.seq usize)) (ix : int) : usize =
@@ -1149,7 +1149,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] [#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 170 20 170 35] n <- ([#"../list_reversal_lasso.rs" 170 20 170 35] Snapshot.new 0);
     goto BB1
   }
@@ -1172,7 +1172,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- ([#"../list_reversal_lasso.rs" 190 14 190 23] l <> (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- ([#"../list_reversal_lasso.rs" 190 14 190 23] l <> ([#"../list_reversal_lasso.rs" 190 19 190 23] (18446744073709551615 : usize)));
     switch (_17)
       | False -> goto BB9
       | True -> goto BB4
@@ -1436,7 +1436,7 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     ensures { result = lasso0 self first s1 s2 }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
@@ -1611,7 +1611,7 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     ensures { result = lasso0 self first s1 s2 }
     
   let constant null0 [#"../list_reversal_lasso.rs" 13 0 13 15]  : usize = [@vc:do_not_keep_trace] [@vc:sp]
-    (18446744073709551615 : usize)
+    [#"../list_reversal_lasso.rs" 13 0 13 15] (18446744073709551615 : usize)
   predicate list0 [#"../list_reversal_lasso.rs" 91 4 91 54] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize)
     
    =
diff --git a/creusot/tests/should_succeed/loop.mlcfg b/creusot/tests/should_succeed/loop.mlcfg
index f5384ca1dd..cd9f3506c4 100644
--- a/creusot/tests/should_succeed/loop.mlcfg
+++ b/creusot/tests/should_succeed/loop.mlcfg
@@ -17,10 +17,10 @@ module Loop_F
     goto BB0
   }
   BB0 {
-    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] (10 : int32));
+    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] [#"../loop.rs" 4 16 4 18] (10 : int32));
     [#"../loop.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../loop.rs" 5 12 5 18] a <-  ^ b;
-    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] (5 : int32)) ; };
+    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] [#"../loop.rs" 6 9 6 10] (5 : int32)) ; };
     assume { resolve0 b };
     goto BB1
   }
@@ -28,13 +28,13 @@ module Loop_F
     goto BB2
   }
   BB2 {
-    switch (true)
+    switch ([#"../loop.rs" 8 11 8 15] true)
       | False -> goto BB4
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../loop.rs" 3 11 13 1] _0 <- ([#"../loop.rs" 3 11 13 1] ());
+    [#"../loop.rs" 3 11 13 1] _0 <- ([#"../loop.rs" 3 11 13 1] [#"../loop.rs" 3 11 13 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/mapping_test.mlcfg b/creusot/tests/should_succeed/mapping_test.mlcfg
index e754183262..fdf9961b91 100644
--- a/creusot/tests/should_succeed/mapping_test.mlcfg
+++ b/creusot/tests/should_succeed/mapping_test.mlcfg
@@ -69,10 +69,10 @@ module MappingTest_Incr
     goto BB1
   }
   BB1 {
-    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + (1 : int32))) ; };
+    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + ([#"../mapping_test.rs" 32 14 32 15] (1 : int32)))) ; };
     assume { resolve0 t };
     assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Snapshot.inner old_t))) 1 };
-    [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] ());
+    [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] [#"../mapping_test.rs" 30 19 36 1] ());
     return _0
   }
   
@@ -122,7 +122,7 @@ module MappingTest_F
     goto BB0
   }
   BB0 {
-    [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T (42 : int32));
+    [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T ([#"../mapping_test.rs" 39 23 39 25] (42 : int32)));
     assert { [@expl:assertion] [#"../mapping_test.rs" 40 19 40 34] Map.get (shallow_model0 x) 13 = 1 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 41 19 41 34] Map.get (shallow_model0 x) 42 = 0 };
     [#"../mapping_test.rs" 42 9 42 15] _8 <- Borrow.borrow_mut x;
@@ -137,7 +137,7 @@ module MappingTest_F
     assume { resolve0 _8 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 43 19 43 34] Map.get (shallow_model0 x) 13 = 1 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 44 19 44 34] Map.get (shallow_model0 x) 42 = 1 };
-    [#"../mapping_test.rs" 38 11 45 1] _0 <- ([#"../mapping_test.rs" 38 11 45 1] ());
+    [#"../mapping_test.rs" 38 11 45 1] _0 <- ([#"../mapping_test.rs" 38 11 45 1] [#"../mapping_test.rs" 38 11 45 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/match_int.mlcfg b/creusot/tests/should_succeed/match_int.mlcfg
index 96b4b86e70..60cef044ff 100644
--- a/creusot/tests/should_succeed/match_int.mlcfg
+++ b/creusot/tests/should_succeed/match_int.mlcfg
@@ -12,15 +12,15 @@ module MatchInt_F
     goto BB0
   }
   BB0 {
-    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] (1 : int32));
-    [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] (0 : int32) <= _1);
+    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] [#"../match_int.rs" 8 10 8 11] (1 : int32));
+    [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] ([#"../match_int.rs" 9 8 9 13] (0 : int32)) <= _1);
     switch (_2)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../match_int.rs" 9 8 9 13] _3 <- ([#"../match_int.rs" 9 8 9 13] _1 < (10 : int32));
+    [#"../match_int.rs" 9 8 9 13] _3 <- ([#"../match_int.rs" 9 8 9 13] _1 < ([#"../match_int.rs" 9 8 9 13] (10 : int32)));
     switch (_3)
       | False -> goto BB3
       | True -> goto BB2
@@ -45,13 +45,13 @@ module MatchInt_F
     goto BB10
   }
   BB6 {
-    switch (false)
+    switch ([#"../match_int.rs" 16 20 16 25] false)
       | False -> goto BB13
       | True -> goto BB14
       end
   }
   BB7 {
-    switch (true)
+    switch ([#"../match_int.rs" 10 20 10 24] true)
       | False -> goto BB8
       | True -> goto BB9
       end
@@ -61,11 +61,11 @@ module MatchInt_F
     absurd
   }
   BB9 {
-    [#"../match_int.rs" 10 25 10 25] _0 <- ([#"../match_int.rs" 10 25 10 25] ());
+    [#"../match_int.rs" 10 25 10 25] _0 <- ([#"../match_int.rs" 10 25 10 25] [#"../match_int.rs" 10 25 10 25] ());
     goto BB15
   }
   BB10 {
-    switch (false)
+    switch ([#"../match_int.rs" 13 20 13 25] false)
       | False -> goto BB11
       | True -> goto BB12
       end
@@ -75,7 +75,7 @@ module MatchInt_F
     absurd
   }
   BB12 {
-    [#"../match_int.rs" 13 26 13 26] _0 <- ([#"../match_int.rs" 13 26 13 26] ());
+    [#"../match_int.rs" 13 26 13 26] _0 <- ([#"../match_int.rs" 13 26 13 26] [#"../match_int.rs" 13 26 13 26] ());
     goto BB15
   }
   BB13 {
@@ -83,7 +83,7 @@ module MatchInt_F
     absurd
   }
   BB14 {
-    [#"../match_int.rs" 16 26 16 26] _0 <- ([#"../match_int.rs" 16 26 16 26] ());
+    [#"../match_int.rs" 16 26 16 26] _0 <- ([#"../match_int.rs" 16 26 16 26] [#"../match_int.rs" 16 26 16 26] ());
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/mc91.mlcfg b/creusot/tests/should_succeed/mc91.mlcfg
index f09ff21c56..98d1a1ce57 100644
--- a/creusot/tests/should_succeed/mc91.mlcfg
+++ b/creusot/tests/should_succeed/mc91.mlcfg
@@ -15,18 +15,18 @@ module Mc91_Mc91
     goto BB0
   }
   BB0 {
-    [#"../mc91.rs" 8 7 8 14] _3 <- ([#"../mc91.rs" 8 7 8 14] x > (100 : uint32));
+    [#"../mc91.rs" 8 7 8 14] _3 <- ([#"../mc91.rs" 8 7 8 14] x > ([#"../mc91.rs" 8 11 8 14] (100 : uint32)));
     switch (_3)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] x - (10 : uint32));
+    [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] x - ([#"../mc91.rs" 9 12 9 14] (10 : uint32)));
     goto BB5
   }
   BB2 {
-    [#"../mc91.rs" 11 18 11 24] _7 <- ([#"../mc91.rs" 11 18 11 24] x + (11 : uint32));
+    [#"../mc91.rs" 11 18 11 24] _7 <- ([#"../mc91.rs" 11 18 11 24] x + ([#"../mc91.rs" 11 22 11 24] (11 : uint32)));
     [#"../mc91.rs" 11 13 11 25] _6 <- ([#"../mc91.rs" 11 13 11 25] mc91 _7);
     _7 <- any uint32;
     goto BB3
diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg
index ece0d14179..eac5236a85 100644
--- a/creusot/tests/should_succeed/mutex.mlcfg
+++ b/creusot/tests/should_succeed/mutex.mlcfg
@@ -162,7 +162,7 @@ module Mutex_Impl3_Call
   }
   BB2 {
     [#"../mutex.rs" 102 18 102 28] val' <- ([#"../mutex.rs" 102 18 102 28] _5);
-    [#"../mutex.rs" 103 11 103 23] _7 <- ([#"../mutex.rs" 103 11 103 23] val' < (100000 : uint32));
+    [#"../mutex.rs" 103 11 103 23] _7 <- ([#"../mutex.rs" 103 11 103 23] val' < ([#"../mutex.rs" 103 17 103 23] (100000 : uint32)));
     switch (_7)
       | False -> goto BB5
       | True -> goto BB3
@@ -171,25 +171,25 @@ module Mutex_Impl3_Call
   BB3 {
     [#"../mutex.rs" 104 12 104 13] _10 <- Borrow.borrow_mut v;
     [#"../mutex.rs" 104 12 104 13] v <-  ^ _10;
-    [#"../mutex.rs" 104 18 104 25] _11 <- ([#"../mutex.rs" 104 18 104 25] val' + (2 : uint32));
+    [#"../mutex.rs" 104 18 104 25] _11 <- ([#"../mutex.rs" 104 18 104 25] val' + ([#"../mutex.rs" 104 24 104 25] (2 : uint32)));
     [#"../mutex.rs" 104 12 104 26] _9 <- ([#"../mutex.rs" 104 12 104 26] set0 _10 _11);
     _10 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
     _11 <- any uint32;
     goto BB4
   }
   BB4 {
-    [#"../mutex.rs" 103 24 105 9] _0 <- ([#"../mutex.rs" 103 24 105 9] ());
+    [#"../mutex.rs" 103 24 105 9] _0 <- ([#"../mutex.rs" 103 24 105 9] [#"../mutex.rs" 103 24 105 9] ());
     goto BB7
   }
   BB5 {
     [#"../mutex.rs" 106 12 106 13] _14 <- Borrow.borrow_mut v;
     [#"../mutex.rs" 106 12 106 13] v <-  ^ _14;
-    [#"../mutex.rs" 106 12 106 20] _13 <- ([#"../mutex.rs" 106 12 106 20] set0 _14 (0 : uint32));
+    [#"../mutex.rs" 106 12 106 20] _13 <- ([#"../mutex.rs" 106 12 106 20] set0 _14 ([#"../mutex.rs" 106 18 106 19] (0 : uint32)));
     _14 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
     goto BB6
   }
   BB6 {
-    [#"../mutex.rs" 105 15 107 9] _0 <- ([#"../mutex.rs" 105 15 107 9] ());
+    [#"../mutex.rs" 105 15 107 9] _0 <- ([#"../mutex.rs" 105 15 107 9] [#"../mutex.rs" 105 15 107 9] ());
     goto BB7
   }
   BB7 {
@@ -424,7 +424,7 @@ module Mutex_Concurrent
   }
   BB0 {
     [#"../mutex.rs" 164 52 164 56] _5 <- ([#"../mutex.rs" 164 52 164 56] Mutex_Even_Type.C_Even);
-    [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 (0 : uint32) _5);
+    [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 ([#"../mutex.rs" 164 49 164 50] (0 : uint32)) _5);
     _5 <- any Mutex_Even_Type.t_even;
     goto BB1
   }
@@ -463,7 +463,7 @@ module Mutex_Concurrent
     goto BB7
   }
   BB7 {
-    [#"../mutex.rs" 163 20 175 1] _0 <- ([#"../mutex.rs" 163 20 175 1] ());
+    [#"../mutex.rs" 163 20 175 1] _0 <- ([#"../mutex.rs" 163 20 175 1] [#"../mutex.rs" 163 20 175 1] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/one_side_update.mlcfg b/creusot/tests/should_succeed/one_side_update.mlcfg
index 8a9675a0ff..e8af0ae821 100644
--- a/creusot/tests/should_succeed/one_side_update.mlcfg
+++ b/creusot/tests/should_succeed/one_side_update.mlcfg
@@ -26,25 +26,25 @@ module OneSideUpdate_F
     goto BB0
   }
   BB0 {
-    [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt (10 : usize));
+    [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 6 22 6 24] (10 : usize)));
     [#"../one_side_update.rs" 7 12 7 18] b <- Borrow.borrow_mut a;
     [#"../one_side_update.rs" 7 12 7 18] a <-  ^ b;
-    switch (true)
+    switch ([#"../one_side_update.rs" 8 7 8 11] true)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
     assume { resolve0 b };
-    [#"../one_side_update.rs" 8 12 10 5] _0 <- ([#"../one_side_update.rs" 8 12 10 5] ());
+    [#"../one_side_update.rs" 8 12 10 5] _0 <- ([#"../one_side_update.rs" 8 12 10 5] [#"../one_side_update.rs" 8 12 10 5] ());
     goto BB3
   }
   BB2 {
-    [#"../one_side_update.rs" 11 13 11 21] _6 <- ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt (5 : usize));
+    [#"../one_side_update.rs" 11 13 11 21] _6 <- ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 11 19 11 20] (5 : usize)));
     [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = ([#"../one_side_update.rs" 11 8 11 21] _6) ; };
     _6 <- any OneSideUpdate_MyInt_Type.t_myint;
     assume { resolve0 b };
-    [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] ());
+    [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] [#"../one_side_update.rs" 10 11 12 5] ());
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/option.mlcfg b/creusot/tests/should_succeed/option.mlcfg
index 8091735123..467ea4307a 100644
--- a/creusot/tests/should_succeed/option.mlcfg
+++ b/creusot/tests/should_succeed/option.mlcfg
@@ -371,7 +371,7 @@ module Option_TestOption
   }
   BB0 {
     [#"../option.rs" 5 32 5 36] none <- ([#"../option.rs" 5 32 5 36] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some ([#"../option.rs" 6 37 6 38] (1 : int32)));
     [#"../option.rs" 9 12 9 26] _4 <- ([#"../option.rs" 9 12 9 26] is_some0 some);
     goto BB1
   }
@@ -436,7 +436,7 @@ module Option_TestOption
     absurd
   }
   BB15 {
-    [#"../option.rs" 14 12 14 30] _16 <- ([#"../option.rs" 14 12 14 30] _17 = (1 : int32));
+    [#"../option.rs" 14 12 14 30] _16 <- ([#"../option.rs" 14 12 14 30] _17 = ([#"../option.rs" 14 29 14 30] (1 : int32)));
     _17 <- any int32;
     switch (_16)
       | False -> goto BB17
@@ -444,7 +444,7 @@ module Option_TestOption
       end
   }
   BB16 {
-    [#"../option.rs" 19 12 19 29] _22 <- ([#"../option.rs" 19 12 19 29] unwrap_or0 some (2 : int32));
+    [#"../option.rs" 19 12 19 29] _22 <- ([#"../option.rs" 19 12 19 29] unwrap_or0 some ([#"../option.rs" 19 27 19 28] (2 : int32)));
     goto BB18
   }
   BB17 {
@@ -452,7 +452,7 @@ module Option_TestOption
     absurd
   }
   BB18 {
-    [#"../option.rs" 19 12 19 34] _21 <- ([#"../option.rs" 19 12 19 34] _22 = (1 : int32));
+    [#"../option.rs" 19 12 19 34] _21 <- ([#"../option.rs" 19 12 19 34] _22 = ([#"../option.rs" 19 33 19 34] (1 : int32)));
     _22 <- any int32;
     switch (_21)
       | False -> goto BB20
@@ -460,7 +460,7 @@ module Option_TestOption
       end
   }
   BB19 {
-    [#"../option.rs" 20 12 20 29] _27 <- ([#"../option.rs" 20 12 20 29] unwrap_or0 none (2 : int32));
+    [#"../option.rs" 20 12 20 29] _27 <- ([#"../option.rs" 20 12 20 29] unwrap_or0 none ([#"../option.rs" 20 27 20 28] (2 : int32)));
     goto BB21
   }
   BB20 {
@@ -468,7 +468,7 @@ module Option_TestOption
     absurd
   }
   BB21 {
-    [#"../option.rs" 20 12 20 34] _26 <- ([#"../option.rs" 20 12 20 34] _27 = (2 : int32));
+    [#"../option.rs" 20 12 20 34] _26 <- ([#"../option.rs" 20 12 20 34] _27 = ([#"../option.rs" 20 33 20 34] (2 : int32)));
     _27 <- any int32;
     switch (_26)
       | False -> goto BB23
@@ -513,13 +513,13 @@ module Option_TestOption
     goto BB29
   }
   BB29 {
-    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] (2 : int32)) ; };
+    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] [#"../option.rs" 24 30 24 31] (2 : int32)) ; };
     assume { resolve0 _36 };
     [#"../option.rs" 25 12 25 25] _41 <- ([#"../option.rs" 25 12 25 25] unwrap0 some);
     goto BB30
   }
   BB30 {
-    [#"../option.rs" 25 12 25 30] _40 <- ([#"../option.rs" 25 12 25 30] _41 = (2 : int32));
+    [#"../option.rs" 25 12 25 30] _40 <- ([#"../option.rs" 25 12 25 30] _41 = ([#"../option.rs" 25 29 25 30] (2 : int32)));
     _41 <- any int32;
     switch (_40)
       | False -> goto BB32
@@ -543,13 +543,13 @@ module Option_TestOption
     goto BB34
   }
   BB34 {
-    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] (1 : int32)) ; };
+    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] [#"../option.rs" 26 30 26 31] (1 : int32)) ; };
     assume { resolve0 _44 };
     [#"../option.rs" 27 12 27 25] _49 <- ([#"../option.rs" 27 12 27 25] unwrap0 some);
     goto BB35
   }
   BB35 {
-    [#"../option.rs" 27 12 27 30] _48 <- ([#"../option.rs" 27 12 27 30] _49 = (1 : int32));
+    [#"../option.rs" 27 12 27 30] _48 <- ([#"../option.rs" 27 12 27 30] _49 = ([#"../option.rs" 27 29 27 30] (1 : int32)));
     _49 <- any int32;
     switch (_48)
       | False -> goto BB37
@@ -588,7 +588,7 @@ module Option_TestOption
     goto BB43
   }
   BB43 {
-    [#"../option.rs" 30 12 30 40] _59 <- ([#"../option.rs" 30 12 30 40] _61 = (1 : int32));
+    [#"../option.rs" 30 12 30 40] _59 <- ([#"../option.rs" 30 12 30 40] _61 = ([#"../option.rs" 30 39 30 40] (1 : int32)));
     switch (_59)
       | False -> goto BB45
       | True -> goto BB44
@@ -613,7 +613,7 @@ module Option_TestOption
       end
   }
   BB48 {
-    [#"../option.rs" 34 21 34 28] _77 <- ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 34 21 34 28] _77 <- ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 34 26 34 27] (2 : int32)));
     [#"../option.rs" 34 12 34 29] _75 <- ([#"../option.rs" 34 12 34 29] and0 none _77);
     _77 <- any Core_Option_Option_Type.t_option int32;
     goto BB50
@@ -651,7 +651,7 @@ module Option_TestOption
       end
   }
   BB56 {
-    [#"../option.rs" 36 21 36 28] _91 <- ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 36 21 36 28] _91 <- ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 36 26 36 27] (2 : int32)));
     [#"../option.rs" 36 12 36 29] _89 <- ([#"../option.rs" 36 12 36 29] and0 some _91);
     _91 <- any Core_Option_Option_Type.t_option int32;
     goto BB58
@@ -666,7 +666,7 @@ module Option_TestOption
     goto BB59
   }
   BB59 {
-    [#"../option.rs" 36 12 36 43] _87 <- ([#"../option.rs" 36 12 36 43] _88 = (2 : int32));
+    [#"../option.rs" 36 12 36 43] _87 <- ([#"../option.rs" 36 12 36 43] _88 = ([#"../option.rs" 36 42 36 43] (2 : int32)));
     _88 <- any int32;
     switch (_87)
       | False -> goto BB61
@@ -692,7 +692,7 @@ module Option_TestOption
       end
   }
   BB64 {
-    [#"../option.rs" 39 20 39 27] _105 <- ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 39 20 39 27] _105 <- ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 39 25 39 26] (2 : int32)));
     [#"../option.rs" 39 12 39 28] _103 <- ([#"../option.rs" 39 12 39 28] or0 none _105);
     _105 <- any Core_Option_Option_Type.t_option int32;
     goto BB66
@@ -707,7 +707,7 @@ module Option_TestOption
     goto BB67
   }
   BB67 {
-    [#"../option.rs" 39 12 39 42] _101 <- ([#"../option.rs" 39 12 39 42] _102 = (2 : int32));
+    [#"../option.rs" 39 12 39 42] _101 <- ([#"../option.rs" 39 12 39 42] _102 = ([#"../option.rs" 39 41 39 42] (2 : int32)));
     _102 <- any int32;
     switch (_101)
       | False -> goto BB69
@@ -728,7 +728,7 @@ module Option_TestOption
     goto BB71
   }
   BB71 {
-    [#"../option.rs" 40 12 40 39] _108 <- ([#"../option.rs" 40 12 40 39] _109 = (1 : int32));
+    [#"../option.rs" 40 12 40 39] _108 <- ([#"../option.rs" 40 12 40 39] _109 = ([#"../option.rs" 40 38 40 39] (1 : int32)));
     _109 <- any int32;
     switch (_108)
       | False -> goto BB73
@@ -736,7 +736,7 @@ module Option_TestOption
       end
   }
   BB72 {
-    [#"../option.rs" 41 20 41 27] _119 <- ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some (2 : int32));
+    [#"../option.rs" 41 20 41 27] _119 <- ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 41 25 41 26] (2 : int32)));
     [#"../option.rs" 41 12 41 28] _117 <- ([#"../option.rs" 41 12 41 28] or0 some _119);
     _119 <- any Core_Option_Option_Type.t_option int32;
     goto BB74
@@ -751,7 +751,7 @@ module Option_TestOption
     goto BB75
   }
   BB75 {
-    [#"../option.rs" 41 12 41 42] _115 <- ([#"../option.rs" 41 12 41 42] _116 = (1 : int32));
+    [#"../option.rs" 41 12 41 42] _115 <- ([#"../option.rs" 41 12 41 42] _116 = ([#"../option.rs" 41 41 41 42] (1 : int32)));
     _116 <- any int32;
     switch (_115)
       | False -> goto BB77
@@ -810,7 +810,7 @@ module Option_TestOption
     goto BB86
   }
   BB86 {
-    [#"../option.rs" 46 12 46 37] _132 <- ([#"../option.rs" 46 12 46 37] _133 = (1 : int32));
+    [#"../option.rs" 46 12 46 37] _132 <- ([#"../option.rs" 46 12 46 37] _133 = ([#"../option.rs" 46 36 46 37] (1 : int32)));
     _133 <- any int32;
     switch (_132)
       | False -> goto BB88
@@ -832,12 +832,12 @@ module Option_TestOption
       end
   }
   BB90 {
-    [#"../option.rs" 48 11 48 18] _141 <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 48 11 48 18] _141 <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some ([#"../option.rs" 48 16 48 17] (1 : int32)));
     [#"../option.rs" 48 4 48 18] some <- ([#"../option.rs" 48 4 48 18] _141);
     _141 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 50 12 50 16] _146 <- Borrow.borrow_mut none;
     [#"../option.rs" 50 12 50 16] none <-  ^ _146;
-    [#"../option.rs" 50 12 50 27] _145 <- ([#"../option.rs" 50 12 50 27] replace0 _146 (2 : int32));
+    [#"../option.rs" 50 12 50 27] _145 <- ([#"../option.rs" 50 12 50 27] replace0 _146 ([#"../option.rs" 50 25 50 26] (2 : int32)));
     _146 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB92
   }
@@ -864,7 +864,7 @@ module Option_TestOption
     absurd
   }
   BB96 {
-    [#"../option.rs" 51 12 51 30] _149 <- ([#"../option.rs" 51 12 51 30] _150 = (2 : int32));
+    [#"../option.rs" 51 12 51 30] _149 <- ([#"../option.rs" 51 12 51 30] _150 = ([#"../option.rs" 51 29 51 30] (2 : int32)));
     _150 <- any int32;
     switch (_149)
       | False -> goto BB98
@@ -877,7 +877,7 @@ module Option_TestOption
     _153 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 53 12 53 16] _158 <- Borrow.borrow_mut some;
     [#"../option.rs" 53 12 53 16] some <-  ^ _158;
-    [#"../option.rs" 53 12 53 27] _157 <- ([#"../option.rs" 53 12 53 27] replace0 _158 (2 : int32));
+    [#"../option.rs" 53 12 53 27] _157 <- ([#"../option.rs" 53 12 53 27] replace0 _158 ([#"../option.rs" 53 25 53 26] (2 : int32)));
     _158 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB99
   }
@@ -891,7 +891,7 @@ module Option_TestOption
     goto BB100
   }
   BB100 {
-    [#"../option.rs" 53 12 53 41] _155 <- ([#"../option.rs" 53 12 53 41] _156 = (1 : int32));
+    [#"../option.rs" 53 12 53 41] _155 <- ([#"../option.rs" 53 12 53 41] _156 = ([#"../option.rs" 53 40 53 41] (1 : int32)));
     _156 <- any int32;
     switch (_155)
       | False -> goto BB102
@@ -907,7 +907,7 @@ module Option_TestOption
     absurd
   }
   BB103 {
-    [#"../option.rs" 54 12 54 30] _161 <- ([#"../option.rs" 54 12 54 30] _162 = (2 : int32));
+    [#"../option.rs" 54 12 54 30] _161 <- ([#"../option.rs" 54 12 54 30] _162 = ([#"../option.rs" 54 29 54 30] (2 : int32)));
     _162 <- any int32;
     switch (_161)
       | False -> goto BB105
@@ -917,7 +917,7 @@ module Option_TestOption
   BB104 {
     [#"../option.rs" 55 12 55 16] _169 <- Borrow.borrow_mut some;
     [#"../option.rs" 55 12 55 16] some <-  ^ _169;
-    [#"../option.rs" 55 12 55 27] _168 <- ([#"../option.rs" 55 12 55 27] replace0 _169 (1 : int32));
+    [#"../option.rs" 55 12 55 27] _168 <- ([#"../option.rs" 55 12 55 27] replace0 _169 ([#"../option.rs" 55 25 55 26] (1 : int32)));
     _169 <- any borrowed (Core_Option_Option_Type.t_option int32);
     goto BB106
   }
@@ -931,7 +931,7 @@ module Option_TestOption
     goto BB107
   }
   BB107 {
-    [#"../option.rs" 55 12 55 41] _166 <- ([#"../option.rs" 55 12 55 41] _167 = (2 : int32));
+    [#"../option.rs" 55 12 55 41] _166 <- ([#"../option.rs" 55 12 55 41] _167 = ([#"../option.rs" 55 40 55 41] (2 : int32)));
     _167 <- any int32;
     switch (_166)
       | False -> goto BB109
@@ -947,7 +947,7 @@ module Option_TestOption
     absurd
   }
   BB110 {
-    [#"../option.rs" 56 12 56 30] _172 <- ([#"../option.rs" 56 12 56 30] _173 = (1 : int32));
+    [#"../option.rs" 56 12 56 30] _172 <- ([#"../option.rs" 56 12 56 30] _173 = ([#"../option.rs" 56 29 56 30] (1 : int32)));
     _173 <- any int32;
     switch (_172)
       | False -> goto BB112
@@ -963,7 +963,7 @@ module Option_TestOption
     absurd
   }
   BB113 {
-    [#"../option.rs" 59 12 59 41] _177 <- ([#"../option.rs" 59 12 59 41] _178 = (0 : int32));
+    [#"../option.rs" 59 12 59 41] _177 <- ([#"../option.rs" 59 12 59 41] _178 = ([#"../option.rs" 59 40 59 41] (0 : int32)));
     _178 <- any int32;
     switch (_177)
       | False -> goto BB115
@@ -979,7 +979,7 @@ module Option_TestOption
     absurd
   }
   BB116 {
-    [#"../option.rs" 60 12 60 41] _182 <- ([#"../option.rs" 60 12 60 41] _183 = (1 : int32));
+    [#"../option.rs" 60 12 60 41] _182 <- ([#"../option.rs" 60 12 60 41] _183 = ([#"../option.rs" 60 40 60 41] (1 : int32)));
     _183 <- any int32;
     switch (_182)
       | False -> goto BB118
@@ -1028,7 +1028,7 @@ module Option_TestOption
     goto BB126
   }
   BB126 {
-    [#"../option.rs" 64 12 64 48] _194 <- ([#"../option.rs" 64 12 64 48] _195 = (1 : int32));
+    [#"../option.rs" 64 12 64 48] _194 <- ([#"../option.rs" 64 12 64 48] _195 = ([#"../option.rs" 64 47 64 48] (1 : int32)));
     _195 <- any int32;
     switch (_194)
       | False -> goto BB128
@@ -1083,7 +1083,7 @@ module Option_TestOption
     goto BB136
   }
   BB136 {
-    [#"../option.rs" 66 12 66 48] _208 <- ([#"../option.rs" 66 12 66 48] _209 = (1 : int32));
+    [#"../option.rs" 66 12 66 48] _208 <- ([#"../option.rs" 66 12 66 48] _209 = ([#"../option.rs" 66 47 66 48] (1 : int32)));
     _209 <- any int32;
     switch (_208)
       | False -> goto BB138
@@ -1132,7 +1132,7 @@ module Option_TestOption
     goto BB146
   }
   BB146 {
-    [#"../option.rs" 69 12 69 48] _222 <- ([#"../option.rs" 69 12 69 48] _223 = (1 : int32));
+    [#"../option.rs" 69 12 69 48] _222 <- ([#"../option.rs" 69 12 69 48] _223 = ([#"../option.rs" 69 47 69 48] (1 : int32)));
     _223 <- any int32;
     switch (_222)
       | False -> goto BB148
@@ -1187,7 +1187,7 @@ module Option_TestOption
     goto BB156
   }
   BB156 {
-    [#"../option.rs" 71 12 71 48] _236 <- ([#"../option.rs" 71 12 71 48] _237 = (1 : int32));
+    [#"../option.rs" 71 12 71 48] _236 <- ([#"../option.rs" 71 12 71 48] _237 = ([#"../option.rs" 71 47 71 48] (1 : int32)));
     _237 <- any int32;
     switch (_236)
       | False -> goto BB158
@@ -1235,7 +1235,7 @@ module Option_TestOption
       end
   }
   BB165 {
-    [#"../option.rs" 78 40 78 47] _258 <- ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../option.rs" 78 40 78 47] _258 <- ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some ([#"../option.rs" 78 45 78 46] (1 : int32)));
     [#"../option.rs" 78 35 78 48] opt2 <- ([#"../option.rs" 78 35 78 48] Core_Option_Option_Type.C_Some _258);
     _258 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 79 12 79 25] _262 <- ([#"../option.rs" 79 12 79 25] flatten0 opt2);
@@ -1251,7 +1251,7 @@ module Option_TestOption
     goto BB168
   }
   BB168 {
-    [#"../option.rs" 79 12 79 39] _260 <- ([#"../option.rs" 79 12 79 39] _261 = (1 : int32));
+    [#"../option.rs" 79 12 79 39] _260 <- ([#"../option.rs" 79 12 79 39] _261 = ([#"../option.rs" 79 38 79 39] (1 : int32)));
     _261 <- any int32;
     switch (_260)
       | False -> goto BB170
@@ -1259,7 +1259,7 @@ module Option_TestOption
       end
   }
   BB169 {
-    [#"../option.rs" 4 21 80 1] _0 <- ([#"../option.rs" 4 21 80 1] ());
+    [#"../option.rs" 4 21 80 1] _0 <- ([#"../option.rs" 4 21 80 1] [#"../option.rs" 4 21 80 1] ());
     return _0
   }
   BB170 {
diff --git a/creusot/tests/should_succeed/projection_toggle.mlcfg b/creusot/tests/should_succeed/projection_toggle.mlcfg
index 97b3ca30db..e7f1978e3a 100644
--- a/creusot/tests/should_succeed/projection_toggle.mlcfg
+++ b/creusot/tests/should_succeed/projection_toggle.mlcfg
@@ -136,8 +136,8 @@ module ProjectionToggle_F
     goto BB0
   }
   BB0 {
-    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
-    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
+    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] [#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
+    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] [#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
     [#"../projection_toggle.rs" 17 30 17 36] _5 <- Borrow.borrow_mut a;
     [#"../projection_toggle.rs" 17 30 17 36] a <-  ^ _5;
     [#"../projection_toggle.rs" 17 30 17 36] _4 <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
@@ -146,7 +146,7 @@ module ProjectionToggle_F
     [#"../projection_toggle.rs" 17 38 17 44] b <-  ^ _7;
     [#"../projection_toggle.rs" 17 38 17 44] _6 <- Borrow.borrow_final ( * _7) (Borrow.get_id _7);
     [#"../projection_toggle.rs" 17 38 17 44] _7 <- { _7 with current = ( ^ _6) ; };
-    [#"../projection_toggle.rs" 17 12 17 45] x <- ([#"../projection_toggle.rs" 17 12 17 45] proj_toggle0 true _4 _6);
+    [#"../projection_toggle.rs" 17 12 17 45] x <- ([#"../projection_toggle.rs" 17 12 17 45] proj_toggle0 ([#"../projection_toggle.rs" 17 24 17 28] true) _4 _6);
     _4 <- any borrowed int32;
     _6 <- any borrowed int32;
     goto BB1
@@ -154,16 +154,16 @@ module ProjectionToggle_F
   BB1 {
     assume { resolve0 _7 };
     assume { resolve0 _5 };
-    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11]  * x + (5 : int32)) ; };
+    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11]  * x + ([#"../projection_toggle.rs" 19 10 19 11] (5 : int32))) ; };
     assume { resolve0 x };
-    [#"../projection_toggle.rs" 20 12 20 19] _9 <- ([#"../projection_toggle.rs" 20 12 20 19] a = (15 : int32));
+    [#"../projection_toggle.rs" 20 12 20 19] _9 <- ([#"../projection_toggle.rs" 20 12 20 19] a = ([#"../projection_toggle.rs" 20 17 20 19] (15 : int32)));
     switch (_9)
       | False -> goto BB3
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../projection_toggle.rs" 13 11 21 1] _0 <- ([#"../projection_toggle.rs" 13 11 21 1] ());
+    [#"../projection_toggle.rs" 13 11 21 1] _0 <- ([#"../projection_toggle.rs" 13 11 21 1] [#"../projection_toggle.rs" 13 11 21 1] ());
     return _0
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/projections.mlcfg b/creusot/tests/should_succeed/projections.mlcfg
index 2c202a2f4b..1648dbf408 100644
--- a/creusot/tests/should_succeed/projections.mlcfg
+++ b/creusot/tests/should_succeed/projections.mlcfg
@@ -142,9 +142,9 @@ module Projections_WriteIntoSum
   BB4 {
     [#"../projections.rs" 18 13 18 14] y <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * x)) (Borrow.inherit_id (Borrow.get_id x) 1);
     [#"../projections.rs" 18 13 18 14] x <- { x with current = (let Core_Option_Option_Type.C_Some x0 =  * x in Core_Option_Option_Type.C_Some ( ^ y)) ; };
-    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] (10 : uint32)) ; };
+    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] [#"../projections.rs" 18 24 18 26] (10 : uint32)) ; };
     assume { resolve0 y };
-    [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] ());
+    [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] [#"../projections.rs" 18 19 18 26] ());
     assume { resolve1 x };
     goto BB5
   }
@@ -167,14 +167,14 @@ module Projections_F
     goto BB0
   }
   BB0 {
-    [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some (10 : int32));
+    [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some ([#"../projections.rs" 24 15 24 17] (10 : int32)));
     switch (_2)
       | Core_Option_Option_Type.C_None -> goto BB1
       | Core_Option_Option_Type.C_Some _ -> goto BB2
       end
   }
   BB1 {
-    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] false);
+    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] [#"../projections.rs" 26 16 26 21] false);
     goto BB5
   }
   BB2 {
@@ -186,11 +186,11 @@ module Projections_F
   }
   BB4 {
     [#"../projections.rs" 25 13 25 14] x <- ([#"../projections.rs" 25 13 25 14] Core_Option_Option_Type.some_0 _2);
-    [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] x = (0 : int32));
+    [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] x = ([#"../projections.rs" 25 24 25 25] (0 : int32)));
     goto BB5
   }
   BB5 {
-    [#"../projections.rs" 23 11 28 1] _0 <- ([#"../projections.rs" 23 11 28 1] ());
+    [#"../projections.rs" 23 11 28 1] _0 <- ([#"../projections.rs" 23 11 28 1] [#"../projections.rs" 23 11 28 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/prophecy.mlcfg b/creusot/tests/should_succeed/prophecy.mlcfg
index a25acd9ae6..249210270e 100644
--- a/creusot/tests/should_succeed/prophecy.mlcfg
+++ b/creusot/tests/should_succeed/prophecy.mlcfg
@@ -17,12 +17,12 @@ module Prophecy_F
     goto BB0
   }
   BB0 {
-    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] (0 : int32));
+    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] [#"../prophecy.rs" 4 16 4 17] (0 : int32));
     [#"../prophecy.rs" 5 12 5 18] y <- Borrow.borrow_mut x;
     [#"../prophecy.rs" 5 12 5 18] x <-  ^ y;
-    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] (5 : int32)) ; };
+    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] [#"../prophecy.rs" 9 9 9 10] (5 : int32)) ; };
     assume { resolve0 y };
-    [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] ());
+    [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] [#"../prophecy.rs" 3 11 10 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index bc7f67acbf..afeac33309 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -1056,7 +1056,7 @@ module RedBlackTree_Impl13_IsRed
       end
   }
   BB1 {
-    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] false);
+    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] [#"../red_black_tree.rs" 391 17 391 22] false);
     goto BB5
   }
   BB2 {
@@ -1071,7 +1071,7 @@ module RedBlackTree_Impl13_IsRed
     goto BB4
   }
   BB4 {
-    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] true);
+    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] [#"../red_black_tree.rs" 390 49 390 53] true);
     goto BB5
   }
   BB5 {
@@ -1612,7 +1612,7 @@ module RedBlackTree_Impl14_RotateRight
     goto BB11
   }
   BB11 {
-    [#"../red_black_tree.rs" 412 31 448 5] _0 <- ([#"../red_black_tree.rs" 412 31 448 5] ());
+    [#"../red_black_tree.rs" 412 31 448 5] _0 <- ([#"../red_black_tree.rs" 412 31 448 5] [#"../red_black_tree.rs" 412 31 448 5] ());
     goto BB12
   }
   BB12 {
@@ -2148,7 +2148,7 @@ module RedBlackTree_Impl14_RotateLeft
     goto BB11
   }
   BB11 {
-    [#"../red_black_tree.rs" 462 30 470 5] _0 <- ([#"../red_black_tree.rs" 462 30 470 5] ());
+    [#"../red_black_tree.rs" 462 30 470 5] _0 <- ([#"../red_black_tree.rs" 462 30 470 5] [#"../red_black_tree.rs" 462 30 470 5] ());
     goto BB12
   }
   BB12 {
@@ -2575,7 +2575,7 @@ module RedBlackTree_Impl14_FlipColors
     assume { resolve1 _18 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve2 self };
-    [#"../red_black_tree.rs" 486 30 489 5] _0 <- ([#"../red_black_tree.rs" 486 30 489 5] ());
+    [#"../red_black_tree.rs" 486 30 489 5] _0 <- ([#"../red_black_tree.rs" 486 30 489 5] [#"../red_black_tree.rs" 486 30 489 5] ());
     return _0
   }
   
@@ -3053,14 +3053,14 @@ module RedBlackTree_Impl14_Balance
     goto BB6
   }
   BB6 {
-    [#"../red_black_tree.rs" 511 54 513 9] _14 <- ([#"../red_black_tree.rs" 511 54 513 9] ());
+    [#"../red_black_tree.rs" 511 54 513 9] _14 <- ([#"../red_black_tree.rs" 511 54 513 9] [#"../red_black_tree.rs" 511 54 513 9] ());
     goto BB9
   }
   BB7 {
     goto BB8
   }
   BB8 {
-    [#"../red_black_tree.rs" 513 9 513 9] _14 <- ([#"../red_black_tree.rs" 513 9 513 9] ());
+    [#"../red_black_tree.rs" 513 9 513 9] _14 <- ([#"../red_black_tree.rs" 513 9 513 9] [#"../red_black_tree.rs" 513 9 513 9] ());
     goto BB9
   }
   BB9 {
@@ -3103,7 +3103,7 @@ module RedBlackTree_Impl14_Balance
     goto BB16
   }
   BB16 {
-    [#"../red_black_tree.rs" 515 80 517 9] _21 <- ([#"../red_black_tree.rs" 515 80 517 9] ());
+    [#"../red_black_tree.rs" 515 80 517 9] _21 <- ([#"../red_black_tree.rs" 515 80 517 9] [#"../red_black_tree.rs" 515 80 517 9] ());
     goto BB20
   }
   BB17 {
@@ -3113,7 +3113,7 @@ module RedBlackTree_Impl14_Balance
     goto BB19
   }
   BB19 {
-    [#"../red_black_tree.rs" 517 9 517 9] _21 <- ([#"../red_black_tree.rs" 517 9 517 9] ());
+    [#"../red_black_tree.rs" 517 9 517 9] _21 <- ([#"../red_black_tree.rs" 517 9 517 9] [#"../red_black_tree.rs" 517 9 517 9] ());
     goto BB20
   }
   BB20 {
@@ -3147,7 +3147,7 @@ module RedBlackTree_Impl14_Balance
   BB25 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../red_black_tree.rs" 519 53 521 9] _0 <- ([#"../red_black_tree.rs" 519 53 521 9] ());
+    [#"../red_black_tree.rs" 519 53 521 9] _0 <- ([#"../red_black_tree.rs" 519 53 521 9] [#"../red_black_tree.rs" 519 53 521 9] ());
     goto BB29
   }
   BB26 {
@@ -3161,7 +3161,7 @@ module RedBlackTree_Impl14_Balance
     goto BB28
   }
   BB28 {
-    [#"../red_black_tree.rs" 521 9 521 9] _0 <- ([#"../red_black_tree.rs" 521 9 521 9] ());
+    [#"../red_black_tree.rs" 521 9 521 9] _0 <- ([#"../red_black_tree.rs" 521 9 521 9] [#"../red_black_tree.rs" 521 9 521 9] ());
     goto BB29
   }
   BB29 {
@@ -5059,7 +5059,7 @@ module RedBlackTree_Impl15_InsertRec
     assume { resolve4 _11 };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve5 self };
-    [#"../red_black_tree.rs" 606 20 606 26] _0 <- ([#"../red_black_tree.rs" 606 20 606 26] ());
+    [#"../red_black_tree.rs" 606 20 606 26] _0 <- ([#"../red_black_tree.rs" 606 20 606 26] [#"../red_black_tree.rs" 606 20 606 26] ());
     goto BB32
   }
   BB16 {
@@ -5080,7 +5080,7 @@ module RedBlackTree_Impl15_InsertRec
     assume { resolve4 _11 };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve5 self };
-    [#"../red_black_tree.rs" 601 43 611 9] _0 <- ([#"../red_black_tree.rs" 601 43 611 9] ());
+    [#"../red_black_tree.rs" 601 43 611 9] _0 <- ([#"../red_black_tree.rs" 601 43 611 9] [#"../red_black_tree.rs" 601 43 611 9] ());
     goto BB31
   }
   BB19 {
@@ -5137,7 +5137,7 @@ module RedBlackTree_Impl15_InsertRec
     goto BB30
   }
   BB30 {
-    [#"../red_black_tree.rs" 619 12 619 18] _0 <- ([#"../red_black_tree.rs" 619 12 619 18] ());
+    [#"../red_black_tree.rs" 619 12 619 18] _0 <- ([#"../red_black_tree.rs" 619 12 619 18] [#"../red_black_tree.rs" 619 12 619 18] ());
     goto BB32
   }
   BB31 {
@@ -5627,7 +5627,7 @@ module RedBlackTree_Impl15_Insert
   }
   BB5 {
     assume { resolve2 _15 };
-    [#"../red_black_tree.rs" 626 45 630 5] _0 <- ([#"../red_black_tree.rs" 626 45 630 5] ());
+    [#"../red_black_tree.rs" 626 45 630 5] _0 <- ([#"../red_black_tree.rs" 626 45 630 5] [#"../red_black_tree.rs" 626 45 630 5] ());
     goto BB6
   }
   BB6 {
@@ -6254,7 +6254,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     goto BB8
   }
   BB7 {
-    [#"../red_black_tree.rs" 647 9 647 9] _16 <- ([#"../red_black_tree.rs" 647 9 647 9] ());
+    [#"../red_black_tree.rs" 647 9 647 9] _16 <- ([#"../red_black_tree.rs" 647 9 647 9] [#"../red_black_tree.rs" 647 9 647 9] ());
     goto BB8
   }
   BB8 {
@@ -6357,11 +6357,11 @@ module RedBlackTree_Impl15_DeleteMaxRec
     _37 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv4 _38 };
     assume { resolve1 _38 };
-    [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] ());
+    [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] [#"../red_black_tree.rs" 652 84 654 9] ());
     goto BB26
   }
   BB25 {
-    [#"../red_black_tree.rs" 654 9 654 9] _29 <- ([#"../red_black_tree.rs" 654 9 654 9] ());
+    [#"../red_black_tree.rs" 654 9 654 9] _29 <- ([#"../red_black_tree.rs" 654 9 654 9] [#"../red_black_tree.rs" 654 9 654 9] ());
     goto BB26
   }
   BB26 {
@@ -6928,7 +6928,7 @@ module RedBlackTree_Impl15_DeleteMax
     assume { resolve1 node };
     assert { [@expl:type invariant] inv4 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 672 13 672 13] _7 <- ([#"../red_black_tree.rs" 672 13 672 13] ());
+    [#"../red_black_tree.rs" 672 13 672 13] _7 <- ([#"../red_black_tree.rs" 672 13 672 13] [#"../red_black_tree.rs" 672 13 672 13] ());
     goto BB7
   }
   BB6 {
@@ -6939,7 +6939,7 @@ module RedBlackTree_Impl15_DeleteMax
     assume { resolve1 node };
     assert { [@expl:type invariant] inv4 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 670 35 672 13] _7 <- ([#"../red_black_tree.rs" 670 35 672 13] ());
+    [#"../red_black_tree.rs" 670 35 672 13] _7 <- ([#"../red_black_tree.rs" 670 35 672 13] [#"../red_black_tree.rs" 670 35 672 13] ());
     goto BB7
   }
   BB7 {
@@ -6990,13 +6990,13 @@ module RedBlackTree_Impl15_DeleteMax
     assume { resolve1 _23 };
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 678 25 680 9] _19 <- ([#"../red_black_tree.rs" 678 25 680 9] ());
+    [#"../red_black_tree.rs" 678 25 680 9] _19 <- ([#"../red_black_tree.rs" 678 25 680 9] [#"../red_black_tree.rs" 678 25 680 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 680 9 680 9] _19 <- ([#"../red_black_tree.rs" 680 9 680 9] ());
+    [#"../red_black_tree.rs" 680 9 680 9] _19 <- ([#"../red_black_tree.rs" 680 9 680 9] [#"../red_black_tree.rs" 680 9 680 9] ());
     goto BB15
   }
   BB15 {
@@ -7699,11 +7699,11 @@ module RedBlackTree_Impl15_DeleteMinRec
     _33 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv3 _34 };
     assume { resolve1 _34 };
-    [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] ());
+    [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] [#"../red_black_tree.rs" 702 82 704 9] ());
     goto BB21
   }
   BB20 {
-    [#"../red_black_tree.rs" 704 9 704 9] _25 <- ([#"../red_black_tree.rs" 704 9 704 9] ());
+    [#"../red_black_tree.rs" 704 9 704 9] _25 <- ([#"../red_black_tree.rs" 704 9 704 9] [#"../red_black_tree.rs" 704 9 704 9] ());
     goto BB21
   }
   BB21 {
@@ -8246,7 +8246,7 @@ module RedBlackTree_Impl15_DeleteMin
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 725 13 725 13] _7 <- ([#"../red_black_tree.rs" 725 13 725 13] ());
+    [#"../red_black_tree.rs" 725 13 725 13] _7 <- ([#"../red_black_tree.rs" 725 13 725 13] [#"../red_black_tree.rs" 725 13 725 13] ());
     goto BB7
   }
   BB6 {
@@ -8257,7 +8257,7 @@ module RedBlackTree_Impl15_DeleteMin
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 723 35 725 13] _7 <- ([#"../red_black_tree.rs" 723 35 725 13] ());
+    [#"../red_black_tree.rs" 723 35 725 13] _7 <- ([#"../red_black_tree.rs" 723 35 725 13] [#"../red_black_tree.rs" 723 35 725 13] ());
     goto BB7
   }
   BB7 {
@@ -8307,13 +8307,13 @@ module RedBlackTree_Impl15_DeleteMin
     assume { resolve1 _21 };
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 730 25 732 9] _17 <- ([#"../red_black_tree.rs" 730 25 732 9] ());
+    [#"../red_black_tree.rs" 730 25 732 9] _17 <- ([#"../red_black_tree.rs" 730 25 732 9] [#"../red_black_tree.rs" 730 25 732 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 732 9 732 9] _17 <- ([#"../red_black_tree.rs" 732 9 732 9] ());
+    [#"../red_black_tree.rs" 732 9 732 9] _17 <- ([#"../red_black_tree.rs" 732 9 732 9] [#"../red_black_tree.rs" 732 9 732 9] ());
     goto BB15
   }
   BB15 {
@@ -9267,11 +9267,11 @@ module RedBlackTree_Impl15_DeleteRec
     _35 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _36 };
     assume { resolve3 _36 };
-    [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] ());
+    [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] [#"../red_black_tree.rs" 756 90 758 17] ());
     goto BB21
   }
   BB20 {
-    [#"../red_black_tree.rs" 758 17 758 17] _27 <- ([#"../red_black_tree.rs" 758 17 758 17] ());
+    [#"../red_black_tree.rs" 758 17 758 17] _27 <- ([#"../red_black_tree.rs" 758 17 758 17] [#"../red_black_tree.rs" 758 17 758 17] ());
     goto BB21
   }
   BB21 {
@@ -9290,7 +9290,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB23 {
     [#"../red_black_tree.rs" 759 16 759 17] r <- ([#"../red_black_tree.rs" 759 16 759 17] _38);
     _38 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] ());
+    [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] [#"../red_black_tree.rs" 759 16 759 45] ());
     goto BB25
   }
   BB25 {
@@ -9326,7 +9326,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB30 {
     [#"../red_black_tree.rs" 764 20 764 21] r <- ([#"../red_black_tree.rs" 764 20 764 21] _46);
     _46 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] ());
+    [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] [#"../red_black_tree.rs" 764 20 764 50] ());
     goto BB32
   }
   BB32 {
@@ -9422,7 +9422,7 @@ module RedBlackTree_Impl15_DeleteRec
       end
   }
   BB48 {
-    [#"../red_black_tree.rs" 775 21 775 21] _63 <- ([#"../red_black_tree.rs" 775 21 775 21] ());
+    [#"../red_black_tree.rs" 775 21 775 21] _63 <- ([#"../red_black_tree.rs" 775 21 775 21] [#"../red_black_tree.rs" 775 21 775 21] ());
     goto BB51
   }
   BB49 {
@@ -9443,7 +9443,7 @@ module RedBlackTree_Impl15_DeleteRec
     _69 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _70 };
     assume { resolve3 _70 };
-    [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] ());
+    [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] [#"../red_black_tree.rs" 773 72 775 21] ());
     goto BB51
   }
   BB51 {
@@ -9525,7 +9525,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB59 {
     [#"../red_black_tree.rs" 781 24 781 25] r <- ([#"../red_black_tree.rs" 781 24 781 25] _87);
     _87 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] ());
+    [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] [#"../red_black_tree.rs" 781 24 781 36] ());
     goto BB61
   }
   BB61 {
@@ -9550,7 +9550,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB65 {
     [#"../red_black_tree.rs" 783 24 783 25] r <- ([#"../red_black_tree.rs" 783 24 783 25] _89);
     _89 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] ());
+    [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] [#"../red_black_tree.rs" 783 24 783 54] ());
     goto BB67
   }
   BB67 {
@@ -10115,7 +10115,7 @@ module RedBlackTree_Impl15_Delete
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _10 };
     assume { resolve2 _10 };
-    [#"../red_black_tree.rs" 806 13 806 13] _9 <- ([#"../red_black_tree.rs" 806 13 806 13] ());
+    [#"../red_black_tree.rs" 806 13 806 13] _9 <- ([#"../red_black_tree.rs" 806 13 806 13] [#"../red_black_tree.rs" 806 13 806 13] ());
     goto BB7
   }
   BB6 {
@@ -10126,7 +10126,7 @@ module RedBlackTree_Impl15_Delete
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _10 };
     assume { resolve2 _10 };
-    [#"../red_black_tree.rs" 804 35 806 13] _9 <- ([#"../red_black_tree.rs" 804 35 806 13] ());
+    [#"../red_black_tree.rs" 804 35 806 13] _9 <- ([#"../red_black_tree.rs" 804 35 806 13] [#"../red_black_tree.rs" 804 35 806 13] ());
     goto BB7
   }
   BB7 {
@@ -10180,13 +10180,13 @@ module RedBlackTree_Impl15_Delete
     assume { resolve1 _24 };
     assert { [@expl:type invariant] inv6 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 811 25 813 9] _20 <- ([#"../red_black_tree.rs" 811 25 813 9] ());
+    [#"../red_black_tree.rs" 811 25 813 9] _20 <- ([#"../red_black_tree.rs" 811 25 813 9] [#"../red_black_tree.rs" 811 25 813 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv6 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 813 9 813 9] _20 <- ([#"../red_black_tree.rs" 813 9 813 9] ());
+    [#"../red_black_tree.rs" 813 9 813 9] _20 <- ([#"../red_black_tree.rs" 813 9 813 9] [#"../red_black_tree.rs" 813 9 813 9] ());
     goto BB15
   }
   BB15 {
@@ -10666,7 +10666,7 @@ module RedBlackTree_Impl15_Get
     assert { [@expl:type invariant] inv0 _27 };
     assume { resolve1 _27 };
     [#"../red_black_tree.rs" 832 27 832 45] tree <- ([#"../red_black_tree.rs" 832 27 832 45] _27);
-    [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] ());
+    [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] [#"../red_black_tree.rs" 832 27 832 45] ());
     goto BB13
   }
   BB10 {
@@ -10684,7 +10684,7 @@ module RedBlackTree_Impl15_Get
     assert { [@expl:type invariant] inv0 _22 };
     assume { resolve1 _22 };
     [#"../red_black_tree.rs" 830 24 830 41] tree <- ([#"../red_black_tree.rs" 830 24 830 41] _22);
-    [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] ());
+    [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] [#"../red_black_tree.rs" 830 24 830 41] ());
     goto BB13
   }
   BB12 {
@@ -11248,7 +11248,7 @@ module RedBlackTree_Impl15_GetMut
     assume { resolve3 tree };
     [#"../red_black_tree.rs" 866 27 866 49] tree <- ([#"../red_black_tree.rs" 866 27 866 49] _36);
     _36 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] ());
+    [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] [#"../red_black_tree.rs" 866 27 866 49] ());
     assert { [@expl:type invariant] inv7 _37 };
     assume { resolve3 _37 };
     goto BB14
@@ -11276,7 +11276,7 @@ module RedBlackTree_Impl15_GetMut
     assume { resolve3 tree };
     [#"../red_black_tree.rs" 864 24 864 45] tree <- ([#"../red_black_tree.rs" 864 24 864 45] _31);
     _31 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] ());
+    [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] [#"../red_black_tree.rs" 864 24 864 45] ());
     assert { [@expl:type invariant] inv7 _32 };
     assume { resolve3 _32 };
     goto BB14
diff --git a/creusot/tests/should_succeed/replace.mlcfg b/creusot/tests/should_succeed/replace.mlcfg
index f360de269f..7b5eafc777 100644
--- a/creusot/tests/should_succeed/replace.mlcfg
+++ b/creusot/tests/should_succeed/replace.mlcfg
@@ -33,7 +33,7 @@ module Replace_Test
     goto BB3
   }
   BB3 {
-    [#"../replace.rs" 8 45 10 1] _0 <- ([#"../replace.rs" 8 45 10 1] ());
+    [#"../replace.rs" 8 45 10 1] _0 <- ([#"../replace.rs" 8 45 10 1] [#"../replace.rs" 8 45 10 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/resolve_uninit.mlcfg b/creusot/tests/should_succeed/resolve_uninit.mlcfg
index f4307d233b..3d4b7b50b8 100644
--- a/creusot/tests/should_succeed/resolve_uninit.mlcfg
+++ b/creusot/tests/should_succeed/resolve_uninit.mlcfg
@@ -43,7 +43,7 @@ module ResolveUninit_MaybeUninit
       end
   }
   BB1 {
-    [#"../resolve_uninit.rs" 8 12 8 24] _6 <- ([#"../resolve_uninit.rs" 8 12 8 24] default0 ());
+    [#"../resolve_uninit.rs" 8 12 8 24] _6 <- ([#"../resolve_uninit.rs" 8 12 8 24] default0 ([#"../resolve_uninit.rs" 8 12 8 24] ()));
     goto BB2
   }
   BB2 {
@@ -57,11 +57,11 @@ module ResolveUninit_MaybeUninit
     goto BB5
   }
   BB5 {
-    [#"../resolve_uninit.rs" 7 9 9 5] _4 <- ([#"../resolve_uninit.rs" 7 9 9 5] ());
+    [#"../resolve_uninit.rs" 7 9 9 5] _4 <- ([#"../resolve_uninit.rs" 7 9 9 5] [#"../resolve_uninit.rs" 7 9 9 5] ());
     goto BB7
   }
   BB6 {
-    [#"../resolve_uninit.rs" 9 5 9 5] _4 <- ([#"../resolve_uninit.rs" 9 5 9 5] ());
+    [#"../resolve_uninit.rs" 9 5 9 5] _4 <- ([#"../resolve_uninit.rs" 9 5 9 5] [#"../resolve_uninit.rs" 9 5 9 5] ());
     goto BB7
   }
   BB7 {
@@ -134,7 +134,7 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 21 8 21 19] y <- ([#"../resolve_uninit.rs" 21 8 21 19] _9);
     _9 <- any borrowed int32;
     assume { resolve0 _10 };
-    [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] ());
+    [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] [#"../resolve_uninit.rs" 19 9 23 5] ());
     goto BB7
   }
   BB2 {
@@ -145,20 +145,20 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 24 8 24 18] y <- ([#"../resolve_uninit.rs" 24 8 24 18] _11);
     _11 <- any borrowed int32;
     assume { resolve0 _12 };
-    [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] ());
+    [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] [#"../resolve_uninit.rs" 23 11 25 5] ());
     goto BB3
   }
   BB3 {
-    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] (5 : int32)) ; };
+    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] [#"../resolve_uninit.rs" 27 9 27 10] (5 : int32)) ; };
     assume { resolve0 y };
-    [#"../resolve_uninit.rs" 28 12 28 18] _14 <- ([#"../resolve_uninit.rs" 28 12 28 18] x = (5 : int32));
+    [#"../resolve_uninit.rs" 28 12 28 18] _14 <- ([#"../resolve_uninit.rs" 28 12 28 18] x = ([#"../resolve_uninit.rs" 28 17 28 18] (5 : int32)));
     switch (_14)
       | False -> goto BB5
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../resolve_uninit.rs" 15 38 29 1] _0 <- ([#"../resolve_uninit.rs" 15 38 29 1] ());
+    [#"../resolve_uninit.rs" 15 38 29 1] _0 <- ([#"../resolve_uninit.rs" 15 38 29 1] [#"../resolve_uninit.rs" 15 38 29 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/result/own.mlcfg b/creusot/tests/should_succeed/result/own.mlcfg
index 6371b85504..27ee1f4709 100644
--- a/creusot/tests/should_succeed/result/own.mlcfg
+++ b/creusot/tests/should_succeed/result/own.mlcfg
@@ -1188,7 +1188,7 @@ module Own_Impl0_UnwrapOrDefault
   BB4 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 132 33 132 45] _0 <- ([#"../own.rs" 132 33 132 45] default0 ());
+    [#"../own.rs" 132 33 132 45] _0 <- ([#"../own.rs" 132 33 132 45] default0 ([#"../own.rs" 132 33 132 45] ()));
     goto BB8
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/result/result.mlcfg b/creusot/tests/should_succeed/result/result.mlcfg
index b01063af64..dd1d9edbac 100644
--- a/creusot/tests/should_succeed/result/result.mlcfg
+++ b/creusot/tests/should_succeed/result/result.mlcfg
@@ -490,8 +490,8 @@ module Result_TestResult
     goto BB0
   }
   BB0 {
-    [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok (1 : int32));
-    [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err (-1 : int32));
+    [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok ([#"../result.rs" 4 38 4 39] (1 : int32)));
+    [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err ([#"../result.rs" 5 40 5 42] (-1 : int32)));
     [#"../result.rs" 8 12 8 22] _4 <- ([#"../result.rs" 8 12 8 22] is_ok0 ok);
     goto BB1
   }
@@ -561,7 +561,7 @@ module Result_TestResult
     goto BB16
   }
   BB16 {
-    [#"../result.rs" 13 12 13 33] _16 <- ([#"../result.rs" 13 12 13 33] _17 = (1 : int32));
+    [#"../result.rs" 13 12 13 33] _16 <- ([#"../result.rs" 13 12 13 33] _17 = ([#"../result.rs" 13 32 13 33] (1 : int32)));
     _17 <- any int32;
     switch (_16)
       | False -> goto BB18
@@ -618,7 +618,7 @@ module Result_TestResult
     goto BB28
   }
   BB28 {
-    [#"../result.rs" 17 12 17 36] _34 <- ([#"../result.rs" 17 12 17 36] _35 = (-1 : int32));
+    [#"../result.rs" 17 12 17 36] _34 <- ([#"../result.rs" 17 12 17 36] _35 = ([#"../result.rs" 17 34 17 36] (-1 : int32)));
     _35 <- any int32;
     switch (_34)
       | False -> goto BB30
@@ -639,7 +639,7 @@ module Result_TestResult
     goto BB32
   }
   BB32 {
-    [#"../result.rs" 20 12 20 38] _40 <- ([#"../result.rs" 20 12 20 38] _42 = (1 : int32));
+    [#"../result.rs" 20 12 20 38] _40 <- ([#"../result.rs" 20 12 20 38] _42 = ([#"../result.rs" 20 37 20 38] (1 : int32)));
     switch (_40)
       | False -> goto BB34
       | True -> goto BB33
@@ -659,7 +659,7 @@ module Result_TestResult
     goto BB36
   }
   BB36 {
-    [#"../result.rs" 21 12 21 44] _47 <- ([#"../result.rs" 21 12 21 44] _49 = (-1 : int32));
+    [#"../result.rs" 21 12 21 44] _47 <- ([#"../result.rs" 21 12 21 44] _49 = ([#"../result.rs" 21 42 21 44] (-1 : int32)));
     switch (_47)
       | False -> goto BB38
       | True -> goto BB37
@@ -682,13 +682,13 @@ module Result_TestResult
     goto BB40
   }
   BB40 {
-    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] (0 : int32)) ; };
+    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] [#"../result.rs" 23 28 23 29] (0 : int32)) ; };
     assume { resolve0 _53 };
     [#"../result.rs" 24 12 24 23] _58 <- ([#"../result.rs" 24 12 24 23] unwrap3 ok);
     goto BB41
   }
   BB41 {
-    [#"../result.rs" 24 12 24 28] _57 <- ([#"../result.rs" 24 12 24 28] _58 = (0 : int32));
+    [#"../result.rs" 24 12 24 28] _57 <- ([#"../result.rs" 24 12 24 28] _58 = ([#"../result.rs" 24 27 24 28] (0 : int32)));
     _58 <- any int32;
     switch (_57)
       | False -> goto BB43
@@ -712,13 +712,13 @@ module Result_TestResult
     goto BB45
   }
   BB45 {
-    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] (1 : int32)) ; };
+    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] [#"../result.rs" 25 28 25 29] (1 : int32)) ; };
     assume { resolve0 _61 };
     [#"../result.rs" 26 12 26 23] _66 <- ([#"../result.rs" 26 12 26 23] unwrap3 ok);
     goto BB46
   }
   BB46 {
-    [#"../result.rs" 26 12 26 28] _65 <- ([#"../result.rs" 26 12 26 28] _66 = (1 : int32));
+    [#"../result.rs" 26 12 26 28] _65 <- ([#"../result.rs" 26 12 26 28] _66 = ([#"../result.rs" 26 27 26 28] (1 : int32)));
     _66 <- any int32;
     switch (_65)
       | False -> goto BB48
@@ -742,13 +742,13 @@ module Result_TestResult
     goto BB50
   }
   BB50 {
-    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] (0 : int32)) ; };
+    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] [#"../result.rs" 27 33 27 34] (0 : int32)) ; };
     assume { resolve0 _69 };
     [#"../result.rs" 28 12 28 28] _74 <- ([#"../result.rs" 28 12 28 28] unwrap_err2 err);
     goto BB51
   }
   BB51 {
-    [#"../result.rs" 28 12 28 33] _73 <- ([#"../result.rs" 28 12 28 33] _74 = (0 : int32));
+    [#"../result.rs" 28 12 28 33] _73 <- ([#"../result.rs" 28 12 28 33] _74 = ([#"../result.rs" 28 32 28 33] (0 : int32)));
     _74 <- any int32;
     switch (_73)
       | False -> goto BB53
@@ -772,13 +772,13 @@ module Result_TestResult
     goto BB55
   }
   BB55 {
-    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] (-1 : int32)) ; };
+    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] [#"../result.rs" 29 33 29 35] (-1 : int32)) ; };
     assume { resolve0 _77 };
     [#"../result.rs" 30 12 30 28] _82 <- ([#"../result.rs" 30 12 30 28] unwrap_err2 err);
     goto BB56
   }
   BB56 {
-    [#"../result.rs" 30 12 30 34] _81 <- ([#"../result.rs" 30 12 30 34] _82 = (-1 : int32));
+    [#"../result.rs" 30 12 30 34] _81 <- ([#"../result.rs" 30 12 30 34] _82 = ([#"../result.rs" 30 32 30 34] (-1 : int32)));
     _82 <- any int32;
     switch (_81)
       | False -> goto BB58
@@ -794,7 +794,7 @@ module Result_TestResult
     absurd
   }
   BB59 {
-    [#"../result.rs" 33 12 33 28] _86 <- ([#"../result.rs" 33 12 33 28] _87 = (1 : int32));
+    [#"../result.rs" 33 12 33 28] _86 <- ([#"../result.rs" 33 12 33 28] _87 = ([#"../result.rs" 33 27 33 28] (1 : int32)));
     _87 <- any int32;
     switch (_86)
       | False -> goto BB61
@@ -810,7 +810,7 @@ module Result_TestResult
     absurd
   }
   BB62 {
-    [#"../result.rs" 37 12 37 34] _91 <- ([#"../result.rs" 37 12 37 34] _92 = (-1 : int32));
+    [#"../result.rs" 37 12 37 34] _91 <- ([#"../result.rs" 37 12 37 34] _92 = ([#"../result.rs" 37 32 37 34] (-1 : int32)));
     _92 <- any int32;
     switch (_91)
       | False -> goto BB64
@@ -818,7 +818,7 @@ module Result_TestResult
       end
   }
   BB63 {
-    [#"../result.rs" 40 12 40 27] _97 <- ([#"../result.rs" 40 12 40 27] unwrap_or0 ok (0 : int32));
+    [#"../result.rs" 40 12 40 27] _97 <- ([#"../result.rs" 40 12 40 27] unwrap_or0 ok ([#"../result.rs" 40 25 40 26] (0 : int32)));
     goto BB65
   }
   BB64 {
@@ -826,7 +826,7 @@ module Result_TestResult
     absurd
   }
   BB65 {
-    [#"../result.rs" 40 12 40 32] _96 <- ([#"../result.rs" 40 12 40 32] _97 = (1 : int32));
+    [#"../result.rs" 40 12 40 32] _96 <- ([#"../result.rs" 40 12 40 32] _97 = ([#"../result.rs" 40 31 40 32] (1 : int32)));
     _97 <- any int32;
     switch (_96)
       | False -> goto BB67
@@ -834,7 +834,7 @@ module Result_TestResult
       end
   }
   BB66 {
-    [#"../result.rs" 41 12 41 28] _102 <- ([#"../result.rs" 41 12 41 28] unwrap_or0 err (0 : int32));
+    [#"../result.rs" 41 12 41 28] _102 <- ([#"../result.rs" 41 12 41 28] unwrap_or0 err ([#"../result.rs" 41 26 41 27] (0 : int32)));
     goto BB68
   }
   BB67 {
@@ -842,7 +842,7 @@ module Result_TestResult
     absurd
   }
   BB68 {
-    [#"../result.rs" 41 12 41 33] _101 <- ([#"../result.rs" 41 12 41 33] _102 = (0 : int32));
+    [#"../result.rs" 41 12 41 33] _101 <- ([#"../result.rs" 41 12 41 33] _102 = ([#"../result.rs" 41 32 41 33] (0 : int32)));
     _102 <- any int32;
     switch (_101)
       | False -> goto BB70
@@ -858,7 +858,7 @@ module Result_TestResult
     absurd
   }
   BB71 {
-    [#"../result.rs" 43 12 43 39] _106 <- ([#"../result.rs" 43 12 43 39] _107 = (1 : int32));
+    [#"../result.rs" 43 12 43 39] _106 <- ([#"../result.rs" 43 12 43 39] _107 = ([#"../result.rs" 43 38 43 39] (1 : int32)));
     _107 <- any int32;
     switch (_106)
       | False -> goto BB73
@@ -874,7 +874,7 @@ module Result_TestResult
     absurd
   }
   BB74 {
-    [#"../result.rs" 44 12 44 40] _111 <- ([#"../result.rs" 44 12 44 40] _112 = (0 : int32));
+    [#"../result.rs" 44 12 44 40] _111 <- ([#"../result.rs" 44 12 44 40] _112 = ([#"../result.rs" 44 39 44 40] (0 : int32)));
     _112 <- any int32;
     switch (_111)
       | False -> goto BB76
@@ -882,7 +882,7 @@ module Result_TestResult
       end
   }
   BB75 {
-    [#"../result.rs" 47 26 47 33] _120 <- ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 47 26 47 33] _120 <- ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err ([#"../result.rs" 47 30 47 32] (-2 : int32)));
     [#"../result.rs" 47 12 47 34] _118 <- ([#"../result.rs" 47 12 47 34] and0 ok _120);
     _120 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB77
@@ -897,7 +897,7 @@ module Result_TestResult
     goto BB78
   }
   BB78 {
-    [#"../result.rs" 47 12 47 53] _116 <- ([#"../result.rs" 47 12 47 53] _117 = (-2 : int32));
+    [#"../result.rs" 47 12 47 53] _116 <- ([#"../result.rs" 47 12 47 53] _117 = ([#"../result.rs" 47 51 47 53] (-2 : int32)));
     _117 <- any int32;
     switch (_116)
       | False -> goto BB80
@@ -905,7 +905,7 @@ module Result_TestResult
       end
   }
   BB79 {
-    [#"../result.rs" 48 19 48 24] _127 <- ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 48 19 48 24] _127 <- ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok ([#"../result.rs" 48 22 48 23] (2 : int32)));
     [#"../result.rs" 48 12 48 25] _125 <- ([#"../result.rs" 48 12 48 25] and0 ok _127);
     _127 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB81
@@ -920,7 +920,7 @@ module Result_TestResult
     goto BB82
   }
   BB82 {
-    [#"../result.rs" 48 12 48 39] _123 <- ([#"../result.rs" 48 12 48 39] _124 = (2 : int32));
+    [#"../result.rs" 48 12 48 39] _123 <- ([#"../result.rs" 48 12 48 39] _124 = ([#"../result.rs" 48 38 48 39] (2 : int32)));
     _124 <- any int32;
     switch (_123)
       | False -> goto BB84
@@ -928,7 +928,7 @@ module Result_TestResult
       end
   }
   BB83 {
-    [#"../result.rs" 49 27 49 34] _134 <- ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 49 27 49 34] _134 <- ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err ([#"../result.rs" 49 31 49 33] (-2 : int32)));
     [#"../result.rs" 49 12 49 35] _132 <- ([#"../result.rs" 49 12 49 35] and0 err _134);
     _134 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB85
@@ -943,7 +943,7 @@ module Result_TestResult
     goto BB86
   }
   BB86 {
-    [#"../result.rs" 49 12 49 54] _130 <- ([#"../result.rs" 49 12 49 54] _131 = (-1 : int32));
+    [#"../result.rs" 49 12 49 54] _130 <- ([#"../result.rs" 49 12 49 54] _131 = ([#"../result.rs" 49 52 49 54] (-1 : int32)));
     _131 <- any int32;
     switch (_130)
       | False -> goto BB88
@@ -951,7 +951,7 @@ module Result_TestResult
       end
   }
   BB87 {
-    [#"../result.rs" 50 20 50 25] _141 <- ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 50 20 50 25] _141 <- ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok ([#"../result.rs" 50 23 50 24] (2 : int32)));
     [#"../result.rs" 50 12 50 26] _139 <- ([#"../result.rs" 50 12 50 26] and0 err _141);
     _141 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB89
@@ -966,7 +966,7 @@ module Result_TestResult
     goto BB90
   }
   BB90 {
-    [#"../result.rs" 50 12 50 45] _137 <- ([#"../result.rs" 50 12 50 45] _138 = (-1 : int32));
+    [#"../result.rs" 50 12 50 45] _137 <- ([#"../result.rs" 50 12 50 45] _138 = ([#"../result.rs" 50 43 50 45] (-1 : int32)));
     _138 <- any int32;
     switch (_137)
       | False -> goto BB92
@@ -974,7 +974,7 @@ module Result_TestResult
       end
   }
   BB91 {
-    [#"../result.rs" 53 18 53 25] _148 <- ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 53 18 53 25] _148 <- ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err ([#"../result.rs" 53 22 53 24] (-2 : int32)));
     [#"../result.rs" 53 12 53 26] _146 <- ([#"../result.rs" 53 12 53 26] or0 ok _148);
     _148 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB93
@@ -989,7 +989,7 @@ module Result_TestResult
     goto BB94
   }
   BB94 {
-    [#"../result.rs" 53 12 53 40] _144 <- ([#"../result.rs" 53 12 53 40] _145 = (1 : int32));
+    [#"../result.rs" 53 12 53 40] _144 <- ([#"../result.rs" 53 12 53 40] _145 = ([#"../result.rs" 53 39 53 40] (1 : int32)));
     _145 <- any int32;
     switch (_144)
       | False -> goto BB96
@@ -997,7 +997,7 @@ module Result_TestResult
       end
   }
   BB95 {
-    [#"../result.rs" 54 25 54 30] _155 <- ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 54 25 54 30] _155 <- ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok ([#"../result.rs" 54 28 54 29] (2 : int32)));
     [#"../result.rs" 54 12 54 31] _153 <- ([#"../result.rs" 54 12 54 31] or0 ok _155);
     _155 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB97
@@ -1012,7 +1012,7 @@ module Result_TestResult
     goto BB98
   }
   BB98 {
-    [#"../result.rs" 54 12 54 45] _151 <- ([#"../result.rs" 54 12 54 45] _152 = (1 : int32));
+    [#"../result.rs" 54 12 54 45] _151 <- ([#"../result.rs" 54 12 54 45] _152 = ([#"../result.rs" 54 44 54 45] (1 : int32)));
     _152 <- any int32;
     switch (_151)
       | False -> goto BB100
@@ -1020,7 +1020,7 @@ module Result_TestResult
       end
   }
   BB99 {
-    [#"../result.rs" 55 19 55 26] _162 <- ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err (-2 : int32));
+    [#"../result.rs" 55 19 55 26] _162 <- ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err ([#"../result.rs" 55 23 55 25] (-2 : int32)));
     [#"../result.rs" 55 12 55 27] _160 <- ([#"../result.rs" 55 12 55 27] or0 err _162);
     _162 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB101
@@ -1035,7 +1035,7 @@ module Result_TestResult
     goto BB102
   }
   BB102 {
-    [#"../result.rs" 55 12 55 46] _158 <- ([#"../result.rs" 55 12 55 46] _159 = (-2 : int32));
+    [#"../result.rs" 55 12 55 46] _158 <- ([#"../result.rs" 55 12 55 46] _159 = ([#"../result.rs" 55 44 55 46] (-2 : int32)));
     _159 <- any int32;
     switch (_158)
       | False -> goto BB104
@@ -1043,7 +1043,7 @@ module Result_TestResult
       end
   }
   BB103 {
-    [#"../result.rs" 56 26 56 31] _169 <- ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok (2 : int32));
+    [#"../result.rs" 56 26 56 31] _169 <- ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok ([#"../result.rs" 56 29 56 30] (2 : int32)));
     [#"../result.rs" 56 12 56 32] _167 <- ([#"../result.rs" 56 12 56 32] or0 err _169);
     _169 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB105
@@ -1058,7 +1058,7 @@ module Result_TestResult
     goto BB106
   }
   BB106 {
-    [#"../result.rs" 56 12 56 46] _165 <- ([#"../result.rs" 56 12 56 46] _166 = (2 : int32));
+    [#"../result.rs" 56 12 56 46] _165 <- ([#"../result.rs" 56 12 56 46] _166 = ([#"../result.rs" 56 45 56 46] (2 : int32)));
     _166 <- any int32;
     switch (_165)
       | False -> goto BB108
@@ -1084,7 +1084,7 @@ module Result_TestResult
     goto BB111
   }
   BB111 {
-    [#"../result.rs" 59 12 59 46] _172 <- ([#"../result.rs" 59 12 59 46] _173 = (1 : int32));
+    [#"../result.rs" 59 12 59 46] _172 <- ([#"../result.rs" 59 12 59 46] _173 = ([#"../result.rs" 59 45 59 46] (1 : int32)));
     _173 <- any int32;
     switch (_172)
       | False -> goto BB113
@@ -1110,7 +1110,7 @@ module Result_TestResult
     goto BB116
   }
   BB116 {
-    [#"../result.rs" 60 12 60 53] _179 <- ([#"../result.rs" 60 12 60 53] _181 = (-1 : int32));
+    [#"../result.rs" 60 12 60 53] _179 <- ([#"../result.rs" 60 12 60 53] _181 = ([#"../result.rs" 60 51 60 53] (-1 : int32)));
     switch (_179)
       | False -> goto BB118
       | True -> goto BB117
@@ -1138,7 +1138,7 @@ module Result_TestResult
     goto BB121
   }
   BB121 {
-    [#"../result.rs" 61 12 61 46] _187 <- ([#"../result.rs" 61 12 61 46] _188 = (1 : int32));
+    [#"../result.rs" 61 12 61 46] _187 <- ([#"../result.rs" 61 12 61 46] _188 = ([#"../result.rs" 61 45 61 46] (1 : int32)));
     _188 <- any int32;
     switch (_187)
       | False -> goto BB123
@@ -1168,7 +1168,7 @@ module Result_TestResult
   }
   BB126 {
     assume { resolve0 _196 };
-    [#"../result.rs" 62 12 62 53] _194 <- ([#"../result.rs" 62 12 62 53]  * _196 = (-1 : int32));
+    [#"../result.rs" 62 12 62 53] _194 <- ([#"../result.rs" 62 12 62 53]  * _196 = ([#"../result.rs" 62 51 62 53] (-1 : int32)));
     switch (_194)
       | False -> goto BB128
       | True -> goto BB127
@@ -1193,7 +1193,7 @@ module Result_TestResult
     goto BB131
   }
   BB131 {
-    [#"../result.rs" 64 12 64 46] _202 <- ([#"../result.rs" 64 12 64 46] _203 = (1 : int32));
+    [#"../result.rs" 64 12 64 46] _202 <- ([#"../result.rs" 64 12 64 46] _203 = ([#"../result.rs" 64 45 64 46] (1 : int32)));
     _203 <- any int32;
     switch (_202)
       | False -> goto BB133
@@ -1219,7 +1219,7 @@ module Result_TestResult
     goto BB136
   }
   BB136 {
-    [#"../result.rs" 65 12 65 53] _209 <- ([#"../result.rs" 65 12 65 53] _211 = (-1 : int32));
+    [#"../result.rs" 65 12 65 53] _209 <- ([#"../result.rs" 65 12 65 53] _211 = ([#"../result.rs" 65 51 65 53] (-1 : int32)));
     switch (_209)
       | False -> goto BB138
       | True -> goto BB137
@@ -1247,7 +1247,7 @@ module Result_TestResult
     goto BB141
   }
   BB141 {
-    [#"../result.rs" 66 12 66 46] _217 <- ([#"../result.rs" 66 12 66 46] _218 = (1 : int32));
+    [#"../result.rs" 66 12 66 46] _217 <- ([#"../result.rs" 66 12 66 46] _218 = ([#"../result.rs" 66 45 66 46] (1 : int32)));
     _218 <- any int32;
     switch (_217)
       | False -> goto BB143
@@ -1277,7 +1277,7 @@ module Result_TestResult
   }
   BB146 {
     assume { resolve0 _226 };
-    [#"../result.rs" 67 12 67 53] _224 <- ([#"../result.rs" 67 12 67 53]  * _226 = (-1 : int32));
+    [#"../result.rs" 67 12 67 53] _224 <- ([#"../result.rs" 67 12 67 53]  * _226 = ([#"../result.rs" 67 51 67 53] (-1 : int32)));
     switch (_224)
       | False -> goto BB148
       | True -> goto BB147
@@ -1305,7 +1305,7 @@ module Result_TestResult
       end
   }
   BB151 {
-    [#"../result.rs" 72 43 72 50] _240 <- ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some (1 : int32));
+    [#"../result.rs" 72 43 72 50] _240 <- ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some ([#"../result.rs" 72 48 72 49] (1 : int32)));
     [#"../result.rs" 72 40 72 51] res1 <- ([#"../result.rs" 72 40 72 51] Core_Result_Result_Type.C_Ok _240);
     _240 <- any Core_Option_Option_Type.t_option int32;
     [#"../result.rs" 73 12 73 27] _245 <- ([#"../result.rs" 73 12 73 27] transpose0 res1);
@@ -1326,7 +1326,7 @@ module Result_TestResult
     goto BB155
   }
   BB155 {
-    [#"../result.rs" 73 12 73 50] _242 <- ([#"../result.rs" 73 12 73 50] _243 = (1 : int32));
+    [#"../result.rs" 73 12 73 50] _242 <- ([#"../result.rs" 73 12 73 50] _243 = ([#"../result.rs" 73 49 73 50] (1 : int32)));
     _243 <- any int32;
     switch (_242)
       | False -> goto BB157
@@ -1334,7 +1334,7 @@ module Result_TestResult
       end
   }
   BB156 {
-    [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err (-1 : int32));
+    [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err ([#"../result.rs" 74 44 74 46] (-1 : int32)));
     [#"../result.rs" 75 12 75 27] _253 <- ([#"../result.rs" 75 12 75 27] transpose0 res2);
     goto BB158
   }
@@ -1353,7 +1353,7 @@ module Result_TestResult
     goto BB160
   }
   BB160 {
-    [#"../result.rs" 75 12 75 55] _250 <- ([#"../result.rs" 75 12 75 55] _251 = (-1 : int32));
+    [#"../result.rs" 75 12 75 55] _250 <- ([#"../result.rs" 75 12 75 55] _251 = ([#"../result.rs" 75 53 75 55] (-1 : int32)));
     _251 <- any int32;
     switch (_250)
       | False -> goto BB162
@@ -1361,7 +1361,7 @@ module Result_TestResult
       end
   }
   BB161 {
-    [#"../result.rs" 3 21 76 1] _0 <- ([#"../result.rs" 3 21 76 1] ());
+    [#"../result.rs" 3 21 76 1] _0 <- ([#"../result.rs" 3 21 76 1] [#"../result.rs" 3 21 76 1] ());
     return _0
   }
   BB162 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
index 6bc1d51054..aa6551e937 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
@@ -110,7 +110,7 @@ module IncMax_IncMax
   BB1 {
     assume { resolve0 _8 };
     assume { resolve0 _6 };
-    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12]  * mc + (1 : uint32)) ; };
+    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12]  * mc + ([#"../inc_max.rs" 17 11 17 12] (1 : uint32))) ; };
     assume { resolve0 mc };
     [#"../inc_max.rs" 18 12 18 18] _10 <- ([#"../inc_max.rs" 18 12 18 18] a <> b);
     switch (_10)
@@ -119,7 +119,7 @@ module IncMax_IncMax
       end
   }
   BB2 {
-    [#"../inc_max.rs" 15 39 19 1] _0 <- ([#"../inc_max.rs" 15 39 19 1] ());
+    [#"../inc_max.rs" 15 39 19 1] _0 <- ([#"../inc_max.rs" 15 39 19 1] [#"../inc_max.rs" 15 39 19 1] ());
     return _0
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
index 426d30ec0c..218a4d16d3 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
@@ -73,11 +73,11 @@ module IncMax3_IncMax3
   BB2 {
     assume { resolve0 _14 };
     assume { resolve0 _12 };
-    [#"../inc_max_3.rs" 13 17 15 5] _6 <- ([#"../inc_max_3.rs" 13 17 15 5] ());
+    [#"../inc_max_3.rs" 13 17 15 5] _6 <- ([#"../inc_max_3.rs" 13 17 15 5] [#"../inc_max_3.rs" 13 17 15 5] ());
     goto BB4
   }
   BB3 {
-    [#"../inc_max_3.rs" 15 5 15 5] _6 <- ([#"../inc_max_3.rs" 15 5 15 5] ());
+    [#"../inc_max_3.rs" 15 5 15 5] _6 <- ([#"../inc_max_3.rs" 15 5 15 5] [#"../inc_max_3.rs" 15 5 15 5] ());
     goto BB4
   }
   BB4 {
@@ -105,12 +105,12 @@ module IncMax3_IncMax3
     assume { resolve0 _23 };
     assume { resolve0 _21 };
     assume { resolve1 mc };
-    [#"../inc_max_3.rs" 16 17 18 5] _15 <- ([#"../inc_max_3.rs" 16 17 18 5] ());
+    [#"../inc_max_3.rs" 16 17 18 5] _15 <- ([#"../inc_max_3.rs" 16 17 18 5] [#"../inc_max_3.rs" 16 17 18 5] ());
     goto BB8
   }
   BB7 {
     assume { resolve1 mc };
-    [#"../inc_max_3.rs" 18 5 18 5] _15 <- ([#"../inc_max_3.rs" 18 5 18 5] ());
+    [#"../inc_max_3.rs" 18 5 18 5] _15 <- ([#"../inc_max_3.rs" 18 5 18 5] [#"../inc_max_3.rs" 18 5 18 5] ());
     goto BB8
   }
   BB8 {
@@ -137,19 +137,19 @@ module IncMax3_IncMax3
   BB10 {
     assume { resolve0 _32 };
     assume { resolve0 _30 };
-    [#"../inc_max_3.rs" 19 17 21 5] _24 <- ([#"../inc_max_3.rs" 19 17 21 5] ());
+    [#"../inc_max_3.rs" 19 17 21 5] _24 <- ([#"../inc_max_3.rs" 19 17 21 5] [#"../inc_max_3.rs" 19 17 21 5] ());
     goto BB12
   }
   BB11 {
-    [#"../inc_max_3.rs" 21 5 21 5] _24 <- ([#"../inc_max_3.rs" 21 5 21 5] ());
+    [#"../inc_max_3.rs" 21 5 21 5] _24 <- ([#"../inc_max_3.rs" 21 5 21 5] [#"../inc_max_3.rs" 21 5 21 5] ());
     goto BB12
   }
   BB12 {
-    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12]  * ma + (2 : uint32)) ; };
+    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12]  * ma + ([#"../inc_max_3.rs" 22 11 22 12] (2 : uint32))) ; };
     assume { resolve1 ma };
-    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12]  * mb + (1 : uint32)) ; };
+    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12]  * mb + ([#"../inc_max_3.rs" 23 11 23 12] (1 : uint32))) ; };
     assume { resolve1 mb };
-    [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] ());
+    [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] [#"../inc_max_3.rs" 12 80 24 1] ());
     return _0
   }
   
@@ -232,7 +232,7 @@ module IncMax3_TestIncMax3
       end
   }
   BB4 {
-    [#"../inc_max_3.rs" 27 58 30 1] _0 <- ([#"../inc_max_3.rs" 27 58 30 1] ());
+    [#"../inc_max_3.rs" 27 58 30 1] _0 <- ([#"../inc_max_3.rs" 27 58 30 1] [#"../inc_max_3.rs" 27 58 30 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
index 62e0af910a..2d21ff1091 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
@@ -137,7 +137,7 @@ module IncMaxMany_IncMaxMany
       end
   }
   BB4 {
-    [#"../inc_max_many.rs" 15 52 19 1] _0 <- ([#"../inc_max_many.rs" 15 52 19 1] ());
+    [#"../inc_max_many.rs" 15 52 19 1] _0 <- ([#"../inc_max_many.rs" 15 52 19 1] [#"../inc_max_many.rs" 15 52 19 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
index b673e8b19e..bf6bde749b 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
@@ -254,7 +254,7 @@ module IncMaxRepeat_IncMaxRepeat
     goto BB0
   }
   BB0 {
-    [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) n);
+    [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range ([#"../inc_max_repeat.rs" 18 13 18 14] (0 : uint32)) n);
     [#"../inc_max_repeat.rs" 16 4 16 86] iter <- ([#"../inc_max_repeat.rs" 16 4 16 86] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
@@ -333,7 +333,7 @@ module IncMaxRepeat_IncMaxRepeat
   BB12 {
     assume { resolve1 _29 };
     assume { resolve1 _27 };
-    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16]  * mc + (1 : uint32)) ; };
+    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16]  * mc + ([#"../inc_max_repeat.rs" 20 15 20 16] (1 : uint32))) ; };
     assume { resolve1 mc };
     goto BB4
   }
@@ -350,7 +350,7 @@ module IncMaxRepeat_IncMaxRepeat
       end
   }
   BB15 {
-    [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- ([#"../inc_max_repeat.rs" 15 54 23 1] ());
+    [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- ([#"../inc_max_repeat.rs" 15 54 23 1] [#"../inc_max_repeat.rs" 15 54 23 1] ());
     return _0
   }
   BB16 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index f91b29fa98..73942e7127 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -74,7 +74,7 @@ module IncSome2List_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
+    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] [#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -189,7 +189,7 @@ module IncSome2List_Impl0_TakeSomeRest
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_list.rs" 58 19 58 27] _10 <- ([#"../inc_some_2_list.rs" 58 19 58 27] random0 ());
+    [#"../inc_some_2_list.rs" 58 19 58 27] _10 <- ([#"../inc_some_2_list.rs" 58 19 58 27] random0 ([#"../inc_some_2_list.rs" 58 19 58 27] ()));
     goto BB6
   }
   BB6 {
@@ -351,7 +351,7 @@ module IncSome2List_IncSome2List
       end
   }
   BB6 {
-    [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- ([#"../inc_some_2_list.rs" 70 52 77 1] ());
+    [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- ([#"../inc_some_2_list.rs" 70 52 77 1] [#"../inc_some_2_list.rs" 70 52 77 1] ());
     goto BB8
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
index 81af8dc36f..6b17078dfb 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
@@ -91,7 +91,7 @@ module IncSome2Tree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] [#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -217,7 +217,7 @@ module IncSome2Tree_Impl0_TakeSomeRest
     [#"../inc_some_2_tree.rs" 65 26 65 29] mtr <- Borrow.borrow_final (IncSome2Tree_Tree_Type.node_2 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 3);
     [#"../inc_some_2_tree.rs" 65 26 65 29] self <- { self with current = (let IncSome2Tree_Tree_Type.C_Node x0 x1 x2 =  * self in IncSome2Tree_Tree_Type.C_Node x0 x1 ( ^ mtr)) ; };
     assert { [@expl:assertion] [#"../inc_some_2_tree.rs" 67 20 67 42] let _ = lemma_sum_nonneg0 ( * mtl) in let _ = lemma_sum_nonneg0 ( * mtr) in true };
-    [#"../inc_some_2_tree.rs" 71 19 71 27] _11 <- ([#"../inc_some_2_tree.rs" 71 19 71 27] random0 ());
+    [#"../inc_some_2_tree.rs" 71 19 71 27] _11 <- ([#"../inc_some_2_tree.rs" 71 19 71 27] random0 ([#"../inc_some_2_tree.rs" 71 19 71 27] ()));
     goto BB5
   }
   BB5 {
@@ -229,7 +229,7 @@ module IncSome2Tree_Impl0_TakeSomeRest
   BB6 {
     [#"../inc_some_2_tree.rs" 72 21 72 23] _12 <- Borrow.borrow_final ( * ma) (Borrow.get_id ma);
     [#"../inc_some_2_tree.rs" 72 21 72 23] ma <- { ma with current = ( ^ _12) ; };
-    [#"../inc_some_2_tree.rs" 72 28 72 36] _15 <- ([#"../inc_some_2_tree.rs" 72 28 72 36] random0 ());
+    [#"../inc_some_2_tree.rs" 72 28 72 36] _15 <- ([#"../inc_some_2_tree.rs" 72 28 72 36] random0 ([#"../inc_some_2_tree.rs" 72 28 72 36] ()));
     goto BB7
   }
   BB7 {
@@ -264,7 +264,7 @@ module IncSome2Tree_Impl0_TakeSomeRest
   }
   BB11 {
     assume { resolve0 ma };
-    [#"../inc_some_2_tree.rs" 73 26 73 34] _17 <- ([#"../inc_some_2_tree.rs" 73 26 73 34] random0 ());
+    [#"../inc_some_2_tree.rs" 73 26 73 34] _17 <- ([#"../inc_some_2_tree.rs" 73 26 73 34] random0 ([#"../inc_some_2_tree.rs" 73 26 73 34] ()));
     goto BB12
   }
   BB12 {
@@ -431,7 +431,7 @@ module IncSome2Tree_IncSome2Tree
       end
   }
   BB6 {
-    [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- ([#"../inc_some_2_tree.rs" 85 52 92 1] ());
+    [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- ([#"../inc_some_2_tree.rs" 85 52 92 1] [#"../inc_some_2_tree.rs" 85 52 92 1] ());
     goto BB8
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index 18a224e3c3..34b6255ef6 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -74,7 +74,7 @@ module IncSomeList_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
+    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] [#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -192,7 +192,7 @@ module IncSomeList_Impl0_TakeSome
     goto BB5
   }
   BB5 {
-    [#"../inc_some_list.rs" 55 19 55 27] _13 <- ([#"../inc_some_list.rs" 55 19 55 27] random0 ());
+    [#"../inc_some_list.rs" 55 19 55 27] _13 <- ([#"../inc_some_list.rs" 55 19 55 27] random0 ([#"../inc_some_list.rs" 55 19 55 27] ()));
     goto BB6
   }
   BB6 {
@@ -330,7 +330,7 @@ module IncSomeList_IncSomeList
       end
   }
   BB5 {
-    [#"../inc_some_list.rs" 67 42 72 1] _0 <- ([#"../inc_some_list.rs" 67 42 72 1] ());
+    [#"../inc_some_list.rs" 67 42 72 1] _0 <- ([#"../inc_some_list.rs" 67 42 72 1] [#"../inc_some_list.rs" 67 42 72 1] ());
     goto BB7
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
index 31f1d09150..7a5ba7246a 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
@@ -91,7 +91,7 @@ module IncSomeTree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] [#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -219,7 +219,7 @@ module IncSomeTree_Impl0_TakeSome
     [#"../inc_some_tree.rs" 63 26 63 29] mtr <- Borrow.borrow_final (IncSomeTree_Tree_Type.node_2 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 3);
     [#"../inc_some_tree.rs" 63 26 63 29] self <- { self with current = (let IncSomeTree_Tree_Type.C_Node x0 x1 x2 =  * self in IncSomeTree_Tree_Type.C_Node x0 x1 ( ^ mtr)) ; };
     assert { [@expl:assertion] [#"../inc_some_tree.rs" 65 20 65 42] let _ = lemma_sum_nonneg0 ( * mtl) in let _ = lemma_sum_nonneg0 ( * mtr) in true };
-    [#"../inc_some_tree.rs" 69 19 69 27] _14 <- ([#"../inc_some_tree.rs" 69 19 69 27] random0 ());
+    [#"../inc_some_tree.rs" 69 19 69 27] _14 <- ([#"../inc_some_tree.rs" 69 19 69 27] random0 ([#"../inc_some_tree.rs" 69 19 69 27] ()));
     goto BB5
   }
   BB5 {
@@ -240,7 +240,7 @@ module IncSomeTree_Impl0_TakeSome
   }
   BB7 {
     assume { resolve0 ma };
-    [#"../inc_some_tree.rs" 71 26 71 34] _16 <- ([#"../inc_some_tree.rs" 71 26 71 34] random0 ());
+    [#"../inc_some_tree.rs" 71 26 71 34] _16 <- ([#"../inc_some_tree.rs" 71 26 71 34] random0 ([#"../inc_some_tree.rs" 71 26 71 34] ()));
     goto BB8
   }
   BB8 {
@@ -390,7 +390,7 @@ module IncSomeTree_IncSomeTree
       end
   }
   BB5 {
-    [#"../inc_some_tree.rs" 83 42 88 1] _0 <- ([#"../inc_some_tree.rs" 83 42 88 1] ());
+    [#"../inc_some_tree.rs" 83 42 88 1] _0 <- ([#"../inc_some_tree.rs" 83 42 88 1] [#"../inc_some_tree.rs" 83 42 88 1] ());
     goto BB7
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index 561b842d2c..1b8ba9f36f 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -606,7 +606,7 @@ module SelectionSortGeneric_SelectionSort
     goto BB2
   }
   BB2 {
-    [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8);
+    [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range ([#"../selection_sort_generic.rs" 38 13 38 14] (0 : usize)) _8);
     _8 <- any usize;
     [#"../selection_sort_generic.rs" 35 4 35 43] iter <- ([#"../selection_sort_generic.rs" 35 4 35 43] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -650,7 +650,7 @@ module SelectionSortGeneric_SelectionSort
   BB9 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve4 v };
-    [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- ([#"../selection_sort_generic.rs" 35 4 35 43] ());
+    [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- ([#"../selection_sort_generic.rs" 35 4 35 43] [#"../selection_sort_generic.rs" 35 4 35 43] ());
     return _0
   }
   BB10 {
@@ -670,7 +670,7 @@ module SelectionSortGeneric_SelectionSort
     _25 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     [#"../selection_sort_generic.rs" 39 22 39 23] min <- ([#"../selection_sort_generic.rs" 39 22 39 23] i);
-    [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- ([#"../selection_sort_generic.rs" 43 17 43 24] i + (1 : usize));
+    [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- ([#"../selection_sort_generic.rs" 43 17 43 24] i + ([#"../selection_sort_generic.rs" 43 22 43 23] (1 : usize)));
     [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ( * v));
     goto BB14
   }
@@ -759,11 +759,11 @@ module SelectionSortGeneric_SelectionSort
   }
   BB28 {
     [#"../selection_sort_generic.rs" 45 16 45 23] min <- ([#"../selection_sort_generic.rs" 45 16 45 23] j);
-    [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] ());
+    [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] [#"../selection_sort_generic.rs" 44 29 46 13] ());
     goto BB30
   }
   BB29 {
-    [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] ());
+    [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] [#"../selection_sort_generic.rs" 46 13 46 13] ());
     goto BB30
   }
   BB30 {
@@ -781,7 +781,7 @@ module SelectionSortGeneric_SelectionSort
     assert { [@expl:type invariant] inv5 _65 };
     assume { resolve3 _65 };
     assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v) -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
-    [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] ());
+    [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] [#"../selection_sort_generic.rs" 38 24 51 5] ());
     goto BB6
   }
   BB34 {
diff --git a/creusot/tests/should_succeed/slices/01.mlcfg b/creusot/tests/should_succeed/slices/01.mlcfg
index 7dcf15e7b8..e26f82686c 100644
--- a/creusot/tests/should_succeed/slices/01.mlcfg
+++ b/creusot/tests/should_succeed/slices/01.mlcfg
@@ -55,7 +55,7 @@ module C01_IndexSlice
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] (10 : usize));
+    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] [#"../01.rs" 7 6 7 8] (10 : usize));
     [#"../01.rs" 7 4 7 9] _4 <- ([#"../01.rs" 7 4 7 9] Slice.length a);
     [#"../01.rs" 7 4 7 9] _5 <- ([#"../01.rs" 7 4 7 9] _3 < _4);
     assert { [@expl:index in bounds] [#"../01.rs" 7 4 7 9] _5 };
@@ -136,16 +136,16 @@ module C01_IndexMutSlice
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] (2 : usize));
+    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] [#"../01.rs" 13 6 13 7] (2 : usize));
     [#"../01.rs" 13 4 13 8] _5 <- ([#"../01.rs" 13 4 13 8] Slice.length ( * a));
     [#"../01.rs" 13 4 13 8] _6 <- ([#"../01.rs" 13 4 13 8] _4 < _5);
     assert { [@expl:index in bounds] [#"../01.rs" 13 4 13 8] _6 };
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] (3 : uint32)) ; };
+    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] [#"../01.rs" 13 11 13 12] (3 : uint32)) ; };
     assume { resolve0 a };
-    [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] ());
+    [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] [#"../01.rs" 12 38 14 1] ());
     return _0
   }
   
@@ -268,7 +268,7 @@ module C01_SliceFirst
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 21 7 21 18] _3 <- ([#"../01.rs" 21 7 21 18] _4 > (0 : usize));
+    [#"../01.rs" 21 7 21 18] _3 <- ([#"../01.rs" 21 7 21 18] _4 > ([#"../01.rs" 21 17 21 18] (0 : usize)));
     _4 <- any usize;
     switch (_3)
       | False -> goto BB4
@@ -276,7 +276,7 @@ module C01_SliceFirst
       end
   }
   BB2 {
-    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] (0 : usize));
+    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] [#"../01.rs" 22 16 22 17] (0 : usize));
     [#"../01.rs" 22 14 22 18] _9 <- ([#"../01.rs" 22 14 22 18] Slice.length a);
     [#"../01.rs" 22 14 22 18] _10 <- ([#"../01.rs" 22 14 22 18] _8 < _9);
     assert { [@expl:index in bounds] [#"../01.rs" 22 14 22 18] _10 };
diff --git a/creusot/tests/should_succeed/slices/02_std.mlcfg b/creusot/tests/should_succeed/slices/02_std.mlcfg
index 45e95c27e8..382bc7d713 100644
--- a/creusot/tests/should_succeed/slices/02_std.mlcfg
+++ b/creusot/tests/should_succeed/slices/02_std.mlcfg
@@ -165,7 +165,7 @@ module C02Std_BinarySearch
     ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 309 8 310 99] forall i : usize . result = Core_Result_Result_Type.C_Err i -> (forall j : usize . i <= j /\ UIntSize.to_int j < Seq.length (shallow_model1 self) -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) }
     
   let constant promoted0 [#"../02_std.rs" 8 0 8 40]  : uint32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
+    let _1 = [#"../02_std.rs" 9 30 9 31] [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
   let rec cfg binary_search [#"../02_std.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (s : slice uint32) : usize
     requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s) -> UInt32.to_int (index_logic0 s i) = i}
     requires {[#"../02_std.rs" 7 11 7 24] Seq.length (shallow_model1 s) = 5}
@@ -181,7 +181,7 @@ module C02Std_BinarySearch
     goto BB0
   }
   BB0 {
-    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] promoted0);
+    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] [#"../02_std.rs" 9 29 9 31] promoted0);
     [#"../02_std.rs" 9 29 9 31] _8 <- ([#"../02_std.rs" 9 29 9 31] _12);
     [#"../02_std.rs" 9 13 9 32] _5 <- ([#"../02_std.rs" 9 13 9 32] binary_search0 s _8);
     goto BB1
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 8b16048a60..790a3ed723 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -919,7 +919,7 @@ module SparseArray_Impl2_Set
   BB9 {
     assert { [@expl:type invariant] inv3 self };
     assume { resolve4 self };
-    [#"../sparse_array.rs" 123 9 123 9] _0 <- ([#"../sparse_array.rs" 123 9 123 9] ());
+    [#"../sparse_array.rs" 123 9 123 9] _0 <- ([#"../sparse_array.rs" 123 9 123 9] [#"../sparse_array.rs" 123 9 123 9] ());
     goto BB16
   }
   BB10 {
@@ -953,10 +953,10 @@ module SparseArray_Impl2_Set
   BB15 {
     [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = ([#"../sparse_array.rs" 121 12 121 33] i) ; };
     assume { resolve3 _34 };
-    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + (1 : usize)) x2 x3 x4) ; };
+    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + ([#"../sparse_array.rs" 122 22 122 23] (1 : usize))) x2 x3 x4) ; };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve4 self };
-    [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] ());
+    [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] [#"../sparse_array.rs" 115 54 123 9] ());
     goto BB16
   }
   BB16 {
@@ -1141,15 +1141,15 @@ module SparseArray_Create
     goto BB1
   }
   BB1 {
-    [#"../sparse_array.rs" 135 59 135 70] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 (0 : usize) sz);
+    [#"../sparse_array.rs" 135 59 135 70] _9 <- ([#"../sparse_array.rs" 135 59 135 70] from_elem1 ([#"../sparse_array.rs" 135 64 135 65] (0 : usize)) sz);
     goto BB2
   }
   BB2 {
-    [#"../sparse_array.rs" 135 78 135 89] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 (0 : usize) sz);
+    [#"../sparse_array.rs" 135 78 135 89] _11 <- ([#"../sparse_array.rs" 135 78 135 89] from_elem1 ([#"../sparse_array.rs" 135 83 135 84] (0 : usize)) sz);
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse sz (0 : usize) _6 _9 _11);
+    [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse sz ([#"../sparse_array.rs" 135 26 135 27] (0 : usize)) _6 _9 _11);
     _6 <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     _9 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     _11 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -1395,20 +1395,20 @@ module SparseArray_F
     goto BB0
   }
   BB0 {
-    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] (0 : int32));
-    [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 (10 : usize) default);
+    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] [#"../sparse_array.rs" 141 18 141 19] (0 : int32));
+    [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 ([#"../sparse_array.rs" 142 23 142 25] (10 : usize)) default);
     goto BB1
   }
   BB1 {
-    [#"../sparse_array.rs" 143 16 143 35] b <- ([#"../sparse_array.rs" 143 16 143 35] create0 (20 : usize) default);
+    [#"../sparse_array.rs" 143 16 143 35] b <- ([#"../sparse_array.rs" 143 16 143 35] create0 ([#"../sparse_array.rs" 143 23 143 25] (20 : usize)) default);
     goto BB2
   }
   BB2 {
-    [#"../sparse_array.rs" 144 16 144 24] x <- ([#"../sparse_array.rs" 144 16 144 24] get0 a (5 : usize));
+    [#"../sparse_array.rs" 144 16 144 24] x <- ([#"../sparse_array.rs" 144 16 144 24] get0 a ([#"../sparse_array.rs" 144 22 144 23] (5 : usize)));
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 145 16 145 24] y <- ([#"../sparse_array.rs" 145 16 145 24] get0 b (7 : usize));
+    [#"../sparse_array.rs" 145 16 145 24] y <- ([#"../sparse_array.rs" 145 16 145 24] get0 b ([#"../sparse_array.rs" 145 22 145 23] (7 : usize)));
     goto BB4
   }
   BB4 {
@@ -1416,7 +1416,7 @@ module SparseArray_F
     [#"../sparse_array.rs" 148 4 148 5] _13 <- Borrow.borrow_mut a;
     [#"../sparse_array.rs" 148 4 148 5] a <-  ^ _13;
     assume { inv0 ( ^ _13) };
-    [#"../sparse_array.rs" 148 4 148 15] _12 <- ([#"../sparse_array.rs" 148 4 148 15] set0 _13 (5 : usize) (1 : int32));
+    [#"../sparse_array.rs" 148 4 148 15] _12 <- ([#"../sparse_array.rs" 148 4 148 15] set0 _13 ([#"../sparse_array.rs" 148 10 148 11] (5 : usize)) ([#"../sparse_array.rs" 148 13 148 14] (1 : int32)));
     _13 <- any borrowed (SparseArray_Sparse_Type.t_sparse int32);
     goto BB5
   }
@@ -1424,18 +1424,18 @@ module SparseArray_F
     [#"../sparse_array.rs" 149 4 149 5] _15 <- Borrow.borrow_mut b;
     [#"../sparse_array.rs" 149 4 149 5] b <-  ^ _15;
     assume { inv0 ( ^ _15) };
-    [#"../sparse_array.rs" 149 4 149 15] _14 <- ([#"../sparse_array.rs" 149 4 149 15] set0 _15 (7 : usize) (2 : int32));
+    [#"../sparse_array.rs" 149 4 149 15] _14 <- ([#"../sparse_array.rs" 149 4 149 15] set0 _15 ([#"../sparse_array.rs" 149 10 149 11] (7 : usize)) ([#"../sparse_array.rs" 149 13 149 14] (2 : int32)));
     _15 <- any borrowed (SparseArray_Sparse_Type.t_sparse int32);
     goto BB6
   }
   BB6 {
-    [#"../sparse_array.rs" 150 8 150 16] _16 <- ([#"../sparse_array.rs" 150 8 150 16] get0 a (5 : usize));
+    [#"../sparse_array.rs" 150 8 150 16] _16 <- ([#"../sparse_array.rs" 150 8 150 16] get0 a ([#"../sparse_array.rs" 150 14 150 15] (5 : usize)));
     goto BB7
   }
   BB7 {
     [#"../sparse_array.rs" 150 4 150 16] x <- ([#"../sparse_array.rs" 150 4 150 16] _16);
     _16 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 b (7 : usize));
+    [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 b ([#"../sparse_array.rs" 151 14 151 15] (7 : usize)));
     goto BB8
   }
   BB8 {
@@ -1449,46 +1449,46 @@ module SparseArray_F
       | Core_Option_Option_Type.C_None -> false
       | Core_Option_Option_Type.C_Some z -> shallow_model0 z = 2
       end };
-    [#"../sparse_array.rs" 161 8 161 16] _24 <- ([#"../sparse_array.rs" 161 8 161 16] get0 a (7 : usize));
+    [#"../sparse_array.rs" 161 8 161 16] _24 <- ([#"../sparse_array.rs" 161 8 161 16] get0 a ([#"../sparse_array.rs" 161 14 161 15] (7 : usize)));
     goto BB9
   }
   BB9 {
     [#"../sparse_array.rs" 161 4 161 16] x <- ([#"../sparse_array.rs" 161 4 161 16] _24);
     _24 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 b (5 : usize));
+    [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 b ([#"../sparse_array.rs" 162 14 162 15] (5 : usize)));
     goto BB10
   }
   BB10 {
     [#"../sparse_array.rs" 162 4 162 16] y <- ([#"../sparse_array.rs" 162 4 162 16] _26);
     _26 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 163 18 163 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 a (0 : usize));
+    [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 a ([#"../sparse_array.rs" 165 14 165 15] (0 : usize)));
     goto BB11
   }
   BB11 {
     [#"../sparse_array.rs" 165 4 165 16] x <- ([#"../sparse_array.rs" 165 4 165 16] _30);
     _30 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 b (0 : usize));
+    [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 b ([#"../sparse_array.rs" 166 14 166 15] (0 : usize)));
     goto BB12
   }
   BB12 {
     [#"../sparse_array.rs" 166 4 166 16] y <- ([#"../sparse_array.rs" 166 4 166 16] _32);
     _32 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 167 18 167 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 a (9 : usize));
+    [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 a ([#"../sparse_array.rs" 169 14 169 15] (9 : usize)));
     goto BB13
   }
   BB13 {
     [#"../sparse_array.rs" 169 4 169 16] x <- ([#"../sparse_array.rs" 169 4 169 16] _36);
     _36 <- any Core_Option_Option_Type.t_option int32;
-    [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 b (9 : usize));
+    [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 b ([#"../sparse_array.rs" 170 14 170 15] (9 : usize)));
     goto BB14
   }
   BB14 {
     [#"../sparse_array.rs" 170 4 170 16] y <- ([#"../sparse_array.rs" 170 4 170 16] _38);
     _38 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 171 18 171 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] ());
+    [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] [#"../sparse_array.rs" 171 4 171 41] ());
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/spec_tests.mlcfg b/creusot/tests/should_succeed/spec_tests.mlcfg
index a662169771..efa8cc215f 100644
--- a/creusot/tests/should_succeed/spec_tests.mlcfg
+++ b/creusot/tests/should_succeed/spec_tests.mlcfg
@@ -25,7 +25,7 @@ module SpecTests_TestSpecs
     goto BB0
   }
   BB0 {
-    [#"../spec_tests.rs" 18 20 18 22] _0 <- ([#"../spec_tests.rs" 18 20 18 22] ());
+    [#"../spec_tests.rs" 18 20 18 22] _0 <- ([#"../spec_tests.rs" 18 20 18 22] [#"../spec_tests.rs" 18 20 18 22] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/division.mlcfg b/creusot/tests/should_succeed/specification/division.mlcfg
index 09d2b1353a..0dbcc0ff2e 100644
--- a/creusot/tests/should_succeed/specification/division.mlcfg
+++ b/creusot/tests/should_succeed/specification/division.mlcfg
@@ -16,7 +16,7 @@ module Division_Divide
   }
   BB0 {
     [#"../division.rs" 7 8 7 9] _5 <- ([#"../division.rs" 7 8 7 9] x);
-    [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = (0 : uint32));
+    [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = ([#"../division.rs" 7 4 7 9] (0 : uint32)));
     assert { [@expl:division by zero] [#"../division.rs" 7 4 7 9] not _6 };
     goto BB1
   }
diff --git a/creusot/tests/should_succeed/specification/forall.mlcfg b/creusot/tests/should_succeed/specification/forall.mlcfg
index d2905b36d8..6eb3d303de 100644
--- a/creusot/tests/should_succeed/specification/forall.mlcfg
+++ b/creusot/tests/should_succeed/specification/forall.mlcfg
@@ -11,7 +11,7 @@ module Forall_F
     goto BB0
   }
   BB0 {
-    [#"../forall.rs" 6 11 6 13] _0 <- ([#"../forall.rs" 6 11 6 13] ());
+    [#"../forall.rs" 6 11 6 13] _0 <- ([#"../forall.rs" 6 11 6 13] [#"../forall.rs" 6 11 6 13] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/logic_call.mlcfg b/creusot/tests/should_succeed/specification/logic_call.mlcfg
index 90835dd6b0..9f18d949a6 100644
--- a/creusot/tests/should_succeed/specification/logic_call.mlcfg
+++ b/creusot/tests/should_succeed/specification/logic_call.mlcfg
@@ -16,7 +16,7 @@ module LogicCall_Dummy
     goto BB0
   }
   BB0 {
-    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] (0 : uint32));
+    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] [#"../logic_call.rs" 12 4 12 5] (0 : uint32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/logic_functions.mlcfg b/creusot/tests/should_succeed/specification/logic_functions.mlcfg
index 3be1b9abd5..69ca12751e 100644
--- a/creusot/tests/should_succeed/specification/logic_functions.mlcfg
+++ b/creusot/tests/should_succeed/specification/logic_functions.mlcfg
@@ -14,7 +14,7 @@ module LogicFunctions_UseLogic
     goto BB0
   }
   BB0 {
-    [#"../logic_functions.rs" 10 19 10 21] _0 <- ([#"../logic_functions.rs" 10 19 10 21] ());
+    [#"../logic_functions.rs" 10 19 10 21] _0 <- ([#"../logic_functions.rs" 10 19 10 21] [#"../logic_functions.rs" 10 19 10 21] ());
     return _0
   }
   
@@ -34,7 +34,7 @@ module LogicFunctions_UseLogicPearlite
     goto BB0
   }
   BB0 {
-    [#"../logic_functions.rs" 19 28 19 30] _0 <- ([#"../logic_functions.rs" 19 28 19 30] ());
+    [#"../logic_functions.rs" 19 28 19 30] _0 <- ([#"../logic_functions.rs" 19 28 19 30] [#"../logic_functions.rs" 19 28 19 30] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/loops.mlcfg b/creusot/tests/should_succeed/specification/loops.mlcfg
index bdf5f2abd2..f607a754b4 100644
--- a/creusot/tests/should_succeed/specification/loops.mlcfg
+++ b/creusot/tests/should_succeed/specification/loops.mlcfg
@@ -24,7 +24,7 @@ module Loops_WhileLoopVariant
     goto BB1
   }
   BB4 {
-    [#"../loops.rs" 6 4 6 14] _0 <- ([#"../loops.rs" 6 4 6 14] ());
+    [#"../loops.rs" 6 4 6 14] _0 <- ([#"../loops.rs" 6 4 6 14] [#"../loops.rs" 6 4 6 14] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/model.mlcfg b/creusot/tests/should_succeed/specification/model.mlcfg
index 59a478c112..a0ebc6a546 100644
--- a/creusot/tests/should_succeed/specification/model.mlcfg
+++ b/creusot/tests/should_succeed/specification/model.mlcfg
@@ -74,7 +74,7 @@ module Model_TestArc
     goto BB1
   }
   BB1 {
-    [#"../model.rs" 43 42 43 44] _0 <- ([#"../model.rs" 43 42 43 44] ());
+    [#"../model.rs" 43 42 43 44] _0 <- ([#"../model.rs" 43 42 43 44] [#"../model.rs" 43 42 43 44] ());
     goto BB2
   }
   BB2 {
@@ -126,7 +126,7 @@ module Model_TestRc
     goto BB1
   }
   BB1 {
-    [#"../model.rs" 46 38 46 40] _0 <- ([#"../model.rs" 46 38 46 40] ());
+    [#"../model.rs" 46 38 46 40] _0 <- ([#"../model.rs" 46 38 46 40] [#"../model.rs" 46 38 46 40] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/specification/opaque.mlcfg b/creusot/tests/should_succeed/specification/opaque.mlcfg
index f44067afe1..9f2c73d665 100644
--- a/creusot/tests/should_succeed/specification/opaque.mlcfg
+++ b/creusot/tests/should_succeed/specification/opaque.mlcfg
@@ -19,7 +19,7 @@ module Opaque_Test
   BB0 {
     assert { [@expl:assertion] [#"../opaque.rs" 21 18 21 34] transparent0 () };
     assert { [@expl:assertion] [#"../opaque.rs" 22 18 22 40] transparent_crate0 () };
-    [#"../opaque.rs" 20 14 23 1] _0 <- ([#"../opaque.rs" 20 14 23 1] ());
+    [#"../opaque.rs" 20 14 23 1] _0 <- ([#"../opaque.rs" 20 14 23 1] [#"../opaque.rs" 20 14 23 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/trusted.mlcfg b/creusot/tests/should_succeed/specification/trusted.mlcfg
index 0cda691d90..97a7981afd 100644
--- a/creusot/tests/should_succeed/specification/trusted.mlcfg
+++ b/creusot/tests/should_succeed/specification/trusted.mlcfg
@@ -14,7 +14,7 @@ module Trusted_VictimOfLie
     goto BB0
   }
   BB0 {
-    [#"../trusted.rs" 19 4 19 9] _0 <- ([#"../trusted.rs" 19 4 19 9] lie0 ());
+    [#"../trusted.rs" 19 4 19 9] _0 <- ([#"../trusted.rs" 19 4 19 9] lie0 ([#"../trusted.rs" 19 4 19 9] ()));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/split_borrow.mlcfg b/creusot/tests/should_succeed/split_borrow.mlcfg
index ee3c4ab203..88564e5e8f 100644
--- a/creusot/tests/should_succeed/split_borrow.mlcfg
+++ b/creusot/tests/should_succeed/split_borrow.mlcfg
@@ -7,7 +7,7 @@ module SplitBorrow_Z
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] true);
+    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] [#"../split_borrow.rs" 6 4 6 8] true);
     return _0
   }
   
@@ -55,14 +55,14 @@ module SplitBorrow_F
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 10 17 10 25] _2 <- ([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize));
-    [#"../split_borrow.rs" 10 27 10 35] _3 <- ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize));
+    [#"../split_borrow.rs" 10 17 10 25] _2 <- ([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 23 10 24] (1 : usize)));
+    [#"../split_borrow.rs" 10 27 10 35] _3 <- ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 33 10 34] (2 : usize)));
     [#"../split_borrow.rs" 10 16 10 36] x <- ([#"../split_borrow.rs" 10 16 10 36] (_2, _3));
     _2 <- any SplitBorrow_MyInt_Type.t_myint;
     _3 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 11 12 11 18] y <- Borrow.borrow_mut x;
     [#"../split_borrow.rs" 11 12 11 18] x <-  ^ y;
-    [#"../split_borrow.rs" 13 7 13 10] _6 <- ([#"../split_borrow.rs" 13 7 13 10] z0 ());
+    [#"../split_borrow.rs" 13 7 13 10] _6 <- ([#"../split_borrow.rs" 13 7 13 10] z0 ([#"../split_borrow.rs" 13 7 13 10] ()));
     goto BB1
   }
   BB1 {
@@ -72,23 +72,23 @@ module SplitBorrow_F
       end
   }
   BB2 {
-    [#"../split_borrow.rs" 14 17 14 25] _7 <- ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt (4 : usize));
+    [#"../split_borrow.rs" 14 17 14 25] _7 <- ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 14 23 14 24] (4 : usize)));
     [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) =  * y in (x0, ([#"../split_borrow.rs" 14 8 14 25] _7))) ; };
     _7 <- any SplitBorrow_MyInt_Type.t_myint;
-    [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] ());
+    [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] [#"../split_borrow.rs" 13 11 15 5] ());
     goto BB4
   }
   BB3 {
-    [#"../split_borrow.rs" 16 17 16 26] _8 <- ([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt (10 : usize));
+    [#"../split_borrow.rs" 16 17 16 26] _8 <- ([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 16 23 16 25] (10 : usize)));
     [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) =  * y in (([#"../split_borrow.rs" 16 8 16 26] _8), x1)) ; };
     _8 <- any SplitBorrow_MyInt_Type.t_myint;
-    [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] ());
+    [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] [#"../split_borrow.rs" 15 11 17 5] ());
     goto BB4
   }
   BB4 {
     assume { resolve0 y };
     assume { resolve1 x };
-    [#"../split_borrow.rs" 9 11 21 1] _0 <- ([#"../split_borrow.rs" 9 11 21 1] ());
+    [#"../split_borrow.rs" 9 11 21 1] _0 <- ([#"../split_borrow.rs" 9 11 21 1] [#"../split_borrow.rs" 9 11 21 1] ());
     return _0
   }
   
@@ -131,8 +131,8 @@ module SplitBorrow_G
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 24 17 24 25] _2 <- ([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize));
-    [#"../split_borrow.rs" 24 27 24 35] _3 <- ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize));
+    [#"../split_borrow.rs" 24 17 24 25] _2 <- ([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 23 24 24] (1 : usize)));
+    [#"../split_borrow.rs" 24 27 24 35] _3 <- ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 33 24 34] (2 : usize)));
     [#"../split_borrow.rs" 24 16 24 36] a <- ([#"../split_borrow.rs" 24 16 24 36] (_2, _3));
     _2 <- any SplitBorrow_MyInt_Type.t_myint;
     _3 <- any SplitBorrow_MyInt_Type.t_myint;
@@ -141,12 +141,12 @@ module SplitBorrow_G
     [#"../split_borrow.rs" 27 13 27 21] _z <- Borrow.borrow_final (let (_, a) =  * x in a) (Borrow.inherit_id (Borrow.get_id x) 2);
     [#"../split_borrow.rs" 27 13 27 21] x <- { x with current = (let (x0, x1) =  * x in (x0,  ^ _z)) ; };
     assume { resolve0 _z };
-    [#"../split_borrow.rs" 29 13 29 21] _6 <- ([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt (3 : usize));
+    [#"../split_borrow.rs" 29 13 29 21] _6 <- ([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 29 19 29 20] (3 : usize)));
     [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) =  * x in (([#"../split_borrow.rs" 29 4 29 21] _6), x1)) ; };
     _6 <- any SplitBorrow_MyInt_Type.t_myint;
     assume { resolve1 x };
     assume { resolve2 a };
-    [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] ());
+    [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] [#"../split_borrow.rs" 23 11 32 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/std_types.mlcfg b/creusot/tests/should_succeed/std_types.mlcfg
index 8517de6b44..740099b545 100644
--- a/creusot/tests/should_succeed/std_types.mlcfg
+++ b/creusot/tests/should_succeed/std_types.mlcfg
@@ -23,7 +23,7 @@ module StdTypes_X
     goto BB0
   }
   BB0 {
-    [#"../std_types.rs" 5 21 5 23] _0 <- ([#"../std_types.rs" 5 21 5 23] ());
+    [#"../std_types.rs" 5 21 5 23] _0 <- ([#"../std_types.rs" 5 21 5 23] [#"../std_types.rs" 5 21 5 23] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg
index b17661743f..0409a7db0a 100644
--- a/creusot/tests/should_succeed/sum.mlcfg
+++ b/creusot/tests/should_succeed/sum.mlcfg
@@ -218,8 +218,8 @@ module Sum_SumFirstN
     goto BB0
   }
   BB0 {
-    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] (0 : uint32));
-    [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 (1 : uint32) n);
+    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] [#"../sum.rs" 7 18 7 19] (0 : uint32));
+    [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 ([#"../sum.rs" 9 13 9 14] (1 : uint32)) n);
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index a40475b1ea..9fcc2559c0 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -231,8 +231,8 @@ module SumOfOdds_ComputeSumOfOdd
     goto BB0
   }
   BB0 {
-    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
-    [#"../sum_of_odds.rs" 39 13 39 17] _8 <- ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) x);
+    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] [#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
+    [#"../sum_of_odds.rs" 39 13 39 17] _8 <- ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range ([#"../sum_of_odds.rs" 39 13 39 14] (0 : uint32)) x);
     [#"../sum_of_odds.rs" 38 4 38 50] iter <- ([#"../sum_of_odds.rs" 38 4 38 50] into_iter0 _8);
     _8 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
@@ -291,8 +291,8 @@ module SumOfOdds_ComputeSumOfOdd
     _23 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 41 12 41 33] let _ = sum_of_odd_is_sqr0 (UInt32.to_int i) in true };
-    [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 18] (2 : uint32) * i);
-    [#"../sum_of_odds.rs" 44 13 44 22] _28 <- ([#"../sum_of_odds.rs" 44 13 44 22] _29 + (1 : uint32));
+    [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 18] ([#"../sum_of_odds.rs" 44 13 44 14] (2 : uint32)) * i);
+    [#"../sum_of_odds.rs" 44 13 44 22] _28 <- ([#"../sum_of_odds.rs" 44 13 44 22] _29 + ([#"../sum_of_odds.rs" 44 21 44 22] (1 : uint32)));
     _29 <- any uint32;
     [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + _28);
     _28 <- any uint32;
@@ -354,7 +354,7 @@ module SumOfOdds_Test
   }
   BB1 {
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 53 8 53 29] let _ = sum_of_odd_is_sqr0 (UInt32.to_int x) in is_square0 (UInt32.to_int y) };
-    [#"../sum_of_odds.rs" 52 4 55 5] _0 <- ([#"../sum_of_odds.rs" 52 4 55 5] ());
+    [#"../sum_of_odds.rs" 52 4 55 5] _0 <- ([#"../sum_of_odds.rs" 52 4 55 5] [#"../sum_of_odds.rs" 52 4 55 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/swap_borrows.mlcfg b/creusot/tests/should_succeed/swap_borrows.mlcfg
index 1dfaf453a0..0bcfab730c 100644
--- a/creusot/tests/should_succeed/swap_borrows.mlcfg
+++ b/creusot/tests/should_succeed/swap_borrows.mlcfg
@@ -106,7 +106,7 @@ module SwapBorrows_F
     goto BB0
   }
   BB0 {
-    [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] ((0 : uint32), (0 : uint32)));
+    [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] (([#"../swap_borrows.rs" 11 26 11 27] (0 : uint32)), ([#"../swap_borrows.rs" 11 29 11 30] (0 : uint32))));
     [#"../swap_borrows.rs" 11 9 11 14] a <- ([#"../swap_borrows.rs" 11 9 11 14] let (a, _) = _3 in a);
     [#"../swap_borrows.rs" 11 16 11 21] b <- ([#"../swap_borrows.rs" 11 16 11 21] let (_, a) = _3 in a);
     assume { resolve0 _3 };
@@ -125,11 +125,11 @@ module SwapBorrows_F
   }
   BB1 {
     assume { resolve1 _8 };
-    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] (10 : uint32)) ; }, x1));
+    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] [#"../swap_borrows.rs" 13 11 13 13] (10 : uint32)) ; }, x1));
     assume { resolve2 p };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 15 20 15 30] b = (10 : uint32) };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 16 20 16 29] a = (0 : uint32) };
-    [#"../swap_borrows.rs" 10 11 17 1] _0 <- ([#"../swap_borrows.rs" 10 11 17 1] ());
+    [#"../swap_borrows.rs" 10 11 17 1] _0 <- ([#"../swap_borrows.rs" 10 11 17 1] [#"../swap_borrows.rs" 10 11 17 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/switch.mlcfg b/creusot/tests/should_succeed/switch.mlcfg
index 589df93f59..881225a54d 100644
--- a/creusot/tests/should_succeed/switch.mlcfg
+++ b/creusot/tests/should_succeed/switch.mlcfg
@@ -33,7 +33,7 @@ module Switch_Test
     goto BB4
   }
   BB2 {
-    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] false);
+    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] [#"../switch.rs" 12 16 12 21] false);
     goto BB5
   }
   BB3 {
@@ -42,7 +42,7 @@ module Switch_Test
   }
   BB4 {
     [#"../switch.rs" 11 13 11 14] x <- ([#"../switch.rs" 11 13 11 14] Switch_Option_Type.some_0 o);
-    [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] x > (0 : uint32));
+    [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] x > ([#"../switch.rs" 11 23 11 24] (0 : uint32)));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/switch_struct.mlcfg b/creusot/tests/should_succeed/switch_struct.mlcfg
index dceefd3ca6..add5733e50 100644
--- a/creusot/tests/should_succeed/switch_struct.mlcfg
+++ b/creusot/tests/should_succeed/switch_struct.mlcfg
@@ -42,7 +42,7 @@ module SwitchStruct_Test
   }
   BB2 {
     [#"../switch_struct.rs" 12 12 12 18] field2 <- ([#"../switch_struct.rs" 12 12 12 18] SwitchStruct_M_Type.g_field2 o);
-    [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] field2 = (0 : uint32));
+    [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] field2 = ([#"../switch_struct.rs" 12 34 12 35] (0 : uint32)));
     goto BB5
   }
   BB3 {
@@ -51,7 +51,7 @@ module SwitchStruct_Test
   }
   BB4 {
     [#"../switch_struct.rs" 11 12 11 18] field1 <- ([#"../switch_struct.rs" 11 12 11 18] SwitchStruct_M_Type.f_field1 o);
-    [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] field1 > (0 : uint32));
+    [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] field1 > ([#"../switch_struct.rs" 11 33 11 34] (0 : uint32)));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/syntax/01_idents.mlcfg b/creusot/tests/should_succeed/syntax/01_idents.mlcfg
index f2db50cf1c..24569dbecd 100644
--- a/creusot/tests/should_succeed/syntax/01_idents.mlcfg
+++ b/creusot/tests/should_succeed/syntax/01_idents.mlcfg
@@ -7,7 +7,7 @@ module C01Idents_Clone
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 3 15 3 17] _0 <- ([#"../01_idents.rs" 3 15 3 17] ());
+    [#"../01_idents.rs" 3 15 3 17] _0 <- ([#"../01_idents.rs" 3 15 3 17] [#"../01_idents.rs" 3 15 3 17] ());
     return _0
   }
   
@@ -20,7 +20,7 @@ module C01Idents_Function
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 5 18 5 20] _0 <- ([#"../01_idents.rs" 5 18 5 20] ());
+    [#"../01_idents.rs" 5 18 5 20] _0 <- ([#"../01_idents.rs" 5 18 5 20] [#"../01_idents.rs" 5 18 5 20] ());
     return _0
   }
   
@@ -33,7 +33,7 @@ module C01Idents_Import
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 7 16 7 18] _0 <- ([#"../01_idents.rs" 7 16 7 18] ());
+    [#"../01_idents.rs" 7 16 7 18] _0 <- ([#"../01_idents.rs" 7 16 7 18] [#"../01_idents.rs" 7 16 7 18] ());
     return _0
   }
   
@@ -46,7 +46,7 @@ module C01Idents_Export
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 9 16 9 18] _0 <- ([#"../01_idents.rs" 9 16 9 18] ());
+    [#"../01_idents.rs" 9 16 9 18] _0 <- ([#"../01_idents.rs" 9 16 9 18] [#"../01_idents.rs" 9 16 9 18] ());
     return _0
   }
   
@@ -59,7 +59,7 @@ module C01Idents_Result
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 11 16 11 18] _0 <- ([#"../01_idents.rs" 11 16 11 18] ());
+    [#"../01_idents.rs" 11 16 11 18] _0 <- ([#"../01_idents.rs" 11 16 11 18] [#"../01_idents.rs" 11 16 11 18] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
index 52a2159d64..f69547e003 100644
--- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg
+++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
@@ -17,7 +17,7 @@ module C02Operators_Division
   }
   BB0 {
     [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y);
-    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = (0 : usize));
+    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = ([#"../02_operators.rs" 9 4 9 9] (0 : usize)));
     assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 };
     goto BB1
   }
@@ -46,7 +46,7 @@ module C02Operators_Modulus
   }
   BB0 {
     [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y);
-    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = (0 : usize));
+    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = ([#"../02_operators.rs" 24 4 24 9] (0 : usize)));
     assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 };
     goto BB1
   }
@@ -150,7 +150,7 @@ module C02Operators_Expression
   }
   BB0 {
     [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y);
-    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = (0 : usize));
+    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = ([#"../02_operators.rs" 78 4 78 9] (0 : usize)));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 };
     goto BB1
   }
@@ -160,7 +160,7 @@ module C02Operators_Expression
     [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z);
     _8 <- any usize;
     [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y);
-    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = (0 : usize));
+    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = ([#"../02_operators.rs" 78 17 78 24] (0 : usize)));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 };
     goto BB2
   }
@@ -208,7 +208,7 @@ module C02Operators_PrimitiveComparison
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] ());
+    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] [#"../02_operators.rs" 92 30 92 32] ());
     return _0
   }
   
@@ -241,7 +241,7 @@ module C02Operators_OldTest
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] ());
+    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] [#"../02_operators.rs" 100 21 100 23] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
index c5083b7d7b..85e0d61601 100644
--- a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
@@ -25,7 +25,7 @@ module C04AssocPrec_RespectPrec
   }
   BB0 {
     assume { resolve0 x };
-    [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- ([#"../04_assoc_prec.rs" 10 35 10 37] ());
+    [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- ([#"../04_assoc_prec.rs" 10 35 10 37] [#"../04_assoc_prec.rs" 10 35 10 37] ());
     return _0
   }
   
@@ -41,7 +41,7 @@ module C04AssocPrec_RespectAssoc
     goto BB0
   }
   BB0 {
-    [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- ([#"../04_assoc_prec.rs" 13 23 13 25] ());
+    [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- ([#"../04_assoc_prec.rs" 13 23 13 25] [#"../04_assoc_prec.rs" 13 23 13 25] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
index 78a410f58d..7d9918a914 100644
--- a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
@@ -30,7 +30,7 @@ module C05Annotations_Assertion
     goto BB1
   }
   BB1 {
-    [#"../05_annotations.rs" 5 26 7 1] _0 <- ([#"../05_annotations.rs" 5 26 7 1] ());
+    [#"../05_annotations.rs" 5 26 7 1] _0 <- ([#"../05_annotations.rs" 5 26 7 1] [#"../05_annotations.rs" 5 26 7 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index b2873eb912..7863fc9bdb 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -66,7 +66,7 @@ module C05Pearlite_StructInPearlite
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 24 32 24 34] _0 <- ([#"../05_pearlite.rs" 24 32 24 34] ());
+    [#"../05_pearlite.rs" 24 32 24 34] _0 <- ([#"../05_pearlite.rs" 24 32 24 34] [#"../05_pearlite.rs" 24 32 24 34] ());
     return _0
   }
   
@@ -91,7 +91,7 @@ module C05Pearlite_StructOrder
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 32 26 32 28] _0 <- ([#"../05_pearlite.rs" 32 26 32 28] ());
+    [#"../05_pearlite.rs" 32 26 32 28] _0 <- ([#"../05_pearlite.rs" 32 26 32 28] [#"../05_pearlite.rs" 32 26 32 28] ());
     return _0
   }
   
@@ -115,7 +115,7 @@ module C05Pearlite_GhostClosure
     goto BB1
   }
   BB1 {
-    [#"../05_pearlite.rs" 48 23 50 1] _0 <- ([#"../05_pearlite.rs" 48 23 50 1] ());
+    [#"../05_pearlite.rs" 48 23 50 1] _0 <- ([#"../05_pearlite.rs" 48 23 50 1] [#"../05_pearlite.rs" 48 23 50 1] ());
     return _0
   }
   
@@ -133,7 +133,7 @@ module C05Pearlite_PearliteClosure
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] ());
+    [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] [#"../05_pearlite.rs" 52 58 52 60] ());
     return _0
   }
   
@@ -164,7 +164,7 @@ module C05Pearlite_Caller
     goto BB2
   }
   BB2 {
-    [#"../05_pearlite.rs" 54 16 56 1] _0 <- ([#"../05_pearlite.rs" 54 16 56 1] ());
+    [#"../05_pearlite.rs" 54 16 56 1] _0 <- ([#"../05_pearlite.rs" 54 16 56 1] [#"../05_pearlite.rs" 54 16 56 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
index bf420021a7..c1687a288a 100644
--- a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
@@ -9,7 +9,7 @@ module C07ExternSpec_Impl0_Func
     goto BB0
   }
   BB0 {
-    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] true);
+    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] [#"../07_extern_spec.rs" 12 8 12 12] true);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
index bf775481c0..5372bc1fb9 100644
--- a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
+++ b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
@@ -23,7 +23,7 @@ module C09Maintains_Test1
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 28 37 28 39] _0 <- ([#"../09_maintains.rs" 28 37 28 39] ());
+    [#"../09_maintains.rs" 28 37 28 39] _0 <- ([#"../09_maintains.rs" 28 37 28 39] [#"../09_maintains.rs" 28 37 28 39] ());
     return _0
   }
   
@@ -55,7 +55,7 @@ module C09Maintains_Test2
   }
   BB0 {
     assume { resolve0 a };
-    [#"../09_maintains.rs" 31 42 31 44] _0 <- ([#"../09_maintains.rs" 31 42 31 44] ());
+    [#"../09_maintains.rs" 31 42 31 44] _0 <- ([#"../09_maintains.rs" 31 42 31 44] [#"../09_maintains.rs" 31 42 31 44] ());
     return _0
   }
   
@@ -94,7 +94,7 @@ module C09Maintains_Test3
   BB0 {
     assume { resolve0 b };
     assume { resolve1 a };
-    [#"../09_maintains.rs" 34 47 34 49] _0 <- ([#"../09_maintains.rs" 34 47 34 49] ());
+    [#"../09_maintains.rs" 34 47 34 49] _0 <- ([#"../09_maintains.rs" 34 47 34 49] [#"../09_maintains.rs" 34 47 34 49] ());
     return _0
   }
   
@@ -119,7 +119,7 @@ module C09Maintains_Test5
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 37 30 37 32] _0 <- ([#"../09_maintains.rs" 37 30 37 32] ());
+    [#"../09_maintains.rs" 37 30 37 32] _0 <- ([#"../09_maintains.rs" 37 30 37 32] [#"../09_maintains.rs" 37 30 37 32] ());
     return _0
   }
   
@@ -141,7 +141,7 @@ module C09Maintains_Test6
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 40 29 40 31] _0 <- ([#"../09_maintains.rs" 40 29 40 31] ());
+    [#"../09_maintains.rs" 40 29 40 31] _0 <- ([#"../09_maintains.rs" 40 29 40 31] [#"../09_maintains.rs" 40 29 40 31] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
index d3af288582..85a717d886 100644
--- a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
@@ -46,7 +46,7 @@ module C10MutualRecTypes_UseTree
     goto BB0
   }
   BB0 {
-    [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- ([#"../10_mutual_rec_types.rs" 13 26 13 28] ());
+    [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- ([#"../10_mutual_rec_types.rs" 13 26 13 28] [#"../10_mutual_rec_types.rs" 13 26 13 28] ());
     return _0
   }
   
@@ -126,7 +126,7 @@ module C10MutualRecTypes_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
+    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] [#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
@@ -140,7 +140,7 @@ module C10MutualRecTypes_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + (1 : uint64));
+    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + ([#"../10_mutual_rec_types.rs" 19 69 19 70] (1 : uint64)));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
index 1c35d39d16..b6a4c2c827 100644
--- a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
@@ -42,16 +42,16 @@ module C11ArrayTypes_Omg
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] (0 : usize));
+    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] [#"../11_array_types.rs" 9 8 9 9] (0 : usize));
     [#"../11_array_types.rs" 9 4 9 10] _4 <- ([#"../11_array_types.rs" 9 4 9 10] Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x));
     [#"../11_array_types.rs" 9 4 9 10] _5 <- ([#"../11_array_types.rs" 9 4 9 10] _3 < _4);
     assert { [@expl:index in bounds] [#"../11_array_types.rs" 9 4 9 10] _5 };
     goto BB1
   }
   BB1 {
-    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] (5 : int64))));
+    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] [#"../11_array_types.rs" 9 13 9 14] (5 : int64))));
     assert { [@expl:assertion] [#"../11_array_types.rs" 11 20 11 32] Int64.to_int (index_logic0 (C11ArrayTypes_UsesArray_Type.usesarray_0 x) 0) = 5 };
-    [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] ());
+    [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] [#"../11_array_types.rs" 8 29 12 1] ());
     return _0
   }
   
@@ -79,7 +79,7 @@ module C11ArrayTypes_CallOmg
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create (5 : usize) (fun _ -> (3 : int64)));
+    [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create ([#"../11_array_types.rs" 15 14 15 24] (5 : usize)) (fun _ -> [#"../11_array_types.rs" 15 15 15 20] (3 : int64)));
     [#"../11_array_types.rs" 16 8 16 22] _2 <- ([#"../11_array_types.rs" 16 8 16 22] C11ArrayTypes_UsesArray_Type.C_UsesArray arr);
     [#"../11_array_types.rs" 16 4 16 23] _0 <- ([#"../11_array_types.rs" 16 4 16 23] omg0 _2);
     _2 <- any C11ArrayTypes_UsesArray_Type.t_usesarray;
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index 62fe4c7f44..06dfc294fa 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -19,7 +19,7 @@ module C12GhostCode_GhostArg
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] ());
+    [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] [#"../12_ghost_code.rs" 4 35 6 1] ());
     return _0
   }
   
@@ -133,7 +133,7 @@ module C12GhostCode_GhostVec
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 9 22 9 32] x <- ([#"../12_ghost_code.rs" 9 22 9 32] new0 ());
+    [#"../12_ghost_code.rs" 9 22 9 32] x <- ([#"../12_ghost_code.rs" 9 22 9 32] new0 ([#"../12_ghost_code.rs" 9 22 9 32] ()));
     goto BB1
   }
   BB1 {
@@ -142,7 +142,7 @@ module C12GhostCode_GhostVec
     goto BB2
   }
   BB2 {
-    [#"../12_ghost_code.rs" 8 19 11 1] _0 <- ([#"../12_ghost_code.rs" 8 19 11 1] ());
+    [#"../12_ghost_code.rs" 8 19 11 1] _0 <- ([#"../12_ghost_code.rs" 8 19 11 1] [#"../12_ghost_code.rs" 8 19 11 1] ());
     goto BB3
   }
   BB3 {
@@ -169,7 +169,7 @@ module C12GhostCode_GhostCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
+    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] [#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
     [#"../12_ghost_code.rs" 19 17 19 52] _s <- ([#"../12_ghost_code.rs" 19 17 19 52] Snapshot.new (Seq.snoc (Seq.empty ) (0 : int32)));
     goto BB1
   }
@@ -180,7 +180,7 @@ module C12GhostCode_GhostCopy
   BB2 {
     [#"../12_ghost_code.rs" 20 4 20 33] _s <- ([#"../12_ghost_code.rs" 20 4 20 33] _4);
     _4 <- any Snapshot.snap_ty (Seq.seq int32);
-    [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] ());
+    [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] [#"../12_ghost_code.rs" 17 20 21 1] ());
     return _0
   }
   
@@ -208,7 +208,7 @@ module C12GhostCode_GhostIsCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
+    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] [#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
     [#"../12_ghost_code.rs" 25 12 25 18] r <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 25 12 25 18] x <-  ^ r;
     assume { resolve0 r };
@@ -219,7 +219,7 @@ module C12GhostCode_GhostIsCopy
     [#"../12_ghost_code.rs" 27 13 27 14] g1 <- ([#"../12_ghost_code.rs" 27 13 27 14] g);
     [#"../12_ghost_code.rs" 28 13 28 14] g2 <- ([#"../12_ghost_code.rs" 28 13 28 14] g);
     assert { [@expl:assertion] [#"../12_ghost_code.rs" 29 18 29 26] g1 = g2 };
-    [#"../12_ghost_code.rs" 23 23 30 1] _0 <- ([#"../12_ghost_code.rs" 23 23 30 1] ());
+    [#"../12_ghost_code.rs" 23 23 30 1] _0 <- ([#"../12_ghost_code.rs" 23 23 30 1] [#"../12_ghost_code.rs" 23 23 30 1] ());
     return _0
   }
   
@@ -358,7 +358,7 @@ module C12GhostCode_GhostCheck
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 36 16 36 26] x <- ([#"../12_ghost_code.rs" 36 16 36 26] new0 ());
+    [#"../12_ghost_code.rs" 36 16 36 26] x <- ([#"../12_ghost_code.rs" 36 16 36 26] new0 ([#"../12_ghost_code.rs" 36 16 36 26] ()));
     goto BB1
   }
   BB1 {
@@ -368,7 +368,7 @@ module C12GhostCode_GhostCheck
   BB2 {
     [#"../12_ghost_code.rs" 41 4 41 5] _5 <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 41 4 41 5] x <-  ^ _5;
-    [#"../12_ghost_code.rs" 41 4 41 13] _4 <- ([#"../12_ghost_code.rs" 41 4 41 13] push0 _5 (0 : int32));
+    [#"../12_ghost_code.rs" 41 4 41 13] _4 <- ([#"../12_ghost_code.rs" 41 4 41 13] push0 _5 ([#"../12_ghost_code.rs" 41 11 41 12] (0 : int32)));
     _5 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     goto BB3
   }
@@ -378,7 +378,7 @@ module C12GhostCode_GhostCheck
   }
   BB4 {
     assume { resolve0 x };
-    [#"../12_ghost_code.rs" 43 12 43 24] _7 <- ([#"../12_ghost_code.rs" 43 12 43 24] _8 = (1 : usize));
+    [#"../12_ghost_code.rs" 43 12 43 24] _7 <- ([#"../12_ghost_code.rs" 43 12 43 24] _8 = ([#"../12_ghost_code.rs" 43 23 43 24] (1 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB6
@@ -386,7 +386,7 @@ module C12GhostCode_GhostCheck
       end
   }
   BB5 {
-    [#"../12_ghost_code.rs" 35 21 44 1] _0 <- ([#"../12_ghost_code.rs" 35 21 44 1] ());
+    [#"../12_ghost_code.rs" 35 21 44 1] _0 <- ([#"../12_ghost_code.rs" 35 21 44 1] [#"../12_ghost_code.rs" 35 21 44 1] ());
     goto BB7
   }
   BB6 {
@@ -451,7 +451,7 @@ module C12GhostCode_TakesStruct
   BB1 {
     [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 27] _3));
     _3 <- any Snapshot.snap_ty uint32;
-    [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] ());
+    [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] [#"../12_ghost_code.rs" 52 37 54 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index d3c48b6e7b..afcdb43d79 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -214,7 +214,7 @@ module C13VecMacro_X
     goto BB0
   }
   BB0 {
-    [#"../13_vec_macro.rs" 6 23 6 29] v0 <- ([#"../13_vec_macro.rs" 6 23 6 29] new0 ());
+    [#"../13_vec_macro.rs" 6 23 6 29] v0 <- ([#"../13_vec_macro.rs" 6 23 6 29] new0 ([#"../../../../../creusot-contracts/src/lib.rs" 290 8 290 30] ()));
     goto BB1
   }
   BB1 {
@@ -223,7 +223,7 @@ module C13VecMacro_X
     goto BB2
   }
   BB2 {
-    [#"../13_vec_macro.rs" 9 13 9 23] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 (0 : int32) (2 : usize));
+    [#"../13_vec_macro.rs" 9 13 9 23] v1 <- ([#"../13_vec_macro.rs" 9 13 9 23] from_elem0 ([#"../13_vec_macro.rs" 9 18 9 19] (0 : int32)) ([#"../13_vec_macro.rs" 9 21 9 22] (2 : usize)));
     goto BB3
   }
   BB3 {
@@ -232,7 +232,7 @@ module C13VecMacro_X
     goto BB4
   }
   BB4 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB5
   }
   BB5 {
@@ -249,7 +249,7 @@ module C13VecMacro_X
     goto BB8
   }
   BB8 {
-    [#"../13_vec_macro.rs" 5 11 14 1] _0 <- ([#"../13_vec_macro.rs" 5 11 14 1] ());
+    [#"../13_vec_macro.rs" 5 11 14 1] _0 <- ([#"../13_vec_macro.rs" 5 11 14 1] [#"../13_vec_macro.rs" 5 11 14 1] ());
     goto BB9
   }
   BB9 {
diff --git a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
index cf4c6cc585..4090c4ffdd 100644
--- a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
+++ b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
@@ -13,7 +13,7 @@ module C14ConstFns_Omg
     goto BB0
   }
   BB0 {
-    [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] x - (1 : int32));
+    [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] x - ([#"../14_const_fns.rs" 6 8 6 9] (1 : int32)));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
index 48f558447b..40dec9e9c2 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
+++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
@@ -270,7 +270,7 @@ module DeriveMacros_Impl3_Eq
     assume { resolve1 rhs };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] false);
+    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] [#"../derive_macros.rs" 10 4 11 8] false);
     goto BB5
   }
   BB4 {
@@ -628,7 +628,7 @@ module DeriveMacros_Impl5_Eq
   BB3 {
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve1 _4 };
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
     goto BB16
   }
   BB4 {
@@ -659,11 +659,11 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB8 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
     goto BB10
   }
   BB9 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
     goto BB10
   }
   BB10 {
@@ -688,11 +688,11 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB13 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
     goto BB15
   }
   BB14 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/trait.mlcfg b/creusot/tests/should_succeed/trait.mlcfg
index 37b9f6d5b8..b091b2062b 100644
--- a/creusot/tests/should_succeed/trait.mlcfg
+++ b/creusot/tests/should_succeed/trait.mlcfg
@@ -26,7 +26,7 @@ module Trait_UsesCustom
     goto BB0
   }
   BB0 {
-    [#"../trait.rs" 9 55 9 57] _0 <- ([#"../trait.rs" 9 55 9 57] ());
+    [#"../trait.rs" 9 55 9 57] _0 <- ([#"../trait.rs" 9 55 9 57] [#"../trait.rs" 9 55 9 57] ());
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
     goto BB1
@@ -63,7 +63,7 @@ module Trait_UsesCustom2
     goto BB0
   }
   BB0 {
-    [#"../trait.rs" 13 62 13 64] _0 <- ([#"../trait.rs" 13 62 13 64] ());
+    [#"../trait.rs" 13 62 13 64] _0 <- ([#"../trait.rs" 13 62 13 64] [#"../trait.rs" 13 62 13 64] ());
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
     goto BB1
diff --git a/creusot/tests/should_succeed/trait_impl.mlcfg b/creusot/tests/should_succeed/trait_impl.mlcfg
index 72dd32901b..47804abcfa 100644
--- a/creusot/tests/should_succeed/trait_impl.mlcfg
+++ b/creusot/tests/should_succeed/trait_impl.mlcfg
@@ -35,7 +35,7 @@ module TraitImpl_Impl0_X
     goto BB0
   }
   BB0 {
-    [#"../trait_impl.rs" 25 15 25 17] _0 <- ([#"../trait_impl.rs" 25 15 25 17] ());
+    [#"../trait_impl.rs" 25 15 25 17] _0 <- ([#"../trait_impl.rs" 25 15 25 17] [#"../trait_impl.rs" 25 15 25 17] ());
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     goto BB1
@@ -56,7 +56,7 @@ module TraitImpl_Impl1_X
     goto BB0
   }
   BB0 {
-    [#"../trait_impl.rs" 29 15 29 17] _0 <- ([#"../trait_impl.rs" 29 15 29 17] ());
+    [#"../trait_impl.rs" 29 15 29 17] _0 <- ([#"../trait_impl.rs" 29 15 29 17] [#"../trait_impl.rs" 29 15 29 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/03.mlcfg b/creusot/tests/should_succeed/traits/03.mlcfg
index 76415daf96..fecedca641 100644
--- a/creusot/tests/should_succeed/traits/03.mlcfg
+++ b/creusot/tests/should_succeed/traits/03.mlcfg
@@ -10,7 +10,7 @@ module C03_Impl0_F
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] (0 : int32));
+    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] [#"../03.rs" 10 8 10 9] (0 : int32));
     return _0
   }
   
@@ -26,7 +26,7 @@ module C03_Impl1_G
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] (1 : uint32));
+    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] [#"../03.rs" 21 8 21 9] (1 : uint32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/04.mlcfg b/creusot/tests/should_succeed/traits/04.mlcfg
index f29b5ed62e..12f055d489 100644
--- a/creusot/tests/should_succeed/traits/04.mlcfg
+++ b/creusot/tests/should_succeed/traits/04.mlcfg
@@ -84,7 +84,7 @@ module C04_User
     goto BB7
   }
   BB7 {
-    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] false);
+    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] [#"../04.rs" 13 4 13 42] false);
     goto BB9
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/traits/06.mlcfg b/creusot/tests/should_succeed/traits/06.mlcfg
index e1f7551ba1..592474a80b 100644
--- a/creusot/tests/should_succeed/traits/06.mlcfg
+++ b/creusot/tests/should_succeed/traits/06.mlcfg
@@ -44,7 +44,7 @@ module C06_Test
   BB0 {
     assert { [@expl:type invariant] inv0 a };
     assume { resolve0 a };
-    [#"../06.rs" 13 4 13 11] _0 <- ([#"../06.rs" 13 4 13 11] ix0 a (0 : usize));
+    [#"../06.rs" 13 4 13 11] _0 <- ([#"../06.rs" 13 4 13 11] ix0 a ([#"../06.rs" 13 9 13 10] (0 : usize)));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/traits/07.mlcfg b/creusot/tests/should_succeed/traits/07.mlcfg
index 5b1ef00955..1720013163 100644
--- a/creusot/tests/should_succeed/traits/07.mlcfg
+++ b/creusot/tests/should_succeed/traits/07.mlcfg
@@ -29,7 +29,7 @@ module C07_Test
     goto BB0
   }
   BB0 {
-    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] true);
+    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] [#"../07.rs" 17 4 17 8] true);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/08.mlcfg b/creusot/tests/should_succeed/traits/08.mlcfg
index fb7f9560b3..55c34ef5bc 100644
--- a/creusot/tests/should_succeed/traits/08.mlcfg
+++ b/creusot/tests/should_succeed/traits/08.mlcfg
@@ -25,7 +25,7 @@ module C08_Tr_Program
     goto BB0
   }
   BB0 {
-    [#"../08.rs" 12 22 12 24] _0 <- ([#"../08.rs" 12 22 12 24] ());
+    [#"../08.rs" 12 22 12 24] _0 <- ([#"../08.rs" 12 22 12 24] [#"../08.rs" 12 22 12 24] ());
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     return _0
@@ -57,7 +57,7 @@ module C08_Test
     goto BB0
   }
   BB0 {
-    [#"../08.rs" 15 25 15 27] _0 <- ([#"../08.rs" 15 25 15 27] ());
+    [#"../08.rs" 15 25 15 27] _0 <- ([#"../08.rs" 15 25 15 27] [#"../08.rs" 15 25 15 27] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/traits/09.mlcfg b/creusot/tests/should_succeed/traits/09.mlcfg
index df092dc7c1..88df5428a8 100644
--- a/creusot/tests/should_succeed/traits/09.mlcfg
+++ b/creusot/tests/should_succeed/traits/09.mlcfg
@@ -11,7 +11,7 @@ module C09_Test
     goto BB0
   }
   BB0 {
-    [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] t + (0 : uint32));
+    [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] t + ([#"../09.rs" 8 8 8 9] (0 : uint32)));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/11.mlcfg b/creusot/tests/should_succeed/traits/11.mlcfg
index 70fb6a02cf..4f7deb31f0 100644
--- a/creusot/tests/should_succeed/traits/11.mlcfg
+++ b/creusot/tests/should_succeed/traits/11.mlcfg
@@ -24,7 +24,7 @@ module C11_Test
     goto BB0
   }
   BB0 {
-    [#"../11.rs" 18 24 18 26] _0 <- ([#"../11.rs" 18 24 18 26] ());
+    [#"../11.rs" 18 24 18 26] _0 <- ([#"../11.rs" 18 24 18 26] [#"../11.rs" 18 24 18 26] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/traits/12_default_method.mlcfg b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
index d57d1dff80..a13d16aa60 100644
--- a/creusot/tests/should_succeed/traits/12_default_method.mlcfg
+++ b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
@@ -27,7 +27,7 @@ module C12DefaultMethod_T_Default
     goto BB0
   }
   BB0 {
-    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
+    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] [#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     return _0
@@ -71,7 +71,7 @@ module C12DefaultMethod_ShouldUseImpl
     goto BB1
   }
   BB1 {
-    [#"../12_default_method.rs" 20 31 22 1] _0 <- ([#"../12_default_method.rs" 20 31 22 1] ());
+    [#"../12_default_method.rs" 20 31 22 1] _0 <- ([#"../12_default_method.rs" 20 31 22 1] [#"../12_default_method.rs" 20 31 22 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
index caff2ea273..8cc5a1ce08 100644
--- a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
+++ b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
@@ -13,7 +13,7 @@ module C15ImplInterfaces_Calls
     goto BB0
   }
   BB0 {
-    [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- ([#"../15_impl_interfaces.rs" 23 37 23 39] ());
+    [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- ([#"../15_impl_interfaces.rs" 23 37 23 39] [#"../15_impl_interfaces.rs" 23 37 23 39] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
index 8a88e4f01e..2bd5179205 100644
--- a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
+++ b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
@@ -86,7 +86,7 @@ module C16ImplCloning_Test
   BB0 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- ([#"../16_impl_cloning.rs" 17 31 17 33] ());
+    [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- ([#"../16_impl_cloning.rs" 17 31 17 33] [#"../16_impl_cloning.rs" 17 31 17 33] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/two_modules.mlcfg b/creusot/tests/should_succeed/two_modules.mlcfg
index 3852cf68b6..b77eccb7c5 100644
--- a/creusot/tests/should_succeed/two_modules.mlcfg
+++ b/creusot/tests/should_succeed/two_modules.mlcfg
@@ -16,7 +16,7 @@ module TwoModules_Mod2_X
     goto BB0
   }
   BB0 {
-    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] true);
+    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] [#"../two_modules.rs" 16 8 16 12] true);
     return _0
   }
   
@@ -39,7 +39,7 @@ module TwoModules_F
     goto BB1
   }
   BB1 {
-    [#"../two_modules.rs" 22 11 24 1] _0 <- ([#"../two_modules.rs" 22 11 24 1] ());
+    [#"../two_modules.rs" 22 11 24 1] _0 <- ([#"../two_modules.rs" 22 11 24 1] [#"../two_modules.rs" 22 11 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_constructors.mlcfg b/creusot/tests/should_succeed/type_constructors.mlcfg
index 7951a68f35..103bc9b952 100644
--- a/creusot/tests/should_succeed/type_constructors.mlcfg
+++ b/creusot/tests/should_succeed/type_constructors.mlcfg
@@ -17,7 +17,7 @@ module TypeConstructors_F
   }
   BB0 {
     [#"../type_constructors.rs" 18 17 18 24] _3 <- ([#"../type_constructors.rs" 18 17 18 24] TypeConstructors_B_X_Type.C_B);
-    [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] ());
+    [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] [#"../type_constructors.rs" 16 11 19 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
index 71892e8b47..2707ed6d8c 100644
--- a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
@@ -139,9 +139,9 @@ module Borrows_Inc
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11]  * x + (1 : int32)) ; };
+    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11]  * x + ([#"../borrows.rs" 102 10 102 11] (1 : int32))) ; };
     assume { resolve0 x };
-    [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] ());
+    [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] [#"../borrows.rs" 101 24 103 1] ());
     return _0
   }
   
@@ -223,7 +223,7 @@ module Borrows_Simple
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 31 31 34 1] _0 <- ([#"../borrows.rs" 31 31 34 1] ());
+    [#"../borrows.rs" 31 31 34 1] _0 <- ([#"../borrows.rs" 31 31 34 1] [#"../borrows.rs" 31 31 34 1] ());
     return _0
   }
   
@@ -317,7 +317,7 @@ module Borrows_Hard
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv1 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 38 29 41 1] _0 <- ([#"../borrows.rs" 38 29 41 1] ());
+    [#"../borrows.rs" 38 29 41 1] _0 <- ([#"../borrows.rs" 38 29 41 1] [#"../borrows.rs" 38 29 41 1] ());
     return _0
   }
   
@@ -407,7 +407,7 @@ module Borrows_Tuple
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] (0 : int32))), x1));
+    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] [#"../borrows.rs" 46 13 46 14] (0 : int32))), x1));
     [#"../borrows.rs" 47 8 47 19] _6 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1);
     [#"../borrows.rs" 47 8 47 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _6)) ; }));
     [#"../borrows.rs" 47 8 47 19] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -420,7 +420,7 @@ module Borrows_Tuple
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 45 45 49 1] _0 <- ([#"../borrows.rs" 45 45 49 1] ());
+    [#"../borrows.rs" 45 45 49 1] _0 <- ([#"../borrows.rs" 45 45 49 1] [#"../borrows.rs" 45 45 49 1] ());
     return _0
   }
   
@@ -525,8 +525,8 @@ module Borrows_PartialMove
     assume { resolve0 _7 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] (0 : int32)));
-    [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] ());
+    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] [#"../borrows.rs" 56 10 56 11] (0 : int32)));
+    [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] [#"../borrows.rs" 53 48 57 1] ());
     return _0
   }
   
@@ -624,7 +624,7 @@ module Borrows_Destruct
     x <- (let (x0, x1) = x in (x0, any borrowed (Borrows_NonZero_Type.t_nonzero)));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] (0 : int32)));
+    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] [#"../borrows.rs" 63 10 63 11] (0 : int32)));
     [#"../borrows.rs" 64 8 64 16] _8 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * b)) (Borrow.inherit_id (Borrow.get_id b) 1);
     [#"../borrows.rs" 64 8 64 16] b <- { b with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * b in Borrows_NonZero_Type.C_NonZero ( ^ _8)) ; };
     [#"../borrows.rs" 64 8 64 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
@@ -637,7 +637,7 @@ module Borrows_Destruct
     assume { resolve1 _8 };
     assert { [@expl:type invariant] inv1 b };
     assume { resolve2 b };
-    [#"../borrows.rs" 61 44 65 1] _0 <- ([#"../borrows.rs" 61 44 65 1] ());
+    [#"../borrows.rs" 61 44 65 1] _0 <- ([#"../borrows.rs" 61 44 65 1] [#"../borrows.rs" 61 44 65 1] ());
     return _0
   }
   
@@ -729,7 +729,7 @@ module Borrows_FrozenDead
   }
   BB1 {
     assume { resolve1 _a };
-    [#"../borrows.rs" 69 67 76 1] _0 <- ([#"../borrows.rs" 69 67 76 1] ());
+    [#"../borrows.rs" 69 67 76 1] _0 <- ([#"../borrows.rs" 69 67 76 1] [#"../borrows.rs" 69 67 76 1] ());
     assert { [@expl:type invariant] inv1 y };
     assume { resolve0 y };
     return _0
@@ -780,9 +780,9 @@ module Borrows_Dec
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11]  * x - (1 : int32)) ; };
+    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11]  * x - ([#"../borrows.rs" 108 10 108 11] (1 : int32))) ; };
     assume { resolve0 x };
-    [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] ());
+    [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] [#"../borrows.rs" 107 24 109 1] ());
     return _0
   }
   
@@ -882,7 +882,7 @@ module Borrows_Impl3_Foo
     assume { resolve0 _8 };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
-    [#"../borrows.rs" 93 26 96 5] _0 <- ([#"../borrows.rs" 93 26 96 5] ());
+    [#"../borrows.rs" 93 26 96 5] _0 <- ([#"../borrows.rs" 93 26 96 5] [#"../borrows.rs" 93 26 96 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/generated.mlcfg b/creusot/tests/should_succeed/type_invariants/generated.mlcfg
index 679f36dda7..efc20b1f50 100644
--- a/creusot/tests/should_succeed/type_invariants/generated.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/generated.mlcfg
@@ -113,7 +113,7 @@ module Generated_UseFoo
   }
   BB0 {
     assert { [@expl:assertion] [#"../generated.rs" 20 18 20 35] inv0 x };
-    [#"../generated.rs" 19 62 21 1] _0 <- ([#"../generated.rs" 19 62 21 1] ());
+    [#"../generated.rs" 19 62 21 1] _0 <- ([#"../generated.rs" 19 62 21 1] [#"../generated.rs" 19 62 21 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
index e6c042a10c..9705591c4b 100644
--- a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
@@ -201,7 +201,7 @@ module VecInv_Vec
     goto BB2
   }
   BB2 {
-    [#"../vec_inv.rs" 18 33 20 1] _0 <- ([#"../vec_inv.rs" 18 33 20 1] ());
+    [#"../vec_inv.rs" 18 33 20 1] _0 <- ([#"../vec_inv.rs" 18 33 20 1] [#"../vec_inv.rs" 18 33 20 1] ());
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/unused_in_loop.mlcfg b/creusot/tests/should_succeed/unused_in_loop.mlcfg
index c8e939e91a..f1fca52781 100644
--- a/creusot/tests/should_succeed/unused_in_loop.mlcfg
+++ b/creusot/tests/should_succeed/unused_in_loop.mlcfg
@@ -13,7 +13,7 @@ module UnusedInLoop_UnusedInLoop
     goto BB0
   }
   BB0 {
-    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
+    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] [#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg
index 8405ef2b9c..fa696eee6a 100644
--- a/creusot/tests/should_succeed/vecdeque.mlcfg
+++ b/creusot/tests/should_succeed/vecdeque.mlcfg
@@ -231,10 +231,10 @@ module Vecdeque_TestDeque
     
   let constant promoted0 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some (3 : uint32) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0
+    let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 24 37 24 38] (3 : uint32)) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0
   let constant promoted1 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some (2 : uint32) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0
+    let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 23 38 23 39] (2 : uint32)) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0
   let constant promoted2 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
     let _1 = [#"../vecdeque.rs" 17 32 17 36] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 17 32 17 36] _1 in _0
@@ -281,7 +281,7 @@ module Vecdeque_TestDeque
     goto BB0
   }
   BB0 {
-    [#"../vecdeque.rs" 6 31 6 57] deque <- ([#"../vecdeque.rs" 6 31 6 57] with_capacity0 (5 : usize));
+    [#"../vecdeque.rs" 6 31 6 57] deque <- ([#"../vecdeque.rs" 6 31 6 57] with_capacity0 ([#"../vecdeque.rs" 6 55 6 56] (5 : usize)));
     goto BB1
   }
   BB1 {
@@ -303,7 +303,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB5 {
-    [#"../vecdeque.rs" 9 12 9 28] _7 <- ([#"../vecdeque.rs" 9 12 9 28] _8 = (0 : usize));
+    [#"../vecdeque.rs" 9 12 9 28] _7 <- ([#"../vecdeque.rs" 9 12 9 28] _8 = ([#"../vecdeque.rs" 9 27 9 28] (0 : usize)));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB7
@@ -311,7 +311,7 @@ module Vecdeque_TestDeque
       end
   }
   BB6 {
-    [#"../vecdeque.rs" 11 35 11 50] deque1 <- ([#"../vecdeque.rs" 11 35 11 50] new0 ());
+    [#"../vecdeque.rs" 11 35 11 50] deque1 <- ([#"../vecdeque.rs" 11 35 11 50] new0 ([#"../vecdeque.rs" 11 35 11 50] ()));
     goto BB8
   }
   BB7 {
@@ -337,7 +337,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB12 {
-    [#"../vecdeque.rs" 14 12 14 28] _17 <- ([#"../vecdeque.rs" 14 12 14 28] _18 = (0 : usize));
+    [#"../vecdeque.rs" 14 12 14 28] _17 <- ([#"../vecdeque.rs" 14 12 14 28] _18 = ([#"../vecdeque.rs" 14 27 14 28] (0 : usize)));
     _18 <- any usize;
     switch (_17)
       | False -> goto BB14
@@ -356,7 +356,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB15 {
-    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] promoted3);
+    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] [#"../vecdeque.rs" 16 33 16 37] promoted3);
     [#"../vecdeque.rs" 16 12 16 37] _22 <- ([#"../vecdeque.rs" 16 12 16 37] eq0 _24 _68);
     goto BB16
   }
@@ -378,7 +378,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB19 {
-    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] promoted2);
+    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] [#"../vecdeque.rs" 17 32 17 36] promoted2);
     [#"../vecdeque.rs" 17 12 17 36] _30 <- ([#"../vecdeque.rs" 17 12 17 36] eq0 _32 _67);
     goto BB20
   }
@@ -391,7 +391,7 @@ module Vecdeque_TestDeque
   BB21 {
     [#"../vecdeque.rs" 19 4 19 9] _38 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 19 4 19 9] deque1 <-  ^ _38;
-    [#"../vecdeque.rs" 19 4 19 23] _37 <- ([#"../vecdeque.rs" 19 4 19 23] push_front0 _38 (1 : uint32));
+    [#"../vecdeque.rs" 19 4 19 23] _37 <- ([#"../vecdeque.rs" 19 4 19 23] push_front0 _38 ([#"../vecdeque.rs" 19 21 19 22] (1 : uint32)));
     _38 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB23
   }
@@ -402,14 +402,14 @@ module Vecdeque_TestDeque
   BB23 {
     [#"../vecdeque.rs" 20 4 20 9] _40 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 20 4 20 9] deque1 <-  ^ _40;
-    [#"../vecdeque.rs" 20 4 20 23] _39 <- ([#"../vecdeque.rs" 20 4 20 23] push_front0 _40 (2 : uint32));
+    [#"../vecdeque.rs" 20 4 20 23] _39 <- ([#"../vecdeque.rs" 20 4 20 23] push_front0 _40 ([#"../vecdeque.rs" 20 21 20 22] (2 : uint32)));
     _40 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB24
   }
   BB24 {
     [#"../vecdeque.rs" 21 4 21 9] _42 <- Borrow.borrow_mut deque1;
     [#"../vecdeque.rs" 21 4 21 9] deque1 <-  ^ _42;
-    [#"../vecdeque.rs" 21 4 21 22] _41 <- ([#"../vecdeque.rs" 21 4 21 22] push_back0 _42 (3 : uint32));
+    [#"../vecdeque.rs" 21 4 21 22] _41 <- ([#"../vecdeque.rs" 21 4 21 22] push_back0 _42 ([#"../vecdeque.rs" 21 20 21 21] (3 : uint32)));
     _42 <- any borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global));
     goto BB25
   }
@@ -421,7 +421,7 @@ module Vecdeque_TestDeque
     goto BB26
   }
   BB26 {
-    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] promoted1);
+    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] [#"../vecdeque.rs" 23 33 23 40] promoted1);
     [#"../vecdeque.rs" 23 12 23 40] _44 <- ([#"../vecdeque.rs" 23 12 23 40] eq0 _46 _66);
     goto BB27
   }
@@ -443,7 +443,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB30 {
-    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] promoted0);
+    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] [#"../vecdeque.rs" 24 32 24 39] promoted0);
     [#"../vecdeque.rs" 24 12 24 39] _52 <- ([#"../vecdeque.rs" 24 12 24 39] eq0 _54 _65);
     goto BB31
   }
@@ -475,7 +475,7 @@ module Vecdeque_TestDeque
       end
   }
   BB36 {
-    [#"../vecdeque.rs" 5 20 27 1] _0 <- ([#"../vecdeque.rs" 5 20 27 1] ());
+    [#"../vecdeque.rs" 5 20 27 1] _0 <- ([#"../vecdeque.rs" 5 20 27 1] [#"../vecdeque.rs" 5 20 27 1] ());
     goto BB38
   }
   BB37 {
diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index 3a44f0ec81..eeaecbe0f6 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -370,7 +370,7 @@ module C01_AllZero
     goto BB2
   }
   BB2 {
-    [#"../01.rs" 11 13 11 23] _7 <- ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8);
+    [#"../01.rs" 11 13 11 23] _7 <- ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range ([#"../01.rs" 11 13 11 14] (0 : usize)) _8);
     _8 <- any usize;
     [#"../01.rs" 9 4 9 42] iter <- ([#"../01.rs" 9 4 9 42] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -412,7 +412,7 @@ module C01_AllZero
   }
   BB9 {
     assume { resolve2 v };
-    [#"../01.rs" 9 4 9 42] _0 <- ([#"../01.rs" 9 4 9 42] ());
+    [#"../01.rs" 9 4 9 42] _0 <- ([#"../01.rs" 9 4 9 42] [#"../01.rs" 9 4 9 42] ());
     return _0
   }
   BB10 {
@@ -439,7 +439,7 @@ module C01_AllZero
     goto BB14
   }
   BB14 {
-    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] (0 : uint32)) ; };
+    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] [#"../01.rs" 12 15 12 16] (0 : uint32)) ; };
     assume { resolve1 _27 };
     goto BB6
   }
diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index 1070d41b2e..55c65859a7 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -435,7 +435,7 @@ module C02Gnome_GnomeSort
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] (0 : usize));
+    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] [#"../02_gnome.rs" 27 16 27 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -456,7 +456,7 @@ module C02Gnome_GnomeSort
       end
   }
   BB5 {
-    [#"../02_gnome.rs" 31 11 31 17] _14 <- ([#"../02_gnome.rs" 31 11 31 17] i = (0 : usize));
+    [#"../02_gnome.rs" 31 11 31 17] _14 <- ([#"../02_gnome.rs" 31 11 31 17] i = ([#"../02_gnome.rs" 31 16 31 17] (0 : usize)));
     switch (_14)
       | False -> goto BB7
       | True -> goto BB6
@@ -466,7 +466,7 @@ module C02Gnome_GnomeSort
     goto BB11
   }
   BB7 {
-    [#"../02_gnome.rs" 31 23 31 28] _20 <- ([#"../02_gnome.rs" 31 23 31 28] i - (1 : usize));
+    [#"../02_gnome.rs" 31 23 31 28] _20 <- ([#"../02_gnome.rs" 31 23 31 28] i - ([#"../02_gnome.rs" 31 27 31 28] (1 : usize)));
     [#"../02_gnome.rs" 31 22 31 29] _18 <- ([#"../02_gnome.rs" 31 22 31 29] index0 ( * v) _20);
     _20 <- any usize;
     goto BB8
@@ -493,8 +493,8 @@ module C02Gnome_GnomeSort
       end
   }
   BB11 {
-    [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + (1 : usize));
-    [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] ());
+    [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + ([#"../02_gnome.rs" 32 17 32 18] (1 : usize)));
+    [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] [#"../02_gnome.rs" 31 40 33 9] ());
     goto BB15
   }
   BB12 {
@@ -509,7 +509,7 @@ module C02Gnome_GnomeSort
     [#"../02_gnome.rs" 34 12 34 13] _28 <- Borrow.borrow_final ( * _29) (Borrow.get_id _29);
     [#"../02_gnome.rs" 34 12 34 13] _29 <- { _29 with current = ( ^ _28) ; };
     assume { inv4 ( ^ _28) };
-    [#"../02_gnome.rs" 34 19 34 24] _31 <- ([#"../02_gnome.rs" 34 19 34 24] i - (1 : usize));
+    [#"../02_gnome.rs" 34 19 34 24] _31 <- ([#"../02_gnome.rs" 34 19 34 24] i - ([#"../02_gnome.rs" 34 23 34 24] (1 : usize)));
     [#"../02_gnome.rs" 34 12 34 28] _27 <- ([#"../02_gnome.rs" 34 12 34 28] swap0 _28 _31 i);
     _28 <- any borrowed (slice t);
     _31 <- any usize;
@@ -518,8 +518,8 @@ module C02Gnome_GnomeSort
   BB14 {
     assert { [@expl:type invariant] inv5 _29 };
     assume { resolve3 _29 };
-    [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - (1 : usize));
-    [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] ());
+    [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - ([#"../02_gnome.rs" 35 17 35 18] (1 : usize)));
+    [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] [#"../02_gnome.rs" 33 15 36 9] ());
     goto BB15
   }
   BB15 {
@@ -528,7 +528,7 @@ module C02Gnome_GnomeSort
   BB16 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve1 v };
-    [#"../02_gnome.rs" 30 4 37 5] _0 <- ([#"../02_gnome.rs" 30 4 37 5] ());
+    [#"../02_gnome.rs" 30 4 37 5] _0 <- ([#"../02_gnome.rs" 30 4 37 5] [#"../02_gnome.rs" 30 4 37 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index 4ecfba6223..e2d9656bc9 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -387,7 +387,7 @@ module C03KnuthShuffle_KnuthShuffle
     goto BB2
   }
   BB2 {
-    [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _7);
+    [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range ([#"../03_knuth_shuffle.rs" 17 13 17 14] (0 : usize)) _7);
     _7 <- any usize;
     [#"../03_knuth_shuffle.rs" 16 4 16 43] iter <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] into_iter0 _6);
     _6 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -429,7 +429,7 @@ module C03KnuthShuffle_KnuthShuffle
   BB9 {
     assert { [@expl:type invariant] inv5 v };
     assume { resolve3 v };
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] ());
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] [#"../03_knuth_shuffle.rs" 16 4 16 43] ());
     return _0
   }
   BB10 {
@@ -456,7 +456,7 @@ module C03KnuthShuffle_KnuthShuffle
   BB14 {
     [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- ([#"../03_knuth_shuffle.rs" 20 20 20 31] _26 - n);
     _26 <- any usize;
-    [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 (0 : usize) upper);
+    [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 ([#"../03_knuth_shuffle.rs" 21 30 21 31] (0 : usize)) upper);
     goto BB15
   }
   BB15 {
@@ -471,7 +471,7 @@ module C03KnuthShuffle_KnuthShuffle
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _32 <- Borrow.borrow_final ( * _33) (Borrow.get_id _33);
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _33 <- { _33 with current = ( ^ _32) ; };
     assume { inv3 ( ^ _32) };
-    [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- ([#"../03_knuth_shuffle.rs" 22 18 22 27] upper - (1 : usize));
+    [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- ([#"../03_knuth_shuffle.rs" 22 18 22 27] upper - ([#"../03_knuth_shuffle.rs" 22 26 22 27] (1 : usize)));
     [#"../03_knuth_shuffle.rs" 22 8 22 28] _31 <- ([#"../03_knuth_shuffle.rs" 22 8 22 28] swap0 _32 i _36);
     _32 <- any borrowed (slice t);
     _36 <- any usize;
diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
index 4356c7b205..2336e6828a 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
+++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
@@ -193,7 +193,7 @@ module C04BinarySearch_BinarySearch
     goto BB1
   }
   BB1 {
-    [#"../04_binary_search.rs" 27 7 27 21] _9 <- ([#"../04_binary_search.rs" 27 7 27 21] _10 = (0 : usize));
+    [#"../04_binary_search.rs" 27 7 27 21] _9 <- ([#"../04_binary_search.rs" 27 7 27 21] _10 = ([#"../04_binary_search.rs" 27 20 27 21] (0 : usize)));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB3
@@ -201,7 +201,7 @@ module C04BinarySearch_BinarySearch
       end
   }
   BB2 {
-    [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err (0 : usize));
+    [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 28 19 28 20] (0 : usize)));
     goto BB21
   }
   BB3 {
@@ -209,7 +209,7 @@ module C04BinarySearch_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
+    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] [#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -219,19 +219,19 @@ module C04BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    [#"../04_binary_search.rs" 36 10 36 18] _21 <- ([#"../04_binary_search.rs" 36 10 36 18] size > (1 : usize));
+    [#"../04_binary_search.rs" 36 10 36 18] _21 <- ([#"../04_binary_search.rs" 36 10 36 18] size > ([#"../04_binary_search.rs" 36 17 36 18] (1 : usize)));
     switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] (2 : usize) = (0 : usize));
+    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize)) = ([#"../04_binary_search.rs" 37 19 37 27] (0 : usize)));
     assert { [@expl:division by zero] [#"../04_binary_search.rs" 37 19 37 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] size / (2 : usize));
+    [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] size / ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize)));
     [#"../04_binary_search.rs" 38 18 38 29] mid <- ([#"../04_binary_search.rs" 38 18 38 29] base + half);
     [#"../04_binary_search.rs" 40 21 40 26] _32 <- ([#"../04_binary_search.rs" 40 21 40 26] index0 arr mid);
     goto BB9
@@ -281,7 +281,7 @@ module C04BinarySearch_BinarySearch
       end
   }
   BB17 {
-    [#"../04_binary_search.rs" 48 12 48 20] _51 <- ([#"../04_binary_search.rs" 48 12 48 20] base + (1 : usize));
+    [#"../04_binary_search.rs" 48 12 48 20] _51 <- ([#"../04_binary_search.rs" 48 12 48 20] base + ([#"../04_binary_search.rs" 48 19 48 20] (1 : usize)));
     [#"../04_binary_search.rs" 48 8 48 21] _0 <- ([#"../04_binary_search.rs" 48 8 48 21] Core_Result_Result_Type.C_Err _51);
     _51 <- any usize;
     goto BB19
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
index 1d05338f16..32fa1beb29 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
@@ -370,7 +370,7 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = (0 : usize));
+    [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = ([#"../05_binary_search_generic.rs" 31 20 31 21] (0 : usize)));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB7
@@ -382,7 +382,7 @@ module C05BinarySearchGeneric_BinarySearch
     assume { resolve2 elem };
     assert { [@expl:type invariant] inv0 arr };
     assume { resolve0 arr };
-    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err (0 : usize));
+    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 32 19 32 20] (0 : usize)));
     goto BB29
   }
   BB6 {
@@ -394,7 +394,7 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB8
   }
   BB8 {
-    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
+    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] [#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
     goto BB9
   }
   BB9 {
@@ -410,19 +410,19 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB12
   }
   BB12 {
-    [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- ([#"../05_binary_search_generic.rs" 40 10 40 18] size > (1 : usize));
+    [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- ([#"../05_binary_search_generic.rs" 40 10 40 18] size > ([#"../05_binary_search_generic.rs" 40 17 40 18] (1 : usize)));
     switch (_21)
       | False -> goto BB20
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] (2 : usize) = (0 : usize));
+    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)) = ([#"../05_binary_search_generic.rs" 41 19 41 27] (0 : usize)));
     assert { [@expl:division by zero] [#"../05_binary_search_generic.rs" 41 19 41 27] not _25 };
     goto BB14
   }
   BB14 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] size / (2 : usize));
+    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] size / ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)));
     [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- ([#"../05_binary_search_generic.rs" 42 18 42 29] base + half);
     [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 arr mid);
     goto BB15
@@ -495,7 +495,7 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB28
   }
   BB27 {
-    [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- ([#"../05_binary_search_generic.rs" 53 30 53 38] base + (1 : usize));
+    [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- ([#"../05_binary_search_generic.rs" 53 30 53 38] base + ([#"../05_binary_search_generic.rs" 53 37 53 38] (1 : usize)));
     [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- ([#"../05_binary_search_generic.rs" 53 26 53 39] Core_Result_Result_Type.C_Err _50);
     _50 <- any usize;
     goto BB28
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index cf267cbe28..875bcbc684 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -263,7 +263,7 @@ module C06KnightsTour_Impl1_New_Closure3
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../06_knights_tour.rs" 44 23 44 36] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 (0 : usize) (field_00 ( * _1)));
+    [#"../06_knights_tour.rs" 44 23 44 36] res <- ([#"../06_knights_tour.rs" 44 23 44 36] from_elem0 ([#"../06_knights_tour.rs" 44 28 44 29] (0 : usize)) (field_00 ( * _1)));
     goto BB1
   }
   BB1 {
@@ -695,7 +695,7 @@ module C06KnightsTour_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 41 19 41 28] _7 <- ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) size);
+    [#"../06_knights_tour.rs" 41 19 41 28] _7 <- ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 41 20 41 21] (0 : usize)) size);
     [#"../06_knights_tour.rs" 43 16 43 50] _9 <- ([#"../06_knights_tour.rs" 43 16 43 50] C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size);
     [#"../06_knights_tour.rs" 41 19 45 13] _6 <- ([#"../06_knights_tour.rs" 41 19 45 13] map_inv0 _7 _9);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -929,7 +929,7 @@ module C06KnightsTour_Impl1_Available
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 16] (0 : isize) <= C06KnightsTour_Point_Type.point_x p);
+    [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 16] ([#"../06_knights_tour.rs" 53 8 53 9] (0 : isize)) <= C06KnightsTour_Point_Type.point_x p);
     switch (_5)
       | False -> goto BB8
       | True -> goto BB1
@@ -945,7 +945,7 @@ module C06KnightsTour_Impl1_Available
       end
   }
   BB2 {
-    [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 23] (0 : isize) <= C06KnightsTour_Point_Type.point_y p);
+    [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 23] ([#"../06_knights_tour.rs" 55 15 55 16] (0 : isize)) <= C06KnightsTour_Point_Type.point_y p);
     switch (_11)
       | False -> goto BB6
       | True -> goto BB3
@@ -979,7 +979,7 @@ module C06KnightsTour_Impl1_Available
     goto BB9
   }
   BB9 {
-    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] false);
+    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] [#"../06_knights_tour.rs" 53 8 57 58] false);
     goto BB12
   }
   BB10 {
@@ -989,7 +989,7 @@ module C06KnightsTour_Impl1_Available
     goto BB11
   }
   BB11 {
-    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] _18 = (0 : usize));
+    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] _18 = ([#"../06_knights_tour.rs" 57 57 57 58] (0 : usize)));
     goto BB12
   }
   BB12 {
@@ -1341,8 +1341,8 @@ module C06KnightsTour_Impl1_CountDegree
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
-    [#"../06_knights_tour.rs" 74 17 74 24] _8 <- ([#"../06_knights_tour.rs" 74 17 74 24] moves0 ());
+    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] [#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
+    [#"../06_knights_tour.rs" 74 17 74 24] _8 <- ([#"../06_knights_tour.rs" 74 17 74 24] moves0 ([#"../06_knights_tour.rs" 74 17 74 24] ()));
     goto BB1
   }
   BB1 {
@@ -1427,12 +1427,12 @@ module C06KnightsTour_Impl1_CountDegree
       end
   }
   BB17 {
-    [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + (1 : usize));
-    [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] ());
+    [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + ([#"../06_knights_tour.rs" 77 25 77 26] (1 : usize)));
+    [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] [#"../06_knights_tour.rs" 76 36 78 13] ());
     goto BB19
   }
   BB18 {
-    [#"../06_knights_tour.rs" 78 13 78 13] _16 <- ([#"../06_knights_tour.rs" 78 13 78 13] ());
+    [#"../06_knights_tour.rs" 78 13 78 13] _16 <- ([#"../06_knights_tour.rs" 78 13 78 13] [#"../06_knights_tour.rs" 78 13 78 13] ());
     goto BB19
   }
   BB19 {
@@ -1707,7 +1707,7 @@ module C06KnightsTour_Impl1_Set
   BB2 {
     [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = ([#"../06_knights_tour.rs" 88 8 88 50] v) ; };
     assume { resolve0 _9 };
-    [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] ());
+    [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] [#"../06_knights_tour.rs" 88 8 88 50] ());
     assume { resolve1 _11 };
     assume { resolve2 self };
     return _0
@@ -2061,18 +2061,18 @@ module C06KnightsTour_Min
     [#"../06_knights_tour.rs" 117 26 117 33] _25 <- ([#"../06_knights_tour.rs" 117 26 117 33] Core_Option_Option_Type.C_Some x);
     [#"../06_knights_tour.rs" 117 20 117 33] min <- ([#"../06_knights_tour.rs" 117 20 117 33] _25);
     _25 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
-    [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] ());
+    [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] [#"../06_knights_tour.rs" 117 20 117 33] ());
     goto BB18
   }
   BB15 {
     [#"../06_knights_tour.rs" 120 26 120 33] _31 <- ([#"../06_knights_tour.rs" 120 26 120 33] Core_Option_Option_Type.C_Some x);
     [#"../06_knights_tour.rs" 120 20 120 33] min <- ([#"../06_knights_tour.rs" 120 20 120 33] _31);
     _31 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
-    [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] ());
+    [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] [#"../06_knights_tour.rs" 120 20 120 33] ());
     goto BB17
   }
   BB16 {
-    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] ());
+    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] [#"../06_knights_tour.rs" 121 17 121 17] ());
     goto BB17
   }
   BB17 {
@@ -2694,7 +2694,7 @@ module C06KnightsTour_KnightsTour
     _12 <- any isize;
     [#"../06_knights_tour.rs" 139 4 139 9] _15 <- Borrow.borrow_mut board;
     [#"../06_knights_tour.rs" 139 4 139 9] board <-  ^ _15;
-    [#"../06_knights_tour.rs" 139 4 139 19] _14 <- ([#"../06_knights_tour.rs" 139 4 139 19] set0 _15 p (1 : usize));
+    [#"../06_knights_tour.rs" 139 4 139 19] _14 <- ([#"../06_knights_tour.rs" 139 4 139 19] set0 _15 p ([#"../06_knights_tour.rs" 139 17 139 18] (1 : usize)));
     _15 <- any borrowed (C06KnightsTour_Board_Type.t_board);
     goto BB2
   }
@@ -2704,7 +2704,7 @@ module C06KnightsTour_KnightsTour
   }
   BB3 {
     [#"../06_knights_tour.rs" 145 19 145 32] _22 <- ([#"../06_knights_tour.rs" 145 19 145 32] size * size);
-    [#"../06_knights_tour.rs" 145 16 145 32] _21 <- ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range (2 : usize) _22);
+    [#"../06_knights_tour.rs" 145 16 145 32] _21 <- ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 145 16 145 17] (2 : usize)) _22);
     _22 <- any usize;
     [#"../06_knights_tour.rs" 142 4 142 36] iter <- ([#"../06_knights_tour.rs" 142 4 142 36] into_iter0 _21);
     _21 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -2772,11 +2772,11 @@ module C06KnightsTour_KnightsTour
     [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] _40);
     _40 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ());
+    [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ([#"../06_knights_tour.rs" 147 50 147 60] ()));
     goto BB17
   }
   BB17 {
-    [#"../06_knights_tour.rs" 150 17 150 24] _46 <- ([#"../06_knights_tour.rs" 150 17 150 24] moves0 ());
+    [#"../06_knights_tour.rs" 150 17 150 24] _46 <- ([#"../06_knights_tour.rs" 150 17 150 24] moves0 ([#"../06_knights_tour.rs" 150 17 150 24] ()));
     goto BB18
   }
   BB18 {
@@ -2872,11 +2872,11 @@ module C06KnightsTour_KnightsTour
     goto BB36
   }
   BB36 {
-    [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] ());
+    [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] [#"../06_knights_tour.rs" 152 36 155 13] ());
     goto BB38
   }
   BB37 {
-    [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] ());
+    [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] [#"../06_knights_tour.rs" 155 13 155 13] ());
     goto BB38
   }
   BB38 {
@@ -2912,7 +2912,7 @@ module C06KnightsTour_KnightsTour
     goto BB44
   }
   BB44 {
-    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] ());
+    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] [#"../06_knights_tour.rs" 145 33 162 5] ());
     goto BB45
   }
   BB45 {
diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
index 4d411db624..da03d2a4a9 100644
--- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg
+++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
@@ -259,7 +259,7 @@ module C07ReadWrite_ReadWrite
     assume { resolve0 x };
     assert { [@expl:type invariant] inv4 a };
     assume { resolve3 a };
-    [#"../07_read_write.rs" 6 76 9 1] _0 <- ([#"../07_read_write.rs" 6 76 9 1] ());
+    [#"../07_read_write.rs" 6 76 9 1] _0 <- ([#"../07_read_write.rs" 6 76 9 1] [#"../07_read_write.rs" 6 76 9 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index be73d8e1ee..4a52b2ef80 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -480,7 +480,7 @@ module C08Haystack_Search
     [#"../08_haystack.rs" 23 21 23 50] _11 <- ([#"../08_haystack.rs" 23 21 23 50] _12 - _14);
     _12 <- any usize;
     _14 <- any usize;
-    [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 (0 : usize) _11);
+    [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 ([#"../08_haystack.rs" 23 17 23 18] (0 : usize)) _11);
     _11 <- any usize;
     goto BB3
   }
@@ -546,7 +546,7 @@ module C08Haystack_Search
     goto BB15
   }
   BB15 {
-    [#"../08_haystack.rs" 25 17 25 32] _35 <- ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range (0 : usize) _36);
+    [#"../08_haystack.rs" 25 17 25 32] _35 <- ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range ([#"../08_haystack.rs" 25 17 25 18] (0 : usize)) _36);
     _36 <- any usize;
     [#"../08_haystack.rs" 24 8 24 68] iter1 <- ([#"../08_haystack.rs" 24 8 24 68] into_iter1 _35);
     _35 <- any Core_Ops_Range_Range_Type.t_range usize;
diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
index d4206d382b..0393781d1b 100644
--- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg
+++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
@@ -142,7 +142,7 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 7 4 7 5] _5 <- Borrow.borrow_mut ( * v);
     [#"../09_capacity.rs" 7 4 7 5] v <- { v with current = ( ^ _5) ; };
     assume { inv0 ( ^ _5) };
-    [#"../09_capacity.rs" 7 4 7 18] _4 <- ([#"../09_capacity.rs" 7 4 7 18] reserve0 _5 (100 : usize));
+    [#"../09_capacity.rs" 7 4 7 18] _4 <- ([#"../09_capacity.rs" 7 4 7 18] reserve0 _5 ([#"../09_capacity.rs" 7 14 7 17] (100 : usize)));
     _5 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB1
   }
@@ -150,7 +150,7 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 8 4 8 5] _7 <- Borrow.borrow_mut ( * v);
     [#"../09_capacity.rs" 8 4 8 5] v <- { v with current = ( ^ _7) ; };
     assume { inv0 ( ^ _7) };
-    [#"../09_capacity.rs" 8 4 8 24] _6 <- ([#"../09_capacity.rs" 8 4 8 24] reserve_exact0 _7 (200 : usize));
+    [#"../09_capacity.rs" 8 4 8 24] _6 <- ([#"../09_capacity.rs" 8 4 8 24] reserve_exact0 _7 ([#"../09_capacity.rs" 8 20 8 23] (200 : usize)));
     _7 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB2
   }
@@ -166,14 +166,14 @@ module C09Capacity_ChangeCapacity
     [#"../09_capacity.rs" 10 4 10 5] _11 <- Borrow.borrow_final ( * v) (Borrow.get_id v);
     [#"../09_capacity.rs" 10 4 10 5] v <- { v with current = ( ^ _11) ; };
     assume { inv0 ( ^ _11) };
-    [#"../09_capacity.rs" 10 4 10 18] _10 <- ([#"../09_capacity.rs" 10 4 10 18] shrink_to0 _11 (1 : usize));
+    [#"../09_capacity.rs" 10 4 10 18] _10 <- ([#"../09_capacity.rs" 10 4 10 18] shrink_to0 _11 ([#"../09_capacity.rs" 10 16 10 17] (1 : usize)));
     _11 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     goto BB4
   }
   BB4 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve0 v };
-    [#"../09_capacity.rs" 6 42 11 1] _0 <- ([#"../09_capacity.rs" 6 42 11 1] ());
+    [#"../09_capacity.rs" 6 42 11 1] _0 <- ([#"../09_capacity.rs" 6 42 11 1] [#"../09_capacity.rs" 6 42 11 1] ());
     return _0
   }
   
@@ -256,7 +256,7 @@ module C09Capacity_ClearVec
   BB1 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve0 v };
-    [#"../09_capacity.rs" 14 36 16 1] _0 <- ([#"../09_capacity.rs" 14 36 16 1] ());
+    [#"../09_capacity.rs" 14 36 16 1] _0 <- ([#"../09_capacity.rs" 14 36 16 1] [#"../09_capacity.rs" 14 36 16 1] ());
     return _0
   }
   

From 39faac816da18d32599ca592a5c271127721e1c3 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sun, 10 Mar 2024 11:15:27 +0100
Subject: [PATCH 57/66] Remove purity from why3 ast

---
 creusot/src/backend/logic.rs       |   2 +-
 creusot/src/backend/logic/vcgen.rs |   8 +-
 creusot/src/backend/term.rs        | 170 ++++++-----------------------
 why3/src/exp.rs                    |  34 +++---
 why3/src/mlcfg/printer.rs          |   4 +-
 5 files changed, 54 insertions(+), 164 deletions(-)

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index bc2d8f60d5..55178bd1be 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -281,7 +281,7 @@ fn subst_qname(body: &mut Exp, name: &Ident, lim_name: &Ident) {
     impl<'a> ExpMutVisitor for QNameSubst<'a> {
         fn visit_mut(&mut self, exp: &mut Exp) {
             match exp {
-                Exp::QVar(qname, _) if qname.module.is_empty() && &qname.name == self.0 => {
+                Exp::QVar(qname) if qname.module.is_empty() && &qname.name == self.0 => {
                     *exp = Exp::pure_var(self.1.clone())
                 }
                 _ => super_visit_mut(self, exp),
diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index 3b613fdd02..5b16dbee7b 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -6,7 +6,7 @@ use std::{
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::{EarlyBinder, GenericArgsRef, ParamEnv, Ty, TyKind};
 use rustc_span::{Span, Symbol};
-use why3::{declaration::Signature, exp::Purity, ty::Type, Exp, Ident, QName};
+use why3::{declaration::Signature, ty::Type, Exp, Ident, QName};
 
 use crate::{
     backend::{
@@ -287,11 +287,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 }),
                 _ => self.build_vc(&lhs, &|lhs| {
                     self.build_vc(rhs, &|rhs| {
-                        k(Exp::BinaryOp(
-                            binop_to_binop(*op, Purity::Logic),
-                            Box::new(lhs.clone()),
-                            Box::new(rhs),
-                        ))
+                        k(Exp::BinaryOp(binop_to_binop(*op), Box::new(lhs.clone()), Box::new(rhs)))
                     })
                 }),
             },
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index 6c886700d4..f952449e9c 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -9,7 +9,7 @@ use crate::{
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::{EarlyBinder, GenericArgsRef, Ty, TyCtxt, TyKind};
 use why3::{
-    exp::{BinOp, Binder, Constant, Exp, Pattern as Pat, Purity},
+    exp::{BinOp, Binder, Constant, Exp, Pattern as Pat},
     ty::Type,
     Ident, QName,
 };
@@ -20,7 +20,7 @@ pub(crate) fn lower_pure<'tcx, N: Namer<'tcx>>(
     term: &Term<'tcx>,
 ) -> Exp {
     let span = term.span;
-    let mut term = Lower { ctx, names, pure: Purity::Logic }.lower_term(term);
+    let mut term = Lower { ctx, names }.lower_term(term);
     term.reassociate();
     ctx.attach_span(span, term)
 }
@@ -28,16 +28,11 @@ pub(crate) fn lower_pure<'tcx, N: Namer<'tcx>>(
 pub(super) struct Lower<'a, 'tcx, N: Namer<'tcx>> {
     pub(super) ctx: &'a mut Why3Generator<'tcx>,
     pub(super) names: &'a mut N,
-    // true when we are translating a purely logical term
-    pub(super) pure: Purity,
 }
 impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
     pub(crate) fn lower_term(&mut self, term: &Term<'tcx>) -> Exp {
         match &term.kind {
-            TermKind::Lit(l) => {
-                let c = lower_literal(self.ctx, self.names, l);
-                c
-            }
+            TermKind::Lit(l) => lower_literal(self.ctx, self.names, l),
             // FIXME: this is a weird dance.
             TermKind::Item(id, subst) => {
                 let method = (*id, *subst);
@@ -61,54 +56,10 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     self.names.import_prelude_module(PreludeModule::Int);
                 }
 
-                match (op, self.pure) {
-                    (Div, _) => Exp::pure_var("div").app(vec![lhs, rhs]),
-                    (Rem, _) => Exp::pure_var("mod").app(vec![lhs, rhs]),
-                    (Eq | Ne | Lt | Le | Gt | Ge, Purity::Program) => {
-                        let (lfvs, rfvs) = (lhs.fvs(), rhs.fvs());
-                        let mut freshvars = (0..)
-                            .map(|i| format!("x{i}").into())
-                            .filter(|x: &Ident| !(lfvs.contains(x) || rfvs.contains(x)));
-
-                        let (a, lhs) = if lhs.is_pure() {
-                            (lhs, None)
-                        } else {
-                            let v = freshvars.next().unwrap();
-                            (Exp::Var(v.clone(), self.pure), Some((v, lhs)))
-                        };
-
-                        let (b, rhs) = if rhs.is_pure() {
-                            (rhs, None)
-                        } else {
-                            let v = freshvars.next().unwrap();
-                            (Exp::Var(v.clone(), self.pure), Some((v, rhs)))
-                        };
-
-                        let op = binop_to_binop(*op, Purity::Logic);
-                        let mut inner =
-                            Exp::Pure(Box::new(Exp::BinaryOp(op, Box::new(a), Box::new(b))));
-
-                        if let Some((a, lhs)) = lhs {
-                            inner = Exp::Let {
-                                pattern: Pat::VarP(a),
-                                arg: Box::new(lhs),
-                                body: Box::new(inner),
-                            }
-                        };
-
-                        if let Some((b, rhs)) = rhs {
-                            inner = Exp::Let {
-                                pattern: Pat::VarP(b),
-                                arg: Box::new(rhs),
-                                body: Box::new(inner),
-                            }
-                        };
-
-                        inner
-                    }
-                    _ => {
-                        Exp::BinaryOp(binop_to_binop(*op, self.pure), Box::new(lhs), Box::new(rhs))
-                    }
+                match op {
+                    Div => Exp::pure_var("div").app(vec![lhs, rhs]),
+                    Rem => Exp::pure_var("mod").app(vec![lhs, rhs]),
+                    _ => Exp::BinaryOp(binop_to_binop(*op), Box::new(lhs), Box::new(rhs)),
                 }
             }
             TermKind::Unary { op, box arg } => {
@@ -135,24 +86,17 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     self.ctx.translate(method.0);
 
                     let clone = self.names.value(method.0, method.1);
-                    if self.pure == Purity::Program {
-                        mk_binders(Exp::QVar(clone, self.pure), args)
-                    } else {
-                        Exp::QVar(clone, self.pure).app(args)
-                    }
+                    Exp::pure_qvar(clone).app(args)
                 })
             }
             TermKind::Forall { binder, box body } => {
-                let ty = translate_ty(self.ctx, self.names, rustc_span::DUMMY_SP, binder.1);
-                self.pure_exp(|this| {
-                    Exp::forall(vec![(binder.0.to_string().into(), ty)], this.lower_term(body))
-                })
+                let ty = self.lower_ty(binder.1);
+
+                Exp::forall(vec![(binder.0.to_string().into(), ty)], self.lower_term(body))
             }
             TermKind::Exists { binder, box body } => {
-                let ty = translate_ty(self.ctx, self.names, rustc_span::DUMMY_SP, binder.1);
-                self.pure_exp(|this| {
-                    Exp::exists(vec![(binder.0.to_string().into(), ty)], this.lower_term(body))
-                })
+                let ty = self.lower_ty(binder.1);
+                Exp::exists(vec![(binder.0.to_string().into(), ty)], self.lower_term(body))
             }
             TermKind::Constructor { typ, variant, fields } => {
                 self.ctx.translate(*typ);
@@ -177,7 +121,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                 Exp::Final(Box::new(self.lower_term(term)))
             }
             TermKind::Impl { box lhs, box rhs } => {
-                self.pure_exp(|this| this.lower_term(lhs).implies(this.lower_term(rhs)))
+                self.lower_term(lhs).implies(self.lower_term(rhs))
             }
             TermKind::Old { box term } => Exp::Old(Box::new(self.lower_term(term))),
             TermKind::Match { box scrutinee, arms } => {
@@ -193,7 +137,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                         Box::new(self.lower_term(false_br)),
                     )
                 } else {
-                    let _ = translate_ty(self.ctx, self.names, rustc_span::DUMMY_SP, scrutinee.ty);
+                    let _ = self.lower_ty(scrutinee.ty);
                     let arms = arms
                         .iter()
                         .map(|(pat, body)| (self.lower_pat(pat), self.lower_term(body)))
@@ -245,33 +189,14 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                 let inner = self.lower_term(&*term);
                 let borrow_id = borrow_generated_id(inner, &projection);
                 Exp::Call(
-                    Box::new(Exp::QVar("Borrow.borrow_logic".into(), Purity::Logic)),
+                    Box::new(Exp::pure_qvar("Borrow.borrow_logic".into())),
                     vec![self.lower_term(&*cur), self.lower_term(&*fin), borrow_id],
                 )
             }
             TermKind::Assert { cond } => {
                 let cond = self.lower_term(&*cond);
-                if self.pure == Purity::Program && !cond.is_pure() {
-                    Exp::Let {
-                        pattern: Pat::VarP("a".into()),
-                        arg: Box::new(cond),
-                        body: Box::new(Exp::Assert(Box::new(Exp::impure_var("a".into())))),
-                    }
-                } else {
-                    Exp::Assert(Box::new(cond))
-                }
-            }
-        }
-    }
 
-    fn pure_exp(&mut self, f: impl FnOnce(&mut Self) -> Exp) -> Exp {
-        match self.pure {
-            Purity::Logic => f(self),
-            Purity::Program => {
-                self.pure = Purity::Logic;
-                let ret = f(self);
-                self.pure = Purity::Program;
-                Exp::Pure(Box::new(ret))
+                Exp::Assert(Box::new(cond))
             }
         }
     }
@@ -316,14 +241,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
             self.names.value(def_id.unwrap(), _substs);
             // self.names.import_builtin_module(builtin.clone().module_qname());
 
-            if let Purity::Program = self.pure {
-                return Some(mk_binders(
-                    Exp::pure_qvar(builtin.without_search_path()),
-                    args.clone(),
-                ));
-            } else {
-                return Some(Exp::pure_qvar(builtin.without_search_path()).app(args.clone()));
-            }
+            return Some(Exp::pure_qvar(builtin.without_search_path()).app(args.clone()));
         }
         None
     }
@@ -365,46 +283,24 @@ pub(crate) fn lower_literal<'tcx, N: Namer<'tcx>>(
     }
 }
 
-pub(crate) fn binop_to_binop(op: pearlite::BinOp, purity: Purity) -> why3::exp::BinOp {
-    match (op, purity) {
-        (pearlite::BinOp::Add, _) => BinOp::Add,
-        (pearlite::BinOp::Sub, _) => BinOp::Sub,
-        (pearlite::BinOp::Mul, _) => BinOp::Mul,
-        (pearlite::BinOp::Lt, _) => BinOp::Lt,
-        (pearlite::BinOp::Le, _) => BinOp::Le,
-        (pearlite::BinOp::Gt, _) => BinOp::Gt,
-        (pearlite::BinOp::Ge, _) => BinOp::Ge,
-        (pearlite::BinOp::Eq, Purity::Logic) => BinOp::Eq,
-        (pearlite::BinOp::Ne, Purity::Logic) => BinOp::Ne,
-        (pearlite::BinOp::And, Purity::Logic) => BinOp::LogAnd,
-        (pearlite::BinOp::And, Purity::Program) => BinOp::LazyAnd,
-        (pearlite::BinOp::Or, Purity::Logic) => BinOp::LogOr,
-        (pearlite::BinOp::Or, Purity::Program) => BinOp::LazyOr,
-        _ => unreachable!("{op:?} {purity:?}"),
+pub(crate) fn binop_to_binop(op: pearlite::BinOp) -> why3::exp::BinOp {
+    match op {
+        pearlite::BinOp::Add => BinOp::Add,
+        pearlite::BinOp::Sub => BinOp::Sub,
+        pearlite::BinOp::Mul => BinOp::Mul,
+        pearlite::BinOp::Lt => BinOp::Lt,
+        pearlite::BinOp::Le => BinOp::Le,
+        pearlite::BinOp::Gt => BinOp::Gt,
+        pearlite::BinOp::Ge => BinOp::Ge,
+        pearlite::BinOp::Eq => BinOp::Eq,
+        pearlite::BinOp::Ne => BinOp::Ne,
+        pearlite::BinOp::And => BinOp::LogAnd,
+        pearlite::BinOp::Or => BinOp::LogOr,
+        pearlite::BinOp::Div => todo!("Refactor binop_to_binop to support Div"),
+        pearlite::BinOp::Rem => todo!("Refactor binop_to_binop to support Rem"),
     }
 }
 
-pub(super) fn mk_binders(func: Exp, args: Vec<Exp>) -> Exp {
-    let mut impure_args = Vec::with_capacity(args.len());
-    let mut call_args = Vec::with_capacity(args.len());
-    for (nm, arg) in ('a'..).zip(args.into_iter()) {
-        if arg.is_pure() {
-            call_args.push(arg);
-        } else {
-            call_args.push(Exp::impure_var(format!("{}'", nm).into()));
-            impure_args.push((format!("{}'", nm), arg));
-        }
-    }
-
-    let call = func.app(call_args);
-
-    impure_args.into_iter().rfold(call, |acc, arg| Exp::Let {
-        pattern: Pat::VarP(arg.0.into()),
-        arg: Box::new(arg.1),
-        body: Box::new(acc),
-    })
-}
-
 fn is_identity_from<'tcx>(tcx: TyCtxt<'tcx>, id: DefId, subst: GenericArgsRef<'tcx>) -> bool {
     if tcx.def_path_str(id) == "std::convert::From::from" && subst.len() == 1 {
         let out_ty: Ty<'tcx> = tcx.fn_sig(id).no_bound_vars().unwrap().output().skip_binder();
diff --git a/why3/src/exp.rs b/why3/src/exp.rs
index 2dab563a5f..4acf9365c2 100644
--- a/why3/src/exp.rs
+++ b/why3/src/exp.rs
@@ -89,7 +89,7 @@ pub enum UnOp {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
-pub enum Purity {
+pub(crate) enum Purity {
     Logic,
     Program,
 }
@@ -123,8 +123,8 @@ pub enum Exp {
         arg: Box<Exp>,
         body: Box<Exp>,
     },
-    Var(Ident, Purity),
-    QVar(QName, Purity),
+    Var(Ident),
+    QVar(QName),
     Record {
         fields: Vec<(String, Exp)>,
     },
@@ -194,8 +194,8 @@ pub fn super_visit_mut<T: ExpMutVisitor>(f: &mut T, exp: &mut Exp) {
             f.visit_mut(arg);
             f.visit_mut(body)
         }
-        Exp::Var(_, _) => {}
-        Exp::QVar(_, _) => {}
+        Exp::Var(_) => {}
+        Exp::QVar(_) => {}
         Exp::RecUp { record, updates } => {
             f.visit_mut(record);
             updates.iter_mut().for_each(|(_, val)| f.visit_mut(val));
@@ -276,8 +276,8 @@ pub fn super_visit<T: ExpVisitor>(f: &mut T, exp: &Exp) {
             f.visit(arg);
             f.visit(body)
         }
-        Exp::Var(_, _) => {}
-        Exp::QVar(_, _) => {}
+        Exp::Var(_) => {}
+        Exp::QVar(_) => {}
         Exp::RecUp { record, updates } => {
             f.visit(record);
             updates.iter().for_each(|(_, val)| f.visit(val));
@@ -341,19 +341,19 @@ pub fn super_visit_trigger<T: ExpVisitor>(f: &mut T, trigger: &Trigger) {
 
 impl Exp {
     pub fn impure_qvar(q: QName) -> Self {
-        Exp::QVar(q, Purity::Program)
+        Exp::QVar(q)
     }
 
     pub fn impure_var(v: Ident) -> Self {
-        Exp::Var(v, Purity::Program)
+        Exp::Var(v)
     }
 
     pub fn pure_qvar(q: QName) -> Self {
-        Exp::QVar(q, Purity::Logic)
+        Exp::QVar(q)
     }
 
     pub fn pure_var(v: impl Into<Ident>) -> Self {
-        Exp::Var(v.into(), Purity::Logic)
+        Exp::Var(v.into())
     }
 
     pub fn lazy_conj(l: Exp, r: Exp) -> Self {
@@ -545,8 +545,6 @@ impl Exp {
         impl ExpVisitor for IsPure {
             fn visit(&mut self, exp: &Exp) {
                 match exp {
-                    Exp::Var(_, Purity::Program) => self.pure &= false,
-                    Exp::QVar(_, Purity::Program) => self.pure &= false,
                     Exp::Verbatim(_) => self.pure &= false,
                     Exp::Absurd => self.pure &= false,
                     // This is a bit absurd, but you can't put "pure {...}"
@@ -701,8 +699,8 @@ impl Exp {
             Exp::Final(_) => Prefix,
             Exp::Let { .. } => IfLet,
             Exp::Abs(_, _) => Abs,
-            Exp::Var(_, _) => Atom,
-            Exp::QVar(_, _) => Atom,
+            Exp::Var(_) => Atom,
+            Exp::QVar(_) => Atom,
             Exp::RecUp { .. } => App,
             Exp::RecField { .. } => Infix4,
             Exp::Tuple(_) => Atom,
@@ -751,7 +749,7 @@ impl Exp {
         impl ExpVisitor for Occurs {
             fn visit(&mut self, exp: &Exp) {
                 match exp {
-                    Exp::Var(v, _) => {
+                    Exp::Var(v) => {
                         *self.occurs.entry(v.clone()).or_insert(0) += 1;
                     }
                     Exp::Let { pattern, arg, body } => {
@@ -804,7 +802,7 @@ impl Exp {
         impl ExpVisitor for QFvs {
             fn visit(&mut self, exp: &Exp) {
                 match exp {
-                    Exp::QVar(v, _) => {
+                    Exp::QVar(v) => {
                         self.qfvs.insert(v.clone());
                     }
                     _ => super_visit(self, exp),
@@ -823,7 +821,7 @@ impl Exp {
         impl<'a> ExpMutVisitor for &'a HashMap<Ident, Exp> {
             fn visit_mut(&mut self, exp: &mut Exp) {
                 match exp {
-                    Exp::Var(v, _) => {
+                    Exp::Var(v) => {
                         if let Some(e) = self.get(v) {
                             *exp = e.clone()
                         }
diff --git a/why3/src/mlcfg/printer.rs b/why3/src/mlcfg/printer.rs
index e001e1da7c..076f07818c 100644
--- a/why3/src/mlcfg/printer.rs
+++ b/why3/src/mlcfg/printer.rs
@@ -545,8 +545,8 @@ impl Print for Exp {
                 .append(arg.pretty(alloc))
                 .append(" in ")
                 .append(body.pretty(alloc)),
-            Exp::Var(v, _) => v.pretty(alloc),
-            Exp::QVar(v, _) => v.pretty(alloc),
+            Exp::Var(v) => v.pretty(alloc),
+            Exp::QVar(v) => v.pretty(alloc),
             Exp::RecUp { box record, updates } => {
                 let mut res = alloc
                     .space()

From 41be4883a692168eccdedc08a72fc05566edee79 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Sun, 10 Mar 2024 11:25:53 +0100
Subject: [PATCH 58/66] Minor Why3 cleanups

* Remove notion of "purity" from AST
* Format printer of implications slightly better
---
 creusot/src/backend/logic.rs                  |   20 +-
 creusot/src/backend/logic/vcgen.rs            |   12 +-
 creusot/src/backend/place.rs                  |   29 +-
 creusot/src/backend/program.rs                |   97 +-
 creusot/src/backend/term.rs                   |   32 +-
 creusot/src/backend/ty.rs                     |    4 +-
 creusot/src/backend/ty_inv.rs                 |    2 +-
 .../bug/01_resolve_unsoundness.mlcfg          |    3 +-
 creusot/tests/should_fail/bug/692.mlcfg       |   37 +-
 creusot/tests/should_fail/bug/695.mlcfg       |   31 +-
 .../tests/should_fail/bug/specialize.mlcfg    |   12 +-
 creusot/tests/should_fail/final_borrows.mlcfg |    8 +-
 .../traits/17_impl_refinement.mlcfg           |    6 +-
 creusot/tests/should_succeed/100doors.mlcfg   |   28 +-
 creusot/tests/should_succeed/all_zero.mlcfg   |   11 +-
 creusot/tests/should_succeed/bdd.mlcfg        |  142 +-
 .../tests/should_succeed/binary_search.mlcfg  |   35 +-
 .../tests/should_succeed/bug/02_derive.mlcfg  |    3 +-
 creusot/tests/should_succeed/bug/206.mlcfg    |    6 +-
 creusot/tests/should_succeed/bug/387.mlcfg    |    6 +-
 creusot/tests/should_succeed/bug/464.mlcfg    |    5 +-
 creusot/tests/should_succeed/bug/552.mlcfg    |    3 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   21 +-
 creusot/tests/should_succeed/bug/949.mlcfg    |   27 +-
 .../tests/should_succeed/bug/two_phase.mlcfg  |    3 +-
 creusot/tests/should_succeed/cell/02.mlcfg    |   13 +-
 .../tests/should_succeed/checked_ops.mlcfg    |  636 ++++--
 .../closures/03_generic_bound.mlcfg           |   31 +-
 .../closures/04_generic_closure.mlcfg         |   31 +-
 .../should_succeed/closures/05_map.mlcfg      |   34 +-
 .../should_succeed/closures/06_fn_specs.mlcfg |  104 +-
 creusot/tests/should_succeed/duration.mlcfg   |   29 +-
 .../should_succeed/filter_positive.mlcfg      |   29 +-
 .../should_succeed/ghost_ptr_token.mlcfg      |   27 +-
 creusot/tests/should_succeed/hashmap.mlcfg    |  123 +-
 .../should_succeed/heapsort_generic.mlcfg     |  207 +-
 creusot/tests/should_succeed/hillel.mlcfg     |  201 +-
 .../tests/should_succeed/index_range.mlcfg    |   72 +-
 creusot/tests/should_succeed/instant.mlcfg    |   88 +-
 .../should_succeed/invariant_moves.mlcfg      |    6 +-
 .../tests/should_succeed/ite_normalize.mlcfg  |   28 +-
 .../should_succeed/iterators/01_range.mlcfg   |   41 +-
 .../iterators/02_iter_mut.mlcfg               |  110 +-
 .../iterators/03_std_iterators.mlcfg          |  267 ++-
 .../should_succeed/iterators/04_skip.mlcfg    |   79 +-
 .../should_succeed/iterators/05_map.mlcfg     |  413 +++-
 .../iterators/06_map_precond.mlcfg            |  805 ++++++--
 .../should_succeed/iterators/07_fuse.mlcfg    |   91 +-
 .../iterators/08_collect_extend.mlcfg         |   79 +-
 .../should_succeed/iterators/09_empty.mlcfg   |   19 +-
 .../should_succeed/iterators/10_once.mlcfg    |   25 +-
 .../should_succeed/iterators/11_repeat.mlcfg  |   37 +-
 .../should_succeed/iterators/12_zip.mlcfg     |  103 +-
 .../should_succeed/iterators/13_cloned.mlcfg  |   73 +-
 .../should_succeed/iterators/14_copied.mlcfg  |   73 +-
 .../iterators/15_enumerate.mlcfg              |  117 +-
 .../should_succeed/iterators/16_take.mlcfg    |   58 +-
 creusot/tests/should_succeed/knapsack.mlcfg   |   70 +-
 .../tests/should_succeed/knapsack_full.mlcfg  |  168 +-
 .../tests/should_succeed/list_index_mut.mlcfg |   23 +-
 .../should_succeed/list_reversal_lasso.mlcfg  |  237 ++-
 creusot/tests/should_succeed/mc91.mlcfg       |    3 +-
 creusot/tests/should_succeed/mutex.mlcfg      |    3 +-
 creusot/tests/should_succeed/option.mlcfg     |   33 +-
 creusot/tests/should_succeed/ord_trait.mlcfg  |   80 +-
 .../tests/should_succeed/red_black_tree.mlcfg | 1807 +++++++++++++----
 creusot/tests/should_succeed/result/own.mlcfg |   73 +-
 .../tests/should_succeed/result/result.mlcfg  |   77 +-
 .../rusthorn/inc_max_repeat.mlcfg             |   16 +-
 .../rusthorn/inc_some_2_list.mlcfg            |    3 +-
 .../rusthorn/inc_some_2_tree.mlcfg            |    4 +-
 .../rusthorn/inc_some_list.mlcfg              |    3 +-
 .../rusthorn/inc_some_tree.mlcfg              |    4 +-
 .../selection_sort_generic.mlcfg              |   78 +-
 creusot/tests/should_succeed/slices/01.mlcfg  |    9 +-
 .../tests/should_succeed/slices/02_std.mlcfg  |   27 +-
 .../tests/should_succeed/sparse_array.mlcfg   |   78 +-
 creusot/tests/should_succeed/sum.mlcfg        |   26 +-
 .../tests/should_succeed/sum_of_odds.mlcfg    |   28 +-
 .../should_succeed/syntax/04_assoc_prec.mlcfg |    2 +-
 .../should_succeed/syntax/05_pearlite.mlcfg   |    3 +-
 .../syntax/10_mutual_rec_types.mlcfg          |    6 +-
 .../should_succeed/syntax/12_ghost_code.mlcfg |   12 +-
 .../should_succeed/syntax/13_vec_macro.mlcfg  |   18 +-
 .../should_succeed/syntax/derive_macros.mlcfg |   16 +-
 .../tests/should_succeed/take_first_mut.mlcfg |    3 +-
 creusot/tests/should_succeed/trait_impl.mlcfg |    2 +-
 creusot/tests/should_succeed/traits/03.mlcfg  |    8 +-
 creusot/tests/should_succeed/traits/07.mlcfg  |    2 +-
 .../traits/13_assoc_types.mlcfg               |    3 +-
 .../should_succeed/traits/18_trait_laws.mlcfg |   10 +-
 .../type_invariants/non_zero.mlcfg            |    6 +-
 .../type_invariants/quant.mlcfg               |    3 +-
 .../type_invariants/vec_inv.mlcfg             |   15 +-
 creusot/tests/should_succeed/vecdeque.mlcfg   |    3 +-
 creusot/tests/should_succeed/vector/01.mlcfg  |   28 +-
 .../should_succeed/vector/02_gnome.mlcfg      |   53 +-
 .../vector/03_knuth_shuffle.mlcfg             |   22 +-
 .../vector/04_binary_search.mlcfg             |   22 +-
 .../vector/05_binary_search_generic.mlcfg     |   66 +-
 .../vector/06_knights_tour.mlcfg              |  236 ++-
 .../should_succeed/vector/07_read_write.mlcfg |    6 +-
 .../should_succeed/vector/08_haystack.mlcfg   |   59 +-
 .../should_succeed/vector/09_capacity.mlcfg   |    9 +-
 why3/src/exp.rs                               |   16 +-
 why3/src/mlcfg/printer.rs                     |    9 +-
 why3/src/name.rs                              |    2 +-
 107 files changed, 6049 insertions(+), 2073 deletions(-)

diff --git a/creusot/src/backend/logic.rs b/creusot/src/backend/logic.rs
index 55178bd1be..6a149bf2cb 100644
--- a/creusot/src/backend/logic.rs
+++ b/creusot/src/backend/logic.rs
@@ -82,9 +82,9 @@ fn builtin_body<'tcx>(
     // Program symbol (for proofs)
     let mut val_sig = sig.clone();
 
-    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::var(id)).collect();
     val_sig.contract.ensures =
-        vec![Exp::pure_var("result").eq(Exp::pure_var(val_sig.name.clone()).app(val_args.clone()))];
+        vec![Exp::var("result").eq(Exp::var(val_sig.name.clone()).app(val_args.clone()))];
 
     if util::is_predicate(ctx.tcx, def_id) {
         sig.retty = None;
@@ -101,7 +101,7 @@ fn builtin_body<'tcx>(
 
     decls.extend(clones);
     if !builtin.module.is_empty() {
-        let body = Exp::pure_qvar(builtin.without_search_path()).app(val_args);
+        let body = Exp::qvar(builtin.without_search_path()).app(val_args);
 
         if util::is_predicate(ctx.tcx, def_id) {
             decls.push(Decl::PredDecl(Predicate { sig, body }));
@@ -127,12 +127,12 @@ pub(crate) fn val_decl<'tcx, N: Namer<'tcx>>(
     sig.contract.variant = Vec::new();
 
     let (val_args, val_binders) = binders_to_args(ctx, sig.args);
-    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::var(id)).collect();
 
     sig.contract
         .ensures
         // = vec!(Exp::pure_var("result".into()).eq(Exp::pure_var(sig.name.clone()).app(val_args)));
-        .push(Exp::pure_var("result").eq(Exp::pure_var(sig.name.clone()).app(val_args)));
+        .push(Exp::var("result").eq(Exp::var(sig.name.clone()).app(val_args)));
     sig.args = val_binders;
     Decl::ValDecl(ValDecl { sig, ghost: false, val: true, kind: None })
 }
@@ -255,12 +255,12 @@ pub fn sigs<'tcx>(ctx: &mut Why3Generator<'tcx>, mut sig: Signature) -> (Signatu
     contract.variant = Vec::new();
     prog_sig.contract = contract;
     let (val_args, val_binders) = binders_to_args(ctx, prog_sig.args);
-    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::pure_var(id)).collect();
+    let val_args: Vec<_> = val_args.into_iter().map(|id| Exp::var(id)).collect();
 
     prog_sig.args = val_binders;
 
     prog_sig.contract.ensures =
-        vec![Exp::pure_var("result").eq(Exp::pure_var(sig.name.clone()).app(val_args))];
+        vec![Exp::var("result").eq(Exp::var(sig.name.clone()).app(val_args))];
 
     (sig, prog_sig)
 }
@@ -282,7 +282,7 @@ fn subst_qname(body: &mut Exp, name: &Ident, lim_name: &Ident) {
         fn visit_mut(&mut self, exp: &mut Exp) {
             match exp {
                 Exp::QVar(qname) if qname.module.is_empty() && &qname.name == self.0 => {
-                    *exp = Exp::pure_var(self.1.clone())
+                    *exp = Exp::var(self.1.clone())
                 }
                 _ => super_visit_mut(self, exp),
             }
@@ -420,13 +420,13 @@ fn function_call(sig: &Signature) -> Exp {
         .cloned()
         .flat_map(|b| b.var_type_pairs())
         .filter(|arg| &*arg.0 != "_")
-        .map(|arg| Exp::pure_var(arg.0))
+        .map(|arg| Exp::var(arg.0))
         .collect();
     if args.is_empty() {
         args = vec![Exp::Tuple(vec![])];
     }
 
-    Exp::pure_var(sig.name.clone()).app(args)
+    Exp::var(sig.name.clone()).app(args)
 }
 
 fn definition_axiom(sig: &Signature, body: Exp, suffix: &str) -> Axiom {
diff --git a/creusot/src/backend/logic/vcgen.rs b/creusot/src/backend/logic/vcgen.rs
index 5b16dbee7b..6fc3b55a94 100644
--- a/creusot/src/backend/logic/vcgen.rs
+++ b/creusot/src/backend/logic/vcgen.rs
@@ -216,7 +216,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
         use crate::pearlite::*;
         match &t.kind {
             // VC(v, Q) = Q(v)
-            TermKind::Var(v) => k(Exp::pure_var(util::ident_of(*v))),
+            TermKind::Var(v) => k(Exp::var(util::ident_of(*v))),
             // VC(l, Q) = Q(l)
             TermKind::Lit(l) => k(self.lower_literal(l)),
             // Items are just global names so
@@ -227,9 +227,9 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
 
                 if get_builtin(self.ctx.borrow().tcx, *id).is_some() {
                     // Builtins can leverage Why3 polymorphism and sometimes can cause typeck errors in why3 due to ambiguous type variables so lets fix the type now.
-                    k(Exp::pure_qvar(item_name).ascribe(self.ty(t.ty)))
+                    k(Exp::qvar(item_name).ascribe(self.ty(t.ty)))
                 } else {
-                    k(Exp::pure_qvar(item_name))
+                    k(Exp::qvar(item_name))
                 }
             }
             // VC(assert { C }, Q) => VC(C, |c| c && Q(()))
@@ -259,7 +259,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 let variant =
                     if *id == self.self_id { self.build_variant(&args)? } else { Exp::mk_true() };
 
-                let call = Exp::pure_qvar(fname).app(args);
+                let call = Exp::qvar(fname).app(args);
                 sig.contract.subst(&[("result".into(), call.clone())].into_iter().collect());
 
                 let inner = k(call)?;
@@ -283,7 +283,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                 //     Ok(Exp::if_(lhs, k(Exp::mk_true())?, self.build_vc(rhs, k)?,))
                 // }),
                 BinOp::Div => self.build_vc(&lhs, &|lhs| {
-                    self.build_vc(rhs, &|rhs| k(Exp::pure_var("div").app(vec![lhs.clone(), rhs])))
+                    self.build_vc(rhs, &|rhs| k(Exp::var("div").app(vec![lhs.clone(), rhs])))
                 }),
                 _ => self.build_vc(&lhs, &|lhs| {
                     self.build_vc(rhs, &|rhs| {
@@ -379,7 +379,7 @@ impl<'a, 'tcx> VCGen<'a, 'tcx> {
                     k => unreachable!("Projection from {k:?}"),
                 };
 
-                self.build_vc(lhs, &|lhs| k(Exp::pure_qvar(accessor.clone()).app(vec![lhs])))
+                self.build_vc(lhs, &|lhs| k(Exp::qvar(accessor.clone()).app(vec![lhs])))
             }
             // TODO: lol
             TermKind::Absurd => todo!("absrd"),
diff --git a/creusot/src/backend/place.rs b/creusot/src/backend/place.rs
index 4d32c1935e..69ab7de126 100644
--- a/creusot/src/backend/place.rs
+++ b/creusot/src/backend/place.rs
@@ -103,8 +103,7 @@ fn create_assign_rec<'tcx>(
 
                 let varnames = freshvars.take(variant.fields.len()).collect::<Vec<Ident>>();
                 let field_pats = varnames.clone().into_iter().map(|x| VarP(x)).collect();
-                let mut varexps: Vec<Exp> =
-                    varnames.into_iter().map(|x| Exp::impure_var(x)).collect();
+                let mut varexps: Vec<Exp> = varnames.into_iter().map(|x| Exp::var(x)).collect();
 
                 varexps[ix.as_usize()] = inner;
 
@@ -118,8 +117,7 @@ fn create_assign_rec<'tcx>(
             TyKind::Tuple(fields) => {
                 let varnames = freshvars.take(fields.len()).collect::<Vec<Ident>>();
                 let field_pats = varnames.clone().into_iter().map(|x| VarP(x.into())).collect();
-                let mut varexps: Vec<Exp> =
-                    varnames.into_iter().map(|x| Exp::impure_var(x.into())).collect();
+                let mut varexps: Vec<Exp> = varnames.into_iter().map(|x| Exp::var(x)).collect();
 
                 varexps[ix.as_usize()] = inner;
 
@@ -133,8 +131,7 @@ fn create_assign_rec<'tcx>(
                 let varnames =
                     freshvars.take(subst.as_closure().upvar_tys().len()).collect::<Vec<Ident>>();
                 let field_pats = varnames.clone().into_iter().map(|x| VarP(x.into())).collect();
-                let mut varexps: Vec<Exp> =
-                    varnames.into_iter().map(|x| Exp::impure_var(x.into())).collect();
+                let mut varexps: Vec<Exp> = varnames.into_iter().map(|x| Exp::var(x)).collect();
 
                 varexps[ix.as_usize()] = inner;
                 let cons = names.constructor(*id, subst);
@@ -149,8 +146,8 @@ fn create_assign_rec<'tcx>(
         },
         Downcast(_, _) => inner,
         Index(ix) => {
-            let set = Exp::impure_qvar(QName::from_string("Slice.set").unwrap());
-            let ix_exp = Exp::impure_var(Ident::build(ix.as_str()));
+            let set = Exp::qvar(QName::from_string("Slice.set").unwrap());
+            let ix_exp = Exp::var(Ident::build(ix.as_str()));
 
             Call(
                 Box::new(set),
@@ -174,7 +171,7 @@ pub(crate) fn translate_rplace<'tcx, N: Namer<'tcx>>(
     loc: Symbol,
     proj: &[mir::ProjectionElem<Symbol, Ty<'tcx>>],
 ) -> Exp {
-    let mut inner = Exp::impure_var(Ident::build(loc.as_str()));
+    let mut inner = Exp::var(Ident::build(loc.as_str()));
     if proj.is_empty() {
         return inner;
     }
@@ -199,7 +196,7 @@ pub(crate) fn translate_rplace<'tcx, N: Namer<'tcx>>(
                     ctx.translate_accessor(def.variants()[variant_id].fields[*ix].did);
 
                     let acc = names.accessor(def.did(), subst, variant_id.as_usize(), *ix);
-                    inner = Call(Box::new(Exp::impure_qvar(acc)), vec![inner]);
+                    inner = Call(Box::new(Exp::qvar(acc)), vec![inner]);
                 }
                 TyKind::Tuple(fields) => {
                     let mut pat = vec![Wildcard; fields.len()];
@@ -208,23 +205,21 @@ pub(crate) fn translate_rplace<'tcx, N: Namer<'tcx>>(
                     inner = Let {
                         pattern: TupleP(pat),
                         arg: Box::new(inner),
-                        body: Box::new(Exp::impure_var("a".into())),
+                        body: Box::new(Exp::var("a")),
                     }
                 }
                 TyKind::Closure(id, subst) => {
-                    inner = Call(
-                        Box::new(Exp::impure_qvar(names.accessor(*id, subst, 0, *ix))),
-                        vec![inner],
-                    );
+                    inner =
+                        Call(Box::new(Exp::qvar(names.accessor(*id, subst, 0, *ix))), vec![inner]);
                 }
                 e => unreachable!("{:?}", e),
             },
             Downcast(_, _) => {}
             Index(ix) => {
                 // TODO: Use [_] syntax
-                let ix_exp = Exp::impure_var(Ident::build(ix.as_str()));
+                let ix_exp = Exp::var(Ident::build(ix.as_str()));
                 inner = Call(
-                    Box::new(Exp::impure_qvar(QName::from_string("Slice.get").unwrap())),
+                    Box::new(Exp::qvar(QName::from_string("Slice.get").unwrap())),
                     vec![inner, ix_exp],
                 )
             }
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index 32aab91fd7..f3abb35d62 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -214,7 +214,7 @@ fn lower_promoted<'tcx>(
     sig.name = format!("promoted{:?}", body_id.promoted.unwrap().as_usize()).into();
 
     let mut previous_block = None;
-    let mut exp = Exp::impure_var("_0".into());
+    let mut exp = Exp::var("_0");
     for (id, bbd) in fmir.blocks.into_iter().rev() {
         // Safety check
         match bbd.terminator {
@@ -268,8 +268,7 @@ pub fn to_why<'tcx>(
         .locals
         .into_iter()
         .map(|(id, decl)| {
-            let init =
-                if decl.arg { Some(Exp::impure_var(Ident::build(id.as_str()))) } else { None };
+            let init = if decl.arg { Some(Exp::var(Ident::build(id.as_str()))) } else { None };
             (
                 false,
                 Ident::build(id.as_str()),
@@ -325,12 +324,12 @@ impl<'tcx> Expr<'tcx> {
             }
             ExprKind::BinOp(BinOp::Eq, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
-                Exp::impure_qvar(QName::from_string("Bool.eqb").unwrap())
+                Exp::qvar(QName::from_string("Bool.eqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
             ExprKind::BinOp(BinOp::Ne, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
-                Exp::impure_qvar(QName::from_string("Bool.neqb").unwrap())
+                Exp::qvar(QName::from_string("Bool.neqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
             ExprKind::BinOp(op, l, r) => {
@@ -369,7 +368,7 @@ impl<'tcx> Expr<'tcx> {
                     }
                     TyKind::Bool => {
                         names.import_prelude_module(PreludeModule::Bool);
-                        Exp::impure_qvar(QName::from_string("Bool.to_int").unwrap())
+                        Exp::qvar(QName::from_string("Bool.to_int").unwrap())
                     }
                     _ => ctx
                         .crash_and_error(DUMMY_SP, "Non integral casts are currently unsupported"),
@@ -380,7 +379,7 @@ impl<'tcx> Expr<'tcx> {
                     TyKind::Uint(uty) => uint_from_int(uty),
                     TyKind::Char => {
                         names.import_prelude_module(PreludeModule::Char);
-                        Exp::impure_qvar(QName::from_string("Char.chr").unwrap())
+                        Exp::qvar(QName::from_string("Char.chr").unwrap())
                     }
                     _ => ctx
                         .crash_and_error(DUMMY_SP, "Non integral casts are currently unsupported"),
@@ -389,7 +388,7 @@ impl<'tcx> Expr<'tcx> {
                 from_int.app_to(to_int.app_to(e.to_why(ctx, names, locals)))
             }
             ExprKind::Len(pl) => {
-                let len_call = Exp::impure_qvar(QName::from_string("Slice.length").unwrap())
+                let len_call = Exp::qvar(QName::from_string("Slice.length").unwrap())
                     .app_to(pl.to_why(ctx, names, locals));
                 len_call
             }
@@ -399,11 +398,11 @@ impl<'tcx> Expr<'tcx> {
 
                 let len = fields.len();
 
-                let arr_var = Exp::impure_var(id.clone());
+                let arr_var = Exp::var(id.clone());
                 let arr_elts =
                     Exp::RecField { record: Box::new(arr_var.clone()), label: "elts".into() };
                 let fields = fields.into_iter().enumerate().map(|(ix, f)| {
-                    Exp::impure_qvar(QName::from_string("Seq.get").unwrap())
+                    Exp::qvar(QName::from_string("Seq.get").unwrap())
                         .app(vec![arr_elts.clone(), Exp::Const(Constant::Int(ix as i128, None))])
                         .eq(f.to_why(ctx, names, locals))
                 });
@@ -415,7 +414,7 @@ impl<'tcx> Expr<'tcx> {
                         fields
                             .map(|e| Exp::Assume(Box::new(e)))
                             .chain(std::iter::once(Exp::Assume(Box::new(
-                                Exp::impure_qvar(QName::from_string("Slice.length").unwrap())
+                                Exp::qvar(QName::from_string("Slice.length").unwrap())
                                     .app_to(arr_var.clone())
                                     .eq(Exp::Const(Constant::Int(len as i128, None))),
                             ))))
@@ -424,11 +423,9 @@ impl<'tcx> Expr<'tcx> {
                     )),
                 }
             }
-            ExprKind::Repeat(e, len) => {
-                Exp::impure_qvar(QName::from_string("Slice.create").unwrap())
-                    .app_to(len.to_why(ctx, names, locals))
-                    .app_to(Exp::FnLit(Box::new(e.to_why(ctx, names, locals))))
-            }
+            ExprKind::Repeat(e, len) => Exp::qvar(QName::from_string("Slice.create").unwrap())
+                .app_to(len.to_why(ctx, names, locals))
+                .app_to(Exp::FnLit(Box::new(e.to_why(ctx, names, locals)))),
         };
 
         if self.span != DUMMY_SP {
@@ -634,7 +631,7 @@ pub(crate) fn borrow_generated_id<V: std::fmt::Debug, T: std::fmt::Debug>(
     projection: &[ProjectionElem<V, T>],
 ) -> Exp {
     let mut borrow_id = Exp::Call(
-        Box::new(Exp::pure_qvar(QName::from_string("Borrow.get_id").unwrap())),
+        Box::new(Exp::qvar(QName::from_string("Borrow.get_id").unwrap())),
         vec![original_borrow],
     );
     for proj in projection {
@@ -644,7 +641,7 @@ pub(crate) fn borrow_generated_id<V: std::fmt::Debug, T: std::fmt::Debug>(
             }
             ProjectionElem::Field(idx, _) => {
                 borrow_id = Exp::Call(
-                    Box::new(Exp::pure_qvar(QName::from_string("Borrow.inherit_id").unwrap())),
+                    Box::new(Exp::qvar(QName::from_string("Borrow.inherit_id").unwrap())),
                     vec![borrow_id, Exp::Const(Constant::Int(idx.as_u32() as i128 + 1, None))],
                 );
             }
@@ -673,7 +670,7 @@ impl<'tcx> Statement<'tcx> {
         match self {
             Statement::Assignment(lhs, RValue::Borrow(BorrowKind::Mut, rhs), span) => {
                 let borrow = Exp::Call(
-                    Box::new(Exp::impure_qvar(QName::from_string("Borrow.borrow_mut").unwrap())),
+                    Box::new(Exp::qvar(QName::from_string("Borrow.borrow_mut").unwrap())),
                     vec![rhs.as_rplace(ctx, names, locals)],
                 );
                 let reassign = Exp::Final(Box::new(lhs.as_rplace(ctx, names, locals)));
@@ -696,7 +693,7 @@ impl<'tcx> Statement<'tcx> {
                 let borrow_id =
                     borrow_generated_id(original_borrow, &rhs.projection[deref_index + 1..]);
                 let borrow = Exp::Call(
-                    Box::new(Exp::impure_qvar(QName::from_string("Borrow.borrow_final").unwrap())),
+                    Box::new(Exp::qvar(QName::from_string("Borrow.borrow_final").unwrap())),
                     vec![rhs.as_rplace(ctx, names, locals), borrow_id],
                 );
                 let reassign = Exp::Final(Box::new(lhs.as_rplace(ctx, names, locals)));
@@ -739,7 +736,7 @@ impl<'tcx> Statement<'tcx> {
             Statement::Resolve(id, subst, pl) => {
                 ctx.translate(id);
 
-                let rp = Exp::impure_qvar(names.value(id, subst));
+                let rp = Exp::qvar(names.value(id, subst));
 
                 let assume = rp.app_to(pl.as_rplace(ctx, names, locals));
                 vec![mlcfg::Statement::Assume(assume)]
@@ -751,7 +748,7 @@ impl<'tcx> Statement<'tcx> {
                 ))]
             }
             Statement::AssumeBorrowInv(pl) => {
-                let inv_fun = Exp::impure_qvar(
+                let inv_fun = Exp::qvar(
                     names.ty_inv(pl.ty(ctx.tcx, locals).builtin_deref(false).unwrap().ty),
                 );
                 let arg = Exp::Final(Box::new(pl.as_rplace(ctx, names, locals)));
@@ -759,7 +756,7 @@ impl<'tcx> Statement<'tcx> {
                 vec![mlcfg::Statement::Assume(inv_fun.app_to(arg))]
             }
             Statement::AssertTyInv(pl) => {
-                let inv_fun = Exp::impure_qvar(names.ty_inv(pl.ty(ctx.tcx, locals)));
+                let inv_fun = Exp::qvar(names.ty_inv(pl.ty(ctx.tcx, locals)));
                 let arg = pl.as_rplace(ctx, names, locals);
                 let exp = Exp::Attr(
                     Attribute::Attr(format!("expl:type invariant")),
@@ -807,17 +804,17 @@ fn func_call_to_why3<'tcx>(
 
         let mut closure_args = vec![args.remove(0)];
 
-        closure_args.extend(names.clone().map(|nm| Exp::impure_var(nm.to_string().into())));
+        closure_args.extend(names.clone().map(|nm| Exp::var(nm.to_string())));
 
         Exp::Let {
             pattern: Pattern::TupleP(
                 names.map(|nm| Pattern::VarP(nm.to_string().into())).collect(),
             ),
             arg: Box::new(args.remove(0)),
-            body: Box::new(Exp::impure_qvar(fname).app(closure_args)),
+            body: Box::new(Exp::qvar(fname).app(closure_args)),
         }
     } else {
-        Exp::impure_qvar(fname).app(args)
+        Exp::qvar(fname).app(args)
     };
     exp
 }
@@ -846,44 +843,44 @@ pub(crate) fn uint_to_prelude(ity: UintTy) -> PreludeModule {
 
 pub(crate) fn int_from_int(ity: &IntTy) -> Exp {
     match ity {
-        IntTy::Isize => Exp::impure_qvar(QName::from_string("IntSize.of_int").unwrap()),
-        IntTy::I8 => Exp::impure_qvar(QName::from_string("Int8.of_int").unwrap()),
-        IntTy::I16 => Exp::impure_qvar(QName::from_string("Int16.of_int").unwrap()),
-        IntTy::I32 => Exp::impure_qvar(QName::from_string("Int32.of_int").unwrap()),
-        IntTy::I64 => Exp::impure_qvar(QName::from_string("Int64.of_int").unwrap()),
-        IntTy::I128 => Exp::impure_qvar(QName::from_string("Int128.of_int").unwrap()),
+        IntTy::Isize => Exp::qvar(QName::from_string("IntSize.of_int").unwrap()),
+        IntTy::I8 => Exp::qvar(QName::from_string("Int8.of_int").unwrap()),
+        IntTy::I16 => Exp::qvar(QName::from_string("Int16.of_int").unwrap()),
+        IntTy::I32 => Exp::qvar(QName::from_string("Int32.of_int").unwrap()),
+        IntTy::I64 => Exp::qvar(QName::from_string("Int64.of_int").unwrap()),
+        IntTy::I128 => Exp::qvar(QName::from_string("Int128.of_int").unwrap()),
     }
 }
 
 pub(crate) fn uint_from_int(uty: &UintTy) -> Exp {
     match uty {
-        UintTy::Usize => Exp::impure_qvar(QName::from_string("UIntSize.of_int").unwrap()),
-        UintTy::U8 => Exp::impure_qvar(QName::from_string("UInt8.of_int").unwrap()),
-        UintTy::U16 => Exp::impure_qvar(QName::from_string("UInt16.of_int").unwrap()),
-        UintTy::U32 => Exp::impure_qvar(QName::from_string("UInt32.of_int").unwrap()),
-        UintTy::U64 => Exp::impure_qvar(QName::from_string("UInt64.of_int").unwrap()),
-        UintTy::U128 => Exp::impure_qvar(QName::from_string("UInt128.of_int").unwrap()),
+        UintTy::Usize => Exp::qvar(QName::from_string("UIntSize.of_int").unwrap()),
+        UintTy::U8 => Exp::qvar(QName::from_string("UInt8.of_int").unwrap()),
+        UintTy::U16 => Exp::qvar(QName::from_string("UInt16.of_int").unwrap()),
+        UintTy::U32 => Exp::qvar(QName::from_string("UInt32.of_int").unwrap()),
+        UintTy::U64 => Exp::qvar(QName::from_string("UInt64.of_int").unwrap()),
+        UintTy::U128 => Exp::qvar(QName::from_string("UInt128.of_int").unwrap()),
     }
 }
 
 pub(crate) fn int_to_int(ity: &IntTy) -> Exp {
     match ity {
-        IntTy::Isize => Exp::impure_qvar(QName::from_string("IntSize.to_int").unwrap()),
-        IntTy::I8 => Exp::impure_qvar(QName::from_string("Int8.to_int").unwrap()),
-        IntTy::I16 => Exp::impure_qvar(QName::from_string("Int16.to_int").unwrap()),
-        IntTy::I32 => Exp::impure_qvar(QName::from_string("Int32.to_int").unwrap()),
-        IntTy::I64 => Exp::impure_qvar(QName::from_string("Int64.to_int").unwrap()),
-        IntTy::I128 => Exp::impure_qvar(QName::from_string("Int128.to_int").unwrap()),
+        IntTy::Isize => Exp::qvar(QName::from_string("IntSize.to_int").unwrap()),
+        IntTy::I8 => Exp::qvar(QName::from_string("Int8.to_int").unwrap()),
+        IntTy::I16 => Exp::qvar(QName::from_string("Int16.to_int").unwrap()),
+        IntTy::I32 => Exp::qvar(QName::from_string("Int32.to_int").unwrap()),
+        IntTy::I64 => Exp::qvar(QName::from_string("Int64.to_int").unwrap()),
+        IntTy::I128 => Exp::qvar(QName::from_string("Int128.to_int").unwrap()),
     }
 }
 
 pub(crate) fn uint_to_int(uty: &UintTy) -> Exp {
     match uty {
-        UintTy::Usize => Exp::impure_qvar(QName::from_string("UIntSize.to_int").unwrap()),
-        UintTy::U8 => Exp::impure_qvar(QName::from_string("UInt8.to_int").unwrap()),
-        UintTy::U16 => Exp::impure_qvar(QName::from_string("UInt16.to_int").unwrap()),
-        UintTy::U32 => Exp::impure_qvar(QName::from_string("UInt32.to_int").unwrap()),
-        UintTy::U64 => Exp::impure_qvar(QName::from_string("UInt64.to_int").unwrap()),
-        UintTy::U128 => Exp::impure_qvar(QName::from_string("UInt128.to_int").unwrap()),
+        UintTy::Usize => Exp::qvar(QName::from_string("UIntSize.to_int").unwrap()),
+        UintTy::U8 => Exp::qvar(QName::from_string("UInt8.to_int").unwrap()),
+        UintTy::U16 => Exp::qvar(QName::from_string("UInt16.to_int").unwrap()),
+        UintTy::U32 => Exp::qvar(QName::from_string("UInt32.to_int").unwrap()),
+        UintTy::U64 => Exp::qvar(QName::from_string("UInt64.to_int").unwrap()),
+        UintTy::U128 => Exp::qvar(QName::from_string("UInt128.to_int").unwrap()),
     }
 }
diff --git a/creusot/src/backend/term.rs b/creusot/src/backend/term.rs
index f952449e9c..7d5362e57c 100644
--- a/creusot/src/backend/term.rs
+++ b/creusot/src/backend/term.rs
@@ -42,11 +42,11 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     let clone = self.names.value(*id, subst);
                     match self.ctx.type_of(id).instantiate_identity().kind() {
                         TyKind::FnDef(_, _) => Exp::Tuple(Vec::new()),
-                        _ => Exp::pure_qvar(clone),
+                        _ => Exp::qvar(clone),
                     }
                 })
             }
-            TermKind::Var(v) => Exp::pure_var(util::ident_of(*v)),
+            TermKind::Var(v) => Exp::var(util::ident_of(*v)),
             TermKind::Binary { op, box lhs, box rhs } => {
                 let lhs = self.lower_term(lhs);
                 let rhs = self.lower_term(rhs);
@@ -57,8 +57,8 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                 }
 
                 match op {
-                    Div => Exp::pure_var("div").app(vec![lhs, rhs]),
-                    Rem => Exp::pure_var("mod").app(vec![lhs, rhs]),
+                    Div => Exp::var("div").app(vec![lhs, rhs]),
+                    Rem => Exp::var("mod").app(vec![lhs, rhs]),
                     _ => Exp::BinaryOp(binop_to_binop(*op), Box::new(lhs), Box::new(rhs)),
                 }
             }
@@ -86,7 +86,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     self.ctx.translate(method.0);
 
                     let clone = self.names.value(method.0, method.1);
-                    Exp::pure_qvar(clone).app(args)
+                    Exp::qvar(clone).app(args)
                 })
             }
             TermKind::Forall { binder, box body } => {
@@ -131,10 +131,10 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     } else {
                         (&arms[1].1, &arms[0].1)
                     };
-                    Exp::IfThenElse(
-                        Box::new(self.lower_term(scrutinee)),
-                        Box::new(self.lower_term(true_br)),
-                        Box::new(self.lower_term(false_br)),
+                    Exp::if_(
+                        self.lower_term(scrutinee),
+                        self.lower_term(true_br),
+                        self.lower_term(false_br),
                     )
                 } else {
                     let _ = self.lower_ty(scrutinee.ty);
@@ -166,7 +166,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
                     k => unreachable!("Projection from {k:?}"),
                 };
 
-                Exp::pure_qvar(accessor).app(vec![lhs])
+                Exp::qvar(accessor).app(vec![lhs])
             }
             TermKind::Closure { body } => {
                 let TyKind::Closure(id, subst) = term.ty.kind() else {
@@ -188,10 +188,12 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
             TermKind::Reborrow { cur, fin, term, projection } => {
                 let inner = self.lower_term(&*term);
                 let borrow_id = borrow_generated_id(inner, &projection);
-                Exp::Call(
-                    Box::new(Exp::pure_qvar("Borrow.borrow_logic".into())),
-                    vec![self.lower_term(&*cur), self.lower_term(&*fin), borrow_id],
-                )
+
+                Exp::qvar("Borrow.borrow_logic".into()).app(vec![
+                    self.lower_term(&*cur),
+                    self.lower_term(&*fin),
+                    borrow_id,
+                ])
             }
             TermKind::Assert { cond } => {
                 let cond = self.lower_term(&*cond);
@@ -241,7 +243,7 @@ impl<'tcx, N: Namer<'tcx>> Lower<'_, 'tcx, N> {
             self.names.value(def_id.unwrap(), _substs);
             // self.names.import_builtin_module(builtin.clone().module_qname());
 
-            return Some(Exp::pure_qvar(builtin.without_search_path()).app(args.clone()));
+            return Some(Exp::qvar(builtin.without_search_path()).app(args.clone()));
         }
         None
     }
diff --git a/creusot/src/backend/ty.rs b/creusot/src/backend/ty.rs
index a85cd71ab5..0e1ad3eabc 100644
--- a/creusot/src/backend/ty.rs
+++ b/creusot/src/backend/ty.rs
@@ -598,13 +598,13 @@ pub(crate) fn build_accessor(
             let mut exp = Exp::Any(field_ty.clone());
             if ix == variant_ix {
                 pat[field_ix] = Pattern::VarP("a".into());
-                exp = Exp::pure_var("a");
+                exp = Exp::var("a");
             };
             (Pattern::ConsP(name.clone(), pat), exp)
         })
         .collect();
 
-    let discr_exp = Exp::Match(Box::new(Exp::pure_var("self")), branches);
+    let discr_exp = Exp::Match(Box::new(Exp::var("self")), branches);
 
     Decl::Let(LetDecl {
         sig,
diff --git a/creusot/src/backend/ty_inv.rs b/creusot/src/backend/ty_inv.rs
index e56e1b6669..29e0faadcb 100644
--- a/creusot/src/backend/ty_inv.rs
+++ b/creusot/src/backend/ty_inv.rs
@@ -465,7 +465,7 @@ fn build_inv_axiom<'tcx>(
     let ty = inv_kind.to_skeleton_ty(ctx.tcx);
     let kind = TyInvKind::from_ty(ctx.tcx, ty);
     // TODO : Refactor and push binding down
-    let lhs: Exp = Exp::impure_qvar(names.ty_inv(ty)).app_to(Exp::pure_var("x"));
+    let lhs: Exp = Exp::qvar(names.ty_inv(ty)).app_to(Exp::var("x"));
     let rhs = if TyInvKind::Trivial == inv_kind {
         Exp::mk_true()
     } else {
diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
index d78da421e5..e65d13878a 100644
--- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
+++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
@@ -88,7 +88,8 @@ module C01ResolveUnsoundness_MakeVecOfSize
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) : bool
diff --git a/creusot/tests/should_fail/bug/692.mlcfg b/creusot/tests/should_fail/bug/692.mlcfg
index 1d0e550225..80de0a8417 100644
--- a/creusot/tests/should_fail/bug/692.mlcfg
+++ b/creusot/tests/should_fail/bug/692.mlcfg
@@ -38,7 +38,10 @@ module C692_Incorrect
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed c . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve1 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed c . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve1 ( ^ s)))
   predicate unnest0 (self : c) (_2 : c)
   val unnest0 (self : c) (_2 : c) : bool
     ensures { result = unnest0 self _2 }
@@ -52,13 +55,19 @@ module C692_Incorrect
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : c, b : c, c : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : c, b : c, c : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : c) : ()
   val unnest_refl0 (self : c) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed c) (args : ()) (res : bool) : ()
   val postcondition_mut_unnest0 (self : borrowed c) (args : ()) (res : bool) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -67,7 +76,11 @@ module C692_Incorrect
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant4 (self : bool) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant4 (self : bool) : bool
@@ -96,7 +109,10 @@ module C692_Incorrect
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve1 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve1 self /\ postcondition0 self args res))
   predicate resolve2 (self : borrowed c) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed c) : bool
@@ -109,7 +125,10 @@ module C692_Incorrect
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve2 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve2 self /\ postcondition0 ( * self) args res))
   predicate invariant1 (self : c)
   val invariant1 (self : c) : bool
     ensures { result = invariant1 self }
@@ -137,7 +156,8 @@ module C692_Incorrect
     ensures { result = resolve0 self }
     
   let rec cfg incorrect [#"../692.rs" 8 0 8 76] [@cfg:stackify] [@cfg:subregion_analysis] (cond : c) (branch : b) : ()
-    requires {[#"../692.rs" 5 0 6 87] precondition0 cond () /\ (forall b : bool . precondition1 branch (b) /\ (exists b : bool . forall b0 : bool . postcondition0 cond () b0 -> b0 = b))}
+    requires {[#"../692.rs" 5 0 6 87] precondition0 cond () /\ (forall b : bool . precondition1 branch (b) /\ (exists b : bool . forall b0 : bool . postcondition0 cond () b0
+     -> b0 = b))}
     requires {[#"../692.rs" 8 57 8 61] inv1 cond}
     requires {[#"../692.rs" 8 66 8 72] inv0 branch}
     ensures { [#"../692.rs" 7 10 7 15] false }
@@ -319,7 +339,8 @@ module C692_ValidNormal
    =
     true
   val incorrect0 [#"../692.rs" 8 0 8 76] (cond : C692_ValidNormal_Closure1.c692_validnormal_closure1) (branch : C692_ValidNormal_Closure2.c692_validnormal_closure2) : ()
-    requires {[#"../692.rs" 5 0 6 87] precondition0 cond () /\ (forall b : bool . precondition1 branch (b) /\ (exists b : bool . forall b0 : bool . postcondition0 cond () b0 -> b0 = b))}
+    requires {[#"../692.rs" 5 0 6 87] precondition0 cond () /\ (forall b : bool . precondition1 branch (b) /\ (exists b : bool . forall b0 : bool . postcondition0 cond () b0
+     -> b0 = b))}
     requires {[#"../692.rs" 8 57 8 61] inv0 cond}
     requires {[#"../692.rs" 8 66 8 72] inv1 branch}
     ensures { [#"../692.rs" 7 10 7 15] false }
diff --git a/creusot/tests/should_fail/bug/695.mlcfg b/creusot/tests/should_fail/bug/695.mlcfg
index d9987ad85d..095ac86c5c 100644
--- a/creusot/tests/should_fail/bug/695.mlcfg
+++ b/creusot/tests/should_fail/bug/695.mlcfg
@@ -38,7 +38,10 @@ module C695_InversedIf
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once1 self args res = (exists s : borrowed c . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once1 self args res = (exists s : borrowed c . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : c) (_2 : c)
   val unnest0 (self : c) (_2 : c) : bool
     ensures { result = unnest0 self _2 }
@@ -52,13 +55,19 @@ module C695_InversedIf
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : c, b : c, c : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : c, b : c, c : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : c) : ()
   val unnest_refl0 (self : c) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : c . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed c) (args : ()) (res : bool) : ()
   val postcondition_mut_unnest0 (self : borrowed c) (args : ()) (res : bool) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -67,7 +76,11 @@ module C695_InversedIf
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant6 (self : borrowed c)
   val invariant6 (self : borrowed c) : bool
     ensures { result = invariant6 self }
@@ -115,7 +128,10 @@ module C695_InversedIf
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once1 self args res = (resolve0 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once1 self args res = (resolve0 self /\ postcondition0 self args res))
   predicate resolve1 (self : borrowed c) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed c) : bool
@@ -128,7 +144,10 @@ module C695_InversedIf
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv3 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed c, args : (), res : bool . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv3 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv4 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
   predicate invariant1 (self : b)
   val invariant1 (self : b) : bool
     ensures { result = invariant1 self }
diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg
index 4575f99212..a226b35a67 100644
--- a/creusot/tests/should_fail/bug/specialize.mlcfg
+++ b/creusot/tests/should_fail/bug/specialize.mlcfg
@@ -99,7 +99,8 @@ module Specialize_G
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -164,7 +165,8 @@ module Specialize_H
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -228,14 +230,16 @@ module Specialize_Impl0
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
-  goal x_refn : [#"../specialize.rs" 12 4 12 22] forall self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global) . inv0 self -> inv0 self
+  goal x_refn : [#"../specialize.rs" 12 4 12 22] forall self : Alloc_Vec_Vec_Type.t_vec u (Alloc_Alloc_Global_Type.t_global) . inv0 self
+   -> inv0 self
 end
 module Specialize_Impl1
   goal x_refn : [#"../specialize.rs" 18 4 18 14] true
diff --git a/creusot/tests/should_fail/final_borrows.mlcfg b/creusot/tests/should_fail/final_borrows.mlcfg
index 11796ac7e4..c44cf38b7f 100644
--- a/creusot/tests/should_fail/final_borrows.mlcfg
+++ b/creusot/tests/should_fail/final_borrows.mlcfg
@@ -322,7 +322,8 @@ module FinalBorrows_Indexing
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   function index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model1 self) ix
   val index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t
@@ -339,7 +340,10 @@ module FinalBorrows_Indexing
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv3 (to_mut_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv3 (to_mut_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
   predicate resolve1 (self : borrowed (slice t)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed (slice t)) : bool
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
index ce8e7c4efe..a712c14c11 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
@@ -42,11 +42,13 @@ module C17ImplRefinement_Impl0
   use prelude.UIntSize
   use prelude.Int
   use prelude.Borrow
-  goal my_function_refn : [#"../17_impl_refinement.rs" 14 4 14 34] forall self : () . inv0 self -> (forall result : usize . UIntSize.to_int result >= 15 -> UIntSize.to_int result >= 10)
+  goal my_function_refn : [#"../17_impl_refinement.rs" 14 4 14 34] forall self : () . inv0 self
+   -> (forall result : usize . UIntSize.to_int result >= 15  -> UIntSize.to_int result >= 10)
 end
 module C17ImplRefinement_Impl1
   use prelude.UInt64
   use prelude.UInt64
   use prelude.Int
-  goal need_false_refn : [#"../17_impl_refinement.rs" 29 4 29 25] forall x : uint64 . UInt64.to_int x >= 10 -> UInt64.to_int x >= 15
+  goal need_false_refn : [#"../17_impl_refinement.rs" 29 4 29 25] forall x : uint64 . UInt64.to_int x >= 10
+   -> UInt64.to_int x >= 15
 end
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index 3feda16990..b6db1c061c 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -174,7 +174,8 @@ module C100doors_F
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -207,7 +208,9 @@ module C100doors_F
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -223,14 +226,22 @@ module C100doors_F
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv11 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv11 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv11 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv11 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -252,7 +263,8 @@ module C100doors_F
     ensures { result = index_logic0 self ix }
     
   predicate resolve2 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve3 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve3 (index_logic0 self i)
   val resolve2 (self : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve2 self }
     
@@ -263,7 +275,8 @@ module C100doors_F
     
   use prelude.Slice
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq bool) (fin : Seq.seq bool) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq bool) (fin : Seq.seq bool) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -350,7 +363,8 @@ module C100doors_F
   val from_elem0 (elem : bool) (n : usize) : Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)
     requires {inv1 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model0 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic0 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic0 result i = elem }
     ensures { inv2 result }
     
   let rec cfg f [#"../100doors.rs" 18 0 18 10] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg
index bf65798d44..7f2f2add47 100644
--- a/creusot/tests/should_succeed/all_zero.mlcfg
+++ b/creusot/tests/should_succeed/all_zero.mlcfg
@@ -66,7 +66,8 @@ module AllZero_AllZero
     
   use prelude.Snapshot
   let rec cfg all_zero [#"../all_zero.rs" 34 0 34 29] [@cfg:stackify] [@cfg:subregion_analysis] (l : borrowed (AllZero_List_Type.t_list)) : ()
-    ensures { [#"../all_zero.rs" 32 0 32 77] forall i : int . 0 <= i /\ i < len0 ( * l) -> get0 ( ^ l) i = Core_Option_Option_Type.C_Some (0 : uint32) }
+    ensures { [#"../all_zero.rs" 32 0 32 77] forall i : int . 0 <= i /\ i < len0 ( * l)
+     -> get0 ( ^ l) i = Core_Option_Option_Type.C_Some (0 : uint32) }
     ensures { [#"../all_zero.rs" 33 10 33 34] len0 ( * l) = len0 ( ^ l) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -90,8 +91,12 @@ module AllZero_AllZero
     goto BB2
   }
   BB2 {
-    invariant { [#"../all_zero.rs" 39 4 41 88] (forall i : int . 0 <= i /\ i < len0 ( * loop_l) -> get0 ( ^ loop_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l) -> get0 ( ^ Snapshot.inner old_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) };
-    invariant { [#"../all_zero.rs" 39 4 41 88] len0 ( ^ loop_l) = len0 ( * loop_l) -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
+    invariant { [#"../all_zero.rs" 39 4 41 88] (forall i : int . 0 <= i /\ i < len0 ( * loop_l)
+     -> get0 ( ^ loop_l) i = Core_Option_Option_Type.C_Some (0 : uint32))
+     -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l)
+     -> get0 ( ^ Snapshot.inner old_l) i = Core_Option_Option_Type.C_Some (0 : uint32)) };
+    invariant { [#"../all_zero.rs" 39 4 41 88] len0 ( ^ loop_l) = len0 ( * loop_l)
+     -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 7f98870d18..25edba4d23 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -95,15 +95,21 @@ module Bdd_Hashmap_Impl2_Hash
     (64 : uint32)
   val wrapping_add0 (self : uint64) (rhs : uint64) : uint64
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt64.to_int result = EuclideanDivision.mod (UInt64.to_int self + UInt64.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt64.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self + UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self + UInt64.to_int rhs <= UInt64.to_int max0 -> UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self + UInt64.to_int rhs < UInt64.to_int min0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self + UInt64.to_int rhs > UInt64.to_int max0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self + UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self + UInt64.to_int rhs <= UInt64.to_int max0
+     -> UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self + UInt64.to_int rhs < UInt64.to_int min0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self + UInt64.to_int rhs > UInt64.to_int max0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
     
   val wrapping_mul0 (self : uint64) (rhs : uint64) : uint64
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt64.to_int result = EuclideanDivision.mod (UInt64.to_int self * UInt64.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt64.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self * UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self * UInt64.to_int rhs <= UInt64.to_int max0 -> UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self * UInt64.to_int rhs < UInt64.to_int min0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self * UInt64.to_int rhs > UInt64.to_int max0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self * UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self * UInt64.to_int rhs <= UInt64.to_int max0
+     -> UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self * UInt64.to_int rhs < UInt64.to_int min0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self * UInt64.to_int rhs > UInt64.to_int max0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
     
   function deep_model2 (self : v) : deep_model_ty1 =
     [#"../../../../creusot-contracts/src/model.rs" 74 8 74 28] deep_model5 self
@@ -631,15 +637,21 @@ module Bdd_Impl1_Hash
     (64 : uint32)
   val wrapping_add0 (self : uint64) (rhs : uint64) : uint64
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt64.to_int result = EuclideanDivision.mod (UInt64.to_int self + UInt64.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt64.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self + UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self + UInt64.to_int rhs <= UInt64.to_int max0 -> UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self + UInt64.to_int rhs < UInt64.to_int min0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self + UInt64.to_int rhs > UInt64.to_int max0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self + UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self + UInt64.to_int rhs <= UInt64.to_int max0
+     -> UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self + UInt64.to_int rhs < UInt64.to_int min0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self + UInt64.to_int rhs > UInt64.to_int max0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self + UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
     
   val wrapping_mul0 (self : uint64) (rhs : uint64) : uint64
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt64.to_int result = EuclideanDivision.mod (UInt64.to_int self * UInt64.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt64.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self * UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self * UInt64.to_int rhs <= UInt64.to_int max0 -> UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self * UInt64.to_int rhs < UInt64.to_int min0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self * UInt64.to_int rhs > UInt64.to_int max0 -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt64.to_int self * UInt64.to_int rhs >= UInt64.to_int min0 /\ UInt64.to_int self * UInt64.to_int rhs <= UInt64.to_int max0
+     -> UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt64.to_int self * UInt64.to_int rhs < UInt64.to_int min0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs + k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt64.to_int self * UInt64.to_int rhs > UInt64.to_int max0
+     -> (exists k : int . k > 0 /\ UInt64.to_int result = UInt64.to_int self * UInt64.to_int rhs - k * (UInt64.to_int max0 - UInt64.to_int min0 + 1)) }
     
   let rec cfg hash [#"../bdd.rs" 116 4 116 25] [@cfg:stackify] [@cfg:subregion_analysis] (self : Bdd_Node_Type.t_node) : uint64
     ensures { [#"../bdd.rs" 115 14 115 46] UInt64.to_int result = hash_log0 (shallow_model1 self) }
@@ -761,7 +773,9 @@ module Bdd_Impl8_Size_Impl
   goal vc_size : match self with
     | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_True) _ -> [#"../bdd.rs" 223 14 223 25] 0 >= 0
     | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_False) _ -> [#"../bdd.rs" 223 14 223 25] 0 >= 0
-    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> ([#"../bdd.rs" 223 14 223 25] size childt >= 0) -> (let ht = size childt in ([#"../bdd.rs" 223 14 223 25] size childf >= 0) -> (let hf = size childf in [#"../bdd.rs" 223 14 223 25] 1 + ht + hf >= 0))
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> ([#"../bdd.rs" 223 14 223 25] size childt >= 0)
+     -> (let ht = size childt in ([#"../bdd.rs" 223 14 223 25] size childf >= 0)
+     -> (let hf = size childf in [#"../bdd.rs" 223 14 223 25] 1 + ht + hf >= 0))
     end
 end
 module Bdd_Context_Type
@@ -948,7 +962,9 @@ module Bdd_Impl10_GrowsIsValidBdd_Impl
   constant b  : Bdd_Bdd_Type.t_bdd
   function grows_is_valid_bdd [#"../bdd.rs" 336 4 336 56] (self : borrowed (Bdd_Context_Type.t_context)) (b : Bdd_Bdd_Type.t_bdd) : ()
     
-  goal vc_grows_is_valid_bdd : ([#"../bdd.rs" 336 35 336 39] inv0 self) -> ([#"../bdd.rs" 334 15 334 35] is_valid_bdd0 ( * self) b) -> ([#"../bdd.rs" 333 15 333 27] grows0 self) -> ([#"../bdd.rs" 335 14 335 37] is_valid_bdd0 ( ^ self) b)
+  goal vc_grows_is_valid_bdd : ([#"../bdd.rs" 336 35 336 39] inv0 self)
+   -> ([#"../bdd.rs" 334 15 334 35] is_valid_bdd0 ( * self) b)
+   -> ([#"../bdd.rs" 333 15 333 27] grows0 self)  -> ([#"../bdd.rs" 335 14 335 37] is_valid_bdd0 ( ^ self) b)
 end
 module Bdd_Impl10_GrowsTrans_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1090,7 +1106,13 @@ module Bdd_Impl10_GrowsTrans_Impl
   constant oo  : borrowed (Bdd_Context_Type.t_context)
   function grows_trans [#"../bdd.rs" 345 4 345 62] (self : borrowed (Bdd_Context_Type.t_context)) (o : borrowed (Bdd_Context_Type.t_context)) (oo : borrowed (Bdd_Context_Type.t_context)) : ()
     
-  goal vc_grows_trans : ([#"../bdd.rs" 345 48 345 50] inv0 oo) -> ([#"../bdd.rs" 345 34 345 35] inv0 o) -> ([#"../bdd.rs" 345 28 345 32] inv0 self) -> ([#"../bdd.rs" 343 15 343 43]  * self =  * oo /\  ^ self =  ^ oo) -> ([#"../bdd.rs" 342 15 342 26]  ^ self =  * o) -> ([#"../bdd.rs" 341 15 341 24] grows0 o) -> ([#"../bdd.rs" 340 15 340 27] grows0 self) -> ([#"../bdd.rs" 344 14 344 24] grows0 oo)
+  goal vc_grows_trans : ([#"../bdd.rs" 345 48 345 50] inv0 oo)
+   -> ([#"../bdd.rs" 345 34 345 35] inv0 o)
+   -> ([#"../bdd.rs" 345 28 345 32] inv0 self)
+   -> ([#"../bdd.rs" 343 15 343 43]  * self =  * oo /\  ^ self =  ^ oo)
+   -> ([#"../bdd.rs" 342 15 342 26]  ^ self =  * o)
+   -> ([#"../bdd.rs" 341 15 341 24] grows0 o)
+   -> ([#"../bdd.rs" 340 15 340 27] grows0 self)  -> ([#"../bdd.rs" 344 14 344 24] grows0 oo)
 end
 module Bdd_Impl10_SetIrreleventVar_Impl
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1217,8 +1239,13 @@ module Bdd_Impl10_SetIrreleventVar_Impl
   constant b  : bool
   function set_irrelevent_var [#"../bdd.rs" 351 4 351 87] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (x : uint64) (v : Map.map uint64 bool) (b : bool) : ()
     
-  goal vc_set_irrelevent_var : ([#"../bdd.rs" 351 26 351 30] inv0 self) -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a) -> ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a) -> match a with
-    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childt) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childt)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childt v = interp0 childt (Map.set v x b)) -> (let _ = set_irrelevent_var self childt x v b in (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childf) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childf)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childf v = interp0 childf (Map.set v x b)) -> (let _ = set_irrelevent_var self childf x v b in [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b)))))
+  goal vc_set_irrelevent_var : ([#"../bdd.rs" 351 26 351 30] inv0 self)
+   -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a)
+   -> ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a)
+   -> match a with
+    | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childt childf) _ -> (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childt) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childt)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childt v = interp0 childt (Map.set v x b))
+     -> (let _ = set_irrelevent_var self childt x v b in (([#"../bdd.rs" 351 26 351 30] inv0 self) && ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 childf) && ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self childf)) /\ (([#"../bdd.rs" 350 14 350 50] interp0 childf v = interp0 childf (Map.set v x b))
+     -> (let _ = set_irrelevent_var self childf x v b in [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b)))))
     | _ -> [#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b)
     end
 end
@@ -1354,7 +1381,10 @@ module Bdd_Impl10_DiscrValuation_Impl
     requires {[#"../bdd.rs" 351 26 351 30] inv0 self}
     ensures { result = set_irrelevent_var0 self a x v b }
     
-  axiom set_irrelevent_var0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, x : uint64, v : Map.map uint64 bool, b : bool . ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a) -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a) -> ([#"../bdd.rs" 351 26 351 30] inv0 self) -> ([#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b))
+  axiom set_irrelevent_var0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, x : uint64, v : Map.map uint64 bool, b : bool . ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a)
+   -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a)
+   -> ([#"../bdd.rs" 351 26 351 30] inv0 self)
+   -> ([#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b))
   function size0 [#"../bdd.rs" 224 4 224 24] (self : Bdd_Bdd_Type.t_bdd) : int =
     [#"../bdd.rs" 226 12 234 13] match self with
       | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_True) _ -> 0
@@ -1370,27 +1400,37 @@ module Bdd_Impl10_DiscrValuation_Impl
   constant b  : Bdd_Bdd_Type.t_bdd
   function discr_valuation [#"../bdd.rs" 370 4 370 82] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : Map.map uint64 bool
     
-  goal vc_discr_valuation : ([#"../bdd.rs" 370 23 370 27] inv0 self) -> ([#"../bdd.rs" 366 15 366 21] a <> b) -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a) -> (let _ = set_irrelevent_var0 in match leastvar0 a < leastvar0 b with
+  goal vc_discr_valuation : ([#"../bdd.rs" 370 23 370 27] inv0 self)
+   -> ([#"../bdd.rs" 366 15 366 21] a <> b)
+   -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b)
+   -> ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)
+   -> (let _ = set_irrelevent_var0 in match leastvar0 a < leastvar0 b with
     | True -> match a with
       | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> match childf <> b with
-        | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childf <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childf)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childf + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childf (discr_valuation self childf b) <> interp0 b (discr_valuation self childf b)) -> (let result = Map.set (discr_valuation self childf b) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
-        | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childt <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childt)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childt + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childt (discr_valuation self childt b) <> interp0 b (discr_valuation self childt b)) -> (let result = Map.set (discr_valuation self childt b) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+        | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childf <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childf)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childf + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childf (discr_valuation self childf b) <> interp0 b (discr_valuation self childf b))
+         -> (let result = Map.set (discr_valuation self childf b) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+        | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childt <> b) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childt)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childt + size0 b) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childt (discr_valuation self childt b) <> interp0 b (discr_valuation self childt b))
+         -> (let result = Map.set (discr_valuation self childt b) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
         end
       | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
       end
     | False -> match leastvar0 a > leastvar0 b with
       | True -> match b with
         | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childt childf) _ -> match childf <> a with
-          | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childf) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childf) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childf) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childf) <> interp0 childf (discr_valuation self a childf)) -> (let result = Map.set (discr_valuation self a childf) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
-          | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childt) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childt) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childt) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childt) <> interp0 childt (discr_valuation self a childt)) -> (let result = Map.set (discr_valuation self a childt) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+          | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childf) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childf) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childf) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childf) <> interp0 childf (discr_valuation self a childf))
+           -> (let result = Map.set (discr_valuation self a childf) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+          | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] a <> childt) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childt) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 a + size0 childt) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation self a childt) <> interp0 childt (discr_valuation self a childt))
+           -> (let result = Map.set (discr_valuation self a childt) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
           end
         | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
         end
       | False -> match a with
         | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If v childta childfa) _ -> match b with
           | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_If _ childtb childfb) _ -> match childfa <> childfb with
-            | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childfa <> childfb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childfb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childfa)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childfa + size0 childfb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childfa (discr_valuation self childfa childfb) <> interp0 childfb (discr_valuation self childfa childfb)) -> (let result = Map.set (discr_valuation self childfa childfb) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
-            | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childta <> childtb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childtb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childta)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childta + size0 childtb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childta (discr_valuation self childta childtb) <> interp0 childtb (discr_valuation self childta childtb)) -> (let result = Map.set (discr_valuation self childta childtb) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+            | True -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childfa <> childfb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childfb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childfa)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childfa + size0 childfb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childfa (discr_valuation self childfa childfb) <> interp0 childfb (discr_valuation self childfa childfb))
+             -> (let result = Map.set (discr_valuation self childfa childfb) v false in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
+            | False -> ((([#"../bdd.rs" 370 23 370 27] inv0 self) && ([#"../bdd.rs" 366 15 366 21] childta <> childtb) && ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self childtb) && ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self childta)) /\ 0 <= ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b) /\ ([#"../bdd.rs" 368 14 368 33] size0 childta + size0 childtb) < ([#"../bdd.rs" 368 14 368 33] size0 a + size0 b)) /\ (([#"../bdd.rs" 367 14 367 50] interp0 childta (discr_valuation self childta childtb) <> interp0 childtb (discr_valuation self childta childtb))
+             -> (let result = Map.set (discr_valuation self childta childtb) v true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result))
             end
           | _ -> let result = Const.const true in [#"../bdd.rs" 367 14 367 50] interp0 a result <> interp0 b result
           end
@@ -1531,7 +1571,10 @@ module Bdd_Impl10_BddCanonical_Impl
     requires {[#"../bdd.rs" 351 26 351 30] inv0 self}
     ensures { result = set_irrelevent_var0 self a x v b }
     
-  axiom set_irrelevent_var0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, x : uint64, v : Map.map uint64 bool, b : bool . ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a) -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a) -> ([#"../bdd.rs" 351 26 351 30] inv0 self) -> ([#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b))
+  axiom set_irrelevent_var0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, x : uint64, v : Map.map uint64 bool, b : bool . ([#"../bdd.rs" 348 15 348 35] is_valid_bdd0 self a)
+   -> ([#"../bdd.rs" 349 15 349 32] UInt64.to_int x < leastvar0 a)
+   -> ([#"../bdd.rs" 351 26 351 30] inv0 self)
+   -> ([#"../bdd.rs" 350 14 350 50] interp0 a v = interp0 a (Map.set v x b))
   function size0 [#"../bdd.rs" 224 4 224 24] (self : Bdd_Bdd_Type.t_bdd) : int =
     [#"../bdd.rs" 226 12 234 13] match self with
       | Bdd_Bdd_Type.C_Bdd (Bdd_Node_Type.C_True) _ -> 0
@@ -1584,13 +1627,21 @@ module Bdd_Impl10_BddCanonical_Impl
     requires {[#"../bdd.rs" 370 23 370 27] inv0 self}
     ensures { result = discr_valuation0 self a b }
     
-  axiom discr_valuation0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, b : Bdd_Bdd_Type.t_bdd . ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a) -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 366 15 366 21] a <> b) -> ([#"../bdd.rs" 370 23 370 27] inv0 self) -> ([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation0 self a b) <> interp0 b (discr_valuation0 self a b))
+  axiom discr_valuation0_spec : forall self : Bdd_Context_Type.t_context, a : Bdd_Bdd_Type.t_bdd, b : Bdd_Bdd_Type.t_bdd . ([#"../bdd.rs" 364 15 364 35] is_valid_bdd0 self a)
+   -> ([#"../bdd.rs" 365 15 365 35] is_valid_bdd0 self b)
+   -> ([#"../bdd.rs" 366 15 366 21] a <> b)
+   -> ([#"../bdd.rs" 370 23 370 27] inv0 self)
+   -> ([#"../bdd.rs" 367 14 367 50] interp0 a (discr_valuation0 self a b) <> interp0 b (discr_valuation0 self a b))
   constant self  : Bdd_Context_Type.t_context
   constant a  : Bdd_Bdd_Type.t_bdd
   constant b  : Bdd_Bdd_Type.t_bdd
   function bdd_canonical [#"../bdd.rs" 418 4 418 62] (self : Bdd_Context_Type.t_context) (a : Bdd_Bdd_Type.t_bdd) (b : Bdd_Bdd_Type.t_bdd) : ()
     
-  goal vc_bdd_canonical : ([#"../bdd.rs" 418 25 418 29] inv0 self) -> ([#"../bdd.rs" 415 4 415 56] forall v : Map.map uint64 bool . interp0 a v = interp0 b v) -> ([#"../bdd.rs" 414 15 414 35] is_valid_bdd0 self b) -> ([#"../bdd.rs" 413 15 413 35] is_valid_bdd0 self a) -> (let _ = discr_valuation0 in [#"../bdd.rs" 416 14 416 20] a = b)
+  goal vc_bdd_canonical : ([#"../bdd.rs" 418 25 418 29] inv0 self)
+   -> ([#"../bdd.rs" 415 4 415 56] forall v : Map.map uint64 bool . interp0 a v = interp0 b v)
+   -> ([#"../bdd.rs" 414 15 414 35] is_valid_bdd0 self b)
+   -> ([#"../bdd.rs" 413 15 413 35] is_valid_bdd0 self a)
+   -> (let _ = discr_valuation0 in [#"../bdd.rs" 416 14 416 20] a = b)
 end
 module Bdd_Impl11_New
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -1978,7 +2029,8 @@ module Bdd_Impl11_Hashcons
   val add0 [#"../bdd.rs" 54 8 54 45] (self : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd))) (key : Bdd_Node_Type.t_node) (val' : Bdd_Bdd_Type.t_bdd) : ()
     requires {[#"../bdd.rs" 54 30 54 33] inv3 key}
     requires {[#"../bdd.rs" 54 38 54 41] inv5 val'}
-    ensures { [#"../bdd.rs" 52 8 52 128] forall i : Bdd_NodeLog_Type.t_nodelog . inv6 i -> Map.get (shallow_model3 ( ^ self)) i = (if i = deep_model1 key then
+    ensures { [#"../bdd.rs" 52 8 52 128] forall i : Bdd_NodeLog_Type.t_nodelog . inv6 i
+     -> Map.get (shallow_model3 ( ^ self)) i = (if i = deep_model1 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model4 self) i
@@ -3118,7 +3170,8 @@ module Bdd_Impl11_Not
   val add0 [#"../bdd.rs" 54 8 54 45] (self : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd))) (key : Bdd_Bdd_Type.t_bdd) (val' : Bdd_Bdd_Type.t_bdd) : ()
     requires {[#"../bdd.rs" 54 30 54 33] inv4 key}
     requires {[#"../bdd.rs" 54 38 54 41] inv4 val'}
-    ensures { [#"../bdd.rs" 52 8 52 128] forall i : uint64 . inv5 i -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model1 key then
+    ensures { [#"../bdd.rs" 52 8 52 128] forall i : uint64 . inv5 i
+     -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model1 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model3 self) i
@@ -3578,7 +3631,8 @@ module Bdd_Impl11_And
   val add0 [#"../bdd.rs" 54 8 54 45] (self : borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd))) (key : (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd)) (val' : Bdd_Bdd_Type.t_bdd) : ()
     requires {[#"../bdd.rs" 54 30 54 33] inv4 key}
     requires {[#"../bdd.rs" 54 38 54 41] inv5 val'}
-    ensures { [#"../bdd.rs" 52 8 52 128] forall i : (uint64, uint64) . inv6 i -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model2 key then
+    ensures { [#"../bdd.rs" 52 8 52 128] forall i : (uint64, uint64) . inv6 i
+     -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model2 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model3 self) i
@@ -4025,7 +4079,9 @@ module Bdd_Hashmap_Impl2
   val deep_model0 (self : (u, v)) : (deep_model_ty0, deep_model_ty1)
     ensures { result = deep_model0 self }
     
-  goal hash_refn : [#"../bdd.rs" 76 8 76 29] forall self : (u, v) . inv0 self -> inv0 self /\ (forall result : uint64 . UInt64.to_int result = hash_log0 (deep_model0 self) -> UInt64.to_int result = hash_log0 (deep_model0 self))
+  goal hash_refn : [#"../bdd.rs" 76 8 76 29] forall self : (u, v) . inv0 self
+   -> inv0 self /\ (forall result : uint64 . UInt64.to_int result = hash_log0 (deep_model0 self)
+   -> UInt64.to_int result = hash_log0 (deep_model0 self))
 end
 module Bdd_Impl1
   use Bdd_Node_Type as Bdd_Node_Type
@@ -4080,7 +4136,9 @@ module Bdd_Impl1
   val shallow_model1 (self : Bdd_Node_Type.t_node) : Bdd_NodeLog_Type.t_nodelog
     ensures { result = shallow_model1 self }
     
-  goal hash_refn : [#"../bdd.rs" 116 4 116 25] forall self : Bdd_Node_Type.t_node . inv0 self -> (forall result : uint64 . UInt64.to_int result = hash_log0 (shallow_model1 self) -> UInt64.to_int result = hash_log0 (deep_model0 self))
+  goal hash_refn : [#"../bdd.rs" 116 4 116 25] forall self : Bdd_Node_Type.t_node . inv0 self
+   -> (forall result : uint64 . UInt64.to_int result = hash_log0 (shallow_model1 self)
+   -> UInt64.to_int result = hash_log0 (deep_model0 self))
 end
 module Bdd_Impl2
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -4123,7 +4181,9 @@ module Bdd_Impl2
   val shallow_model1 (self : Bdd_Bdd_Type.t_bdd) : uint64
     ensures { result = shallow_model1 self }
     
-  goal hash_refn : [#"../bdd.rs" 142 4 142 25] forall self : Bdd_Bdd_Type.t_bdd . inv0 self -> (forall result : uint64 . UInt64.to_int result = hash_log0 (shallow_model1 self) -> UInt64.to_int result = hash_log0 (deep_model0 self))
+  goal hash_refn : [#"../bdd.rs" 142 4 142 25] forall self : Bdd_Bdd_Type.t_bdd . inv0 self
+   -> (forall result : uint64 . UInt64.to_int result = hash_log0 (shallow_model1 self)
+   -> UInt64.to_int result = hash_log0 (deep_model0 self))
 end
 module Bdd_Impl12
   
@@ -4166,7 +4226,9 @@ module Bdd_Impl14
   val deep_model0 (self : Bdd_Node_Type.t_node) : Bdd_NodeLog_Type.t_nodelog
     ensures { result = deep_model0 self }
     
-  goal eq_refn : [#"../bdd.rs" 90 13 90 22] forall self : Bdd_Node_Type.t_node . forall other : Bdd_Node_Type.t_node . inv0 other /\ inv0 self -> (forall result : bool . result = (deep_model0 self = deep_model0 other) -> result = (deep_model0 self = deep_model0 other))
+  goal eq_refn : [#"../bdd.rs" 90 13 90 22] forall self : Bdd_Node_Type.t_node . forall other : Bdd_Node_Type.t_node . inv0 other /\ inv0 self
+   -> (forall result : bool . result = (deep_model0 self = deep_model0 other)
+   -> result = (deep_model0 self = deep_model0 other))
 end
 module Bdd_Impl7
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -4203,7 +4265,9 @@ module Bdd_Impl7
   val shallow_model0 (self : Bdd_Bdd_Type.t_bdd) : uint64
     ensures { result = shallow_model0 self }
     
-  goal eq_refn : [#"../bdd.rs" 202 4 202 34] forall self : Bdd_Bdd_Type.t_bdd . forall other : Bdd_Bdd_Type.t_bdd . inv0 other /\ inv0 self -> (forall result : bool . result = (shallow_model0 self = shallow_model0 other) -> result = (deep_model0 self = deep_model0 other))
+  goal eq_refn : [#"../bdd.rs" 202 4 202 34] forall self : Bdd_Bdd_Type.t_bdd . forall other : Bdd_Bdd_Type.t_bdd . inv0 other /\ inv0 self
+   -> (forall result : bool . result = (shallow_model0 self = shallow_model0 other)
+   -> result = (deep_model0 self = deep_model0 other))
 end
 module Bdd_Impl15
   use Bdd_Node_Type as Bdd_Node_Type
@@ -4228,7 +4292,8 @@ module Bdd_Impl15
     
   axiom inv0 : forall x : Bdd_Node_Type.t_node . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../bdd.rs" 90 24 90 29] forall self : Bdd_Node_Type.t_node . inv0 self -> (forall result : Bdd_Node_Type.t_node . result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../bdd.rs" 90 24 90 29] forall self : Bdd_Node_Type.t_node . inv0 self
+   -> (forall result : Bdd_Node_Type.t_node . result = self  -> inv1 result /\ result = self)
 end
 module Bdd_Impl0
   use Bdd_Bdd_Type as Bdd_Bdd_Type
@@ -4253,7 +4318,8 @@ module Bdd_Impl0
     
   axiom inv0 : forall x : Bdd_Bdd_Type.t_bdd . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../bdd.rs" 109 4 109 27] forall self : Bdd_Bdd_Type.t_bdd . inv0 self -> (forall result : Bdd_Bdd_Type.t_bdd . result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../bdd.rs" 109 4 109 27] forall self : Bdd_Bdd_Type.t_bdd . inv0 self
+   -> (forall result : Bdd_Bdd_Type.t_bdd . result = self  -> inv1 result /\ result = self)
 end
 module Bdd_Impl16
   
diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg
index 535ec75ad4..74f0a7549e 100644
--- a/creusot/tests/should_succeed/binary_search.mlcfg
+++ b/creusot/tests/should_succeed/binary_search.mlcfg
@@ -30,8 +30,10 @@ module BinarySearch_Impl0_LenLogic_Impl
   use prelude.Int
   constant self  : BinarySearch_List_Type.t_list t
   function len_logic [#"../binary_search.rs" 22 4 22 29] (self : BinarySearch_List_Type.t_list t) : int
-  goal vc_len_logic : ([#"../binary_search.rs" 22 17 22 21] inv0 self) -> match self with
-    | BinarySearch_List_Type.C_Cons _ ls -> ([#"../binary_search.rs" 22 17 22 21] inv0 ls) /\ (([#"../binary_search.rs" 21 14 21 25] len_logic ls >= 0) -> ([#"../binary_search.rs" 21 14 21 25] 1 + len_logic ls >= 0))
+  goal vc_len_logic : ([#"../binary_search.rs" 22 17 22 21] inv0 self)
+   -> match self with
+    | BinarySearch_List_Type.C_Cons _ ls -> ([#"../binary_search.rs" 22 17 22 21] inv0 ls) /\ (([#"../binary_search.rs" 21 14 21 25] len_logic ls >= 0)
+     -> ([#"../binary_search.rs" 21 14 21 25] 1 + len_logic ls >= 0))
     | BinarySearch_List_Type.C_Nil -> [#"../binary_search.rs" 21 14 21 25] 0 >= 0
     end
 end
@@ -111,7 +113,8 @@ module BinarySearch_Impl0_Index
     requires {[#"../binary_search.rs" 22 17 22 21] inv3 self}
     ensures { result = len_logic0 self }
     
-  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list t . ([#"../binary_search.rs" 22 17 22 21] inv3 self) -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
+  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list t . ([#"../binary_search.rs" 22 17 22 21] inv3 self)
+   -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
   use prelude.UIntSize
   predicate resolve0 (self : BinarySearch_List_Type.t_list t)
   val resolve0 (self : BinarySearch_List_Type.t_list t) : bool
@@ -241,7 +244,8 @@ module BinarySearch_Impl0_Len
     requires {[#"../binary_search.rs" 22 17 22 21] inv2 self}
     ensures { result = len_logic0 self }
     
-  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list t . ([#"../binary_search.rs" 22 17 22 21] inv2 self) -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
+  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list t . ([#"../binary_search.rs" 22 17 22 21] inv2 self)
+   -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
   use prelude.UIntSize
   predicate resolve0 (self : BinarySearch_List_Type.t_list t)
   val resolve0 (self : BinarySearch_List_Type.t_list t) : bool
@@ -353,7 +357,8 @@ module BinarySearch_BinarySearch
     ensures { result = get0 self ix }
     
   predicate is_sorted0 [#"../binary_search.rs" 88 4 88 30] (self : BinarySearch_List_Type.t_list uint32) =
-    [#"../binary_search.rs" 90 12 97 13] forall x2 : int . forall x1 : int . x1 <= x2 -> match (get0 self x1, get0 self x2) with
+    [#"../binary_search.rs" 90 12 97 13] forall x2 : int . forall x1 : int . x1 <= x2
+     -> match (get0 self x1, get0 self x2) with
       | (Core_Option_Option_Type.C_Some v1, Core_Option_Option_Type.C_Some v2) -> v1 <= v2
       | (Core_Option_Option_Type.C_None, Core_Option_Option_Type.C_None) -> true
       | _ -> false
@@ -373,7 +378,8 @@ module BinarySearch_BinarySearch
     requires {[#"../binary_search.rs" 22 17 22 21] inv1 self}
     ensures { result = len_logic0 self }
     
-  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list uint32 . ([#"../binary_search.rs" 22 17 22 21] inv1 self) -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
+  axiom len_logic0_spec : forall self : BinarySearch_List_Type.t_list uint32 . ([#"../binary_search.rs" 22 17 22 21] inv1 self)
+   -> ([#"../binary_search.rs" 21 14 21 25] len_logic0 self >= 0)
   use prelude.UIntSize
   val index0 [#"../binary_search.rs" 45 4 45 40] (self : BinarySearch_List_Type.t_list uint32) (ix : usize) : uint32
     requires {[#"../binary_search.rs" 43 15 43 37] UIntSize.to_int ix < len_logic0 self}
@@ -400,9 +406,14 @@ module BinarySearch_BinarySearch
   let rec cfg binary_search [#"../binary_search.rs" 109 0 109 72] [@cfg:stackify] [@cfg:subregion_analysis] (arr : BinarySearch_List_Type.t_list uint32) (elem : uint32) : Core_Result_Result_Type.t_result usize usize
     requires {[#"../binary_search.rs" 102 11 102 39] len_logic0 arr <= 1000000}
     requires {[#"../binary_search.rs" 103 11 103 26] is_sorted0 arr}
-    ensures { [#"../binary_search.rs" 104 0 104 73] forall x : usize . result = Core_Result_Result_Type.C_Ok x -> get0 arr (UIntSize.to_int x) = Core_Option_Option_Type.C_Some elem }
-    ensures { [#"../binary_search.rs" 105 0 106 78] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . 0 <= UIntSize.to_int i /\ UIntSize.to_int i < UIntSize.to_int x -> get_default0 arr (UIntSize.to_int i) (0 : uint32) <= elem) }
-    ensures { [#"../binary_search.rs" 107 0 108 90] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . UIntSize.to_int x < UIntSize.to_int i /\ UIntSize.to_int i < len_logic0 arr -> elem < get_default0 arr (UIntSize.to_int i) (0 : uint32)) }
+    ensures { [#"../binary_search.rs" 104 0 104 73] forall x : usize . result = Core_Result_Result_Type.C_Ok x
+     -> get0 arr (UIntSize.to_int x) = Core_Option_Option_Type.C_Some elem }
+    ensures { [#"../binary_search.rs" 105 0 106 78] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . 0 <= UIntSize.to_int i /\ UIntSize.to_int i < UIntSize.to_int x
+     -> get_default0 arr (UIntSize.to_int i) (0 : uint32) <= elem) }
+    ensures { [#"../binary_search.rs" 107 0 108 90] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . UIntSize.to_int x < UIntSize.to_int i /\ UIntSize.to_int i < len_logic0 arr
+     -> elem < get_default0 arr (UIntSize.to_int i) (0 : uint32)) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Result_Result_Type.t_result usize usize;
@@ -453,8 +464,10 @@ module BinarySearch_BinarySearch
   }
   BB5 {
     invariant { [#"../binary_search.rs" 116 16 116 63] 0 < UIntSize.to_int size /\ UIntSize.to_int size + UIntSize.to_int base <= len_logic0 arr };
-    invariant { [#"../binary_search.rs" 116 4 116 65] forall i : usize . i < base -> get_default0 arr (UIntSize.to_int i) (0 : uint32) <= elem };
-    invariant { [#"../binary_search.rs" 116 4 116 65] forall i : usize . UIntSize.to_int base + UIntSize.to_int size < UIntSize.to_int i /\ UIntSize.to_int i < len_logic0 arr -> elem < get_default0 arr (UIntSize.to_int i) (0 : uint32) };
+    invariant { [#"../binary_search.rs" 116 4 116 65] forall i : usize . i < base
+     -> get_default0 arr (UIntSize.to_int i) (0 : uint32) <= elem };
+    invariant { [#"../binary_search.rs" 116 4 116 65] forall i : usize . UIntSize.to_int base + UIntSize.to_int size < UIntSize.to_int i /\ UIntSize.to_int i < len_logic0 arr
+     -> elem < get_default0 arr (UIntSize.to_int i) (0 : uint32) };
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/bug/02_derive.mlcfg b/creusot/tests/should_succeed/bug/02_derive.mlcfg
index f810252f63..bde749a147 100644
--- a/creusot/tests/should_succeed/bug/02_derive.mlcfg
+++ b/creusot/tests/should_succeed/bug/02_derive.mlcfg
@@ -43,5 +43,6 @@ module C02Derive_Impl0
     
   axiom inv0 : forall x : C02Derive_Lit_Type.t_lit . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../02_derive.rs" 3 9 3 14] forall self : C02Derive_Lit_Type.t_lit . inv0 self -> (forall result : C02Derive_Lit_Type.t_lit . inv1 result /\ result = self)
+  goal clone'_refn : [#"../02_derive.rs" 3 9 3 14] forall self : C02Derive_Lit_Type.t_lit . inv0 self
+   -> (forall result : C02Derive_Lit_Type.t_lit . inv1 result /\ result = self)
 end
diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg
index 27260b8ca6..962eca159a 100644
--- a/creusot/tests/should_succeed/bug/206.mlcfg
+++ b/creusot/tests/should_succeed/bug/206.mlcfg
@@ -81,7 +81,8 @@ module C206_U2_Impl
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -122,7 +123,8 @@ module C206_Ex
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
diff --git a/creusot/tests/should_succeed/bug/387.mlcfg b/creusot/tests/should_succeed/bug/387.mlcfg
index 5433b79dfe..7be97d4802 100644
--- a/creusot/tests/should_succeed/bug/387.mlcfg
+++ b/creusot/tests/should_succeed/bug/387.mlcfg
@@ -88,8 +88,10 @@ module C387_Impl0_Height
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 53 26 53 66] deep_model0 result >= deep_model0 self }
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 54 26 54 63] deep_model0 result >= deep_model0 other }
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 7 0 62 1] result = self \/ result = other }
-    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 56 16 56 79] deep_model0 self <= deep_model0 other -> result = other }
-    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 57 16 57 81] deep_model0 other < deep_model0 self -> result = self }
+    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 56 16 56 79] deep_model0 self <= deep_model0 other
+     -> result = other }
+    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 57 16 57 81] deep_model0 other < deep_model0 self
+     -> result = self }
     ensures { inv0 result }
     
   use C387_Node_Type as C387_Node_Type
diff --git a/creusot/tests/should_succeed/bug/464.mlcfg b/creusot/tests/should_succeed/bug/464.mlcfg
index c30857ff70..05e57fe6c4 100644
--- a/creusot/tests/should_succeed/bug/464.mlcfg
+++ b/creusot/tests/should_succeed/bug/464.mlcfg
@@ -21,7 +21,7 @@ module C464_Impl1_Invariant_Impl
   constant assoc  : C464_AssocStruct_Type.t_assocstruct
   predicate invariant' [#"../464.rs" 34 4 34 50] (self : C464_Struct_Type.t_struct) (assoc : C464_AssocStruct_Type.t_assocstruct)
     
-  goal vc_invariant' : [#"../464.rs" 33 4 33 44] true -> invariant0 assoc
+  goal vc_invariant' : [#"../464.rs" 33 4 33 44] true  -> invariant0 assoc
 end
 module C464_Impl0
   
@@ -54,5 +54,6 @@ module C464_Impl1
   val invariant0 [#"../464.rs" 23 4 23 30] (self : C464_AssocStruct_Type.t_assocstruct) : bool
     ensures { result = invariant0 self }
     
-  goal invariant'_refn : [#"../464.rs" 34 4 34 50] forall self : C464_Struct_Type.t_struct . forall assoc : C464_AssocStruct_Type.t_assocstruct . inv0 assoc /\ inv1 self -> (forall result : bool . result -> invariant0 assoc -> result -> invariant0 assoc)
+  goal invariant'_refn : [#"../464.rs" 34 4 34 50] forall self : C464_Struct_Type.t_struct . forall assoc : C464_AssocStruct_Type.t_assocstruct . inv0 assoc /\ inv1 self
+   -> (forall result : bool . result  -> invariant0 assoc  -> result  -> invariant0 assoc)
 end
diff --git a/creusot/tests/should_succeed/bug/552.mlcfg b/creusot/tests/should_succeed/bug/552.mlcfg
index 13540ef45e..4e77aeaf09 100644
--- a/creusot/tests/should_succeed/bug/552.mlcfg
+++ b/creusot/tests/should_succeed/bug/552.mlcfg
@@ -89,5 +89,6 @@ module C552_Impl0
   val invariants0 [#"../552.rs" 18 4 18 31] (self : C552_Machine_Type.t_machine) : bool
     ensures { result = invariants0 self }
     
-  goal step_refn : [#"../552.rs" 23 4 23 30] forall self : borrowed (C552_Machine_Type.t_machine) . inv0 self /\ invariants0 ( * self) -> invariants0 ( * self) /\ (forall result : bool . invariants0 ( ^ self) -> invariants0 ( ^ self))
+  goal step_refn : [#"../552.rs" 23 4 23 30] forall self : borrowed (C552_Machine_Type.t_machine) . inv0 self /\ invariants0 ( * self)
+   -> invariants0 ( * self) /\ (forall result : bool . invariants0 ( ^ self)  -> invariants0 ( ^ self))
 end
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index b98cced6ef..e0ccd86ee7 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -111,7 +111,14 @@ module C874_CanExtend
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv5 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq int32, b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq int32, c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv5 a) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv3 ab) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv5 b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv3 bc) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv5 c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq int32, b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq int32, c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv5 a)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv3 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv5 b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv3 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv5 c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global)) : ()
     
@@ -121,7 +128,8 @@ module C874_CanExtend
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv5 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
   predicate invariant5 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant5 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -173,7 +181,8 @@ module C874_CanExtend
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant1 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant1 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -205,7 +214,8 @@ module C874_CanExtend
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve1 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve1 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -261,7 +271,8 @@ module C874_CanExtend
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : slice int32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv3 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : slice int32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv3 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   function shallow_model1 (self : slice int32) : Seq.seq int32 =
     [#"../../../../../creusot-contracts/src/std/boxed.rs" 20 8 20 31] shallow_model4 self
   val shallow_model1 (self : slice int32) : Seq.seq int32
diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
index 87c81dd3af..0cacf416bb 100644
--- a/creusot/tests/should_succeed/bug/949.mlcfg
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -141,7 +141,8 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv1 self}
     ensures { result = view0 self }
     
-  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv4 (view0 self)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
+  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv4 (view0 self)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
   function get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
     
    =
@@ -161,7 +162,8 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv1 self}
     ensures { result = len0 self }
     
-  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
+  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
   use map.Map
   function remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
@@ -170,7 +172,9 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv2 k}
     ensures { result = remove0 self k }
     
-  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv2 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv1 (remove0 self k)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
+  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv2 k)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv1 (remove0 self k)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
     len0 self - 1
   else
     len0 self
@@ -180,14 +184,17 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false}
     ensures { result = unreachable0 _1 }
     
-  axiom unreachable0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
+  axiom unreachable0_spec : forall _1 : () . ([#"../../../../../creusot-contracts/src/util.rs" 24 11 24 16] false)
+   -> ([#"../../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
   function unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
   val unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
     requires {[#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None}
     requires {[#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv6 op}
     ensures { result = unwrap0 op }
     
-  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv6 op) -> ([#"../../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
+  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None)
+   -> ([#"../../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv6 op)
+   -> ([#"../../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
   function lookup_unsized0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : int32
     
    =
@@ -212,7 +219,8 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv5 self}
     ensures { result = make_sized0 self }
     
-  axiom make_sized0_spec : forall self : int32 . ([#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
   function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -221,7 +229,12 @@ module C949_Main
     requires {[#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv3 v}
     ensures { result = insert0 self k v }
     
-  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv1 self) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv2 k) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv3 v) -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv1 (insert0 self k v)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
+  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv2 k)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv3 v)
+   -> ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv1 (insert0 self k v)) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k
+   -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k
+   -> len0 (insert0 self k v) = len0 self) && ([#"../../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
   val ptr_from_box0 (self : borrowed (CreusotContracts_GhostPtr_GhostPtrToken_Type.t_ghostptrtoken int32)) (val' : int32) : opaque_ptr
     requires {[#"../../../../../creusot-contracts/src/ghost_ptr.rs" 71 35 71 38] inv0 val'}
     ensures { [#"../../../../../creusot-contracts/src/ghost_ptr.rs" 67 4 67 42] not contains0 (shallow_model0 ( * self)) result }
diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg
index 5312c5a4c8..4f55c628db 100644
--- a/creusot/tests/should_succeed/bug/two_phase.mlcfg
+++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg
@@ -67,7 +67,8 @@ module TwoPhase_Test
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model3 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index d950baf96b..29baa985e3 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -46,11 +46,14 @@ module C02_LemmaFibBound_Impl
     
   constant i  : int
   function lemma_fib_bound [#"../02.rs" 47 0 47 30] (i : int) : ()
-  goal vc_lemma_fib_bound : ([#"../02.rs" 44 11 44 17] 0 <= i) -> match i = 0 with
+  goal vc_lemma_fib_bound : ([#"../02.rs" 44 11 44 17] 0 <= i)
+   -> match i = 0 with
     | True -> [#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i
     | False -> match i = 1 with
       | True -> [#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i
-      | False -> (([#"../02.rs" 44 11 44 17] 0 <= i - 2) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 2) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 2) <= Power.power 2 (i - 2)) -> (let _ = lemma_fib_bound (i - 2) in (([#"../02.rs" 44 11 44 17] 0 <= i - 1) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 1) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 1) <= Power.power 2 (i - 1)) -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i))))
+      | False -> (([#"../02.rs" 44 11 44 17] 0 <= i - 2) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 2) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 2) <= Power.power 2 (i - 2))
+       -> (let _ = lemma_fib_bound (i - 2) in (([#"../02.rs" 44 11 44 17] 0 <= i - 1) /\ 0 <= ([#"../02.rs" 46 10 46 11] i) /\ ([#"../02.rs" 46 10 46 11] i - 1) < ([#"../02.rs" 46 10 46 11] i)) /\ (([#"../02.rs" 45 10 45 28] fib0 (i - 1) <= Power.power 2 (i - 1))
+       -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i))))
       end
     end
 end
@@ -151,7 +154,8 @@ module C02_FibMemo
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -261,7 +265,8 @@ module C02_FibMemo
     requires {[#"../02.rs" 44 11 44 17] 0 <= i}
     ensures { result = lemma_fib_bound0 i }
     
-  axiom lemma_fib_bound0_spec : forall i : int . ([#"../02.rs" 44 11 44 17] 0 <= i) -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i)
+  axiom lemma_fib_bound0_spec : forall i : int . ([#"../02.rs" 44 11 44 17] 0 <= i)
+   -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i)
   use prelude.Snapshot
   function lemma_max_int0 [#"../02.rs" 62 0 62 22] (_1 : ()) : () =
     [#"../02.rs" 60 0 60 8] ()
diff --git a/creusot/tests/should_succeed/checked_ops.mlcfg b/creusot/tests/should_succeed/checked_ops.mlcfg
index 83d5837fe0..3b574e107b 100644
--- a/creusot/tests/should_succeed/checked_ops.mlcfg
+++ b/creusot/tests/should_succeed/checked_ops.mlcfg
@@ -68,21 +68,30 @@ module CheckedOps_TestU8AddExample
   use prelude.UInt8
   val overflowing_add0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_add0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_add0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option uint8) : bool
@@ -97,7 +106,8 @@ module CheckedOps_TestU8AddExample
     
   val checked_add0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
     
   let rec cfg test_u8_add_example [#"../checked_ops.rs" 5 0 5 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -337,21 +347,30 @@ module CheckedOps_TestU8AddOverflow
     (8 : uint32)
   val overflowing_add0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_add0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_add0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option uint8) : bool
@@ -360,7 +379,8 @@ module CheckedOps_TestU8AddOverflow
     
   val checked_add0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
     
   let rec cfg test_u8_add_overflow [#"../checked_ops.rs" 23 0 23 34] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) : ()
     requires {[#"../checked_ops.rs" 22 11 22 18] UInt8.to_int a <> 0}
@@ -488,9 +508,12 @@ module CheckedOps_TestU8WrappingAdd
     (8 : uint32)
   val wrapping_add0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   let rec cfg test_u8_wrapping_add [#"../checked_ops.rs" 34 0 34 47] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : uint8
     ensures { [#"../checked_ops.rs" 33 10 33 56] UInt8.to_int result = UInt8.to_int a + UInt8.to_int b \/ UInt8.to_int result = UInt8.to_int a + UInt8.to_int b - 256 }
@@ -538,7 +561,8 @@ module CheckedOps_TestU8OverflowingAdd
   use prelude.UInt8
   val checked_add0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self + UInt8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -548,9 +572,12 @@ module CheckedOps_TestU8OverflowingAdd
     (8 : uint32)
   val wrapping_add0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -569,9 +596,12 @@ module CheckedOps_TestU8OverflowingAdd
     
   val overflowing_add0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self + UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self + UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self + UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self + UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self + UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self + UInt8.to_int rhs > UInt8.to_int max0) }
     
   let rec cfg test_u8_overflowing_add [#"../checked_ops.rs" 39 0 39 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : ()
@@ -705,21 +735,30 @@ module CheckedOps_TestU8SubExample
   use prelude.UInt8
   val overflowing_sub0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_sub0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_sub0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
@@ -734,7 +773,8 @@ module CheckedOps_TestU8SubExample
     
   val checked_sub0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
     
   let rec cfg test_u8_sub_example [#"../checked_ops.rs" 45 0 45 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -974,21 +1014,30 @@ module CheckedOps_TestU8SubOverflow
     (8 : uint32)
   val overflowing_sub0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_sub0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_sub0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option uint8) : bool
@@ -997,7 +1046,8 @@ module CheckedOps_TestU8SubOverflow
     
   val checked_sub0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
     
   let rec cfg test_u8_sub_overflow [#"../checked_ops.rs" 63 0 63 34] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) : ()
     requires {[#"../checked_ops.rs" 62 11 62 18] UInt8.to_int a <> 0}
@@ -1131,9 +1181,12 @@ module CheckedOps_TestU8WrappingSub
     (8 : uint32)
   val wrapping_sub0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   let rec cfg test_u8_wrapping_sub [#"../checked_ops.rs" 74 0 74 47] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : uint8
     ensures { [#"../checked_ops.rs" 73 10 73 56] UInt8.to_int result = UInt8.to_int a - UInt8.to_int b \/ UInt8.to_int result = UInt8.to_int a - UInt8.to_int b + 256 }
@@ -1181,7 +1234,8 @@ module CheckedOps_TestU8OverflowingSub
   use prelude.UInt8
   val checked_sub0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self - UInt8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -1191,9 +1245,12 @@ module CheckedOps_TestU8OverflowingSub
     (8 : uint32)
   val wrapping_sub0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -1212,9 +1269,12 @@ module CheckedOps_TestU8OverflowingSub
     
   val overflowing_sub0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self - UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self - UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self - UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self - UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self - UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self - UInt8.to_int rhs > UInt8.to_int max0) }
     
   let rec cfg test_u8_overflowing_sub [#"../checked_ops.rs" 79 0 79 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : ()
@@ -1348,21 +1408,30 @@ module CheckedOps_TestU8MulExample
   use prelude.UInt8
   val overflowing_mul0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_mul0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_mul0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option uint8) : bool
@@ -1377,7 +1446,8 @@ module CheckedOps_TestU8MulExample
     
   val checked_mul0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
     
   let rec cfg test_u8_mul_example [#"../checked_ops.rs" 85 0 85 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -1627,21 +1697,30 @@ module CheckedOps_TestU8MulZero
   use prelude.UInt8
   val overflowing_mul0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
     
   val saturating_mul0 (self : uint8) (rhs : uint8) : uint8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> UInt8.to_int result = UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int max0 }
     
   val wrapping_mul0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
@@ -1651,7 +1730,8 @@ module CheckedOps_TestU8MulZero
     
   val checked_mul0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
     
   let rec cfg test_u8_mul_zero [#"../checked_ops.rs" 102 0 102 30] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) : ()
     
@@ -1787,7 +1867,8 @@ module CheckedOps_TestU8OverflowingMul
   use prelude.UInt8
   val checked_mul0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = UInt8.to_int self * UInt8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -1797,9 +1878,12 @@ module CheckedOps_TestU8OverflowingMul
     (8 : uint32)
   val wrapping_mul0 (self : uint8) (rhs : uint8) : uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] UInt8.to_int result = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int result = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -1818,9 +1902,12 @@ module CheckedOps_TestU8OverflowingMul
     
   val overflowing_mul0 (self : uint8) (rhs : uint8) : (uint8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] UInt8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (UInt8.to_int self * UInt8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + UInt8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0 -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] UInt8.to_int self * UInt8.to_int rhs >= UInt8.to_int min0 /\ UInt8.to_int self * UInt8.to_int rhs <= UInt8.to_int max0
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs + k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0
+     -> (exists k : int . k > 0 /\ UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self * UInt8.to_int rhs - k * (UInt8.to_int max0 - UInt8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (UInt8.to_int self * UInt8.to_int rhs < UInt8.to_int min0 \/ UInt8.to_int self * UInt8.to_int rhs > UInt8.to_int max0) }
     
   let rec cfg test_u8_overflowing_mul [#"../checked_ops.rs" 111 0 111 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : ()
@@ -1946,18 +2033,21 @@ module CheckedOps_TestU8DivExample
   use prelude.UInt8
   val overflowing_div0 (self : uint8) (rhs : uint8) : (uint8, bool)
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 91 27 91 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 95 26 95 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int (let (a, _) = result in a) = div (UInt8.to_int self) (UInt8.to_int rhs) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 97 26 97 74] (let (_, a) = result in a) = (UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1) }
     
   val saturating_div0 (self : uint8) (rhs : uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 82 27 82 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int result = UInt8.to_int min0 }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 86 26 86 89] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int result = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   val wrapping_div0 (self : uint8) (rhs : uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 73 27 73 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int result = UInt8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int result = UInt8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 77 26 77 89] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int result = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option uint8) : uint8
@@ -1973,7 +2063,8 @@ module CheckedOps_TestU8DivExample
     
   val checked_div0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int rhs = 0 \/ UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   let rec cfg test_u8_div_example [#"../checked_ops.rs" 117 0 117 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -2146,18 +2237,21 @@ module CheckedOps_TestU8DivNoOverflow
     (0 : uint8)
   val overflowing_div0 (self : uint8) (rhs : uint8) : (uint8, bool)
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 91 27 91 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int (let (a, _) = result in a) = UInt8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 95 26 95 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int (let (a, _) = result in a) = div (UInt8.to_int self) (UInt8.to_int rhs) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 97 26 97 74] (let (_, a) = result in a) = (UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1) }
     
   val saturating_div0 (self : uint8) (rhs : uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 82 27 82 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int result = UInt8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int result = UInt8.to_int min0 }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 86 26 86 89] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int result = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   val wrapping_div0 (self : uint8) (rhs : uint8) : uint8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 73 27 73 36] UInt8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 -> UInt8.to_int result = UInt8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1
+     -> UInt8.to_int result = UInt8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 77 26 77 89] UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1 \/ UInt8.to_int result = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option uint8) : uint8
@@ -2168,7 +2262,8 @@ module CheckedOps_TestU8DivNoOverflow
     
   val checked_div0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int rhs = 0 \/ UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   let rec cfg test_u8_div_no_overflow [#"../checked_ops.rs" 128 0 128 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) (b : uint8) : ()
     requires {[#"../checked_ops.rs" 127 11 127 18] UInt8.to_int b <> 0}
@@ -2351,7 +2446,8 @@ module CheckedOps_TestU8DivZero
   use prelude.UInt8
   val checked_div0 (self : uint8) (rhs : uint8) : Core_Option_Option_Type.t_option uint8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (UInt8.to_int rhs = 0 \/ UInt8.to_int self = UInt8.to_int min0 /\ UInt8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : uint8 . result = Core_Option_Option_Type.C_Some r
+     -> UInt8.to_int r = div (UInt8.to_int self) (UInt8.to_int rhs) }
     
   let rec cfg test_u8_div_zero [#"../checked_ops.rs" 137 0 137 30] [@cfg:stackify] [@cfg:subregion_analysis] (a : uint8) : ()
     
@@ -2450,21 +2546,30 @@ module CheckedOps_TestI8AddExample
   use prelude.Int8
   val overflowing_add0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_add0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_add0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -2479,7 +2584,8 @@ module CheckedOps_TestI8AddExample
     
   val checked_add0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
     
   let rec cfg test_i8_add_example [#"../checked_ops.rs" 142 0 142 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -2808,21 +2914,30 @@ module CheckedOps_TestI8AddOverflowPos
     (8 : uint32)
   val overflowing_add0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_add0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_add0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -2831,7 +2946,8 @@ module CheckedOps_TestI8AddOverflowPos
     
   val checked_add0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
     
   let rec cfg test_i8_add_overflow_pos [#"../checked_ops.rs" 165 0 165 38] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     requires {[#"../checked_ops.rs" 164 11 164 17] Int8.to_int a > 0}
@@ -2992,21 +3108,30 @@ module CheckedOps_TestI8AddOverflowNeg
     (8 : uint32)
   val overflowing_add0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_add0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_add0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -3015,7 +3140,8 @@ module CheckedOps_TestI8AddOverflowNeg
     
   val checked_add0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
     
   let rec cfg test_i8_add_overflow_neg [#"../checked_ops.rs" 175 0 175 38] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     requires {[#"../checked_ops.rs" 174 11 174 17] Int8.to_int a < 0}
@@ -3149,9 +3275,12 @@ module CheckedOps_TestI8WrappingAdd
     (8 : uint32)
   val wrapping_add0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   let rec cfg test_i8_wrapping_add [#"../checked_ops.rs" 186 0 186 47] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : int8
     ensures { [#"../checked_ops.rs" 185 10 185 84] Int8.to_int result = Int8.to_int a + Int8.to_int b \/ Int8.to_int result = Int8.to_int a + Int8.to_int b - 256 \/ Int8.to_int result = Int8.to_int a + Int8.to_int b + 256 }
@@ -3199,7 +3328,8 @@ module CheckedOps_TestI8OverflowingAdd
   use prelude.Int8
   val checked_add0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self + Int8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -3209,9 +3339,12 @@ module CheckedOps_TestI8OverflowingAdd
     (8 : uint32)
   val wrapping_add0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -3230,9 +3363,12 @@ module CheckedOps_TestI8OverflowingAdd
     
   val overflowing_add0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self + Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self + Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self + Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self + Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self + Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self + Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self + Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self + Int8.to_int rhs > Int8.to_int max0) }
     
   let rec cfg test_i8_overflowing_add [#"../checked_ops.rs" 191 0 191 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : ()
@@ -3366,21 +3502,30 @@ module CheckedOps_TestI8SubExample
   use prelude.Int8
   val overflowing_sub0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_sub0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_sub0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -3395,7 +3540,8 @@ module CheckedOps_TestI8SubExample
     
   val checked_sub0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
     
   let rec cfg test_i8_sub_example [#"../checked_ops.rs" 197 0 197 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -3728,21 +3874,30 @@ module CheckedOps_TestI8SubOverflowPos
     (8 : uint32)
   val overflowing_sub0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_sub0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_sub0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -3751,7 +3906,8 @@ module CheckedOps_TestI8SubOverflowPos
     
   val checked_sub0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
     
   let rec cfg test_i8_sub_overflow_pos [#"../checked_ops.rs" 220 0 220 38] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     requires {[#"../checked_ops.rs" 219 11 219 17] Int8.to_int a > 0}
@@ -3912,21 +4068,30 @@ module CheckedOps_TestI8SubOverflowNeg
     (8 : uint32)
   val overflowing_sub0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_sub0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_sub0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -3935,7 +4100,8 @@ module CheckedOps_TestI8SubOverflowNeg
     
   val checked_sub0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
     
   let rec cfg test_i8_sub_overflow_neg [#"../checked_ops.rs" 230 0 230 38] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     requires {[#"../checked_ops.rs" 229 11 229 17] Int8.to_int a < 0}
@@ -4075,9 +4241,12 @@ module CheckedOps_TestI8WrappingSub
     (8 : uint32)
   val wrapping_sub0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   let rec cfg test_i8_wrapping_sub [#"../checked_ops.rs" 241 0 241 47] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : int8
     ensures { [#"../checked_ops.rs" 240 10 240 84] Int8.to_int result = Int8.to_int a - Int8.to_int b \/ Int8.to_int result = Int8.to_int a - Int8.to_int b + 256 \/ Int8.to_int result = Int8.to_int a - Int8.to_int b - 256 }
@@ -4125,7 +4294,8 @@ module CheckedOps_TestI8OverflowingSub
   use prelude.Int8
   val checked_sub0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self - Int8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -4135,9 +4305,12 @@ module CheckedOps_TestI8OverflowingSub
     (8 : uint32)
   val wrapping_sub0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -4156,9 +4329,12 @@ module CheckedOps_TestI8OverflowingSub
     
   val overflowing_sub0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self - Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self - Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self - Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self - Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self - Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self - Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self - Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self - Int8.to_int rhs > Int8.to_int max0) }
     
   let rec cfg test_i8_overflowing_sub [#"../checked_ops.rs" 246 0 246 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : ()
@@ -4292,21 +4468,30 @@ module CheckedOps_TestI8MulExample
   use prelude.Int8
   val overflowing_mul0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_mul0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_mul0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   use prelude.Borrow
   val is_none0 (self : Core_Option_Option_Type.t_option int8) : bool
@@ -4321,7 +4506,8 @@ module CheckedOps_TestI8MulExample
     
   val checked_mul0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
     
   let rec cfg test_i8_mul_example [#"../checked_ops.rs" 252 0 252 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -4660,21 +4846,30 @@ module CheckedOps_TestI8MulZero
   use prelude.Int8
   val overflowing_mul0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
     
   val saturating_mul0 (self : int8) (rhs : int8) : int8
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> Int8.to_int result = Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> Int8.to_int result = Int8.to_int max0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 161 16 164 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 166 16 166 85] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 167 16 167 85] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int max0 }
     
   val wrapping_mul0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option int8) : int8
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
@@ -4684,7 +4879,8 @@ module CheckedOps_TestI8MulZero
     
   val checked_mul0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
     
   let rec cfg test_i8_mul_zero [#"../checked_ops.rs" 274 0 274 30] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     
@@ -4820,7 +5016,8 @@ module CheckedOps_TestI8OverflowingMul
   use prelude.Int8
   val checked_mul0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 124 20 125 89] (result = Core_Option_Option_Type.C_None) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 128 16 128 89] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = Int8.to_int self * Int8.to_int rhs }
     
   use prelude.UInt32
   use int.EuclideanDivision
@@ -4830,9 +5027,12 @@ module CheckedOps_TestI8OverflowingMul
     (8 : uint32)
   val wrapping_mul0 (self : int8) (rhs : int8) : int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 135 20 135 93] Int8.to_int result = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 138 16 141 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int result = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 145 16 149 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 150 16 154 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int result = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     
   predicate resolve2 (self : bool) =
     [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -4851,9 +5051,12 @@ module CheckedOps_TestI8OverflowingMul
     
   val overflowing_mul0 (self : int8) (rhs : int8) : (int8, bool)
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 175 20 175 95] Int8.to_int (let (a, _) = result in a) = EuclideanDivision.mod (Int8.to_int self * Int8.to_int rhs) (Power.power 2 (UInt32.to_int bits0)) + Int8.to_int min0 }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0 -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 178 16 181 18] Int8.to_int self * Int8.to_int rhs >= Int8.to_int min0 /\ Int8.to_int self * Int8.to_int rhs <= Int8.to_int max0
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 185 16 189 18] Int8.to_int self * Int8.to_int rhs < Int8.to_int min0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs + k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 190 16 194 18] Int8.to_int self * Int8.to_int rhs > Int8.to_int max0
+     -> (exists k : int . k > 0 /\ Int8.to_int (let (a, _) = result in a) = Int8.to_int self * Int8.to_int rhs - k * (Int8.to_int max0 - Int8.to_int min0 + 1)) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 197 20 197 98] (let (_, a) = result in a) = (Int8.to_int self * Int8.to_int rhs < Int8.to_int min0 \/ Int8.to_int self * Int8.to_int rhs > Int8.to_int max0) }
     
   let rec cfg test_i8_overflowing_mul [#"../checked_ops.rs" 283 0 283 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : ()
@@ -4979,18 +5182,21 @@ module CheckedOps_TestI8DivExample
   use prelude.Int8
   val overflowing_div0 (self : int8) (rhs : int8) : (int8, bool)
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 91 27 91 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 95 26 95 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int (let (a, _) = result in a) = div (Int8.to_int self) (Int8.to_int rhs) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 97 26 97 74] (let (_, a) = result in a) = (Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1) }
     
   val saturating_div0 (self : int8) (rhs : int8) : int8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 82 27 82 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int result = Int8.to_int min0 }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 86 26 86 89] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int result = div (Int8.to_int self) (Int8.to_int rhs) }
     
   val wrapping_div0 (self : int8) (rhs : int8) : int8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 73 27 73 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int result = Int8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int result = Int8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 77 26 77 89] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int result = div (Int8.to_int self) (Int8.to_int rhs) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option int8) : int8
@@ -5006,7 +5212,8 @@ module CheckedOps_TestI8DivExample
     
   val checked_div0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (Int8.to_int rhs = 0 \/ Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
     
   let rec cfg test_i8_div_example [#"../checked_ops.rs" 289 0 289 28] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
@@ -5361,18 +5568,21 @@ module CheckedOps_TestI8DivNoOverflow
     (-128 : int8)
   val overflowing_div0 (self : int8) (rhs : int8) : (int8, bool)
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 91 27 91 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 93 16 93 87] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int (let (a, _) = result in a) = Int8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 95 26 95 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int (let (a, _) = result in a) = div (Int8.to_int self) (Int8.to_int rhs) }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 97 26 97 74] (let (_, a) = result in a) = (Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1) }
     
   val saturating_div0 (self : int8) (rhs : int8) : int8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 82 27 82 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int result = Int8.to_int min0 }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 84 16 84 91] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int result = Int8.to_int min0 }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 86 26 86 89] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int result = div (Int8.to_int self) (Int8.to_int rhs) }
     
   val wrapping_div0 (self : int8) (rhs : int8) : int8
     requires {[#"../../../../creusot-contracts/src/std/num.rs" 73 27 73 36] Int8.to_int rhs <> 0}
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 -> Int8.to_int result = Int8.to_int self }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 75 16 75 85] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1
+     -> Int8.to_int result = Int8.to_int self }
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 77 26 77 89] Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1 \/ Int8.to_int result = div (Int8.to_int self) (Int8.to_int rhs) }
     
   val unwrap0 (self : Core_Option_Option_Type.t_option int8) : int8
@@ -5383,7 +5593,8 @@ module CheckedOps_TestI8DivNoOverflow
     
   val checked_div0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (Int8.to_int rhs = 0 \/ Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
     
   let rec cfg test_i8_div_no_overflow [#"../checked_ops.rs" 313 0 313 44] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) (b : int8) : ()
     requires {[#"../checked_ops.rs" 312 11 312 46] Int8.to_int b <> 0 /\ (Int8.to_int a <> - 128 \/ Int8.to_int b <> - 1)}
@@ -5626,7 +5837,8 @@ module CheckedOps_TestI8DivZero
   use prelude.Int8
   val checked_div0 (self : int8) (rhs : int8) : Core_Option_Option_Type.t_option int8
     ensures { [#"../../../../creusot-contracts/src/std/num.rs" 66 26 66 97] (result = Core_Option_Option_Type.C_None) = (Int8.to_int rhs = 0 \/ Int8.to_int self = Int8.to_int min0 /\ Int8.to_int rhs = - 1) }
-    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/num.rs" 68 16 68 85] forall r : int8 . result = Core_Option_Option_Type.C_Some r
+     -> Int8.to_int r = div (Int8.to_int self) (Int8.to_int rhs) }
     
   let rec cfg test_i8_div_zero [#"../checked_ops.rs" 322 0 322 30] [@cfg:stackify] [@cfg:subregion_analysis] (a : int8) : ()
     
diff --git a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
index 3666325a25..9a25790a9a 100644
--- a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
+++ b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
@@ -38,7 +38,10 @@ module C03GenericBound_ClosureParam
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv2 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv2 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -52,13 +55,19 @@ module C03GenericBound_ClosureParam
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : uint32) (res : ()) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : uint32) (res : ()) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -67,7 +76,11 @@ module C03GenericBound_ClosureParam
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv2 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv2 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant4 (self : borrowed f)
   val invariant4 (self : borrowed f) : bool
     ensures { result = invariant4 self }
@@ -90,7 +103,10 @@ module C03GenericBound_ClosureParam
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv3 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv2 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv2 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
   predicate resolve1 (self : borrowed f) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed f) : bool
@@ -103,7 +119,10 @@ module C03GenericBound_ClosureParam
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv3 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv2 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed f, args : uint32, res : () . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv2 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
   predicate invariant2 (self : uint32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant2 (self : uint32) : bool
diff --git a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
index 984d0a051a..3521e7b2ab 100644
--- a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
+++ b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
@@ -39,7 +39,10 @@ module C04GenericClosure_GenericClosure
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv4 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv5 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv4 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv5 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -53,13 +56,19 @@ module C04GenericClosure_GenericClosure
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -68,7 +77,11 @@ module C04GenericClosure_GenericClosure
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv4 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv4 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant5 (self : borrowed f)
   val invariant5 (self : borrowed f) : bool
     ensures { result = invariant5 self }
@@ -85,7 +98,10 @@ module C04GenericClosure_GenericClosure
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv4 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv4 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
   predicate resolve1 (self : borrowed f) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed f) : bool
@@ -98,7 +114,10 @@ module C04GenericClosure_GenericClosure
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv4 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv4 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
   predicate invariant4 (self : a)
   val invariant4 (self : a) : bool
     ensures { result = invariant4 self }
diff --git a/creusot/tests/should_succeed/closures/05_map.mlcfg b/creusot/tests/should_succeed/closures/05_map.mlcfg
index f0754d7255..7f7f2d2c1f 100644
--- a/creusot/tests/should_succeed/closures/05_map.mlcfg
+++ b/creusot/tests/should_succeed/closures/05_map.mlcfg
@@ -69,7 +69,10 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv8 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve3 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv8 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve3 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -83,13 +86,19 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv9 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv9 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv9 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv9 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv9 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv9 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -98,7 +107,11 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv8 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv8 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant8 (self : borrowed f)
   val invariant8 (self : borrowed f) : bool
     ensures { result = invariant8 self }
@@ -120,7 +133,10 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv7 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve3 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve3 self /\ postcondition0 self args res))
   predicate resolve2 (self : borrowed f) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed f) : bool
@@ -133,7 +149,10 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv7 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv8 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve2 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv8 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve2 self /\ postcondition0 ( * self) args res))
   predicate invariant6 (self : a)
   val invariant6 (self : a) : bool
     ensures { result = invariant6 self }
@@ -328,5 +347,6 @@ module C05Map_Impl0
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : borrowed (C05Map_Map_Type.t_map i f) . inv0 x = true
-  goal next_refn : [#"../05_map.rs" 17 4 17 44] forall self : borrowed (C05Map_Map_Type.t_map i f) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result -> inv1 result)
+  goal next_refn : [#"../05_map.rs" 17 4 17 44] forall self : borrowed (C05Map_Map_Type.t_map i f) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result  -> inv1 result)
 end
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
index 3a62306c30..6583bbed11 100644
--- a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
+++ b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
@@ -127,7 +127,10 @@ module C06FnSpecs_Weaken2
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv3 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 19 43 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 25 43 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 42 14 42 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 19 43 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 25 43 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 42 14 42 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -141,13 +144,19 @@ module C06FnSpecs_Weaken2
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 36 15 36 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 37 15 37 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 20 39 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 26 39 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 38 14 38 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 36 15 36 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 37 15 37 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 20 39 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 26 39 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 38 14 38 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 32 14 32 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 32 14 32 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res}
@@ -156,7 +165,11 @@ module C06FnSpecs_Weaken2
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv3 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 37 29 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 43 29 47] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 28 14 28 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 37 29 41] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 43 29 47] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 28 14 28 35] unnest0 ( * self) ( ^ self))
   predicate invariant2 (self : borrowed f)
   val invariant2 (self : borrowed f) : bool
     ensures { result = invariant2 self }
@@ -260,7 +273,10 @@ module C06FnSpecs_Weaken
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 19 43 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 25 43 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 42 14 42 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 19 43 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 25 43 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 43 37 43 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 42 14 42 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -274,13 +290,19 @@ module C06FnSpecs_Weaken
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 36 15 36 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 37 15 37 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 20 39 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 26 39 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 38 14 38 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 36 15 36 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 37 15 37 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 20 39 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 26 39 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 39 35 39 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 38 14 38 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 32 14 32 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 33 19 33 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 32 14 32 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res}
@@ -289,7 +311,11 @@ module C06FnSpecs_Weaken
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 37 29 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 43 29 47] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 28 14 28 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 27 15 27 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 37 29 41] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 43 29 47] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 29 55 29 58] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 28 14 28 35] unnest0 ( * self) ( ^ self))
   predicate invariant3 (self : borrowed f)
   val invariant3 (self : borrowed f) : bool
     ensures { result = invariant3 self }
@@ -311,7 +337,10 @@ module C06FnSpecs_Weaken
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 61 33 61 36] inv2 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 15 61 19] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 21 61 25] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 33 61 36] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 60 14 60 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 15 61 19] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 21 61 25] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 61 33 61 36] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 60 14 60 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
   predicate resolve1 (self : borrowed f) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed f) : bool
@@ -324,7 +353,10 @@ module C06FnSpecs_Weaken
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 57 37 57 40] inv2 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 19 57 23] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 25 57 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 37 57 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 56 14 56 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 19 57 23] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 25 57 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 57 37 57 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 56 14 56 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
   predicate invariant1 (self : a)
   val invariant1 (self : a) : bool
     ensures { result = invariant1 self }
@@ -511,7 +543,10 @@ module C06FnSpecs_Weaken2Std
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -525,13 +560,19 @@ module C06FnSpecs_Weaken2Std
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -540,7 +581,11 @@ module C06FnSpecs_Weaken2Std
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant2 (self : borrowed f)
   val invariant2 (self : borrowed f) : bool
     ensures { result = invariant2 self }
@@ -644,7 +689,10 @@ module C06FnSpecs_WeakenStd
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -658,13 +706,19 @@ module C06FnSpecs_WeakenStd
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : a) (res : output0) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -673,7 +727,11 @@ module C06FnSpecs_WeakenStd
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant3 (self : borrowed f)
   val invariant3 (self : borrowed f) : bool
     ensures { result = invariant3 self }
@@ -695,7 +753,10 @@ module C06FnSpecs_WeakenStd
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res}
     ensures { result = fn_once0 self args res }
     
-  axiom fn_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
+  axiom fn_once0_spec : forall self : f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 15 145 19] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 21 145 25] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 145 33 145 36] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 144 14 144 101] postcondition_once0 self args res = (resolve0 self /\ postcondition0 self args res))
   predicate resolve1 (self : borrowed f) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed f) : bool
@@ -708,7 +769,10 @@ module C06FnSpecs_WeakenStd
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res}
     ensures { result = fn_mut0 self args res }
     
-  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv1 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
+  axiom fn_mut0_spec : forall self : borrowed f, args : a, res : output0 . ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 19 139 23] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 25 139 29] inv1 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 139 37 139 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 138 14 138 100] postcondition_mut0 self args res = (resolve1 self /\ postcondition0 ( * self) args res))
   predicate invariant1 (self : a)
   val invariant1 (self : a) : bool
     ensures { result = invariant1 self }
diff --git a/creusot/tests/should_succeed/duration.mlcfg b/creusot/tests/should_succeed/duration.mlcfg
index 735b526864..520273912b 100644
--- a/creusot/tests/should_succeed/duration.mlcfg
+++ b/creusot/tests/should_succeed/duration.mlcfg
@@ -74,20 +74,26 @@ module Duration_TestDuration
     
   use prelude.UInt32
   val checked_div0 (self : Core_Time_Duration_Type.t_duration) (rhs : uint32) : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 137 16 137 58] rhs = (0 : uint32) -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 138 16 138 85] rhs <> (0 : uint32) -> deep_model0 result = Core_Option_Option_Type.C_Some (div (shallow_model0 self) (UInt32.to_int rhs)) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 137 16 137 58] rhs = (0 : uint32)
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 138 16 138 85] rhs <> (0 : uint32)
+     -> deep_model0 result = Core_Option_Option_Type.C_Some (div (shallow_model0 self) (UInt32.to_int rhs)) }
     
   function nanos_to_secs0 (nanos : int) : int
   val nanos_to_secs0 (nanos : int) : int
     ensures { result = nanos_to_secs0 nanos }
     
   val checked_mul0 (self : Core_Time_Duration_Type.t_duration) (rhs : uint32) : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 133 16 133 86] nanos_to_secs0 (shallow_model0 self * UInt32.to_int rhs) > UInt64.to_int max0 -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 134 16 134 114] nanos_to_secs0 (shallow_model0 self * UInt32.to_int rhs) <= UInt64.to_int max0 -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self * UInt32.to_int rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 133 16 133 86] nanos_to_secs0 (shallow_model0 self * UInt32.to_int rhs) > UInt64.to_int max0
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 134 16 134 114] nanos_to_secs0 (shallow_model0 self * UInt32.to_int rhs) <= UInt64.to_int max0
+     -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self * UInt32.to_int rhs) }
     
   val checked_sub0 (self : Core_Time_Duration_Type.t_duration) (rhs : Core_Time_Duration_Type.t_duration) : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 129 16 129 63] shallow_model0 self - shallow_model0 rhs < 0 -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 130 16 130 91] shallow_model0 self - shallow_model0 rhs >= 0 -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self - shallow_model0 rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 129 16 129 63] shallow_model0 self - shallow_model0 rhs < 0
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 130 16 130 91] shallow_model0 self - shallow_model0 rhs >= 0
+     -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self - shallow_model0 rhs) }
     
   use prelude.Borrow
   val is_some0 (self : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)) : bool
@@ -99,8 +105,10 @@ module Duration_TestDuration
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 36 26 36 51] result = (self = Core_Option_Option_Type.C_None) }
     
   val checked_add0 (self : Core_Time_Duration_Type.t_duration) (rhs : Core_Time_Duration_Type.t_duration) : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 125 16 125 86] nanos_to_secs0 (shallow_model0 self + shallow_model0 rhs) > UInt64.to_int max0 -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 126 16 126 114] nanos_to_secs0 (shallow_model0 self + shallow_model0 rhs) <= UInt64.to_int max0 -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self + shallow_model0 rhs) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 125 16 125 86] nanos_to_secs0 (shallow_model0 self + shallow_model0 rhs) > UInt64.to_int max0
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 126 16 126 114] nanos_to_secs0 (shallow_model0 self + shallow_model0 rhs) <= UInt64.to_int max0
+     -> deep_model0 result = Core_Option_Option_Type.C_Some (shallow_model0 self + shallow_model0 rhs) }
     
   use prelude.UInt128
   function nanos_to_micros0 (nanos : int) : int
@@ -139,8 +147,9 @@ module Duration_TestDuration
     ensures { [#"../../../../creusot-contracts/src/std/time.rs" 100 26 100 57] UInt64.to_int result = nanos_to_secs0 (shallow_model4 self) }
     
   val is_zero0 (self : Core_Time_Duration_Type.t_duration) : bool
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 96 16 96 57] shallow_model4 self = 0 -> result = true }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 97 16 97 58] shallow_model4 self <> 0 -> result = false }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 96 16 96 57] shallow_model4 self = 0  -> result = true }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 97 16 97 58] shallow_model4 self <> 0
+     -> result = false }
     
   val from_nanos0 (nanos : uint64) : Core_Time_Duration_Type.t_duration
     ensures { [#"../../../../creusot-contracts/src/std/time.rs" 93 26 93 43] shallow_model0 result = UInt64.to_int nanos }
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index 8ff04c9b95..75528e23e2 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -38,8 +38,10 @@ module FilterPositive_LemmaNumOfPosIncreasing_Impl
   constant t  : Seq.seq int32
   function lemma_num_of_pos_increasing [#"../filter_positive.rs" 65 0 65 67] (i : int) (j : int) (k : int) (t : Seq.seq int32) : ()
     
-  goal vc_lemma_num_of_pos_increasing : ([#"../filter_positive.rs" 62 11 62 17] j <= k) -> match j < k with
-    | True -> (([#"../filter_positive.rs" 62 11 62 17] j + 1 <= k) /\ 0 <= ([#"../filter_positive.rs" 64 10 64 13] k - j) /\ ([#"../filter_positive.rs" 64 10 64 13] k - (j + 1)) < ([#"../filter_positive.rs" 64 10 64 13] k - j)) /\ (([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i (j + 1) t <= num_of_pos0 i k t) -> ([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t))
+  goal vc_lemma_num_of_pos_increasing : ([#"../filter_positive.rs" 62 11 62 17] j <= k)
+   -> match j < k with
+    | True -> (([#"../filter_positive.rs" 62 11 62 17] j + 1 <= k) /\ 0 <= ([#"../filter_positive.rs" 64 10 64 13] k - j) /\ ([#"../filter_positive.rs" 64 10 64 13] k - (j + 1)) < ([#"../filter_positive.rs" 64 10 64 13] k - j)) /\ (([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i (j + 1) t <= num_of_pos0 i k t)
+     -> ([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t))
     | False -> [#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t
     end
 end
@@ -62,7 +64,9 @@ module FilterPositive_LemmaNumOfPosStrictlyIncreasing_Impl
   constant i  : int
   constant t  : Seq.seq int32
   function lemma_num_of_pos_strictly_increasing [#"../filter_positive.rs" 79 0 79 60] (i : int) (t : Seq.seq int32) : ()
-  goal vc_lemma_num_of_pos_strictly_increasing : ([#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0) -> ([#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t) -> ([#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t)
+  goal vc_lemma_num_of_pos_strictly_increasing : ([#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0)
+   -> ([#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t)
+   -> ([#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t)
 end
 module Core_Ptr_NonNull_NonNull_Type
   use prelude.Opaque
@@ -194,7 +198,8 @@ module FilterPositive_M
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model1 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -209,7 +214,8 @@ module FilterPositive_M
   use prelude.Slice
   use seq.Seq
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq int32) (fin : Seq.seq int32) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq int32) (fin : Seq.seq int32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -261,7 +267,8 @@ module FilterPositive_M
     requires {[#"../filter_positive.rs" 62 11 62 17] j <= k}
     ensures { result = lemma_num_of_pos_increasing0 i j k t }
     
-  axiom lemma_num_of_pos_increasing0_spec : forall i : int, j : int, k : int, t : Seq.seq int32 . ([#"../filter_positive.rs" 62 11 62 17] j <= k) -> ([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t)
+  axiom lemma_num_of_pos_increasing0_spec : forall i : int, j : int, k : int, t : Seq.seq int32 . ([#"../filter_positive.rs" 62 11 62 17] j <= k)
+   -> ([#"../filter_positive.rs" 63 10 63 48] num_of_pos0 i j t <= num_of_pos0 i k t)
   function lemma_num_of_pos_strictly_increasing0 [#"../filter_positive.rs" 79 0 79 60] (i : int) (t : Seq.seq int32) : ()
     
    =
@@ -271,7 +278,9 @@ module FilterPositive_M
     requires {[#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0}
     ensures { result = lemma_num_of_pos_strictly_increasing0 i t }
     
-  axiom lemma_num_of_pos_strictly_increasing0_spec : forall i : int, t : Seq.seq int32 . ([#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t) -> ([#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0) -> ([#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t)
+  axiom lemma_num_of_pos_strictly_increasing0_spec : forall i : int, t : Seq.seq int32 . ([#"../filter_positive.rs" 76 11 76 32] 0 <= i /\ i < Seq.length t)
+   -> ([#"../filter_positive.rs" 77 11 77 20] Int32.to_int (Seq.get t i) > 0)
+   -> ([#"../filter_positive.rs" 78 10 78 49] num_of_pos0 0 i t < num_of_pos0 0 (i + 1) t)
   function shallow_model3 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : Seq.seq int32 =
     [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model1 self
   val shallow_model3 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : Seq.seq int32
@@ -297,14 +306,16 @@ module FilterPositive_M
     ensures { result = index_logic1 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve2 (index_logic1 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve2 (index_logic1 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
   val from_elem0 (elem : int32) (n : usize) : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)
     requires {inv3 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model1 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic1 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic1 result i = elem }
     ensures { inv0 result }
     
   val len1 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : usize
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index 8186e9a003..5e668e0e8f 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -144,14 +144,17 @@ module GhostPtrToken_Test
     requires {[#"../../../../creusot-contracts/src/util.rs" 24 11 24 16] false}
     ensures { result = unreachable0 _1 }
     
-  axiom unreachable0_spec : forall _1 : () . ([#"../../../../creusot-contracts/src/util.rs" 24 11 24 16] false) -> ([#"../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
+  axiom unreachable0_spec : forall _1 : () . ([#"../../../../creusot-contracts/src/util.rs" 24 11 24 16] false)
+   -> ([#"../../../../creusot-contracts/src/util.rs" 27 0 27 28] inv0 (unreachable0 _1)) && ([#"../../../../creusot-contracts/src/util.rs" 25 10 25 15] false)
   function unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
   val unwrap0 (op : Core_Option_Option_Type.t_option int32) : int32
     requires {[#"../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None}
     requires {[#"../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv7 op}
     ensures { result = unwrap0 op }
     
-  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None) -> ([#"../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv7 op) -> ([#"../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
+  axiom unwrap0_spec : forall op : Core_Option_Option_Type.t_option int32 . ([#"../../../../creusot-contracts/src/util.rs" 33 11 33 21] op <> Core_Option_Option_Type.C_None)
+   -> ([#"../../../../creusot-contracts/src/util.rs" 35 17 35 19] inv7 op)
+   -> ([#"../../../../creusot-contracts/src/util.rs" 35 0 35 36] inv0 (unwrap0 op)) && ([#"../../../../creusot-contracts/src/util.rs" 34 10 34 28] Core_Option_Option_Type.C_Some (unwrap0 op) = op)
   use map.Map
   function mk0 (_m : Map.map opaque_ptr (Core_Option_Option_Type.t_option int32)) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
@@ -164,7 +167,8 @@ module GhostPtrToken_Test
     requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self}
     ensures { result = view0 self }
     
-  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv6 (view0 self)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
+  axiom view0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 16 28 20] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 28 4 28 35] inv6 (view0 self)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 27 14 27 38] mk0 (view0 self) = self)
   function get0 [@inline:trivial] (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : Core_Option_Option_Type.t_option int32
     
    =
@@ -247,14 +251,16 @@ module GhostPtrToken_Test
     requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self}
     ensures { result = len0 self }
     
-  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
+  axiom len0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 13 15 13 19] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 12 14 12 25] len0 self >= 0)
   use map.Map
   function make_sized0 (self : int32) : int32
   val make_sized0 (self : int32) : int32
     requires {[#"../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv2 self}
     ensures { result = make_sized0 self }
     
-  axiom make_sized0_spec : forall self : int32 . ([#"../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv2 self) -> ([#"../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
+  axiom make_sized0_spec : forall self : int32 . ([#"../../../../creusot-contracts/src/util.rs" 16 19 16 23] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/util.rs" 16 4 16 40] inv0 (make_sized0 self)) && ([#"../../../../creusot-contracts/src/util.rs" 15 14 15 30] make_sized0 self = self)
   function insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val insert0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) (v : int32) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -263,7 +269,12 @@ module GhostPtrToken_Test
     requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v}
     ensures { result = insert0 self k v }
     
-  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv3 (insert0 self k v)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k -> len0 (insert0 self k v) = len0 self) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
+  axiom insert0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr, v : int32 . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 18 38 22] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 24 38 25] inv4 k)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 30 38 31] inv5 v)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 38 4 38 43] inv3 (insert0 self k v)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 37 4 37 68] not contains0 self k
+   -> len0 (insert0 self k v) = len0 self + 1) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 36 4 36 63] contains0 self k
+   -> len0 (insert0 self k v) = len0 self) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 35 14 35 71] view0 (insert0 self k v) = Map.set (view0 self) k (Core_Option_Option_Type.C_Some (make_sized0 v)))
   function remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
     
   val remove0 (self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32) (k : opaque_ptr) : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32
@@ -271,7 +282,9 @@ module GhostPtrToken_Test
     requires {[#"../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k}
     ensures { result = remove0 self k }
     
-  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k) -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv3 (remove0 self k)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
+  axiom remove0_spec : forall self : CreusotContracts_Logic_Fmap_FMap_Type.t_fmap opaque_ptr int32, k : opaque_ptr . ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 18 47 22] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 24 47 25] inv4 k)
+   -> ([#"../../../../creusot-contracts/src/logic/fmap.rs" 47 4 47 37] inv3 (remove0 self k)) && ([#"../../../../creusot-contracts/src/logic/fmap.rs" 46 14 46 84] len0 (remove0 self k) = (if contains0 self k then
     len0 self - 1
   else
     len0 self
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index f98174ba28..9e997d3136 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -153,7 +153,8 @@ module Hashmap_Impl5_New
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model2 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model2 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -258,26 +259,30 @@ module Hashmap_Impl5_New
   predicate good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int)
     
    =
-    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv5 v -> inv0 k -> get1 l k = Core_Option_Option_Type.C_Some v -> bucket_ix0 self k = h
+    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv0 k  -> get1 l k = Core_Option_Option_Type.C_Some v  -> bucket_ix0 self k = h
   val good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int) : bool
     ensures { result = good_bucket0 self l h }
     
   use prelude.Borrow
   predicate hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) =
-    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model2 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
+    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model2 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 (Hashmap_MyHashMap_Type.myhashmap_buckets self))
+     -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
   val hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = hashmap_inv0 self }
     
   val from_elem0 (elem : Hashmap_List_Type.t_list (k, v)) (n : usize) : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global)
     requires {inv2 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model2 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic0 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic0 result i = elem }
     ensures { inv3 result }
     
   let rec cfg new [#"../hashmap.rs" 98 4 98 46] [@cfg:stackify] [@cfg:subregion_analysis] (size : usize) : Hashmap_MyHashMap_Type.t_myhashmap k v
     requires {[#"../hashmap.rs" 95 15 95 24] 0 < UIntSize.to_int size}
     ensures { [#"../hashmap.rs" 96 14 96 34] hashmap_inv0 result }
-    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : deep_model_ty0 . inv0 i -> Map.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
+    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : deep_model_ty0 . inv0 i
+     -> Map.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
     ensures { [#"../hashmap.rs" 98 31 98 46] inv1 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -491,7 +496,8 @@ module Hashmap_Impl5_Add
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv17 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv17 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   predicate invariant1 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -587,12 +593,14 @@ module Hashmap_Impl5_Add
   predicate good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int)
     
    =
-    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv7 v -> inv5 k -> get0 l k = Core_Option_Option_Type.C_Some v -> bucket_ix0 self k = h
+    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv7 v
+     -> inv5 k  -> get0 l k = Core_Option_Option_Type.C_Some v  -> bucket_ix0 self k = h
   val good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int) : bool
     ensures { result = good_bucket0 self l h }
     
   predicate hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) =
-    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model6 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model6 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
+    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model6 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model6 (Hashmap_MyHashMap_Type.myhashmap_buckets self))
+     -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
   val hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = hashmap_inv0 self }
     
@@ -651,7 +659,8 @@ module Hashmap_Impl5_Add
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Hashmap_List_Type.t_list (k, v))) (fin : Seq.seq (Hashmap_List_Type.t_list (k, v)))
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Hashmap_List_Type.t_list (k, v))) (fin : Seq.seq (Hashmap_List_Type.t_list (k, v))) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -712,7 +721,8 @@ module Hashmap_Impl5_Add
     requires {[#"../hashmap.rs" 106 26 106 29] inv6 key}
     requires {[#"../hashmap.rs" 106 34 106 37] inv7 val'}
     ensures { [#"../hashmap.rs" 104 14 104 35] hashmap_inv0 ( ^ self) }
-    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : deep_model_ty0 . inv5 i -> Map.get (shallow_model1 ( ^ self)) i = (if i = deep_model0 key then
+    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : deep_model_ty0 . inv5 i
+     -> Map.get (shallow_model1 ( ^ self)) i = (if i = deep_model0 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model2 self) i
@@ -800,11 +810,16 @@ module Hashmap_Impl5_Add
   }
   BB7 {
     invariant { [#"../hashmap.rs" 114 20 114 52] good_bucket0 ( * Snapshot.inner old_self) ( * l) (UIntSize.to_int index) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] good_bucket0 ( * Snapshot.inner old_self) ( ^ l) (UIntSize.to_int index) -> good_bucket0 ( * Snapshot.inner old_self) ( ^ Snapshot.inner old_l) (UIntSize.to_int index) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] get0 ( ^ l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' -> get0 ( ^ Snapshot.inner old_l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' };
-    invariant { [#"../hashmap.rs" 114 8 114 54] forall i : deep_model_ty0 . inv5 i -> get0 ( ^ l) i = get0 ( * l) i -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i };
+    invariant { [#"../hashmap.rs" 114 8 114 54] good_bucket0 ( * Snapshot.inner old_self) ( ^ l) (UIntSize.to_int index)
+     -> good_bucket0 ( * Snapshot.inner old_self) ( ^ Snapshot.inner old_l) (UIntSize.to_int index) };
+    invariant { [#"../hashmap.rs" 114 8 114 54] get0 ( ^ l) (deep_model0 key) = Core_Option_Option_Type.C_Some val'
+     -> get0 ( ^ Snapshot.inner old_l) (deep_model0 key) = Core_Option_Option_Type.C_Some val' };
+    invariant { [#"../hashmap.rs" 114 8 114 54] forall i : deep_model_ty0 . inv5 i
+     -> get0 ( ^ l) i = get0 ( * l) i  -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i };
     invariant { [#"../hashmap.rs" 118 20 118 44] no_double_binding0 ( * l) };
-    invariant { [#"../hashmap.rs" 114 8 114 54] (forall i : deep_model_ty0 . inv5 i -> get0 ( * l) i = get0 ( ^ l) i \/ i = deep_model0 key) /\ no_double_binding0 ( ^ l) -> no_double_binding0 ( ^ Snapshot.inner old_l) };
+    invariant { [#"../hashmap.rs" 114 8 114 54] (forall i : deep_model_ty0 . inv5 i
+     -> get0 ( * l) i = get0 ( ^ l) i \/ i = deep_model0 key) /\ no_double_binding0 ( ^ l)
+     -> no_double_binding0 ( ^ Snapshot.inner old_l) };
     goto BB8
   }
   BB8 {
@@ -974,7 +989,8 @@ module Hashmap_Impl5_Get
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1142,12 +1158,14 @@ module Hashmap_Impl5_Get
   predicate good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int)
     
    =
-    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv12 k -> get0 l k = Core_Option_Option_Type.C_Some v -> bucket_ix0 self k = h
+    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv12 k  -> get0 l k = Core_Option_Option_Type.C_Some v  -> bucket_ix0 self k = h
   val good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int) : bool
     ensures { result = good_bucket0 self l h }
     
   predicate hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) =
-    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
+    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self))
+     -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
   val hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = hashmap_inv0 self }
     
@@ -1454,7 +1472,8 @@ module Hashmap_Impl5_Resize
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1585,12 +1604,14 @@ module Hashmap_Impl5_Resize
   predicate good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int)
     
    =
-    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv8 v -> inv1 k -> get1 l k = Core_Option_Option_Type.C_Some v -> bucket_ix0 self k = h
+    [#"../hashmap.rs" 201 8 203 9] forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv1 k  -> get1 l k = Core_Option_Option_Type.C_Some v  -> bucket_ix0 self k = h
   val good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) (l : Hashmap_List_Type.t_list (k, v)) (h : int) : bool
     ensures { result = good_bucket0 self l h }
     
   predicate hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) =
-    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
+    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets self))
+     -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
   val hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap k v) : bool
     ensures { result = hashmap_inv0 self }
     
@@ -1600,7 +1621,8 @@ module Hashmap_Impl5_Resize
     requires {[#"../hashmap.rs" 106 26 106 29] inv7 key}
     requires {[#"../hashmap.rs" 106 34 106 37] inv8 val'}
     ensures { [#"../hashmap.rs" 104 14 104 35] hashmap_inv0 ( ^ self) }
-    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : deep_model_ty0 . inv1 i -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model0 key then
+    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : deep_model_ty0 . inv1 i
+     -> Map.get (shallow_model2 ( ^ self)) i = (if i = deep_model0 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model4 self) i
@@ -1630,7 +1652,8 @@ module Hashmap_Impl5_Resize
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Hashmap_List_Type.t_list (k, v))) (fin : Seq.seq (Hashmap_List_Type.t_list (k, v)))
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Hashmap_List_Type.t_list (k, v))) (fin : Seq.seq (Hashmap_List_Type.t_list (k, v))) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -1691,7 +1714,8 @@ module Hashmap_Impl5_Resize
   val new1 [#"../hashmap.rs" 98 4 98 46] (size : usize) : Hashmap_MyHashMap_Type.t_myhashmap k v
     requires {[#"../hashmap.rs" 95 15 95 24] 0 < UIntSize.to_int size}
     ensures { [#"../hashmap.rs" 96 14 96 34] hashmap_inv0 result }
-    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : deep_model_ty0 . inv1 i -> Map.get (shallow_model2 result) i = Core_Option_Option_Type.C_None }
+    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : deep_model_ty0 . inv1 i
+     -> Map.get (shallow_model2 result) i = Core_Option_Option_Type.C_None }
     ensures { [#"../hashmap.rs" 98 31 98 46] inv2 result }
     
   function shallow_model5 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global)) : Seq.seq (Hashmap_List_Type.t_list (k, v))
@@ -1715,7 +1739,8 @@ module Hashmap_Impl5_Resize
     requires {[#"../hashmap.rs" 157 15 157 36] hashmap_inv0 ( * self)}
     requires {[#"../hashmap.rs" 161 19 161 23] inv3 self}
     ensures { [#"../hashmap.rs" 158 14 158 35] hashmap_inv0 ( ^ self) }
-    ensures { [#"../hashmap.rs" 159 4 159 74] forall k : deep_model_ty0 . inv1 k -> Map.get (shallow_model2 ( ^ self)) k = Map.get (shallow_model4 self) k }
+    ensures { [#"../hashmap.rs" 159 4 159 74] forall k : deep_model_ty0 . inv1 k
+     -> Map.get (shallow_model2 ( ^ self)) k = Map.get (shallow_model4 self) k }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -1770,9 +1795,14 @@ module Hashmap_Impl5_Resize
     goto BB6
   }
   BB6 {
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i <= bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
-    invariant { [#"../hashmap.rs" 166 8 166 111] forall j : int . UIntSize.to_int i <= j /\ j < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) j = index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)) j };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k
+     -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i
+     -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall k : deep_model_ty0 . inv1 k
+     -> UIntSize.to_int i <= bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)))
+     -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
+    invariant { [#"../hashmap.rs" 166 8 166 111] forall j : int . UIntSize.to_int i <= j /\ j < Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)))
+     -> index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) j = index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)) j };
     invariant { [#"../hashmap.rs" 172 20 172 37] hashmap_inv0 new };
     invariant { [#"../hashmap.rs" 173 20 173 46]  ^ Snapshot.inner old_self =  ^ self };
     invariant { [#"../hashmap.rs" 174 20 174 66] Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) = Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self))) };
@@ -1836,9 +1866,15 @@ module Hashmap_Impl5_Resize
   }
   BB17 {
     invariant { [#"../hashmap.rs" 179 24 179 41] hashmap_inv0 new };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> UIntSize.to_int i < bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self))) -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
-    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = match get1 l k with
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k
+     -> bucket_ix0 ( * Snapshot.inner old_self) k < UIntSize.to_int i
+     -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k
+     -> UIntSize.to_int i < bucket_ix0 ( * Snapshot.inner old_self) k /\ bucket_ix0 ( * Snapshot.inner old_self) k <= Seq.length (shallow_model3 (Hashmap_MyHashMap_Type.myhashmap_buckets ( * Snapshot.inner old_self)))
+     -> Map.get (shallow_model2 new) k = Core_Option_Option_Type.C_None };
+    invariant { [#"../hashmap.rs" 179 12 179 43] forall k : deep_model_ty0 . inv1 k
+     -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i
+     -> Map.get (shallow_model1 old_self) k = match get1 l k with
       | Core_Option_Option_Type.C_None -> Map.get (shallow_model2 new) k
       | Core_Option_Option_Type.C_Some v -> Core_Option_Option_Type.C_Some v
       end };
@@ -1890,7 +1926,9 @@ module Hashmap_Impl5_Resize
   BB25 {
     assert { [@expl:type invariant] inv5 l };
     assume { resolve4 l };
-    assert { [@expl:assertion] [#"../hashmap.rs" 192 12 192 121] forall k : deep_model_ty0 . inv1 k -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
+    assert { [@expl:assertion] [#"../hashmap.rs" 192 12 192 121] forall k : deep_model_ty0 . inv1 k
+     -> bucket_ix0 ( * Snapshot.inner old_self) k = UIntSize.to_int i
+     -> Map.get (shallow_model1 old_self) k = Map.get (shallow_model2 new) k };
     goto BB27
   }
   BB26 {
@@ -1958,7 +1996,8 @@ module Hashmap_Main
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (usize, isize)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (usize, isize)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (usize, isize)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -2116,12 +2155,14 @@ module Hashmap_Main
   predicate good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap usize isize) (l : Hashmap_List_Type.t_list (usize, isize)) (h : int)
     
    =
-    [#"../hashmap.rs" 201 8 203 9] forall v : isize . forall k : int . inv6 v -> inv0 k -> get2 l k = Core_Option_Option_Type.C_Some v -> bucket_ix0 self k = h
+    [#"../hashmap.rs" 201 8 203 9] forall v : isize . forall k : int . inv6 v
+     -> inv0 k  -> get2 l k = Core_Option_Option_Type.C_Some v  -> bucket_ix0 self k = h
   val good_bucket0 [#"../hashmap.rs" 200 4 200 57] (self : Hashmap_MyHashMap_Type.t_myhashmap usize isize) (l : Hashmap_List_Type.t_list (usize, isize)) (h : int) : bool
     ensures { result = good_bucket0 self l h }
     
   predicate hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap usize isize) =
-    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
+    [#"../hashmap.rs" 210 8 213 9] 0 < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 (Hashmap_MyHashMap_Type.myhashmap_buckets self))
+     -> good_bucket0 self (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i) i /\ no_double_binding0 (index_logic0 (Hashmap_MyHashMap_Type.myhashmap_buckets self) i))
   val hashmap_inv0 [#"../hashmap.rs" 209 4 209 33] (self : Hashmap_MyHashMap_Type.t_myhashmap usize isize) : bool
     ensures { result = hashmap_inv0 self }
     
@@ -2131,7 +2172,8 @@ module Hashmap_Main
     requires {[#"../hashmap.rs" 106 26 106 29] inv3 key}
     requires {[#"../hashmap.rs" 106 34 106 37] inv6 val'}
     ensures { [#"../hashmap.rs" 104 14 104 35] hashmap_inv0 ( ^ self) }
-    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : int . inv0 i -> Map.get (shallow_model1 ( ^ self)) i = (if i = deep_model0 key then
+    ensures { [#"../hashmap.rs" 105 4 105 124] forall i : int . inv0 i
+     -> Map.get (shallow_model1 ( ^ self)) i = (if i = deep_model0 key then
       Core_Option_Option_Type.C_Some val'
     else
       Map.get (shallow_model3 self) i
@@ -2157,7 +2199,8 @@ module Hashmap_Main
   val new0 [#"../hashmap.rs" 98 4 98 46] (size : usize) : Hashmap_MyHashMap_Type.t_myhashmap usize isize
     requires {[#"../hashmap.rs" 95 15 95 24] 0 < UIntSize.to_int size}
     ensures { [#"../hashmap.rs" 96 14 96 34] hashmap_inv0 result }
-    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : int . inv0 i -> Map.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
+    ensures { [#"../hashmap.rs" 97 4 97 64] forall i : int . inv0 i
+     -> Map.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
     ensures { [#"../hashmap.rs" 98 31 98 46] inv1 result }
     
   let rec cfg main [#"../hashmap.rs" 217 0 217 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
@@ -2304,7 +2347,9 @@ module Hashmap_Impl0
     
   axiom inv0 : forall x : Hashmap_List_Type.t_list t . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../hashmap.rs" 16 4 16 27] forall self : Hashmap_List_Type.t_list t . inv0 self -> inv0 self /\ (forall result : Hashmap_List_Type.t_list t . inv1 result /\ result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../hashmap.rs" 16 4 16 27] forall self : Hashmap_List_Type.t_list t . inv0 self
+   -> inv0 self /\ (forall result : Hashmap_List_Type.t_list t . inv1 result /\ result = self
+   -> inv1 result /\ result = self)
 end
 module Hashmap_Impl2
   use prelude.UIntSize
@@ -2339,7 +2384,9 @@ module Hashmap_Impl2
     
   use prelude.UInt64
   use prelude.UInt64
-  goal hash_refn : [#"../hashmap.rs" 59 4 59 25] forall self : usize . inv0 self -> (forall result : uint64 . UInt64.to_int result = hash_log0 (deep_model0 self) -> UInt64.to_int result = hash_log0 (deep_model0 self))
+  goal hash_refn : [#"../hashmap.rs" 59 4 59 25] forall self : usize . inv0 self
+   -> (forall result : uint64 . UInt64.to_int result = hash_log0 (deep_model0 self)
+   -> UInt64.to_int result = hash_log0 (deep_model0 self))
 end
 module Hashmap_Impl3
   type k
diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index 88ce6f7b5a..1902e99d20 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -28,7 +28,9 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : t) (y : t) : ()
   val antisym20 (x : t) (y : t) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -36,7 +38,10 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : t) (y : t) : ()
   val antisym10 (x : t) (y : t) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -44,7 +49,10 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : t) (y : t) (z : t) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
   val trans0 (x : t) (y : t) (z : t) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o}
@@ -54,13 +62,19 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : t, y : t, z : t, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : t, y : t, z : t, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : t) : ()
   val refl0 (x : t) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : t) (o : t) : bool
   val gt_log0 (self : t) (o : t) : bool
     ensures { result = gt_log0 self o }
@@ -71,7 +85,9 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : t) (o : t) : bool
   val ge_log0 (self : t) (o : t) : bool
     ensures { result = ge_log0 self o }
@@ -82,7 +98,9 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : t) (o : t) : bool
   val lt_log0 (self : t) (o : t) : bool
     ensures { result = lt_log0 self o }
@@ -93,7 +111,9 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : t) (o : t) : bool
   val le_log0 (self : t) (o : t) : bool
     ensures { result = le_log0 self o }
@@ -104,7 +124,9 @@ module HeapsortGeneric_HeapFragMax_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : t, y : t . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use seq.Seq
   predicate invariant0 (self : Seq.seq t)
   val invariant0 (self : Seq.seq t) : bool
@@ -123,7 +145,8 @@ module HeapsortGeneric_HeapFragMax_Impl
     
   use seq.Seq
   predicate heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq t) (start : int) (end' : int) =
-    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end' -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
+    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end'
+     -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
   val heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq t) (start : int) (end' : int) : bool
     ensures { result = heap_frag0 s start end' }
     
@@ -131,8 +154,12 @@ module HeapsortGeneric_HeapFragMax_Impl
   constant i  : int
   constant end'  : int
   function heap_frag_max [#"../heapsort_generic.rs" 25 0 25 58] (s : Seq.seq t) (i : int) (end' : int) : ()
-  goal vc_heap_frag_max : ([#"../heapsort_generic.rs" 25 30 25 31] inv0 s) -> ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end') -> ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end') -> match i > 0 with
-    | True -> ((([#"../heapsort_generic.rs" 25 30 25 31] inv0 s) && ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= parent0 i /\ parent0 i < end') && ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end')) /\ 0 <= ([#"../heapsort_generic.rs" 24 10 24 11] i) /\ ([#"../heapsort_generic.rs" 24 10 24 11] parent0 i) < ([#"../heapsort_generic.rs" 24 10 24 11] i)) /\ (([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s (parent0 i)) (Seq.get s 0)) -> ([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0)))
+  goal vc_heap_frag_max : ([#"../heapsort_generic.rs" 25 30 25 31] inv0 s)
+   -> ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end')
+   -> ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end')
+   -> match i > 0 with
+    | True -> ((([#"../heapsort_generic.rs" 25 30 25 31] inv0 s) && ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= parent0 i /\ parent0 i < end') && ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end')) /\ 0 <= ([#"../heapsort_generic.rs" 24 10 24 11] i) /\ ([#"../heapsort_generic.rs" 24 10 24 11] parent0 i) < ([#"../heapsort_generic.rs" 24 10 24 11] i)) /\ (([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s (parent0 i)) (Seq.get s 0))
+     -> ([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0)))
     | False -> [#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0)
     end
 end
@@ -262,7 +289,8 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model3 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -293,7 +321,9 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -301,7 +331,10 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -309,7 +342,10 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -320,13 +356,19 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -337,7 +379,9 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -348,7 +392,9 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -359,7 +405,9 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -370,7 +418,9 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant1 (self : deep_model_ty0)
   val invariant1 (self : deep_model_ty0) : bool
     ensures { result = invariant1 self }
@@ -406,14 +456,17 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self}
     ensures { result = deep_model1 self }
     
-  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv9 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> Seq.get (deep_model1 self) i = deep_model3 (index_logic0 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
+  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv9 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+   -> Seq.get (deep_model1 self) i = deep_model3 (index_logic0 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
   function parent0 [#"../heapsort_generic.rs" 10 0 10 24] (i : int) : int =
     [#"../heapsort_generic.rs" 11 4 11 19] div (i + 1) 2 - 1
   val parent0 [#"../heapsort_generic.rs" 10 0 10 24] (i : int) : int
     ensures { result = parent0 i }
     
   predicate heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq deep_model_ty0) (start : int) (end' : int) =
-    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end' -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
+    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end'
+     -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
   val heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq deep_model_ty0) (start : int) (end' : int) : bool
     ensures { result = heap_frag0 s start end' }
     
@@ -434,7 +487,8 @@ module HeapsortGeneric_SiftDown
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   function shallow_model6 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model7 ( * self)
   val shallow_model6 (self : borrowed (slice t)) : Seq.seq t
@@ -539,8 +593,13 @@ module HeapsortGeneric_SiftDown
     requires {[#"../heapsort_generic.rs" 41 33 41 34] inv6 v}
     ensures { [#"../heapsort_generic.rs" 34 10 34 52] heap_frag0 (deep_model1 ( ^ v)) (UIntSize.to_int start) (UIntSize.to_int end') }
     ensures { [#"../heapsort_generic.rs" 35 0 35 36] permutation_of0 (shallow_model3 ( ^ v)) (shallow_model0 v) }
-    ensures { [#"../heapsort_generic.rs" 36 0 37 43] forall i : int . 0 <= i /\ i < UIntSize.to_int start \/ UIntSize.to_int end' <= i /\ i < Seq.length (shallow_model0 v) -> index_logic0 ( * v) i = index_logic0 ( ^ v) i }
-    ensures { [#"../heapsort_generic.rs" 38 0 40 80] forall m : deep_model_ty0 . inv1 m -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 v) j) m) -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model1 ( ^ v)) j) m) }
+    ensures { [#"../heapsort_generic.rs" 36 0 37 43] forall i : int . 0 <= i /\ i < UIntSize.to_int start \/ UIntSize.to_int end' <= i /\ i < Seq.length (shallow_model0 v)
+     -> index_logic0 ( * v) i = index_logic0 ( ^ v) i }
+    ensures { [#"../heapsort_generic.rs" 38 0 40 80] forall m : deep_model_ty0 . inv1 m
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model0 v) j) m)
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model1 ( ^ v)) j) m) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -584,11 +643,19 @@ module HeapsortGeneric_SiftDown
   BB2 {
     invariant { [#"../heapsort_generic.rs" 48 4 48 43] permutation_of0 (shallow_model0 v) (shallow_model1 old_v) };
     invariant { [#"../heapsort_generic.rs" 49 16 49 41] UIntSize.to_int start <= UIntSize.to_int i /\ UIntSize.to_int i < UIntSize.to_int end' };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . 0 <= j /\ j < UIntSize.to_int start \/ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v) -> index_logic0 ( * Snapshot.inner old_v) j = index_logic0 ( * v) j };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall m : deep_model_ty0 . inv1 m -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 (Snapshot.inner old_v)) j) m) -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 v) j) m) };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . UIntSize.to_int start <= parent0 j /\ j < UIntSize.to_int end' /\ UIntSize.to_int i <> parent0 j -> le_log0 (Seq.get (deep_model0 v) j) (Seq.get (deep_model0 v) (parent0 j)) };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 1 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i) -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
-    invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 2 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i) -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . 0 <= j /\ j < UIntSize.to_int start \/ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v)
+     -> index_logic0 ( * Snapshot.inner old_v) j = index_logic0 ( * v) j };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall m : deep_model_ty0 . inv1 m
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model0 (Snapshot.inner old_v)) j) m)
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model0 v) j) m) };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] forall j : int . UIntSize.to_int start <= parent0 j /\ j < UIntSize.to_int end' /\ UIntSize.to_int i <> parent0 j
+     -> le_log0 (Seq.get (deep_model0 v) j) (Seq.get (deep_model0 v) (parent0 j)) };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 1 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i)
+     -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
+    invariant { [#"../heapsort_generic.rs" 48 4 48 43] let c = 2 * UIntSize.to_int i + 2 in c < UIntSize.to_int end' /\ UIntSize.to_int start <= parent0 (UIntSize.to_int i)
+     -> le_log0 (Seq.get (deep_model0 v) c) (Seq.get (deep_model0 v) (parent0 (parent0 c))) };
     goto BB3
   }
   BB3 {
@@ -794,7 +861,8 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model3 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -821,7 +889,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -829,7 +899,10 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -837,7 +910,10 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -848,13 +924,19 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -865,7 +947,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -876,7 +960,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -887,7 +973,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -898,7 +986,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use prelude.Snapshot
   predicate invariant0 (self : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))))
     
@@ -912,7 +1002,8 @@ module HeapsortGeneric_HeapSort
   axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../heapsort_generic.rs" 77 0 77 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) =
-    [#"../heapsort_generic.rs" 78 4 80 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
+    [#"../heapsort_generic.rs" 78 4 80 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u
+     -> le_log0 (Seq.get s i) (Seq.get s j)
   val sorted_range0 [#"../heapsort_generic.rs" 77 0 77 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) : bool
     ensures { result = sorted_range0 s l u }
     
@@ -939,7 +1030,9 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self}
     ensures { result = deep_model1 self }
     
-  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> Seq.get (deep_model1 self) i = deep_model2 (index_logic1 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
+  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+   -> Seq.get (deep_model1 self) i = deep_model2 (index_logic1 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
   let constant max0  : usize = [@vc:do_not_keep_trace] [@vc:sp]
     (18446744073709551615 : usize)
   use seq.Permut
@@ -960,7 +1053,8 @@ module HeapsortGeneric_HeapSort
     ensures { result = parent0 i }
     
   predicate heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq deep_model_ty0) (start : int) (end' : int) =
-    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end' -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
+    [#"../heapsort_generic.rs" 16 4 17 26] forall i : int . start <= parent0 i /\ i < end'
+     -> le_log0 (Seq.get s i) (Seq.get s (parent0 i))
   val heap_frag0 [#"../heapsort_generic.rs" 15 0 15 66] (s : Seq.seq deep_model_ty0) (start : int) (end' : int) : bool
     ensures { result = heap_frag0 s start end' }
     
@@ -978,8 +1072,13 @@ module HeapsortGeneric_HeapSort
     requires {[#"../heapsort_generic.rs" 41 33 41 34] inv1 v}
     ensures { [#"../heapsort_generic.rs" 34 10 34 52] heap_frag0 (deep_model1 ( ^ v)) (UIntSize.to_int start) (UIntSize.to_int end') }
     ensures { [#"../heapsort_generic.rs" 35 0 35 36] permutation_of0 (shallow_model3 ( ^ v)) (shallow_model0 v) }
-    ensures { [#"../heapsort_generic.rs" 36 0 37 43] forall i : int . 0 <= i /\ i < UIntSize.to_int start \/ UIntSize.to_int end' <= i /\ i < Seq.length (shallow_model0 v) -> index_logic1 ( * v) i = index_logic1 ( ^ v) i }
-    ensures { [#"../heapsort_generic.rs" 38 0 40 80] forall m : deep_model_ty0 . inv7 m -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model0 v) j) m) -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end' -> le_log0 (Seq.get (deep_model1 ( ^ v)) j) m) }
+    ensures { [#"../heapsort_generic.rs" 36 0 37 43] forall i : int . 0 <= i /\ i < UIntSize.to_int start \/ UIntSize.to_int end' <= i /\ i < Seq.length (shallow_model0 v)
+     -> index_logic1 ( * v) i = index_logic1 ( ^ v) i }
+    ensures { [#"../heapsort_generic.rs" 38 0 40 80] forall m : deep_model_ty0 . inv7 m
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model0 v) j) m)
+     -> (forall j : int . UIntSize.to_int start <= j /\ j < UIntSize.to_int end'
+     -> le_log0 (Seq.get (deep_model1 ( ^ v)) j) m) }
     
   function heap_frag_max0 [#"../heapsort_generic.rs" 25 0 25 58] (s : Seq.seq deep_model_ty0) (i : int) (end' : int) : ()
     
@@ -994,7 +1093,10 @@ module HeapsortGeneric_HeapSort
     requires {[#"../heapsort_generic.rs" 25 30 25 31] inv6 s}
     ensures { result = heap_frag_max0 s i end' }
     
-  axiom heap_frag_max0_spec : forall s : Seq.seq deep_model_ty0, i : int, end' : int . ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end') -> ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end') -> ([#"../heapsort_generic.rs" 25 30 25 31] inv6 s) -> ([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0))
+  axiom heap_frag_max0_spec : forall s : Seq.seq deep_model_ty0, i : int, end' : int . ([#"../heapsort_generic.rs" 21 11 21 31] heap_frag0 s 0 end')
+   -> ([#"../heapsort_generic.rs" 22 11 22 28] 0 <= i /\ i < end')
+   -> ([#"../heapsort_generic.rs" 25 30 25 31] inv6 s)
+   -> ([#"../heapsort_generic.rs" 23 10 23 22] le_log0 (Seq.get s i) (Seq.get s 0))
   predicate resolve2 (self : borrowed (slice t)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (slice t)) : bool
@@ -1007,7 +1109,8 @@ module HeapsortGeneric_HeapSort
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max1)
+  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max1)
   function shallow_model6 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model7 ( * self)
   val shallow_model6 (self : borrowed (slice t)) : Seq.seq t
@@ -1151,7 +1254,8 @@ module HeapsortGeneric_HeapSort
     invariant { [#"../heapsort_generic.rs" 109 4 109 34] permutation_of0 (shallow_model0 v) (shallow_model1 old_v) };
     invariant { [#"../heapsort_generic.rs" 111 16 111 50] heap_frag0 (deep_model0 v) 0 (UIntSize.to_int end') };
     invariant { [#"../heapsort_generic.rs" 112 16 112 60] sorted_range0 (deep_model0 v) (UIntSize.to_int end') (Seq.length (shallow_model0 v)) };
-    invariant { [#"../heapsort_generic.rs" 109 4 109 34] forall j : int . forall i : int . 0 <= i /\ i < UIntSize.to_int end' /\ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v) -> le_log0 (Seq.get (deep_model0 v) i) (Seq.get (deep_model0 v) j) };
+    invariant { [#"../heapsort_generic.rs" 109 4 109 34] forall j : int . forall i : int . 0 <= i /\ i < UIntSize.to_int end' /\ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v)
+     -> le_log0 (Seq.get (deep_model0 v) i) (Seq.get (deep_model0 v) j) };
     goto BB12
   }
   BB12 {
@@ -1181,7 +1285,8 @@ module HeapsortGeneric_HeapSort
   BB15 {
     assert { [@expl:type invariant] inv4 _37 };
     assume { resolve2 _37 };
-    assert { [@expl:assertion] [#"../heapsort_generic.rs" 119 12 119 59] let _ = heap_frag_max0 (deep_model0 v) 0 (UIntSize.to_int end') in forall j : int . forall i : int . 0 <= i /\ i < UIntSize.to_int end' /\ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v) -> le_log0 (Seq.get (deep_model0 v) i) (Seq.get (deep_model0 v) j) };
+    assert { [@expl:assertion] [#"../heapsort_generic.rs" 119 12 119 59] let _ = heap_frag_max0 (deep_model0 v) 0 (UIntSize.to_int end') in forall j : int . forall i : int . 0 <= i /\ i < UIntSize.to_int end' /\ UIntSize.to_int end' <= j /\ j < Seq.length (shallow_model0 v)
+     -> le_log0 (Seq.get (deep_model0 v) i) (Seq.get (deep_model0 v) j) };
     [#"../heapsort_generic.rs" 123 18 123 19] _43 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 123 18 123 19] v <- { v with current = ( ^ _43) ; };
     assume { inv2 ( ^ _43) };
diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index 95280b1a32..393f7ab249 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -76,7 +76,8 @@ module Hillel_RightPad
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model3 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -176,10 +177,14 @@ module Hillel_RightPad
     requires {[#"../hillel.rs" 16 52 16 55] inv1 pad}
     ensures { [#"../hillel.rs" 10 10 10 62] Seq.length (shallow_model3 ( ^ str)) >= UIntSize.to_int len /\ Seq.length (shallow_model3 ( ^ str)) >= Seq.length (shallow_model1 str) }
     ensures { [#"../hillel.rs" 11 10 11 62] Seq.length (shallow_model3 ( ^ str)) = UIntSize.to_int len \/ Seq.length (shallow_model3 ( ^ str)) = Seq.length (shallow_model1 str) }
-    ensures { [#"../hillel.rs" 12 0 12 62] UIntSize.to_int len <= Seq.length (shallow_model1 str) -> Seq.length (shallow_model3 ( ^ str)) = Seq.length (shallow_model1 str) }
-    ensures { [#"../hillel.rs" 13 0 13 55] UIntSize.to_int len > Seq.length (shallow_model1 str) -> Seq.length (shallow_model3 ( ^ str)) = UIntSize.to_int len }
-    ensures { [#"../hillel.rs" 14 0 14 75] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( ^ str) i = index_logic0 ( * str) i }
-    ensures { [#"../hillel.rs" 15 0 15 75] forall i : int . Seq.length (shallow_model1 str) <= i /\ i < UIntSize.to_int len -> index_logic0 ( ^ str) i = pad }
+    ensures { [#"../hillel.rs" 12 0 12 62] UIntSize.to_int len <= Seq.length (shallow_model1 str)
+     -> Seq.length (shallow_model3 ( ^ str)) = Seq.length (shallow_model1 str) }
+    ensures { [#"../hillel.rs" 13 0 13 55] UIntSize.to_int len > Seq.length (shallow_model1 str)
+     -> Seq.length (shallow_model3 ( ^ str)) = UIntSize.to_int len }
+    ensures { [#"../hillel.rs" 14 0 14 75] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 str)
+     -> index_logic0 ( ^ str) i = index_logic0 ( * str) i }
+    ensures { [#"../hillel.rs" 15 0 15 75] forall i : int . Seq.length (shallow_model1 str) <= i /\ i < UIntSize.to_int len
+     -> index_logic0 ( ^ str) i = pad }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -205,10 +210,14 @@ module Hillel_RightPad
   }
   BB2 {
     invariant { [#"../hillel.rs" 19 16 19 44] Seq.length (shallow_model0 old_str) <= Seq.length (shallow_model1 str) };
-    invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
-    invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model1 str) > UIntSize.to_int len -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
-    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 old_str) -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) i };
-    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . Seq.length (shallow_model0 old_str) <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( * str) i = pad };
+    invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len
+     -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
+    invariant { [#"../hillel.rs" 19 4 19 46] Seq.length (shallow_model1 str) > UIntSize.to_int len
+     -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
+    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 old_str)
+     -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) i };
+    invariant { [#"../hillel.rs" 19 4 19 46] forall i : int . Seq.length (shallow_model0 old_str) <= i /\ i < Seq.length (shallow_model1 str)
+     -> index_logic0 ( * str) i = pad };
     goto BB3
   }
   BB3 {
@@ -282,7 +291,8 @@ module Hillel_LeftPad
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model4 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -338,9 +348,11 @@ module Hillel_LeftPad
     requires {inv2 self}
     requires {inv1 element}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 95 26 95 59] Seq.length (shallow_model4 ( ^ self)) = Seq.length (shallow_model1 self) + 1 }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 96 16 96 89] forall i : int . 0 <= i /\ i < UIntSize.to_int index -> index_logic0 ( ^ self) i = index_logic0 ( * self) i }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 96 16 96 89] forall i : int . 0 <= i /\ i < UIntSize.to_int index
+     -> index_logic0 ( ^ self) i = index_logic0 ( * self) i }
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 97 26 97 52] index_logic0 ( ^ self) (UIntSize.to_int index) = element }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 98 16 98 105] forall i : int . UIntSize.to_int index < i /\ i < Seq.length (shallow_model4 ( ^ self)) -> index_logic0 ( ^ self) i = index_logic0 ( * self) (i - 1) }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 98 16 98 105] forall i : int . UIntSize.to_int index < i /\ i < Seq.length (shallow_model4 ( ^ self))
+     -> index_logic0 ( ^ self) i = index_logic0 ( * self) (i - 1) }
     
   predicate resolve2 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -397,8 +409,10 @@ module Hillel_LeftPad
     requires {[#"../hillel.rs" 33 51 33 54] inv1 pad}
     ensures { [#"../hillel.rs" 29 10 29 62] Seq.length (shallow_model4 ( ^ str)) >= UIntSize.to_int len /\ Seq.length (shallow_model4 ( ^ str)) >= Seq.length (shallow_model1 str) }
     ensures { [#"../hillel.rs" 30 10 30 62] Seq.length (shallow_model4 ( ^ str)) = UIntSize.to_int len \/ Seq.length (shallow_model4 ( ^ str)) = Seq.length (shallow_model1 str) }
-    ensures { [#"../hillel.rs" 31 0 31 90] forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 ( ^ str)) - Seq.length (shallow_model1 str) -> index_logic0 ( ^ str) i = pad }
-    ensures { [#"../hillel.rs" 32 0 32 106] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( ^ str) (i + (Seq.length (shallow_model4 ( ^ str)) - Seq.length (shallow_model1 str))) = index_logic0 ( * str) i }
+    ensures { [#"../hillel.rs" 31 0 31 90] forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 ( ^ str)) - Seq.length (shallow_model1 str)
+     -> index_logic0 ( ^ str) i = pad }
+    ensures { [#"../hillel.rs" 32 0 32 106] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 str)
+     -> index_logic0 ( ^ str) (i + (Seq.length (shallow_model4 ( ^ str)) - Seq.length (shallow_model1 str))) = index_logic0 ( * str) i }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -430,11 +444,15 @@ module Hillel_LeftPad
   }
   BB3 {
     invariant { [#"../hillel.rs" 37 16 37 44] Seq.length (shallow_model0 old_str) <= Seq.length (shallow_model1 str) };
-    invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
-    invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model1 str) > UIntSize.to_int len -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
+    invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model0 old_str) < UIntSize.to_int len
+     -> Seq.length (shallow_model1 str) <= UIntSize.to_int len };
+    invariant { [#"../hillel.rs" 37 4 37 46] Seq.length (shallow_model1 str) > UIntSize.to_int len
+     -> Seq.length (shallow_model1 str) = Seq.length (shallow_model0 old_str) };
     invariant { [#"../hillel.rs" 40 16 40 49] shallow_model3 c = Seq.length (shallow_model1 str) - Seq.length (shallow_model0 old_str) };
-    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . shallow_model3 c <= i /\ i < Seq.length (shallow_model1 str) -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) (i - shallow_model3 c) };
-    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . 0 <= i /\ i < shallow_model3 c -> index_logic0 ( * str) i = pad };
+    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . shallow_model3 c <= i /\ i < Seq.length (shallow_model1 str)
+     -> index_logic0 ( * str) i = index_logic0 ( * Snapshot.inner old_str) (i - shallow_model3 c) };
+    invariant { [#"../hillel.rs" 37 4 37 46] forall i : int . 0 <= i /\ i < shallow_model3 c
+     -> index_logic0 ( * str) i = pad };
     goto BB4
   }
   BB4 {
@@ -506,7 +524,7 @@ module Hillel_SubsetPush_Impl
     ensures { result = contains0 seq elem }
     
   predicate is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq t) (sup : Seq.seq t) =
-    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub -> contains0 sup (Seq.get sub i)
+    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub  -> contains0 sup (Seq.get sub i)
   val is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq t) (sup : Seq.seq t) : bool
     ensures { result = is_subset0 sub sup }
     
@@ -514,7 +532,8 @@ module Hillel_SubsetPush_Impl
   constant s  : Seq.seq t
   constant elem  : t
   function subset_push [#"../hillel.rs" 72 0 72 37] (s : Seq.seq t) (elem : t) : ()
-  goal vc_subset_push : ([#"../hillel.rs" 72 29 72 33] inv1 elem) -> ([#"../hillel.rs" 72 18 72 19] inv0 s) -> ([#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem))
+  goal vc_subset_push : ([#"../hillel.rs" 72 29 72 33] inv1 elem)
+   -> ([#"../hillel.rs" 72 18 72 19] inv0 s)  -> ([#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem))
 end
 module Core_Slice_Iter_Iter_Type
   use prelude.Borrow
@@ -621,7 +640,8 @@ module Hillel_InsertUnique
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv14 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv14 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant8 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv14 (shallow_model3 self)
   val invariant8 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -675,7 +695,8 @@ module Hillel_InsertUnique
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv15 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv15 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv14 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model5 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
+  axiom shallow_model5_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv15 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv14 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model5 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
   function index_logic5 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model5 self) ix
   val index_logic5 [@inline:trivial] (self : slice t) (ix : int) : t
@@ -697,7 +718,9 @@ module Hillel_InsertUnique
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv13 (to_ref_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic5 self i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model0 self))
+  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv13 (to_ref_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic5 self i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model0 self))
   function shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
   val shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
     ensures { result = shallow_model2 self }
@@ -720,7 +743,11 @@ module Hillel_InsertUnique
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv13 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv13 ab) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv13 bc) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv13 ab)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv13 bc)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter t) : () =
     [#"../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
@@ -779,7 +806,9 @@ module Hillel_InsertUnique
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv8 self}
     ensures { result = deep_model3 self }
     
-  axiom deep_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv8 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv9 (deep_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> Seq.get (deep_model3 self) i = deep_model1 (index_logic1 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model3 self))
+  axiom deep_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv8 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv9 (deep_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+   -> Seq.get (deep_model3 self) i = deep_model1 (index_logic1 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model3 self))
   use seq.Seq
   function shallow_model4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : Seq.seq t
    =
@@ -793,7 +822,8 @@ module Hillel_InsertUnique
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 78 26 78 51] shallow_model3 ( ^ self) = Seq.snoc (shallow_model4 self) value }
     
   predicate is_unique0 [#"../hillel.rs" 50 0 50 34] (s : Seq.seq deep_model_ty0) =
-    [#"../hillel.rs" 51 4 53 5] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s -> Seq.get s i = Seq.get s j -> i = j
+    [#"../hillel.rs" 51 4 53 5] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s
+     -> Seq.get s i = Seq.get s j  -> i = j
   val is_unique0 [#"../hillel.rs" 50 0 50 34] (s : Seq.seq deep_model_ty0) : bool
     ensures { result = is_unique0 s }
     
@@ -921,7 +951,7 @@ module Hillel_InsertUnique
     
   use prelude.Snapshot
   predicate is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) =
-    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub -> contains0 sup (Seq.get sub i)
+    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub  -> contains0 sup (Seq.get sub i)
   val is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) : bool
     ensures { result = is_subset0 sub sup }
     
@@ -945,7 +975,8 @@ module Hillel_InsertUnique
     requires {[#"../hillel.rs" 72 29 72 33] inv10 elem}
     ensures { result = subset_push0 s elem }
     
-  axiom subset_push0_spec : forall s : Seq.seq deep_model_ty0, elem : deep_model_ty0 . ([#"../hillel.rs" 72 18 72 19] inv9 s) -> ([#"../hillel.rs" 72 29 72 33] inv10 elem) -> ([#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem))
+  axiom subset_push0_spec : forall s : Seq.seq deep_model_ty0, elem : deep_model_ty0 . ([#"../hillel.rs" 72 18 72 19] inv9 s)
+   -> ([#"../hillel.rs" 72 29 72 33] inv10 elem)  -> ([#"../hillel.rs" 71 10 71 36] is_subset0 s (Seq.snoc s elem))
   let rec cfg insert_unique [#"../hillel.rs" 79 0 79 62] [@cfg:stackify] [@cfg:subregion_analysis] (vec : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) (elem : t) : ()
     requires {[#"../hillel.rs" 74 11 74 38] is_unique0 (deep_model0 vec)}
     requires {[#"../hillel.rs" 79 36 79 39] inv7 vec}
@@ -1035,7 +1066,8 @@ module Hillel_InsertUnique
   BB12 {
     invariant { [#"../hillel.rs" 84 4 84 111] inv3 iter };
     invariant { [#"../hillel.rs" 84 4 84 111] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
-    invariant { [#"../hillel.rs" 84 4 84 111] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced) -> deep_model2 (index_logic0 produced j) <> deep_model1 elem };
+    invariant { [#"../hillel.rs" 84 4 84 111] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced)
+     -> deep_model2 (index_logic0 produced j) <> deep_model1 elem };
     goto BB13
   }
   BB13 {
@@ -1267,7 +1299,8 @@ module Hillel_Unique
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv9 (shallow_model1 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1290,7 +1323,9 @@ module Hillel_Unique
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model2 (Core_Ops_Range_Range_Type.range_start self) <= deep_model2 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model2 (Core_Ops_Range_Range_Type.range_start o) <= deep_model2 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model2 (Core_Ops_Range_Range_Type.range_start o) - deep_model2 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model2 (Seq.get visited i) = deep_model2 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model2 (Core_Ops_Range_Range_Type.range_start self) <= deep_model2 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model2 (Core_Ops_Range_Range_Type.range_start o) <= deep_model2 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model2 (Core_Ops_Range_Range_Type.range_start o) - deep_model2 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model2 (Seq.get visited i) = deep_model2 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -1306,14 +1341,22 @@ module Hillel_Unique
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -1343,7 +1386,8 @@ module Hillel_Unique
     ensures { result = index_logic2 self ix }
     
   predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve2 (index_logic2 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve2 (index_logic2 self i)
   val resolve5 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve5 self }
     
@@ -1354,7 +1398,8 @@ module Hillel_Unique
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   function shallow_model0 (self : slice t) : Seq.seq t =
     [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model3 self
   val shallow_model0 (self : slice t) : Seq.seq t
@@ -1384,7 +1429,7 @@ module Hillel_Unique
     ensures { result = deep_model3 self }
     
   predicate is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) =
-    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub -> contains0 sup (Seq.get sub i)
+    [#"../hillel.rs" 65 4 67 5] forall i : int . 0 <= i /\ i < Seq.length sub  -> contains0 sup (Seq.get sub i)
   val is_subset0 [#"../hillel.rs" 64 0 64 49] (sub : Seq.seq deep_model_ty0) (sup : Seq.seq deep_model_ty0) : bool
     ensures { result = is_subset0 sub sup }
     
@@ -1393,9 +1438,12 @@ module Hillel_Unique
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self}
     ensures { result = deep_model0 self }
     
-  axiom deep_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> Seq.get (deep_model0 self) i = deep_model3 (index_logic2 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model1 self) = Seq.length (deep_model0 self))
+  axiom deep_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+   -> Seq.get (deep_model0 self) i = deep_model3 (index_logic2 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model1 self) = Seq.length (deep_model0 self))
   predicate is_unique0 [#"../hillel.rs" 50 0 50 34] (s : Seq.seq deep_model_ty0) =
-    [#"../hillel.rs" 51 4 53 5] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s -> Seq.get s i = Seq.get s j -> i = j
+    [#"../hillel.rs" 51 4 53 5] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s
+     -> Seq.get s i = Seq.get s j  -> i = j
   val is_unique0 [#"../hillel.rs" 50 0 50 34] (s : Seq.seq deep_model_ty0) : bool
     ensures { result = is_unique0 s }
     
@@ -1446,7 +1494,9 @@ module Hillel_Unique
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv11 self}
     ensures { result = deep_model4 self }
     
-  axiom deep_model4_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 32 4 32 44] inv6 (deep_model4 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 31 4 31 98] forall i : int . 0 <= i /\ i < Seq.length (deep_model4 self) -> Seq.get (deep_model4 self) i = deep_model3 (index_logic4 self i)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 30 14 30 44] Seq.length (shallow_model0 self) = Seq.length (deep_model4 self))
+  axiom deep_model4_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 32 4 32 44] inv6 (deep_model4 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 31 4 31 98] forall i : int . 0 <= i /\ i < Seq.length (deep_model4 self)
+   -> Seq.get (deep_model4 self) i = deep_model3 (index_logic4 self i)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 30 14 30 44] Seq.length (shallow_model0 self) = Seq.length (deep_model4 self))
   function deep_model1 (self : slice t) : Seq.seq deep_model_ty0 =
     [#"../../../../creusot-contracts/src/model.rs" 74 8 74 28] deep_model4 self
   val deep_model1 (self : slice t) : Seq.seq deep_model_ty0
@@ -1668,8 +1718,10 @@ module Hillel_SumRange_Impl
   constant from  : int
   constant to'  : int
   function sum_range [#"../hillel.rs" 122 0 122 54] (seq : Seq.seq uint32) (from : int) (to' : int) : int
-  goal vc_sum_range : ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> match to' - from > 0 with
-    | True -> (([#"../hillel.rs" 120 11 120 53] 0 <= from + 1 /\ from + 1 <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 119 10 119 19] to' - from) /\ ([#"../hillel.rs" 119 10 119 19] to' - (from + 1)) < ([#"../hillel.rs" 119 10 119 19] to' - from)) /\ (([#"../hillel.rs" 121 10 121 21] sum_range seq (from + 1) to' >= 0) -> ([#"../hillel.rs" 121 10 121 21] UInt32.to_int (Seq.get seq from) + sum_range seq (from + 1) to' >= 0))
+  goal vc_sum_range : ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq)
+   -> match to' - from > 0 with
+    | True -> (([#"../hillel.rs" 120 11 120 53] 0 <= from + 1 /\ from + 1 <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 119 10 119 19] to' - from) /\ ([#"../hillel.rs" 119 10 119 19] to' - (from + 1)) < ([#"../hillel.rs" 119 10 119 19] to' - from)) /\ (([#"../hillel.rs" 121 10 121 21] sum_range seq (from + 1) to' >= 0)
+     -> ([#"../hillel.rs" 121 10 121 21] UInt32.to_int (Seq.get seq from) + sum_range seq (from + 1) to' >= 0))
     | False -> [#"../hillel.rs" 121 10 121 21] 0 >= 0
     end
 end
@@ -1690,14 +1742,17 @@ module Hillel_SumRangeSplit_Impl
     requires {[#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq}
     ensures { result = sum_range0 seq from to' }
     
-  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
+  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq)
+   -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
   constant seq  : Seq.seq uint32
   constant from  : int
   constant to'  : int
   constant i  : int
   function sum_range_split [#"../hillel.rs" 134 0 134 61] (seq : Seq.seq uint32) (from : int) (to' : int) (i : int) : ()
-  goal vc_sum_range_split : ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq) -> match i > from with
-    | True -> (([#"../hillel.rs" 132 11 132 63] 0 <= from + 1 /\ from + 1 <= i /\ i <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 131 10 131 18] i - from) /\ ([#"../hillel.rs" 131 10 131 18] i - (from + 1)) < ([#"../hillel.rs" 131 10 131 18] i - from)) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq (from + 1) to' = sum_range0 seq (from + 1) i + sum_range0 seq i to') -> (let _ = sum_range_split seq (from + 1) to' i in [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to'))
+  goal vc_sum_range_split : ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq)
+   -> match i > from with
+    | True -> (([#"../hillel.rs" 132 11 132 63] 0 <= from + 1 /\ from + 1 <= i /\ i <= to' /\ to' <= Seq.length seq) /\ 0 <= ([#"../hillel.rs" 131 10 131 18] i - from) /\ ([#"../hillel.rs" 131 10 131 18] i - (from + 1)) < ([#"../hillel.rs" 131 10 131 18] i - from)) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq (from + 1) to' = sum_range0 seq (from + 1) i + sum_range0 seq i to')
+     -> (let _ = sum_range_split seq (from + 1) to' i in [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to'))
     | False -> [#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to'
     end
 end
@@ -1723,7 +1778,8 @@ module Hillel_Score_Impl
     requires {[#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq}
     ensures { result = sum_range0 seq from to' }
     
-  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
+  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq)
+   -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
   function sum_range_split0 [#"../hillel.rs" 134 0 134 61] (seq : Seq.seq uint32) (from : int) (to' : int) (i : int) : ()
     
   axiom sum_range_split0_def : forall seq : Seq.seq uint32, from : int, to' : int, i : int . sum_range_split0 seq from to' i = ([#"../hillel.rs" 135 4 137 5] if i > from then
@@ -1735,11 +1791,17 @@ module Hillel_Score_Impl
     requires {[#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq}
     ensures { result = sum_range_split0 seq from to' i }
     
-  axiom sum_range_split0_spec : forall seq : Seq.seq uint32, from : int, to' : int, i : int . ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to')
+  axiom sum_range_split0_spec : forall seq : Seq.seq uint32, from : int, to' : int, i : int . ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq)
+   -> ([#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to')
   constant seq  : Seq.seq uint32
   constant i  : int
   function score [#"../hillel.rs" 144 0 144 38] (seq : Seq.seq uint32) (i : int) : int
-  goal vc_score : ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq) -> ([#"../hillel.rs" 132 11 132 63] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq 0 (Seq.length seq) = sum_range0 seq 0 i + sum_range0 seq i (Seq.length seq)) -> (let _ = sum_range_split0 seq 0 (Seq.length seq) i in ([#"../hillel.rs" 120 11 120 53] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq 0 i >= 0) -> ([#"../hillel.rs" 120 11 120 53] 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq i (Seq.length seq) >= 0) -> (let result = abs_diff0 (sum_range0 seq 0 i) (sum_range0 seq i (Seq.length seq)) in ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq -> result = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= result /\ result <= sum_range0 seq 0 (Seq.length seq)))))))
+  goal vc_score : ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq)
+   -> ([#"../hillel.rs" 132 11 132 63] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 133 10 133 85] sum_range0 seq 0 (Seq.length seq) = sum_range0 seq 0 i + sum_range0 seq i (Seq.length seq))
+   -> (let _ = sum_range_split0 seq 0 (Seq.length seq) i in ([#"../hillel.rs" 120 11 120 53] 0 <= 0 /\ 0 <= i /\ i <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq 0 i >= 0)
+   -> ([#"../hillel.rs" 120 11 120 53] 0 <= i /\ i <= Seq.length seq /\ Seq.length seq <= Seq.length seq) /\ (([#"../hillel.rs" 121 10 121 21] sum_range0 seq i (Seq.length seq) >= 0)
+   -> (let result = abs_diff0 (sum_range0 seq 0 i) (sum_range0 seq i (Seq.length seq)) in ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq
+   -> result = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= result /\ result <= sum_range0 seq 0 (Seq.length seq)))))))
 end
 module Hillel_Fulcrum
   use prelude.UIntSize
@@ -1847,7 +1909,9 @@ module Hillel_Fulcrum
   predicate produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces1 self visited o }
     
@@ -1863,14 +1927,22 @@ module Hillel_Fulcrum
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv9 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv9 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv9 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv9 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -1889,7 +1961,8 @@ module Hillel_Fulcrum
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : slice uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : slice uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   function index_logic3 [@inline:trivial] (self : slice uint32) (ix : int) : uint32 =
     [#"../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model4 self) ix
   val index_logic3 [@inline:trivial] (self : slice uint32) (ix : int) : uint32
@@ -1907,7 +1980,9 @@ module Hillel_Fulcrum
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv2 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv2 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv6 (to_ref_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic3 self i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model1 self))
+  axiom to_ref_seq0_spec : forall self : slice uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv6 (to_ref_seq0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic3 self i) && ([#"../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model1 self))
   function shallow_model3 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : slice uint32
   val shallow_model3 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : slice uint32
     ensures { result = shallow_model3 self }
@@ -1930,7 +2005,11 @@ module Hillel_Fulcrum
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv6 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv6 ab) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv6 bc) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv6 ab)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv6 bc)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : () =
     [#"../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
@@ -1987,7 +2066,8 @@ module Hillel_Fulcrum
     requires {[#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq}
     ensures { result = sum_range0 seq from to' }
     
-  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
+  axiom sum_range0_spec : forall seq : Seq.seq uint32, from : int, to' : int . ([#"../hillel.rs" 120 11 120 53] 0 <= from /\ from <= to' /\ to' <= Seq.length seq)
+   -> ([#"../hillel.rs" 121 10 121 21] sum_range0 seq from to' >= 0)
   function sum_range_split0 [#"../hillel.rs" 134 0 134 61] (seq : Seq.seq uint32) (from : int) (to' : int) (i : int) : ()
     
   axiom sum_range_split0_def : forall seq : Seq.seq uint32, from : int, to' : int, i : int . sum_range_split0 seq from to' i = ([#"../hillel.rs" 135 4 137 5] if i > from then
@@ -1999,14 +2079,17 @@ module Hillel_Fulcrum
     requires {[#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq}
     ensures { result = sum_range_split0 seq from to' i }
     
-  axiom sum_range_split0_spec : forall seq : Seq.seq uint32, from : int, to' : int, i : int . ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq) -> ([#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to')
+  axiom sum_range_split0_spec : forall seq : Seq.seq uint32, from : int, to' : int, i : int . ([#"../hillel.rs" 132 11 132 63] 0 <= from /\ from <= i /\ i <= to' /\ to' <= Seq.length seq)
+   -> ([#"../hillel.rs" 133 10 133 85] sum_range0 seq from to' = sum_range0 seq from i + sum_range0 seq i to')
   function score0 [#"../hillel.rs" 144 0 144 38] (seq : Seq.seq uint32) (i : int) : int =
     [#"../hillel.rs" 145 4 145 41] let _ = sum_range_split0 seq 0 (Seq.length seq) i in abs_diff1 (sum_range0 seq 0 i) (sum_range0 seq i (Seq.length seq))
   val score0 [#"../hillel.rs" 144 0 144 38] (seq : Seq.seq uint32) (i : int) : int
     requires {[#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq}
     ensures { result = score0 seq i }
     
-  axiom score0_spec : forall seq : Seq.seq uint32, i : int . ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq) -> ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq -> score0 seq i = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= score0 seq i /\ score0 seq i <= sum_range0 seq 0 (Seq.length seq))
+  axiom score0_spec : forall seq : Seq.seq uint32, i : int . ([#"../hillel.rs" 141 11 141 35] 0 <= i /\ i <= Seq.length seq)
+   -> ([#"../hillel.rs" 143 0 143 79] 0 = i \/ i = Seq.length seq
+   -> score0 seq i = sum_range0 seq 0 (Seq.length seq)) && ([#"../hillel.rs" 142 10 142 64] 0 <= score0 seq i /\ score0 seq i <= sum_range0 seq 0 (Seq.length seq))
   use prelude.Snapshot
   use prelude.Snapshot
   use prelude.Snapshot
@@ -2082,7 +2165,8 @@ module Hillel_Fulcrum
     requires {[#"../hillel.rs" 152 11 152 45] sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) <= 1000}
     requires {[#"../hillel.rs" 153 11 153 23] Seq.length (shallow_model1 s) > 0}
     ensures { [#"../hillel.rs" 154 10 154 44] 0 <= UIntSize.to_int result /\ UIntSize.to_int result < Seq.length (shallow_model1 s) }
-    ensures { [#"../hillel.rs" 155 0 155 88] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s) -> score0 (shallow_model1 s) (UIntSize.to_int result) <= score0 (shallow_model1 s) i }
+    ensures { [#"../hillel.rs" 155 0 155 88] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s)
+     -> score0 (shallow_model1 s) (UIntSize.to_int result) <= score0 (shallow_model1 s) i }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : usize;
@@ -2214,7 +2298,8 @@ module Hillel_Fulcrum
     invariant { [#"../hillel.rs" 172 16 172 30] UInt32.to_int sum <= UInt32.to_int total };
     invariant { [#"../hillel.rs" 173 16 173 61] UIntSize.to_int min_i <= Seq.length (Snapshot.inner produced1) /\ UIntSize.to_int min_i < Seq.length (shallow_model1 s) };
     invariant { [#"../hillel.rs" 174 16 174 46] UInt32.to_int min_dist = score0 (shallow_model1 s) (UIntSize.to_int min_i) };
-    invariant { [#"../hillel.rs" 171 4 171 58] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced1) -> score0 (shallow_model1 s) (UIntSize.to_int min_i) <= score0 (shallow_model1 s) j };
+    invariant { [#"../hillel.rs" 171 4 171 58] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced1)
+     -> score0 (shallow_model1 s) (UIntSize.to_int min_i) <= score0 (shallow_model1 s) j };
     goto BB17
   }
   BB17 {
diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg
index 9a386a260e..462f0884b0 100644
--- a/creusot/tests/should_succeed/index_range.mlcfg
+++ b/creusot/tests/should_succeed/index_range.mlcfg
@@ -89,7 +89,8 @@ module IndexRange_CreateArr
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -250,7 +251,8 @@ module IndexRange_TestRange
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model0 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -385,7 +387,8 @@ module IndexRange_TestRange
   predicate resolve_elswhere0 (self : Core_Ops_Range_Range_Type.t_range usize) (old' : Seq.seq int32) (fin : Seq.seq int32)
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 149 8 152 9] forall i : int . 0 <= i /\ (i < UIntSize.to_int (Core_Ops_Range_Range_Type.range_start self) \/ UIntSize.to_int (Core_Ops_Range_Range_Type.range_end self) <= i) /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 149 8 152 9] forall i : int . 0 <= i /\ (i < UIntSize.to_int (Core_Ops_Range_Range_Type.range_start self) \/ UIntSize.to_int (Core_Ops_Range_Range_Type.range_end self) <= i) /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 (self : Core_Ops_Range_Range_Type.t_range usize) (old' : Seq.seq int32) (fin : Seq.seq int32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -395,7 +398,8 @@ module IndexRange_TestRange
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   use seq_ext.SeqExt
   predicate has_value0 (self : Core_Ops_Range_Range_Type.t_range usize) (seq : Seq.seq int32) (out : slice int32) =
     [#"../../../../creusot-contracts/src/std/slice.rs" 143 20 143 67] SeqExt.subsequence seq (UIntSize.to_int (Core_Ops_Range_Range_Type.range_start self)) (UIntSize.to_int (Core_Ops_Range_Range_Type.range_end self)) = shallow_model6 out
@@ -436,7 +440,8 @@ module IndexRange_TestRange
   val get0 (self : slice int32) (index : Core_Ops_Range_Range_Type.t_range usize) : Core_Option_Option_Type.t_option (slice int32)
     requires {inv2 self}
     requires {inv1 index}
-    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self) -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
+    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self)
+     -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
     ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 253 18 253 55] in_bounds0 index (shallow_model3 self) \/ result = Core_Option_Option_Type.C_None }
     ensures { inv3 result }
     
@@ -458,7 +463,8 @@ module IndexRange_TestRange
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -1061,7 +1067,8 @@ module IndexRange_TestRangeTo
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model0 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1196,7 +1203,8 @@ module IndexRange_TestRangeTo
   predicate resolve_elswhere0 (self : Core_Ops_Range_RangeTo_Type.t_rangeto usize) (old' : Seq.seq int32) (fin : Seq.seq int32)
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 172 8 172 90] forall i : int . UIntSize.to_int (Core_Ops_Range_RangeTo_Type.rangeto_end self) <= i /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 172 8 172 90] forall i : int . UIntSize.to_int (Core_Ops_Range_RangeTo_Type.rangeto_end self) <= i /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 (self : Core_Ops_Range_RangeTo_Type.t_rangeto usize) (old' : Seq.seq int32) (fin : Seq.seq int32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -1206,7 +1214,8 @@ module IndexRange_TestRangeTo
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   use seq_ext.SeqExt
   predicate has_value0 (self : Core_Ops_Range_RangeTo_Type.t_rangeto usize) (seq : Seq.seq int32) (out : slice int32) =
     [#"../../../../creusot-contracts/src/std/slice.rs" 166 20 166 57] SeqExt.subsequence seq 0 (UIntSize.to_int (Core_Ops_Range_RangeTo_Type.rangeto_end self)) = shallow_model6 out
@@ -1247,7 +1256,8 @@ module IndexRange_TestRangeTo
   val get0 (self : slice int32) (index : Core_Ops_Range_RangeTo_Type.t_rangeto usize) : Core_Option_Option_Type.t_option (slice int32)
     requires {inv2 self}
     requires {inv1 index}
-    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self) -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
+    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self)
+     -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
     ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 253 18 253 55] in_bounds0 index (shallow_model3 self) \/ result = Core_Option_Option_Type.C_None }
     ensures { inv3 result }
     
@@ -1269,7 +1279,8 @@ module IndexRange_TestRangeTo
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -1682,7 +1693,8 @@ module IndexRange_TestRangeFrom
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model0 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1817,7 +1829,8 @@ module IndexRange_TestRangeFrom
   predicate resolve_elswhere0 (self : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize) (old' : Seq.seq int32) (fin : Seq.seq int32)
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 192 8 194 9] forall i : int . 0 <= i /\ i < UIntSize.to_int (Core_Ops_Range_RangeFrom_Type.rangefrom_start self) /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 192 8 194 9] forall i : int . 0 <= i /\ i < UIntSize.to_int (Core_Ops_Range_RangeFrom_Type.rangefrom_start self) /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 (self : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize) (old' : Seq.seq int32) (fin : Seq.seq int32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -1827,7 +1840,8 @@ module IndexRange_TestRangeFrom
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   use seq_ext.SeqExt
   predicate has_value0 (self : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize) (seq : Seq.seq int32) (out : slice int32)
     
@@ -1870,7 +1884,8 @@ module IndexRange_TestRangeFrom
   val get0 (self : slice int32) (index : Core_Ops_Range_RangeFrom_Type.t_rangefrom usize) : Core_Option_Option_Type.t_option (slice int32)
     requires {inv2 self}
     requires {inv1 index}
-    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self) -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
+    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self)
+     -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
     ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 253 18 253 55] in_bounds0 index (shallow_model3 self) \/ result = Core_Option_Option_Type.C_None }
     ensures { inv3 result }
     
@@ -1892,7 +1907,8 @@ module IndexRange_TestRangeFrom
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -2331,7 +2347,8 @@ module IndexRange_TestRangeFull
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model0 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -2455,7 +2472,8 @@ module IndexRange_TestRangeFull
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   predicate has_value0 (self : Core_Ops_Range_RangeFull_Type.t_rangefull) (seq : Seq.seq int32) (out : slice int32) =
     [#"../../../../creusot-contracts/src/std/slice.rs" 208 20 208 31] seq = shallow_model6 out
   val has_value0 (self : Core_Ops_Range_RangeFull_Type.t_rangefull) (seq : Seq.seq int32) (out : slice int32) : bool
@@ -2496,7 +2514,8 @@ module IndexRange_TestRangeFull
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -2902,7 +2921,8 @@ module IndexRange_TestRangeToInclusive
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model0 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -3037,7 +3057,8 @@ module IndexRange_TestRangeToInclusive
   predicate resolve_elswhere0 (self : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize) (old' : Seq.seq int32) (fin : Seq.seq int32)
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 234 8 234 89] forall i : int . UIntSize.to_int (Core_Ops_Range_RangeToInclusive_Type.rangetoinclusive_end self) < i /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 234 8 234 89] forall i : int . UIntSize.to_int (Core_Ops_Range_RangeToInclusive_Type.rangetoinclusive_end self) < i /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 (self : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize) (old' : Seq.seq int32) (fin : Seq.seq int32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -3047,7 +3068,8 @@ module IndexRange_TestRangeToInclusive
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice int32 . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv11 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv10 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   use seq_ext.SeqExt
   predicate has_value0 (self : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize) (seq : Seq.seq int32) (out : slice int32)
     
@@ -3090,7 +3112,8 @@ module IndexRange_TestRangeToInclusive
   val get0 (self : slice int32) (index : Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize) : Core_Option_Option_Type.t_option (slice int32)
     requires {inv2 self}
     requires {inv1 index}
-    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self) -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
+    ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 252 8 252 102] in_bounds0 index (shallow_model3 self)
+     -> (exists r : slice int32 . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\ has_value0 index (shallow_model3 self) r) }
     ensures { [#"../../../../creusot-contracts/src/std/slice.rs" 253 18 253 55] in_bounds0 index (shallow_model3 self) \/ result = Core_Option_Option_Type.C_None }
     ensures { inv3 result }
     
@@ -3112,7 +3135,8 @@ module IndexRange_TestRangeToInclusive
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg
index f1b83118ea..ce4b8c6105 100644
--- a/creusot/tests/should_succeed/instant.mlcfg
+++ b/creusot/tests/should_succeed/instant.mlcfg
@@ -201,7 +201,9 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv4 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : ()
   val antisym20 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -209,7 +211,10 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv4 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : ()
   val antisym10 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -217,7 +222,10 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv4 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) (z : Core_Option_Option_Type.t_option int) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : Core_Option_Option_Type.t_option int) (y : Core_Option_Option_Type.t_option int) (z : Core_Option_Option_Type.t_option int) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -228,13 +236,19 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv4 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int, z : Core_Option_Option_Type.t_option int, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv4 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int, z : Core_Option_Option_Type.t_option int, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv4 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : Core_Option_Option_Type.t_option int) : ()
   val refl0 (x : Core_Option_Option_Type.t_option int) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv4 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool =
     [#"../../../../creusot-contracts/src/logic/ord.rs" 41 20 41 56] cmp_log0 self o = Core_Cmp_Ordering_Type.C_Greater
   val gt_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool
@@ -246,7 +260,9 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv4 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log1 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool =
     [#"../../../../creusot-contracts/src/logic/ord.rs" 31 20 31 53] cmp_log0 self o <> Core_Cmp_Ordering_Type.C_Less
   val ge_log1 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool
@@ -258,7 +274,9 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv4 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log1 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log1 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool =
     [#"../../../../creusot-contracts/src/logic/ord.rs" 21 20 21 53] cmp_log0 self o = Core_Cmp_Ordering_Type.C_Less
   val lt_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool
@@ -270,7 +288,9 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv4 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool =
     [#"../../../../creusot-contracts/src/logic/ord.rs" 11 20 11 56] cmp_log0 self o <> Core_Cmp_Ordering_Type.C_Greater
   val le_log0 (self : Core_Option_Option_Type.t_option int) (o : Core_Option_Option_Type.t_option int) : bool
@@ -282,7 +302,9 @@ module Instant_TestInstant
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv4 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv4 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv4 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : Core_Option_Option_Type.t_option int, y : Core_Option_Option_Type.t_option int . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv4 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv4 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant0 (self : Core_Time_Duration_Type.t_duration) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Time_Duration_Type.t_duration) : bool
@@ -318,8 +340,10 @@ module Instant_TestInstant
     ensures { result = shallow_model3 self }
     
   val saturating_duration_since0 (self : Std_Time_Instant_Type.t_instant) (earlier : Std_Time_Instant_Type.t_instant) : Core_Time_Duration_Type.t_duration
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 157 16 157 60] shallow_model3 self > shallow_model0 earlier -> shallow_model1 result > 0 }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 158 16 158 62] shallow_model3 self <= shallow_model0 earlier -> shallow_model1 result = 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 157 16 157 60] shallow_model3 self > shallow_model0 earlier
+     -> shallow_model1 result > 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 158 16 158 62] shallow_model3 self <= shallow_model0 earlier
+     -> shallow_model1 result = 0 }
     
   val is_none0 (self : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)) : bool
     requires {inv3 self}
@@ -330,12 +354,16 @@ module Instant_TestInstant
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 33 26 33 51] result = (self <> Core_Option_Option_Type.C_None) }
     
   val checked_duration_since0 (self : Std_Time_Instant_Type.t_instant) (earlier : Std_Time_Instant_Type.t_instant) : Core_Option_Option_Type.t_option (Core_Time_Duration_Type.t_duration)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 153 16 153 64] shallow_model3 self >= shallow_model0 earlier -> result <> Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 154 16 154 63] shallow_model3 self < shallow_model0 earlier -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 153 16 153 64] shallow_model3 self >= shallow_model0 earlier
+     -> result <> Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 154 16 154 63] shallow_model3 self < shallow_model0 earlier
+     -> result = Core_Option_Option_Type.C_None }
     
   val duration_since0 (self : Std_Time_Instant_Type.t_instant) (earlier : Std_Time_Instant_Type.t_instant) : Core_Time_Duration_Type.t_duration
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 149 16 149 60] shallow_model3 self > shallow_model0 earlier -> shallow_model1 result > 0 }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 150 16 150 62] shallow_model3 self <= shallow_model0 earlier -> shallow_model1 result = 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 149 16 149 60] shallow_model3 self > shallow_model0 earlier
+     -> shallow_model1 result > 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 150 16 150 62] shallow_model3 self <= shallow_model0 earlier
+     -> shallow_model1 result = 0 }
     
   use int.Int
   function deep_model3 (self : Core_Time_Duration_Type.t_duration) : int
@@ -357,12 +385,16 @@ module Instant_TestInstant
     ensures { [#"../../../../creusot-contracts/src/std/cmp.rs" 11 26 11 75] result = (deep_model0 self = deep_model0 other) }
     
   val sub1 (self : Std_Time_Instant_Type.t_instant) (other : Std_Time_Instant_Type.t_instant) : Core_Time_Duration_Type.t_duration
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 199 8 199 50] shallow_model0 self > shallow_model0 other -> shallow_model1 result > 0 }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 200 8 200 52] shallow_model0 self <= shallow_model0 other -> shallow_model1 result = 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 199 8 199 50] shallow_model0 self > shallow_model0 other
+     -> shallow_model1 result > 0 }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 200 8 200 52] shallow_model0 self <= shallow_model0 other
+     -> shallow_model1 result = 0 }
     
   val sub0 (self : Std_Time_Instant_Type.t_instant) (other : Core_Time_Duration_Type.t_duration) : Std_Time_Instant_Type.t_instant
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 193 8 193 50] shallow_model1 other = 0 -> shallow_model0 self = shallow_model0 result }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 194 8 194 48] shallow_model1 other > 0 -> shallow_model0 self > shallow_model0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 193 8 193 50] shallow_model1 other = 0
+     -> shallow_model0 self = shallow_model0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 194 8 194 48] shallow_model1 other > 0
+     -> shallow_model0 self > shallow_model0 result }
     
   function deep_model4 (self : Std_Time_Instant_Type.t_instant) : int
   val deep_model4 (self : Std_Time_Instant_Type.t_instant) : int
@@ -380,12 +412,16 @@ module Instant_TestInstant
     ensures { result = deep_model1 self }
     
   val checked_sub0 (self : Std_Time_Instant_Type.t_instant) (duration : Core_Time_Duration_Type.t_duration) : Core_Option_Option_Type.t_option (Std_Time_Instant_Type.t_instant)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 165 16 165 81] shallow_model1 duration = 0 -> deep_model1 result = Core_Option_Option_Type.C_Some (shallow_model3 self) }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 166 16 166 97] shallow_model1 duration > 0 /\ result <> Core_Option_Option_Type.C_None -> gt_log0 (Core_Option_Option_Type.C_Some (shallow_model3 self)) (deep_model1 result) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 165 16 165 81] shallow_model1 duration = 0
+     -> deep_model1 result = Core_Option_Option_Type.C_Some (shallow_model3 self) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 166 16 166 97] shallow_model1 duration > 0 /\ result <> Core_Option_Option_Type.C_None
+     -> gt_log0 (Core_Option_Option_Type.C_Some (shallow_model3 self)) (deep_model1 result) }
     
   val add0 (self : Std_Time_Instant_Type.t_instant) (other : Core_Time_Duration_Type.t_duration) : Std_Time_Instant_Type.t_instant
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 187 8 187 50] shallow_model1 other = 0 -> shallow_model0 self = shallow_model0 result }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 188 8 188 48] shallow_model1 other > 0 -> shallow_model0 self < shallow_model0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 187 8 187 50] shallow_model1 other = 0
+     -> shallow_model0 self = shallow_model0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 188 8 188 48] shallow_model1 other > 0
+     -> shallow_model0 self < shallow_model0 result }
     
   function deep_model2 (self : Std_Time_Instant_Type.t_instant) : int =
     [#"../../../../creusot-contracts/src/model.rs" 74 8 74 28] deep_model4 self
@@ -402,8 +438,10 @@ module Instant_TestInstant
     ensures { inv2 result }
     
   val checked_add0 (self : Std_Time_Instant_Type.t_instant) (duration : Core_Time_Duration_Type.t_duration) : Core_Option_Option_Type.t_option (Std_Time_Instant_Type.t_instant)
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 161 16 161 81] shallow_model1 duration = 0 -> deep_model1 result = Core_Option_Option_Type.C_Some (shallow_model3 self) }
-    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 162 16 162 97] shallow_model1 duration > 0 /\ result <> Core_Option_Option_Type.C_None -> lt_log0 (Core_Option_Option_Type.C_Some (shallow_model3 self)) (deep_model1 result) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 161 16 161 81] shallow_model1 duration = 0
+     -> deep_model1 result = Core_Option_Option_Type.C_Some (shallow_model3 self) }
+    ensures { [#"../../../../creusot-contracts/src/std/time.rs" 162 16 162 97] shallow_model1 duration > 0 /\ result <> Core_Option_Option_Type.C_None
+     -> lt_log0 (Core_Option_Option_Type.C_Some (shallow_model3 self)) (deep_model1 result) }
     
   use int.Int
   val ge0 (self : Core_Time_Duration_Type.t_duration) (other : Core_Time_Duration_Type.t_duration) : bool
diff --git a/creusot/tests/should_succeed/invariant_moves.mlcfg b/creusot/tests/should_succeed/invariant_moves.mlcfg
index fb368a8e57..e8632bd56b 100644
--- a/creusot/tests/should_succeed/invariant_moves.mlcfg
+++ b/creusot/tests/should_succeed/invariant_moves.mlcfg
@@ -74,7 +74,8 @@ module InvariantMoves_TestInvariantMove
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -117,7 +118,8 @@ module InvariantMoves_TestInvariantMove
     ensures { result = index_logic0 self ix }
     
   predicate resolve1 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve1 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve1 self }
     
diff --git a/creusot/tests/should_succeed/ite_normalize.mlcfg b/creusot/tests/should_succeed/ite_normalize.mlcfg
index a81e0e39cc..bc16d1b8af 100644
--- a/creusot/tests/should_succeed/ite_normalize.mlcfg
+++ b/creusot/tests/should_succeed/ite_normalize.mlcfg
@@ -771,7 +771,8 @@ module IteNormalize_Impl5_SimplifyHelper
   val insert0 [#"../ite_normalize.rs" 28 4 30 15] (self : borrowed (IteNormalize_BTreeMap_Type.t_btreemap usize bool)) (key : usize) (value : bool) : Core_Option_Option_Type.t_option bool
     requires {[#"../ite_normalize.rs" 28 25 28 28] inv3 key}
     requires {[#"../ite_normalize.rs" 28 33 28 38] inv4 value}
-    ensures { [#"../ite_normalize.rs" 27 4 27 125] forall i : int . inv5 i -> Map.get (shallow_model0 ( ^ self)) i = (if i = deep_model1 key then
+    ensures { [#"../ite_normalize.rs" 27 4 27 125] forall i : int . inv5 i
+     -> Map.get (shallow_model0 ( ^ self)) i = (if i = deep_model1 key then
       Core_Option_Option_Type.C_Some value
     else
       Map.get (shallow_model3 self) i
@@ -805,13 +806,17 @@ module IteNormalize_Impl5_SimplifyHelper
     
   val get0 [#"../ite_normalize.rs" 19 4 21 15] (self : IteNormalize_BTreeMap_Type.t_btreemap usize bool) (key : usize) : Core_Option_Option_Type.t_option bool
     requires {[#"../ite_normalize.rs" 19 25 19 28] inv0 key}
-    ensures { [#"../ite_normalize.rs" 17 4 17 70] result = Core_Option_Option_Type.C_None -> Map.get (shallow_model2 self) (deep_model0 key) = Core_Option_Option_Type.C_None }
-    ensures { [#"../ite_normalize.rs" 18 4 18 91] forall v : bool . inv1 v -> result = Core_Option_Option_Type.C_Some v -> Map.get (shallow_model2 self) (deep_model0 key) = Core_Option_Option_Type.C_Some v }
+    ensures { [#"../ite_normalize.rs" 17 4 17 70] result = Core_Option_Option_Type.C_None
+     -> Map.get (shallow_model2 self) (deep_model0 key) = Core_Option_Option_Type.C_None }
+    ensures { [#"../ite_normalize.rs" 18 4 18 91] forall v : bool . inv1 v
+     -> result = Core_Option_Option_Type.C_Some v
+     -> Map.get (shallow_model2 self) (deep_model0 key) = Core_Option_Option_Type.C_Some v }
     ensures { [#"../ite_normalize.rs" 19 40 19 53] inv2 result }
     
   let rec cfg simplify_helper [#"../ite_normalize.rs" 189 4 189 66] [@cfg:stackify] [@cfg:subregion_analysis] (self : IteNormalize_Expr_Type.t_expr) (state : IteNormalize_BTreeMap_Type.t_btreemap usize bool) : IteNormalize_Expr_Type.t_expr
     requires {[#"../ite_normalize.rs" 185 15 185 35] is_normalized0 self}
-    ensures { [#"../ite_normalize.rs" 186 4 186 107] forall i : usize . (exists v : bool . Map.get (shallow_model0 state) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v) -> does_not_contain0 result i }
+    ensures { [#"../ite_normalize.rs" 186 4 186 107] forall i : usize . (exists v : bool . Map.get (shallow_model0 state) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v)
+     -> does_not_contain0 result i }
     ensures { [#"../ite_normalize.rs" 187 14 187 36] is_simplified0 result }
     variant {[#"../ite_normalize.rs" 188 14 188 18] self}
     
@@ -1142,7 +1147,8 @@ module IteNormalize_Impl5_Simplify
     
   val simplify_helper0 [#"../ite_normalize.rs" 189 4 189 66] (self : IteNormalize_Expr_Type.t_expr) (state : IteNormalize_BTreeMap_Type.t_btreemap usize bool) : IteNormalize_Expr_Type.t_expr
     requires {[#"../ite_normalize.rs" 185 15 185 35] is_normalized0 self}
-    ensures { [#"../ite_normalize.rs" 186 4 186 107] forall i : usize . (exists v : bool . Map.get (shallow_model0 state) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v) -> does_not_contain0 result i }
+    ensures { [#"../ite_normalize.rs" 186 4 186 107] forall i : usize . (exists v : bool . Map.get (shallow_model0 state) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v)
+     -> does_not_contain0 result i }
     ensures { [#"../ite_normalize.rs" 187 14 187 36] is_simplified0 result }
     
   val new0 [#"../ite_normalize.rs" 12 4 12 20] (_1 : ()) : IteNormalize_BTreeMap_Type.t_btreemap usize bool
@@ -1201,7 +1207,8 @@ module IteNormalize_Impl1
     
   axiom inv0 : forall x : IteNormalize_BTreeMap_Type.t_btreemap k v . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../ite_normalize.rs" 39 4 39 27] forall self : IteNormalize_BTreeMap_Type.t_btreemap k v . inv0 self -> (forall result : IteNormalize_BTreeMap_Type.t_btreemap k v . self = result -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../ite_normalize.rs" 39 4 39 27] forall self : IteNormalize_BTreeMap_Type.t_btreemap k v . inv0 self
+   -> (forall result : IteNormalize_BTreeMap_Type.t_btreemap k v . self = result  -> inv1 result /\ result = self)
 end
 module IteNormalize_Impl6
   use IteNormalize_Expr_Type as IteNormalize_Expr_Type
@@ -1226,7 +1233,8 @@ module IteNormalize_Impl6
     
   axiom inv0 : forall x : IteNormalize_Expr_Type.t_expr . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../ite_normalize.rs" 55 9 55 14] forall self : IteNormalize_Expr_Type.t_expr . inv0 self -> (forall result : IteNormalize_Expr_Type.t_expr . result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../ite_normalize.rs" 55 9 55 14] forall self : IteNormalize_Expr_Type.t_expr . inv0 self
+   -> (forall result : IteNormalize_Expr_Type.t_expr . result = self  -> inv1 result /\ result = self)
 end
 module IteNormalize_Impl2
   type k
@@ -1259,7 +1267,8 @@ module IteNormalize_Impl3
     
   axiom inv0 : forall x : usize . inv0 x = true
   use prelude.Int
-  goal from_refn : [#"../ite_normalize.rs" 80 4 80 29] forall value : usize . inv0 value -> (forall result : IteNormalize_Expr_Type.t_expr . inv1 result)
+  goal from_refn : [#"../ite_normalize.rs" 80 4 80 29] forall value : usize . inv0 value
+   -> (forall result : IteNormalize_Expr_Type.t_expr . inv1 result)
 end
 module IteNormalize_Impl4
   use IteNormalize_Expr_Type as IteNormalize_Expr_Type
@@ -1283,5 +1292,6 @@ module IteNormalize_Impl4
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : bool . inv0 x = true
-  goal from_refn : [#"../ite_normalize.rs" 86 4 86 28] forall value : bool . inv0 value -> (forall result : IteNormalize_Expr_Type.t_expr . inv1 result)
+  goal from_refn : [#"../ite_normalize.rs" 86 4 86 28] forall value : bool . inv0 value
+   -> (forall result : IteNormalize_Expr_Type.t_expr . inv1 result)
 end
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 8a039a6a18..cbd437911f 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -25,7 +25,9 @@ module C01Range_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
-    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0 -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
+    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0
+     -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
@@ -46,7 +48,9 @@ module C01Range_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
-    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0 -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
+    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0
+     -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
@@ -57,7 +61,9 @@ module C01Range_Impl0_ProducesTrans_Impl
   constant c  : C01Range_Range_Type.t_range
   function produces_trans [#"../01_range.rs" 51 4 51 90] (a : C01Range_Range_Type.t_range) (ab : Seq.seq isize) (b : C01Range_Range_Type.t_range) (bc : Seq.seq isize) (c : C01Range_Range_Type.t_range) : ()
     
-  goal vc_produces_trans : ([#"../01_range.rs" 49 15 49 32] produces0 b bc c) -> ([#"../01_range.rs" 48 15 48 32] produces0 a ab b) -> ([#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../01_range.rs" 49 15 49 32] produces0 b bc c)
+   -> ([#"../01_range.rs" 48 15 48 32] produces0 a ab b)
+   -> ([#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -81,7 +87,9 @@ module C01Range_Impl0_Next
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
-    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0 -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
+    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0
+     -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
@@ -166,7 +174,9 @@ module C01Range_SumRange
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
-    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0 -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
+    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0
+     -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
@@ -179,7 +189,9 @@ module C01Range_SumRange
     requires {[#"../01_range.rs" 49 15 49 32] produces0 b bc c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C01Range_Range_Type.t_range, ab : Seq.seq isize, b : C01Range_Range_Type.t_range, bc : Seq.seq isize, c : C01Range_Range_Type.t_range . ([#"../01_range.rs" 48 15 48 32] produces0 a ab b) -> ([#"../01_range.rs" 49 15 49 32] produces0 b bc c) -> ([#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C01Range_Range_Type.t_range, ab : Seq.seq isize, b : C01Range_Range_Type.t_range, bc : Seq.seq isize, c : C01Range_Range_Type.t_range . ([#"../01_range.rs" 48 15 48 32] produces0 a ab b)
+   -> ([#"../01_range.rs" 49 15 49 32] produces0 b bc c)
+   -> ([#"../01_range.rs" 50 14 50 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../01_range.rs" 44 4 44 26] (self : C01Range_Range_Type.t_range) : () =
     [#"../01_range.rs" 41 4 41 10] ()
@@ -371,18 +383,25 @@ module C01Range_Impl0
   predicate produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range)
     
    =
-    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0 -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
+    [#"../01_range.rs" 32 8 38 9] C01Range_Range_Type.range_end self = C01Range_Range_Type.range_end o /\ C01Range_Range_Type.range_start self <= C01Range_Range_Type.range_start o /\ (Seq.length visited > 0
+     -> C01Range_Range_Type.range_start o <= C01Range_Range_Type.range_end o) /\ Seq.length visited = IntSize.to_int (C01Range_Range_Type.range_start o) - IntSize.to_int (C01Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> IntSize.to_int (Seq.get visited i) = IntSize.to_int (C01Range_Range_Type.range_start self) + i)
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv1 self -> (forall result : Core_Option_Option_Type.t_option isize . match result with
+  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self
+   -> (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv1 self
+   -> (forall result : Core_Option_Option_Type.t_option isize . match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end
+   -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index fbc9be83d4..06bbe2d2b1 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -63,7 +63,8 @@ module C02IterMut_Impl1_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant0 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model1 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model1 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -96,18 +97,23 @@ module C02IterMut_Impl1_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv1 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv2 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv2 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
   predicate produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t)
     
    =
-    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
+    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self))
+     ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t) : bool
     ensures { result = produces0 self visited tl }
     
   use seq.Seq
   constant self  : C02IterMut_IterMut_Type.t_itermut t
   function produces_refl [#"../02_iter_mut.rs" 50 4 50 26] (self : C02IterMut_IterMut_Type.t_itermut t) : ()
-  goal vc_produces_refl : ([#"../02_iter_mut.rs" 50 21 50 25] inv0 self) -> ([#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../02_iter_mut.rs" 50 21 50 25] inv0 self)
+   -> ([#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
 end
 module C02IterMut_Impl1_ProducesTrans_Impl
   type t
@@ -162,7 +168,8 @@ module C02IterMut_Impl1_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant0 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model1 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model1 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -195,11 +202,15 @@ module C02IterMut_Impl1_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv1 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv1 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
   predicate produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t)
     
    =
-    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
+    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self))
+     ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t) : bool
     ensures { result = produces0 self visited tl }
     
@@ -210,7 +221,14 @@ module C02IterMut_Impl1_ProducesTrans_Impl
   constant c  : C02IterMut_IterMut_Type.t_itermut t
   function produces_trans [#"../02_iter_mut.rs" 57 4 57 90] (a : C02IterMut_IterMut_Type.t_itermut t) (ab : Seq.seq (borrowed t)) (b : C02IterMut_IterMut_Type.t_itermut t) (bc : Seq.seq (borrowed t)) (c : C02IterMut_IterMut_Type.t_itermut t) : ()
     
-  goal vc_produces_trans : ([#"../02_iter_mut.rs" 57 82 57 83] inv0 c) -> ([#"../02_iter_mut.rs" 57 61 57 63] inv1 bc) -> ([#"../02_iter_mut.rs" 57 52 57 53] inv0 b) -> ([#"../02_iter_mut.rs" 57 31 57 33] inv1 ab) -> ([#"../02_iter_mut.rs" 57 22 57 23] inv0 a) -> ([#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c) -> ([#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b) -> ([#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../02_iter_mut.rs" 57 82 57 83] inv0 c)
+   -> ([#"../02_iter_mut.rs" 57 61 57 63] inv1 bc)
+   -> ([#"../02_iter_mut.rs" 57 52 57 53] inv0 b)
+   -> ([#"../02_iter_mut.rs" 57 31 57 33] inv1 ab)
+   -> ([#"../02_iter_mut.rs" 57 22 57 23] inv0 a)
+   -> ([#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c)
+   -> ([#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b)
+   -> ([#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -261,7 +279,8 @@ module C02IterMut_Impl1_Next
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant6 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model0 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model0 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -337,11 +356,15 @@ module C02IterMut_Impl1_Next
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv0 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv7 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic0 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic0 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model1 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv7 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic0 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic0 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model1 self))
   predicate produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t)
     
    =
-    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner self)) ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
+    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 (C02IterMut_IterMut_Type.itermut_inner self))
+     ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t) : bool
     ensures { result = produces0 self visited tl }
     
@@ -451,7 +474,8 @@ module C02IterMut_Impl2_IntoIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv3 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant0 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model0 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model0 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -572,7 +596,8 @@ module C02IterMut_IterMut
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant4 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model2 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model2 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -616,7 +641,8 @@ module C02IterMut_IterMut
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv6 (shallow_model3 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -777,7 +803,8 @@ module C02IterMut_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model1 self)
   val invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -829,7 +856,8 @@ module C02IterMut_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : slice usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : slice usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   function index_logic4 [@inline:trivial] (self : slice usize) (ix : int) : usize =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model4 self) ix
   val index_logic4 [@inline:trivial] (self : slice usize) (ix : int) : usize
@@ -846,11 +874,15 @@ module C02IterMut_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv7 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice usize) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv8 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic4 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic4 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model3 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice usize) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv8 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic4 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic4 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model3 self))
   predicate produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut usize) (visited : Seq.seq (borrowed usize)) (tl : C02IterMut_IterMut_Type.t_itermut usize)
     
    =
-    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner self)) ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
+    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 (C02IterMut_IterMut_Type.itermut_inner self))
+     ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut usize) (visited : Seq.seq (borrowed usize)) (tl : C02IterMut_IterMut_Type.t_itermut usize) : bool
     ensures { result = produces0 self visited tl }
     
@@ -868,7 +900,14 @@ module C02IterMut_AllZero
     requires {[#"../02_iter_mut.rs" 57 82 57 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C02IterMut_IterMut_Type.t_itermut usize, ab : Seq.seq (borrowed usize), b : C02IterMut_IterMut_Type.t_itermut usize, bc : Seq.seq (borrowed usize), c : C02IterMut_IterMut_Type.t_itermut usize . ([#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b) -> ([#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c) -> ([#"../02_iter_mut.rs" 57 22 57 23] inv0 a) -> ([#"../02_iter_mut.rs" 57 31 57 33] inv8 ab) -> ([#"../02_iter_mut.rs" 57 52 57 53] inv0 b) -> ([#"../02_iter_mut.rs" 57 61 57 63] inv8 bc) -> ([#"../02_iter_mut.rs" 57 82 57 83] inv0 c) -> ([#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C02IterMut_IterMut_Type.t_itermut usize, ab : Seq.seq (borrowed usize), b : C02IterMut_IterMut_Type.t_itermut usize, bc : Seq.seq (borrowed usize), c : C02IterMut_IterMut_Type.t_itermut usize . ([#"../02_iter_mut.rs" 54 15 54 32] produces0 a ab b)
+   -> ([#"../02_iter_mut.rs" 55 15 55 32] produces0 b bc c)
+   -> ([#"../02_iter_mut.rs" 57 22 57 23] inv0 a)
+   -> ([#"../02_iter_mut.rs" 57 31 57 33] inv8 ab)
+   -> ([#"../02_iter_mut.rs" 57 52 57 53] inv0 b)
+   -> ([#"../02_iter_mut.rs" 57 61 57 63] inv8 bc)
+   -> ([#"../02_iter_mut.rs" 57 82 57 83] inv0 c)
+   -> ([#"../02_iter_mut.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../02_iter_mut.rs" 50 4 50 26] (self : C02IterMut_IterMut_Type.t_itermut usize) : () =
     [#"../02_iter_mut.rs" 47 4 47 10] ()
@@ -876,7 +915,8 @@ module C02IterMut_AllZero
     requires {[#"../02_iter_mut.rs" 50 21 50 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : C02IterMut_IterMut_Type.t_itermut usize . ([#"../02_iter_mut.rs" 50 21 50 25] inv0 self) -> ([#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : C02IterMut_IterMut_Type.t_itermut usize . ([#"../02_iter_mut.rs" 50 21 50 25] inv0 self)
+   -> ([#"../02_iter_mut.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
   predicate invariant0 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut usize) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model4 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model4 ( * C02IterMut_IterMut_Type.itermut_inner self))
   val invariant0 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut usize) : bool
@@ -957,7 +997,8 @@ module C02IterMut_AllZero
     
   let rec cfg all_zero [#"../02_iter_mut.rs" 84 0 84 35] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : ()
     ensures { [#"../02_iter_mut.rs" 82 10 82 33] Seq.length (shallow_model1 ( ^ v)) = Seq.length (shallow_model2 v) }
-    ensures { [#"../02_iter_mut.rs" 83 0 83 66] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 v) -> UIntSize.to_int (index_logic1 ( ^ v) i) = 0 }
+    ensures { [#"../02_iter_mut.rs" 83 0 83 66] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 v)
+     -> UIntSize.to_int (index_logic1 ( ^ v) i) = 0 }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -1000,7 +1041,8 @@ module C02IterMut_AllZero
   BB5 {
     invariant { [#"../02_iter_mut.rs" 88 16 88 23] inv0 it };
     invariant { [#"../02_iter_mut.rs" 89 16 89 55] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) it };
-    invariant { [#"../02_iter_mut.rs" 88 4 88 25] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
+    invariant { [#"../02_iter_mut.rs" 88 4 88 25] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced)
+     -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
     goto BB6
   }
   BB6 {
@@ -1101,7 +1143,8 @@ module C02IterMut_Impl1
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   use C02IterMut_IterMut_Type as C02IterMut_IterMut_Type
   predicate invariant2 [#"../02_iter_mut.rs" 20 4 20 30] (self : C02IterMut_IterMut_Type.t_itermut t) =
     [#"../02_iter_mut.rs" 22 20 22 64] Seq.length (shallow_model1 ( ^ C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length (shallow_model1 ( * C02IterMut_IterMut_Type.itermut_inner self))
@@ -1155,11 +1198,15 @@ module C02IterMut_Impl1
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv4 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv3 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice t) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv3 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic1 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic1 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model0 self))
   predicate produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t)
     
    =
-    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
+    [#"../02_iter_mut.rs" 39 12 43 13] Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self)) = Seq.length visited + Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner tl)) /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 (C02IterMut_IterMut_Type.itermut_inner self))
+     ->  * Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  * Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i /\  ^ Seq.get (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner self)) i =  ^ Seq.get (Seq.(++) visited (to_mut_seq0 (C02IterMut_IterMut_Type.itermut_inner tl))) i)
   val produces0 [#"../02_iter_mut.rs" 37 4 37 65] (self : C02IterMut_IterMut_Type.t_itermut t) (visited : Seq.seq (borrowed t)) (tl : C02IterMut_IterMut_Type.t_itermut t) : bool
     ensures { result = produces0 self visited tl }
     
@@ -1176,13 +1223,18 @@ module C02IterMut_Impl1
   val completed0 [#"../02_iter_mut.rs" 31 4 31 35] (self : borrowed (C02IterMut_IterMut_Type.t_itermut t)) : bool
     ensures { result = completed0 self }
     
-  goal next_refn : [#"../02_iter_mut.rs" 63 4 63 44] forall self : borrowed (C02IterMut_IterMut_Type.t_itermut t) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (borrowed t) . inv1 result /\ match result with
+  goal next_refn : [#"../02_iter_mut.rs" 63 4 63 44] forall self : borrowed (C02IterMut_IterMut_Type.t_itermut t) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (borrowed t) . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv1 result /\ match result with
+    end
+   -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_refl_refn : [#"../02_iter_mut.rs" 50 4 50 26] forall self : C02IterMut_IterMut_Type.t_itermut t . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal produces_trans_refn : [#"../02_iter_mut.rs" 57 4 57 90] forall a : C02IterMut_IterMut_Type.t_itermut t . forall ab : Seq.seq (borrowed t) . forall b : C02IterMut_IterMut_Type.t_itermut t . forall bc : Seq.seq (borrowed t) . forall c : C02IterMut_IterMut_Type.t_itermut t . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../02_iter_mut.rs" 50 4 50 26] forall self : C02IterMut_IterMut_Type.t_itermut t . inv2 self
+   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../02_iter_mut.rs" 57 4 57 90] forall a : C02IterMut_IterMut_Type.t_itermut t . forall ab : Seq.seq (borrowed t) . forall b : C02IterMut_IterMut_Type.t_itermut t . forall bc : Seq.seq (borrowed t) . forall c : C02IterMut_IterMut_Type.t_itermut t . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index 83fe4f8554..738bfa46eb 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -96,7 +96,8 @@ module C03StdIterators_SliceIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv7 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv7 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   function index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model3 self) ix
   val index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t
@@ -118,7 +119,9 @@ module C03StdIterators_SliceIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv0 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv5 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic1 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model1 self))
+  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv5 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic1 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model1 self))
   function shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
   val shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
     ensures { result = shallow_model2 self }
@@ -141,7 +144,11 @@ module C03StdIterators_SliceIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv5 ab) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv5 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter t) : () =
     [#"../../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
@@ -418,7 +425,8 @@ module C03StdIterators_VecIter
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model3 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -472,7 +480,8 @@ module C03StdIterators_VecIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv8 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   function index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model6 self) ix
   val index_logic1 [@inline:trivial] (self : slice t) (ix : int) : t
@@ -490,7 +499,9 @@ module C03StdIterators_VecIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv6 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv5 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic1 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model4 self))
+  axiom to_ref_seq0_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv5 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic1 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model4 self))
   function shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
   val shallow_model2 (self : Core_Slice_Iter_Iter_Type.t_iter t) : slice t
     ensures { result = shallow_model2 self }
@@ -513,7 +524,11 @@ module C03StdIterators_VecIter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv5 ab) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter t, ab : Seq.seq t, b : Core_Slice_Iter_Iter_Type.t_iter t, bc : Seq.seq t, c : Core_Slice_Iter_Iter_Type.t_iter t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv5 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv5 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter t) : () =
     [#"../../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
@@ -783,7 +798,8 @@ module C03StdIterators_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model1 self)
   val invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -830,7 +846,8 @@ module C03StdIterators_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : slice usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : slice usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   function index_logic4 [@inline:trivial] (self : slice usize) (ix : int) : usize =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model4 self) ix
   val index_logic4 [@inline:trivial] (self : slice usize) (ix : int) : usize
@@ -848,7 +865,10 @@ module C03StdIterators_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self}
     ensures { result = to_mut_seq0 self }
     
-  axiom to_mut_seq0_spec : forall self : borrowed (slice usize) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv7 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  ^ Seq.get (to_mut_seq0 self) i = index_logic4 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self) ->  * Seq.get (to_mut_seq0 self) i = index_logic4 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model3 self))
+  axiom to_mut_seq0_spec : forall self : borrowed (slice usize) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 23 82 27] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 82 4 82 43] inv7 (to_mut_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 81 4 81 85] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  ^ Seq.get (to_mut_seq0 self) i = index_logic4 ( ^ self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 80 4 80 82] forall i : int . 0 <= i /\ i < Seq.length (to_mut_seq0 self)
+   ->  * Seq.get (to_mut_seq0 self) i = index_logic4 ( * self) i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 79 14 79 41] Seq.length (to_mut_seq0 self) = Seq.length (shallow_model3 self))
   function shallow_model5 (self : Core_Slice_Iter_IterMut_Type.t_itermut usize) : borrowed (slice usize)
   val shallow_model5 (self : Core_Slice_Iter_IterMut_Type.t_itermut usize) : borrowed (slice usize)
     ensures { result = shallow_model5 self }
@@ -872,7 +892,11 @@ module C03StdIterators_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 449 61 449 63] inv7 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_IterMut_Type.t_itermut usize, ab : Seq.seq (borrowed usize), b : Core_Slice_Iter_IterMut_Type.t_itermut usize, bc : Seq.seq (borrowed usize), c : Core_Slice_Iter_IterMut_Type.t_itermut usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 446 15 446 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 447 15 447 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 449 31 449 33] inv7 ab) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 449 61 449 63] inv7 bc) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 448 14 448 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_IterMut_Type.t_itermut usize, ab : Seq.seq (borrowed usize), b : Core_Slice_Iter_IterMut_Type.t_itermut usize, bc : Seq.seq (borrowed usize), c : Core_Slice_Iter_IterMut_Type.t_itermut usize . ([#"../../../../../creusot-contracts/src/std/slice.rs" 446 15 446 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 447 15 447 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 449 31 449 33] inv7 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 449 61 449 63] inv7 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 448 14 448 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_IterMut_Type.t_itermut usize) : () =
     [#"../../../../../creusot-contracts/src/std/slice.rs" 439 4 439 10] ()
@@ -991,7 +1015,8 @@ module C03StdIterators_AllZero
     
   let rec cfg all_zero [#"../03_std_iterators.rs" 28 0 28 35] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : ()
     ensures { [#"../03_std_iterators.rs" 26 10 26 33] Seq.length (shallow_model1 ( ^ v)) = Seq.length (shallow_model2 v) }
-    ensures { [#"../03_std_iterators.rs" 27 0 27 66] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 v) -> UIntSize.to_int (index_logic1 ( ^ v) i) = 0 }
+    ensures { [#"../03_std_iterators.rs" 27 0 27 66] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 v)
+     -> UIntSize.to_int (index_logic1 ( ^ v) i) = 0 }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -1046,7 +1071,8 @@ module C03StdIterators_AllZero
   BB6 {
     invariant { [#"../03_std_iterators.rs" 29 4 29 87] inv0 iter };
     invariant { [#"../03_std_iterators.rs" 29 4 29 87] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 29 4 29 87] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
+    invariant { [#"../03_std_iterators.rs" 29 4 29 87] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced)
+     -> UIntSize.to_int ( ^ index_logic0 produced i) = 0 };
     goto BB7
   }
   BB7 {
@@ -1149,14 +1175,22 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c}
     ensures { result = produces_trans2 a ab b bc c }
     
-  axiom produces_trans2_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces2 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces2 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces2 a (Seq.(++) ab bc) c)
+  axiom produces_trans2_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces2 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces2 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces2 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl2 (self : i) : ()
   val produces_refl2 (self : i) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self}
     ensures { result = produces_refl2 self }
     
-  axiom produces_refl2_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces2 self (Seq.empty ) self)
+  axiom produces_refl2_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces2 self (Seq.empty ) self)
   use Core_Iter_Adapters_Take_Take_Type as Core_Iter_Adapters_Take_Take_Type
   predicate inv3 (_x : Core_Iter_Adapters_Take_Take_Type.t_take i)
   val inv3 (_x : Core_Iter_Adapters_Take_Take_Type.t_take i) : bool
@@ -1177,7 +1211,8 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter/take.rs" 34 9 34 13] inv3 self}
     ensures { result = n0 self }
     
-  axiom n0_spec : forall self : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 34 9 34 13] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 33 14 33 50] n0 self >= 0 /\ n0 self <= UIntSize.to_int max0)
+  axiom n0_spec : forall self : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 34 9 34 13] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 33 14 33 50] n0 self >= 0 /\ n0 self <= UIntSize.to_int max0)
   predicate produces1 (self : Core_Iter_Adapters_Take_Take_Type.t_take i) (visited : Seq.seq item0) (o : Core_Iter_Adapters_Take_Take_Type.t_take i)
     
    =
@@ -1197,13 +1232,21 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 82 78 83] inv3 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Iter_Adapters_Take_Take_Type.t_take i, ab : Seq.seq item0, b : Core_Iter_Adapters_Take_Take_Type.t_take i, bc : Seq.seq item0, c : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 75 15 75 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 76 15 76 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 22 78 23] inv3 a) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 31 78 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 52 78 53] inv3 b) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 61 78 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 82 78 83] inv3 c) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 77 14 77 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Iter_Adapters_Take_Take_Type.t_take i, ab : Seq.seq item0, b : Core_Iter_Adapters_Take_Take_Type.t_take i, bc : Seq.seq item0, c : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 75 15 75 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 76 15 76 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 22 78 23] inv3 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 31 78 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 52 78 53] inv3 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 61 78 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 78 82 78 83] inv3 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 77 14 77 42] produces1 a (Seq.(++) ab bc) c)
   function produces_refl1 (self : Core_Iter_Adapters_Take_Take_Type.t_take i) : ()
   val produces_refl1 (self : Core_Iter_Adapters_Take_Take_Type.t_take i) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/take.rs" 71 21 71 25] inv3 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 71 21 71 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 70 14 70 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Iter_Adapters_Take_Take_Type.t_take i . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 71 21 71 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 70 14 70 45] produces1 self (Seq.empty ) self)
   predicate invariant6 (self : Seq.seq item0)
   val invariant6 (self : Seq.seq item0) : bool
     ensures { result = invariant6 self }
@@ -1238,11 +1281,13 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter/skip.rs" 23 9 23 13] inv0 self}
     ensures { result = n1 self }
     
-  axiom n1_spec : forall self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 23 9 23 13] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 22 14 22 50] n1 self >= 0 /\ n1 self <= UIntSize.to_int max0)
+  axiom n1_spec : forall self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 23 9 23 13] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 22 14 22 50] n1 self >= 0 /\ n1 self <= UIntSize.to_int max0)
   predicate produces0 (self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)) (visited : Seq.seq item0) (o : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/skip.rs" 57 8 64 9] visited = Seq.empty  /\ self = o \/ n1 o = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv6 s /\ Seq.length s = n1 self /\ produces1 (iter1 self) (Seq.(++) s visited) (iter1 o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve3 (Seq.get s i)))
+    [#"../../../../../creusot-contracts/src/std/iter/skip.rs" 57 8 64 9] visited = Seq.empty  /\ self = o \/ n1 o = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv6 s /\ Seq.length s = n1 self /\ produces1 (iter1 self) (Seq.(++) s visited) (iter1 o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve3 (Seq.get s i)))
   val produces0 (self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)) (visited : Seq.seq item0) (o : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)) : bool
     ensures { result = produces0 self visited o }
     
@@ -1258,14 +1303,22 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 82 77 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i), ab : Seq.seq item0, b : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i), bc : Seq.seq item0, c : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 74 15 74 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 75 15 75 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 22 77 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 31 77 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 52 77 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 61 77 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 82 77 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 76 14 76 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i), ab : Seq.seq item0, b : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i), bc : Seq.seq item0, c : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 74 15 74 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 75 15 75 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 22 77 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 31 77 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 52 77 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 61 77 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 77 82 77 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 76 14 76 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 (self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)) : ()
     
   val produces_refl0 (self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/skip.rs" 70 21 70 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 70 21 70 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 69 14 69 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 70 21 70 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/skip.rs" 69 14 69 45] produces0 self (Seq.empty ) self)
   predicate invariant4 (self : borrowed (Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)))
     
   val invariant4 (self : borrowed (Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i))) : bool
@@ -1329,7 +1382,8 @@ module C03StdIterators_SkipTake
     requires {[#"../../../../../creusot-contracts/src/std/iter/take.rs" 26 21 26 25] inv5 self}
     ensures { result = iter_mut0 self }
     
-  axiom iter_mut0_spec : forall self : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 26 21 26 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 26 4 26 36] inv7 (iter_mut0 self)) && ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 25 14 25 68] iter0 ( * self) =  * iter_mut0 self /\ iter0 ( ^ self) =  ^ iter_mut0 self)
+  axiom iter_mut0_spec : forall self : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i) . ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 26 21 26 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 26 4 26 36] inv7 (iter_mut0 self)) && ([#"../../../../../creusot-contracts/src/std/iter/take.rs" 25 14 25 68] iter0 ( * self) =  * iter_mut0 self /\ iter0 ( ^ self) =  ^ iter_mut0 self)
   predicate resolve5 (self : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve5 (self : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i)) : bool
@@ -1343,7 +1397,8 @@ module C03StdIterators_SkipTake
   predicate completed0 (self : borrowed (Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i)))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/skip.rs" 43 8 51 9] n1 ( ^ self) = 0 /\ (exists i : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i) . exists s : Seq.seq item0 . inv5 i /\ inv6 s /\ Seq.length s <= n1 ( * self) /\ produces1 (iter1 ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve3 (Seq.get s i)) /\ completed1 i /\  ^ i = iter1 ( ^ self))
+    [#"../../../../../creusot-contracts/src/std/iter/skip.rs" 43 8 51 9] n1 ( ^ self) = 0 /\ (exists i : borrowed (Core_Iter_Adapters_Take_Take_Type.t_take i) . exists s : Seq.seq item0 . inv5 i /\ inv6 s /\ Seq.length s <= n1 ( * self) /\ produces1 (iter1 ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve3 (Seq.get s i)) /\ completed1 i /\  ^ i = iter1 ( ^ self))
   val completed0 (self : borrowed (Core_Iter_Adapters_Skip_Skip_Type.t_skip (Core_Iter_Adapters_Take_Take_Type.t_take i))) : bool
     ensures { result = completed0 self }
     
@@ -1606,7 +1661,8 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant8 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv6 (shallow_model0 self)
   val invariant8 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1655,7 +1711,8 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv14 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv14 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model5 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
+  axiom shallow_model5_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv14 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model5 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
   function index_logic4 [@inline:trivial] (self : slice uint32) (ix : int) : uint32 =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model5 self) ix
   val index_logic4 [@inline:trivial] (self : slice uint32) (ix : int) : uint32
@@ -1675,7 +1732,9 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv9 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic4 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model2 self))
+  axiom to_ref_seq0_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv9 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic4 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model2 self))
   function shallow_model4 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : slice uint32
   val shallow_model4 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : slice uint32
     ensures { result = shallow_model4 self }
@@ -1690,11 +1749,13 @@ module C03StdIterators_Counter
   predicate produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (visited : Seq.seq uint32) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq uint32 . inv9 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq uint32 . inv9 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
     else
        * Seq.get fs 0 = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self /\  ^ Seq.get fs (Seq.length visited - 1) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (visited : Seq.seq uint32) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = produces1 self visited succ }
     
@@ -1710,7 +1771,14 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv5 c}
     ensures { result = produces_trans2 a ab b bc c }
     
-  axiom produces_trans2_spec : forall a : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, ab : Seq.seq uint32, b : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, bc : Seq.seq uint32, c : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 28 15 28 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 29 15 29 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 22 31 23] inv5 a) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 31 31 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 52 31 53] inv5 b) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 61 31 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv5 c) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 30 14 30 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans2_spec : forall a : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, ab : Seq.seq uint32, b : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, bc : Seq.seq uint32, c : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 28 15 28 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 29 15 29 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 22 31 23] inv5 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 31 31 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 52 31 53] inv5 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 61 31 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv5 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 30 14 30 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl2 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : ()
     
@@ -1718,7 +1786,8 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv5 self}
     ensures { result = produces_refl2 self }
     
-  axiom produces_refl2_spec : forall self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 23 14 23 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl2_spec : forall self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 23 14 23 45] produces1 self (Seq.empty ) self)
   predicate invariant7 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0))
     
    =
@@ -1750,7 +1819,8 @@ module C03StdIterators_Counter
   predicate next_precondition0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (produced : Seq.seq uint32)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i
+     -> inv3 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -1758,7 +1828,16 @@ module C03StdIterators_Counter
   predicate preservation0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall b : uint32 . forall f : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv11 b -> inv12 f -> inv3 e2 -> inv3 e1 -> inv9 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall b : uint32 . forall f : borrowed C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i
+     -> inv11 b
+     -> inv12 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv9 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 (iter : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : bool
     ensures { result = preservation0 iter func }
     
@@ -1775,7 +1854,11 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv9 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : Core_Slice_Iter_Iter_Type.t_iter uint32, func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, produced : Seq.seq uint32 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 24 121 28] inv2 iter) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 33 121 37] inv4 func) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv9 produced) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 120 4 120 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : Core_Slice_Iter_Iter_Type.t_iter uint32, func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0, produced : Seq.seq uint32 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 24 121 28] inv2 iter)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 33 121 37] inv4 func)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv9 produced)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 120 4 120 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   function shallow_model6 (self : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32)) : slice uint32 =
     [#"../../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model4 ( * self)
   val shallow_model6 (self : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32)) : slice uint32
@@ -1792,7 +1875,9 @@ module C03StdIterators_Counter
     ensures { result = completed1 self }
     
   predicate reinitialize0 (_1 : ()) =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 148 8 153 9] forall func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall iter : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32) . inv4 func -> inv10 iter -> completed1 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 148 8 153 9] forall func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0 . forall iter : borrowed (Core_Slice_Iter_Iter_Type.t_iter uint32) . inv4 func
+     -> inv10 iter
+     -> completed1 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1821,7 +1906,11 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv9 bc}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv9 ab) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv9 bc) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv9 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv9 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl1 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : () =
     [#"../../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
   val produces_refl1 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : ()
@@ -1868,13 +1957,21 @@ module C03StdIterators_Counter
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv9 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv9 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter uint32, ab : Seq.seq uint32, b : Core_Slice_Iter_Iter_Type.t_iter uint32, bc : Seq.seq uint32, c : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv9 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv9 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : ()
   val produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Slice_Iter_Iter_Type.t_iter uint32 . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
   use seq.Seq
   predicate resolve2 (self : uint32) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -1889,7 +1986,8 @@ module C03StdIterators_Counter
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -1934,7 +2032,8 @@ module C03StdIterators_Counter
     ensures { inv8 result }
     
   val map_inv0 (self : Core_Slice_Iter_Iter_Type.t_iter uint32) (func : C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0) : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Slice_Iter_Iter_Type.t_iter uint32) uint32 C03StdIterators_Counter_Closure0.c03stditerators_counter_closure0
-    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Slice_Iter_Iter_Type.t_iter uint32 . forall e : uint32 . inv2 i2
+     -> inv3 e  -> produces0 self (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 44 15 44 51] reinitialize0 ()}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 45 15 45 70] preservation0 self func}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 21 47 25] inv2 self}
@@ -2088,7 +2187,9 @@ module C03StdIterators_SumRange
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range isize) (visited : Seq.seq isize) (o : Core_Ops_Range_Range_Type.t_range isize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range isize) (visited : Seq.seq isize) (o : Core_Ops_Range_Range_Type.t_range isize) : bool
     ensures { result = produces0 self visited o }
     
@@ -2104,14 +2205,22 @@ module C03StdIterators_SumRange
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range isize, ab : Seq.seq isize, b : Core_Ops_Range_Range_Type.t_range isize, bc : Seq.seq isize, c : Core_Ops_Range_Range_Type.t_range isize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range isize, ab : Seq.seq isize, b : Core_Ops_Range_Range_Type.t_range isize, bc : Seq.seq isize, c : Core_Ops_Range_Range_Type.t_range isize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range isize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range isize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range isize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range isize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range isize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range isize) : bool
@@ -2310,7 +2419,9 @@ module C03StdIterators_EnumerateRange
   predicate produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces1 self visited o }
     
@@ -2326,14 +2437,22 @@ module C03StdIterators_EnumerateRange
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv2 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv2 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv2 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv2 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
   predicate invariant3 (self : Seq.seq usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant3 (self : Seq.seq usize) : bool
@@ -2381,7 +2500,8 @@ module C03StdIterators_EnumerateRange
   predicate produces0 (self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize)) (visited : Seq.seq (usize, usize)) (o : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 62 8 67 9] Seq.length visited = n0 o - n0 self /\ (exists s : Seq.seq usize . inv3 s /\ produces1 (iter0 self) s (iter0 o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = n0 self + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
+    [#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 62 8 67 9] Seq.length visited = n0 o - n0 self /\ (exists s : Seq.seq usize . inv3 s /\ produces1 (iter0 self) s (iter0 o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = n0 self + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
   val produces0 (self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize)) (visited : Seq.seq (usize, usize)) (o : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize)) : bool
     ensures { result = produces0 self visited o }
     
@@ -2397,7 +2517,14 @@ module C03StdIterators_EnumerateRange
     requires {[#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 82 80 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize), ab : Seq.seq (usize, usize), b : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize), bc : Seq.seq (usize, usize), c : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 77 15 77 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 78 15 78 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 22 80 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 31 80 33] inv5 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 52 80 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 61 80 63] inv5 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 82 80 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 79 14 79 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize), ab : Seq.seq (usize, usize), b : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize), bc : Seq.seq (usize, usize), c : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 77 15 77 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 78 15 78 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 22 80 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 31 80 33] inv5 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 52 80 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 61 80 63] inv5 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 80 82 80 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 79 14 79 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize)) : ()
     
@@ -2405,7 +2532,8 @@ module C03StdIterators_EnumerateRange
     requires {[#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 73 21 73 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 73 21 73 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 72 14 72 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Enumerate_Enumerate_Type.t_enumerate (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 73 21 73 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/enumerate.rs" 72 14 72 45] produces0 self (Seq.empty ) self)
   predicate resolve5 (self : borrowed (Core_Ops_Range_Range_Type.t_range usize)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve5 (self : borrowed (Core_Ops_Range_Range_Type.t_range usize)) : bool
@@ -2553,7 +2681,8 @@ module C03StdIterators_EnumerateRange
   BB5 {
     invariant { [#"../03_std_iterators.rs" 73 4 73 96] inv0 iter };
     invariant { [#"../03_std_iterators.rs" 73 4 73 96] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
-    invariant { [#"../03_std_iterators.rs" 73 4 73 96] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced) -> (let (a, _) = index_logic0 produced i in a) = (let (_, a) = index_logic0 produced i in a) };
+    invariant { [#"../03_std_iterators.rs" 73 4 73 96] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner produced)
+     -> (let (a, _) = index_logic0 produced i in a) = (let (_, a) = index_logic0 produced i in a) };
     goto BB6
   }
   BB6 {
@@ -2706,7 +2835,9 @@ module C03StdIterators_MyReverse
   predicate produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces1 self visited o }
     
@@ -2722,14 +2853,22 @@ module C03StdIterators_MyReverse
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv5 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv5 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv5 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv5 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv5 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv5 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv5 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv5 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
   predicate invariant6 (self : Seq.seq usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant6 (self : Seq.seq usize) : bool
@@ -2791,7 +2930,8 @@ module C03StdIterators_MyReverse
   predicate produces0 (self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize)) (visited : Seq.seq (usize, usize)) (o : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize))
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/zip.rs" 44 8 50 9] exists p2 : Seq.seq usize . exists p1 : Seq.seq usize . inv6 p2 /\ inv6 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (itera0 self) p1 (itera0 o) /\ produces1 (iterb0 self) p2 (iterb0 o)
+    [#"../../../../../creusot-contracts/src/std/iter/zip.rs" 44 8 50 9] exists p2 : Seq.seq usize . exists p1 : Seq.seq usize . inv6 p2 /\ inv6 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (itera0 self) p1 (itera0 o) /\ produces1 (iterb0 self) p2 (iterb0 o)
   val produces0 (self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize)) (visited : Seq.seq (usize, usize)) (o : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize)) : bool
     ensures { result = produces0 self visited o }
     
@@ -2807,7 +2947,14 @@ module C03StdIterators_MyReverse
     requires {[#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 82 63 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize), ab : Seq.seq (usize, usize), b : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize), bc : Seq.seq (usize, usize), c : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 60 15 60 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 61 15 61 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 22 63 23] inv1 a) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 31 63 33] inv10 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 52 63 53] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 61 63 63] inv10 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 82 63 83] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 62 14 62 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize), ab : Seq.seq (usize, usize), b : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize), bc : Seq.seq (usize, usize), c : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 60 15 60 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 61 15 61 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 22 63 23] inv1 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 31 63 33] inv10 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 52 63 53] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 61 63 63] inv10 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 63 82 63 83] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 62 14 62 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize)) : ()
     
@@ -2815,7 +2962,8 @@ module C03StdIterators_MyReverse
     requires {[#"../../../../../creusot-contracts/src/std/iter/zip.rs" 56 21 56 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 56 21 56 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 55 14 55 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize) . ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 56 21 56 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/zip.rs" 55 14 55 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Iter_Adapters_Zip_Zip_Type.t_zip (Core_Ops_Range_Range_Type.t_range usize) (Core_Ops_Range_Range_Type.t_range usize))
     
    =
@@ -2845,7 +2993,8 @@ module C03StdIterators_MyReverse
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate resolve3 (self : borrowed (slice t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve3 (self : borrowed (slice t)) : bool
@@ -2911,12 +3060,12 @@ module C03StdIterators_MyReverse
   predicate equiv_reverse_range0 [#"../03_std_iterators.rs" 87 0 87 81] (s1 : Seq.seq t) (s2 : Seq.seq t) (l : int) (u : int) (n : int)
     
    =
-    [#"../03_std_iterators.rs" 88 4 90 5] forall i : int . l <= i /\ i < u -> Seq.get s1 i = Seq.get s2 (n - i)
+    [#"../03_std_iterators.rs" 88 4 90 5] forall i : int . l <= i /\ i < u  -> Seq.get s1 i = Seq.get s2 (n - i)
   val equiv_reverse_range0 [#"../03_std_iterators.rs" 87 0 87 81] (s1 : Seq.seq t) (s2 : Seq.seq t) (l : int) (u : int) (n : int) : bool
     ensures { result = equiv_reverse_range0 s1 s2 l u n }
     
   predicate equiv_range0 [#"../03_std_iterators.rs" 80 0 80 65] (s1 : Seq.seq t) (s2 : Seq.seq t) (l : int) (u : int) =
-    [#"../03_std_iterators.rs" 81 4 83 5] forall i : int . l <= i /\ i < u -> Seq.get s1 i = Seq.get s2 i
+    [#"../03_std_iterators.rs" 81 4 83 5] forall i : int . l <= i /\ i < u  -> Seq.get s1 i = Seq.get s2 i
   val equiv_range0 [#"../03_std_iterators.rs" 80 0 80 65] (s1 : Seq.seq t) (s2 : Seq.seq t) (l : int) (u : int) : bool
     ensures { result = equiv_range0 s1 s2 l u }
     
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index fb4c64a4b7..761a674266 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -53,14 +53,21 @@ module C04Skip_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C04Skip_Skip_Type as C04Skip_Skip_Type
   predicate invariant0 (self : C04Skip_Skip_Type.t_skip i)
   val invariant0 (self : C04Skip_Skip_Type.t_skip i) : bool
@@ -82,13 +89,15 @@ module C04Skip_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
   constant self  : C04Skip_Skip_Type.t_skip i
   function produces_refl [#"../04_skip.rs" 50 4 50 26] (self : C04Skip_Skip_Type.t_skip i) : ()
-  goal vc_produces_refl : ([#"../04_skip.rs" 50 21 50 25] inv0 self) -> ([#"../04_skip.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../04_skip.rs" 50 21 50 25] inv0 self)
+   -> ([#"../04_skip.rs" 49 14 49 45] produces0 self (Seq.empty ) self)
 end
 module C04Skip_Impl0_ProducesTrans_Impl
   type i
@@ -124,14 +133,21 @@ module C04Skip_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq item0)
   val invariant1 (self : Seq.seq item0) : bool
     ensures { result = invariant1 self }
@@ -158,7 +174,8 @@ module C04Skip_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
@@ -169,7 +186,14 @@ module C04Skip_Impl0_ProducesTrans_Impl
   constant c  : C04Skip_Skip_Type.t_skip i
   function produces_trans [#"../04_skip.rs" 57 4 57 90] (a : C04Skip_Skip_Type.t_skip i) (ab : Seq.seq item0) (b : C04Skip_Skip_Type.t_skip i) (bc : Seq.seq item0) (c : C04Skip_Skip_Type.t_skip i) : ()
     
-  goal vc_produces_trans : ([#"../04_skip.rs" 57 82 57 83] inv0 c) -> ([#"../04_skip.rs" 57 61 57 63] inv1 bc) -> ([#"../04_skip.rs" 57 52 57 53] inv0 b) -> ([#"../04_skip.rs" 57 31 57 33] inv1 ab) -> ([#"../04_skip.rs" 57 22 57 23] inv0 a) -> ([#"../04_skip.rs" 55 15 55 32] produces0 b bc c) -> ([#"../04_skip.rs" 54 15 54 32] produces0 a ab b) -> ([#"../04_skip.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../04_skip.rs" 57 82 57 83] inv0 c)
+   -> ([#"../04_skip.rs" 57 61 57 63] inv1 bc)
+   -> ([#"../04_skip.rs" 57 52 57 53] inv0 b)
+   -> ([#"../04_skip.rs" 57 31 57 33] inv1 ab)
+   -> ([#"../04_skip.rs" 57 22 57 23] inv0 a)
+   -> ([#"../04_skip.rs" 55 15 55 32] produces0 b bc c)
+   -> ([#"../04_skip.rs" 54 15 54 32] produces0 a ab b)
+   -> ([#"../04_skip.rs" 56 14 56 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -281,14 +305,21 @@ module C04Skip_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv9 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv9 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv9 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv9 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   use prelude.Snapshot
   predicate invariant1 (self : Snapshot.snap_ty (Seq.seq item0))
   val invariant1 (self : Snapshot.snap_ty (Seq.seq item0)) : bool
@@ -319,7 +350,8 @@ module C04Skip_Impl0_Next
   predicate produces1 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv9 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces0 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve3 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv9 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces0 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve3 (Seq.get s i)))
   val produces1 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces1 self visited o }
     
@@ -328,7 +360,8 @@ module C04Skip_Impl0_Next
     ensures { result = completed1 self }
     
   predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
-    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv8 i /\ inv9 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces0 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve3 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
+    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv8 i /\ inv9 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces0 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve3 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
   val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = completed0 self }
     
@@ -436,7 +469,8 @@ module C04Skip_Impl0_Next
   BB4 {
     invariant { [#"../04_skip.rs" 67 20 67 53] Seq.length (Snapshot.inner skipped) + UIntSize.to_int n = UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * Snapshot.inner old_self)) };
     invariant { [#"../04_skip.rs" 67 8 67 55] produces0 (C04Skip_Skip_Type.skip_iter ( * Snapshot.inner old_self)) (Snapshot.inner skipped) (C04Skip_Skip_Type.skip_iter ( * self)) };
-    invariant { [#"../04_skip.rs" 67 8 67 55] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner skipped) -> resolve3 (index_logic0 skipped i) };
+    invariant { [#"../04_skip.rs" 67 8 67 55] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner skipped)
+     -> resolve3 (index_logic0 skipped i) };
     invariant { [#"../04_skip.rs" 70 20 70 35] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) = 0 };
     invariant { [#"../04_skip.rs" 71 20 71 29] inv2 self };
     goto BB5
@@ -581,7 +615,8 @@ module C04Skip_Impl0
   use seq.Seq
   use prelude.UIntSize
   predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
-    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv1 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
+    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv1 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
   val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = completed0 self }
     
@@ -591,16 +626,22 @@ module C04Skip_Impl0
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s -> resolve0 (Seq.get s i)))
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
+  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index 9eb4c7f24d..1aa3b53e9d 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -117,14 +117,21 @@ module C05Map_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate resolve0 (self : f)
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
@@ -144,7 +151,10 @@ module C05Map_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv5 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv5 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -158,13 +168,19 @@ module C05Map_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv4 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv4 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -173,20 +189,33 @@ module C05Map_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv7 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate precondition0 (self : f) (_2 : item0)
   val precondition0 (self : f) (_2 : item0) : bool
     ensures { result = precondition0 self _2 }
     
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv3 i -> inv9 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv3 i
+     -> inv9 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
   use seq.Seq
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv7 b -> inv5 f -> inv9 e2 -> inv9 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i
+     -> inv7 b
+     -> inv5 f
+     -> inv9 e2
+     -> inv9 e1
+     -> inv1 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -195,7 +224,8 @@ module C05Map_Impl0_ProducesRefl_Impl
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv4 func -> inv8 iter -> completed0 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv4 func
+     -> inv8 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -222,18 +252,21 @@ module C05Map_Impl0_ProducesRefl_Impl
   predicate produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C05Map_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C05Map_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
   use seq.Seq
   constant self  : C05Map_Map_Type.t_map i b f
   function produces_refl [#"../05_map.rs" 29 4 29 26] (self : C05Map_Map_Type.t_map i b f) : ()
-  goal vc_produces_refl : ([#"../05_map.rs" 29 21 29 25] inv0 self) -> ([#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../05_map.rs" 29 21 29 25] inv0 self)
+   -> ([#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self)
 end
 module C05Map_Impl0_ProducesTrans_Impl
   type i
@@ -340,14 +373,21 @@ module C05Map_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate resolve0 (self : f)
   val resolve0 (self : f) : bool
     ensures { result = resolve0 self }
@@ -367,7 +407,10 @@ module C05Map_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -381,13 +424,19 @@ module C05Map_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv5 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv5 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -396,7 +445,11 @@ module C05Map_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant1 (self : Seq.seq b)
   val invariant1 (self : Seq.seq b) : bool
     ensures { result = invariant1 self }
@@ -412,13 +465,22 @@ module C05Map_Impl0_ProducesTrans_Impl
     
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv4 i -> inv10 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv4 i
+     -> inv10 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
   use seq.Seq
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv8 b
+     -> inv6 f
+     -> inv10 e2
+     -> inv10 e1
+     -> inv2 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -427,7 +489,8 @@ module C05Map_Impl0_ProducesTrans_Impl
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv5 func -> inv9 iter -> completed0 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv5 func
+     -> inv9 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -455,11 +518,13 @@ module C05Map_Impl0_ProducesTrans_Impl
   predicate produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C05Map_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C05Map_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
@@ -470,7 +535,14 @@ module C05Map_Impl0_ProducesTrans_Impl
   constant c  : C05Map_Map_Type.t_map i b f
   function produces_trans [#"../05_map.rs" 36 4 36 90] (a : C05Map_Map_Type.t_map i b f) (ab : Seq.seq b) (b : C05Map_Map_Type.t_map i b f) (bc : Seq.seq b) (c : C05Map_Map_Type.t_map i b f) : ()
     
-  goal vc_produces_trans : ([#"../05_map.rs" 36 82 36 83] inv0 c) -> ([#"../05_map.rs" 36 61 36 63] inv1 bc) -> ([#"../05_map.rs" 36 52 36 53] inv0 b) -> ([#"../05_map.rs" 36 31 36 33] inv1 ab) -> ([#"../05_map.rs" 36 22 36 23] inv0 a) -> ([#"../05_map.rs" 34 15 34 32] produces0 b bc c) -> ([#"../05_map.rs" 33 15 33 32] produces0 a ab b) -> ([#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../05_map.rs" 36 82 36 83] inv0 c)
+   -> ([#"../05_map.rs" 36 61 36 63] inv1 bc)
+   -> ([#"../05_map.rs" 36 52 36 53] inv0 b)
+   -> ([#"../05_map.rs" 36 31 36 33] inv1 ab)
+   -> ([#"../05_map.rs" 36 22 36 23] inv0 a)
+   -> ([#"../05_map.rs" 34 15 34 32] produces0 b bc c)
+   -> ([#"../05_map.rs" 33 15 33 32] produces0 a ab b)
+   -> ([#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -580,7 +652,10 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -594,13 +669,19 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -609,7 +690,11 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -627,14 +712,21 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../common.rs" 21 82 21 83] inv6 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv6 a) -> ([#"../common.rs" 21 31 21 33] inv4 ab) -> ([#"../common.rs" 21 52 21 53] inv6 b) -> ([#"../common.rs" 21 61 21 63] inv4 bc) -> ([#"../common.rs" 21 82 21 83] inv6 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv6 a)
+   -> ([#"../common.rs" 21 31 21 33] inv4 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv6 b)
+   -> ([#"../common.rs" 21 61 21 63] inv4 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv6 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv6 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv6 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv6 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant3 (self : item0)
   val invariant3 (self : item0) : bool
     ensures { result = invariant3 self }
@@ -669,11 +761,13 @@ module C05Map_Impl1_ProducesOne_Impl
   predicate produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C05Map_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C05Map_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
@@ -691,7 +785,13 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../05_map.rs" 36 82 36 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C05Map_Map_Type.t_map i b f, ab : Seq.seq b, b : C05Map_Map_Type.t_map i b f, bc : Seq.seq b, c : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 33 15 33 32] produces0 a ab b) -> ([#"../05_map.rs" 34 15 34 32] produces0 b bc c) -> ([#"../05_map.rs" 36 22 36 23] inv0 a) -> ([#"../05_map.rs" 36 31 36 33] inv8 ab) -> ([#"../05_map.rs" 36 52 36 53] inv0 b) -> ([#"../05_map.rs" 36 61 36 63] inv8 bc) -> ([#"../05_map.rs" 36 82 36 83] inv0 c) -> ([#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C05Map_Map_Type.t_map i b f, ab : Seq.seq b, b : C05Map_Map_Type.t_map i b f, bc : Seq.seq b, c : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 33 15 33 32] produces0 a ab b)
+   -> ([#"../05_map.rs" 34 15 34 32] produces0 b bc c)
+   -> ([#"../05_map.rs" 36 22 36 23] inv0 a)
+   -> ([#"../05_map.rs" 36 31 36 33] inv8 ab)
+   -> ([#"../05_map.rs" 36 52 36 53] inv0 b)
+   -> ([#"../05_map.rs" 36 61 36 63] inv8 bc)
+   -> ([#"../05_map.rs" 36 82 36 83] inv0 c)  -> ([#"../05_map.rs" 35 14 35 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../05_map.rs" 29 4 29 26] (self : C05Map_Map_Type.t_map i b f) : () =
     [#"../05_map.rs" 26 4 26 10] ()
@@ -699,7 +799,8 @@ module C05Map_Impl1_ProducesOne_Impl
     requires {[#"../05_map.rs" 29 21 29 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 29 21 29 25] inv0 self) -> ([#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 29 21 29 25] inv0 self)
+   -> ([#"../05_map.rs" 28 14 28 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : b)
   val invariant1 (self : b) : bool
     ensures { result = invariant1 self }
@@ -707,13 +808,22 @@ module C05Map_Impl1_ProducesOne_Impl
   axiom inv1 : forall x : b . inv1 x = true
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv6 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv6 i
+     -> inv3 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
   use seq.Seq
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i
+     -> inv1 b
+     -> inv2 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv4 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -722,7 +832,8 @@ module C05Map_Impl1_ProducesOne_Impl
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv7 func -> inv10 iter -> completed0 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv7 func
+     -> inv10 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -740,7 +851,10 @@ module C05Map_Impl1_ProducesOne_Impl
   constant succ  : C05Map_Map_Type.t_map i b f
   predicate produces_one [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f)
     
-  goal vc_produces_one : ([#"../05_map.rs" 117 38 117 42] inv0 succ) -> ([#"../05_map.rs" 117 26 117 33] inv1 visited) -> ([#"../05_map.rs" 117 20 117 24] inv0 self) -> ([#"../05_map.rs" 116 14 116 68] ([#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)) = produces0 self (Seq.singleton visited) succ)
+  goal vc_produces_one : ([#"../05_map.rs" 117 38 117 42] inv0 succ)
+   -> ([#"../05_map.rs" 117 26 117 33] inv1 visited)
+   -> ([#"../05_map.rs" 117 20 117 24] inv0 self)
+   -> ([#"../05_map.rs" 116 14 116 68] ([#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv2 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C05Map_Impl1_ProducesOneInvariant_Impl
   type i
@@ -831,7 +945,8 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv4 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv4 i
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
@@ -845,7 +960,15 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv2 b
+     -> inv3 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv5 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -854,7 +977,8 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv7 func -> inv8 iter -> completed0 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv7 func
+     -> inv8 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -886,7 +1010,10 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -896,13 +1023,19 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -911,7 +1044,11 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   function produces_trans0 [#"../common.rs" 21 4 21 91] (a : i) (ab : Seq.seq item0) (b : i) (bc : Seq.seq item0) (c : i) : ()
     
@@ -925,14 +1062,21 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv5 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv5 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv5 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv5 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   constant self  : C05Map_Map_Type.t_map i b f
   constant e  : item0
   constant r  : b
@@ -940,7 +1084,20 @@ module C05Map_Impl1_ProducesOneInvariant_Impl
   constant iter  : i
   function produces_one_invariant [#"../05_map.rs" 107 4 107 73] (self : C05Map_Map_Type.t_map i b f) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
-  goal vc_produces_one_invariant : ([#"../05_map.rs" 107 65 107 69] inv4 iter) -> ([#"../05_map.rs" 107 54 107 55] inv3 f) -> ([#"../05_map.rs" 107 48 107 49] inv2 r) -> ([#"../05_map.rs" 107 36 107 37] inv1 e) -> ([#"../05_map.rs" 107 30 107 34] inv0 self) -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r) -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self) -> ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../05_map.rs" 101 4 101 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f)))
+  goal vc_produces_one_invariant : ([#"../05_map.rs" 107 65 107 69] inv4 iter)
+   -> ([#"../05_map.rs" 107 54 107 55] inv3 f)
+   -> ([#"../05_map.rs" 107 48 107 49] inv2 r)
+   -> ([#"../05_map.rs" 107 36 107 37] inv1 e)
+   -> ([#"../05_map.rs" 107 30 107 34] inv0 self)
+   -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r)
+   -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self)
+   -> ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter)
+   -> ([#"../05_map.rs" 101 4 101 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+   -> inv1 e2
+   -> inv1 e1
+   -> inv5 s
+   -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+   -> produces0 (C05Map_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f)))
 end
 module C05Map_Impl0_Next
   type i
@@ -1021,7 +1178,8 @@ module C05Map_Impl0_Next
     
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv0 i -> inv7 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv0 i
+     -> inv7 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
@@ -1035,7 +1193,15 @@ module C05Map_Impl0_Next
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv8 b -> inv9 f -> inv7 e2 -> inv7 e1 -> inv10 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv8 b
+     -> inv9 f
+     -> inv7 e2
+     -> inv7 e1
+     -> inv10 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -1048,7 +1214,8 @@ module C05Map_Impl0_Next
     ensures { result = inv5 _x }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv2 func -> inv5 iter -> completed1 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv2 func
+     -> inv5 iter  -> completed1 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1080,7 +1247,10 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv11 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv9 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve3 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv11 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv9 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve3 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -1090,13 +1260,19 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -1105,7 +1281,11 @@ module C05Map_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv11 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv11 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant5 (self : borrowed i)
   val invariant5 (self : borrowed i) : bool
     ensures { result = invariant5 self }
@@ -1157,14 +1337,21 @@ module C05Map_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv10 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv10 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv10 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv10 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -1180,11 +1367,13 @@ module C05Map_Impl0_Next
   predicate produces1 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv10 s /\ Seq.length s = Seq.length visited /\ produces0 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv12 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv10 s /\ Seq.length s = Seq.length visited /\ produces0 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv12 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C05Map_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C05Map_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
   val produces1 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces1 self visited succ }
     
@@ -1199,7 +1388,10 @@ module C05Map_Impl0_Next
     requires {[#"../05_map.rs" 117 38 117 42] inv6 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv6 self) -> ([#"../05_map.rs" 117 26 117 33] inv8 visited) -> ([#"../05_map.rs" 117 38 117 42] inv6 succ) -> ([#"../05_map.rs" 116 14 116 68] produces_one0 self visited succ = produces1 self (Seq.singleton visited) succ)
+  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv6 self)
+   -> ([#"../05_map.rs" 117 26 117 33] inv8 visited)
+   -> ([#"../05_map.rs" 117 38 117 42] inv6 succ)
+   -> ([#"../05_map.rs" 116 14 116 68] produces_one0 self visited succ = produces1 self (Seq.singleton visited) succ)
   predicate completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) =
     [#"../05_map.rs" 23 8 23 75] completed1 (Borrow.borrow_logic (C05Map_Map_Type.map_iter ( * self)) (C05Map_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C05Map_Map_Type.map_func ( * self) = C05Map_Map_Type.map_func ( ^ self)
   val completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
@@ -1236,7 +1428,15 @@ module C05Map_Impl0_Next
     requires {[#"../05_map.rs" 107 65 107 69] inv0 iter}
     ensures { result = produces_one_invariant0 self e r f iter }
     
-  axiom produces_one_invariant0_spec : forall self : C05Map_Map_Type.t_map i b f, e : item0, r : b, f : borrowed f, iter : i . ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self) -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r) -> ([#"../05_map.rs" 107 30 107 34] inv6 self) -> ([#"../05_map.rs" 107 36 107 37] inv7 e) -> ([#"../05_map.rs" 107 48 107 49] inv8 r) -> ([#"../05_map.rs" 107 54 107 55] inv9 f) -> ([#"../05_map.rs" 107 65 107 69] inv0 iter) -> ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f))
+  axiom produces_one_invariant0_spec : forall self : C05Map_Map_Type.t_map i b f, e : item0, r : b, f : borrowed f, iter : i . ([#"../05_map.rs" 102 4 102 60] produces0 (C05Map_Map_Type.map_iter self) (Seq.singleton e) iter)
+   -> ([#"../05_map.rs" 103 15 103 30]  * f = C05Map_Map_Type.map_func self)
+   -> ([#"../05_map.rs" 104 15 104 43] postcondition_mut0 f (e) r)
+   -> ([#"../05_map.rs" 107 30 107 34] inv6 self)
+   -> ([#"../05_map.rs" 107 36 107 37] inv7 e)
+   -> ([#"../05_map.rs" 107 48 107 49] inv8 r)
+   -> ([#"../05_map.rs" 107 54 107 55] inv9 f)
+   -> ([#"../05_map.rs" 107 65 107 69] inv0 iter)
+   -> ([#"../05_map.rs" 106 14 106 47] next_precondition0 iter ( ^ f)) && ([#"../05_map.rs" 105 14 105 42] preservation0 iter ( ^ f))
   predicate resolve0 (self : Core_Option_Option_Type.t_option item0)
   val resolve0 (self : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = resolve0 self }
@@ -1397,7 +1597,10 @@ module C05Map_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -1411,13 +1614,19 @@ module C05Map_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
   val postcondition_mut_unnest0 (self : borrowed f) (args : item0) (res : b) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res}
@@ -1426,7 +1635,11 @@ module C05Map_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : item0, res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate invariant7 (self : Seq.seq item0)
   val invariant7 (self : Seq.seq item0) : bool
@@ -1474,13 +1687,22 @@ module C05Map_Map
     ensures { result = inv1 _x }
     
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv0 i
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
   use seq.Seq
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv5 b
+     -> inv6 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -1489,7 +1711,8 @@ module C05Map_Map
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv2 func -> inv4 iter -> completed0 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv2 func
+     -> inv4 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1534,16 +1757,24 @@ module C05Map_Map
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv7 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv7 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv7 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv7 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   let rec cfg map [#"../05_map.rs" 144 0 144 84] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) (func : f) : C05Map_Map_Type.t_map i b f
-    requires {[#"../05_map.rs" 140 0 140 105] forall i2 : i . forall e : item0 . inv0 i2 -> inv1 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e)}
+    requires {[#"../05_map.rs" 140 0 140 105] forall i2 : i . forall e : item0 . inv0 i2
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i2  -> precondition0 func (e)}
     requires {[#"../05_map.rs" 141 11 141 41] reinitialize0 ()}
     requires {[#"../05_map.rs" 142 11 142 51] preservation0 iter func}
     requires {[#"../05_map.rs" 144 51 144 55] inv0 iter}
@@ -1709,7 +1940,8 @@ module C05Map_Impl0
     
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
-    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv9 i -> inv8 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e)
+    [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv9 i
+     -> inv8 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
@@ -1723,7 +1955,15 @@ module C05Map_Impl0
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
-    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv6 b -> inv7 f -> inv8 e2 -> inv8 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1) -> postcondition_mut0 f (e1) b -> precondition0 ( ^ f) (e2)
+    [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
+     -> inv6 b
+     -> inv7 f
+     -> inv8 e2
+     -> inv8 e1
+     -> inv4 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
   val preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -1732,7 +1972,8 @@ module C05Map_Impl0
     ensures { result = completed1 self }
     
   predicate reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) =
-    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv10 func -> inv11 iter -> completed1 iter -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
+    [#"../05_map.rs" 94 8 98 9] forall func : f . forall iter : borrowed i . inv10 func
+     -> inv11 iter  -> completed1 iter  -> next_precondition0 ( ^ iter) func /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1757,11 +1998,13 @@ module C05Map_Impl0
   predicate produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C05Map_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C05Map_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C05Map_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
@@ -1775,22 +2018,30 @@ module C05Map_Impl0
     requires {[#"../05_map.rs" 117 38 117 42] inv0 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv0 self) -> ([#"../05_map.rs" 117 26 117 33] inv6 visited) -> ([#"../05_map.rs" 117 38 117 42] inv0 succ) -> ([#"../05_map.rs" 116 14 116 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
+  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv0 self)
+   -> ([#"../05_map.rs" 117 26 117 33] inv6 visited)
+   -> ([#"../05_map.rs" 117 38 117 42] inv0 succ)
+   -> ([#"../05_map.rs" 116 14 116 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
   predicate completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) =
     [#"../05_map.rs" 23 8 23 75] completed1 (Borrow.borrow_logic (C05Map_Map_Type.map_iter ( * self)) (C05Map_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C05Map_Map_Type.map_func ( * self) = C05Map_Map_Type.map_func ( ^ self)
   val completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
     ensures { result = completed0 self }
     
   use seq.Seq
-  goal produces_trans_refn : [#"../05_map.rs" 36 4 36 90] forall a : C05Map_Map_Type.t_map i b f . forall ab : Seq.seq b . forall b : C05Map_Map_Type.t_map i b f . forall bc : Seq.seq b . forall c : C05Map_Map_Type.t_map i b f . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal next_refn : [#"../05_map.rs" 60 4 60 44] forall self : borrowed (C05Map_Map_Type.t_map i b f) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option b . inv3 result /\ match result with
+  goal produces_trans_refn : [#"../05_map.rs" 36 4 36 90] forall a : C05Map_Map_Type.t_map i b f . forall ab : Seq.seq b . forall b : C05Map_Map_Type.t_map i b f . forall bc : Seq.seq b . forall c : C05Map_Map_Type.t_map i b f . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../05_map.rs" 60 4 60 44] forall self : borrowed (C05Map_Map_Type.t_map i b f) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option b . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces_one0 ( * self) v ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_refl_refn : [#"../05_map.rs" 29 4 29 26] forall self : C05Map_Map_Type.t_map i b f . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_refl_refn : [#"../05_map.rs" 29 4 29 26] forall self : C05Map_Map_Type.t_map i b f . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C05Map_Impl2
   type i
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index cf3837888a..70b63946f5 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -68,7 +68,10 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv4 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -82,13 +85,19 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -98,7 +107,11 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv6 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv3 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant5 (self : item0)
   val invariant5 (self : item0) : bool
     ensures { result = invariant5 self }
@@ -143,14 +156,21 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate invariant2 (self : Seq.seq item0)
   val invariant2 (self : Seq.seq item0) : bool
     ensures { result = invariant2 self }
@@ -173,7 +193,16 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   use prelude.Snapshot
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv3 b
+     -> inv4 f
+     -> inv5 e2
+     -> inv5 e1
+     -> inv2 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
@@ -181,7 +210,21 @@ module C06MapPrecond_Impl1_PreservationInv_Impl
   constant func  : f
   constant produced  : Seq.seq item0
   predicate preservation_inv [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0)
-  goal vc_preservation_inv : ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 93 33 93 37] inv1 func) -> ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> ([#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv3 b -> inv4 f -> inv5 e2 -> inv5 e1 -> inv2 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))) = preservation0 iter func)
+  goal vc_preservation_inv : ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv1 func)
+   -> ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> ([#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+   -> inv3 b
+   -> inv4 f
+   -> inv5 e2
+   -> inv5 e1
+   -> inv2 s
+   -> unnest0 func ( * f)
+   -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+   -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+   -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+   -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))) = preservation0 iter func)
 end
 module C06MapPrecond_Impl0_ProducesRefl_Impl
   type i
@@ -300,7 +343,10 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -314,13 +360,19 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv4 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv4 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv4 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -330,7 +382,11 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv8 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -348,14 +404,21 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
   val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
@@ -363,32 +426,57 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
   use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv3 i -> inv10 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv3 i
+     -> inv10 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i
+     -> inv8 b
+     -> inv6 f
+     -> inv10 e2
+     -> inv10 e1
+     -> inv1 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i -> inv8 b -> inv6 f -> inv10 e2 -> inv10 e1 -> inv1 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv3 i
+     -> inv8 b
+     -> inv6 f
+     -> inv10 e2
+     -> inv10 e1
+     -> inv1 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv3 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv1 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv3 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv1 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv3 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv1 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv4 func -> inv9 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv4 func
+     -> inv9 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -417,18 +505,21 @@ module C06MapPrecond_Impl0_ProducesRefl_Impl
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv2 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
   use seq.Seq
   constant self  : C06MapPrecond_Map_Type.t_map i b f item0
   function produces_refl [#"../06_map_precond.rs" 31 4 31 26] (self : C06MapPrecond_Map_Type.t_map i b f item0) : ()
-  goal vc_produces_refl : ([#"../06_map_precond.rs" 31 21 31 25] inv0 self) -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../06_map_precond.rs" 31 21 31 25] inv0 self)
+   -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
 end
 module C06MapPrecond_Impl0_ProducesTrans_Impl
   type i
@@ -547,7 +638,10 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -561,13 +655,19 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv5 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv5 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv5 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -577,7 +677,11 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
@@ -595,14 +699,21 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq b)
   val invariant1 (self : Seq.seq b) : bool
     ensures { result = invariant1 self }
@@ -619,32 +730,58 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   use prelude.Snapshot
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv11 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i
+     -> inv11 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv9 b
+     -> inv7 f
+     -> inv11 e2
+     -> inv11 e1
+     -> inv2 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv2 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv9 b
+     -> inv7 f
+     -> inv11 e2
+     -> inv11 e1
+     -> inv2 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv4 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv5 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv2 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv5 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv5 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv2 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv5 func -> inv10 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv5 func
+     -> inv10 iter
+     -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -674,11 +811,13 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv2 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv3 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -689,7 +828,14 @@ module C06MapPrecond_Impl0_ProducesTrans_Impl
   constant c  : C06MapPrecond_Map_Type.t_map i b f item0
   function produces_trans [#"../06_map_precond.rs" 38 4 38 90] (a : C06MapPrecond_Map_Type.t_map i b f item0) (ab : Seq.seq b) (b : C06MapPrecond_Map_Type.t_map i b f item0) (bc : Seq.seq b) (c : C06MapPrecond_Map_Type.t_map i b f item0) : ()
     
-  goal vc_produces_trans : ([#"../06_map_precond.rs" 38 82 38 83] inv0 c) -> ([#"../06_map_precond.rs" 38 61 38 63] inv1 bc) -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b) -> ([#"../06_map_precond.rs" 38 31 38 33] inv1 ab) -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a) -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c) -> ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b) -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../06_map_precond.rs" 38 82 38 83] inv0 c)
+   -> ([#"../06_map_precond.rs" 38 61 38 63] inv1 bc)
+   -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b)
+   -> ([#"../06_map_precond.rs" 38 31 38 33] inv1 ab)
+   -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a)
+   -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c)
+   -> ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b)
+   -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -809,7 +955,10 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv10 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv1 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv2 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -823,13 +972,19 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv7 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv7 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -839,7 +994,11 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv10 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv10 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv1 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant3 (self : item0)
   val invariant3 (self : item0) : bool
     ensures { result = invariant3 self }
@@ -871,14 +1030,21 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../common.rs" 21 82 21 83] inv6 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv6 a) -> ([#"../common.rs" 21 31 21 33] inv4 ab) -> ([#"../common.rs" 21 52 21 53] inv6 b) -> ([#"../common.rs" 21 61 21 63] inv4 bc) -> ([#"../common.rs" 21 82 21 83] inv6 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv6 a)
+   -> ([#"../common.rs" 21 31 21 33] inv4 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv6 b)
+   -> ([#"../common.rs" 21 61 21 63] inv4 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv6 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv6 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv6 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv6 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
   use seq.Seq
   predicate inv0 (_x : C06MapPrecond_Map_Type.t_map i b f item0)
@@ -903,11 +1069,13 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -925,7 +1093,14 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../06_map_precond.rs" 38 82 38 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C06MapPrecond_Map_Type.t_map i b f item0, ab : Seq.seq b, b : C06MapPrecond_Map_Type.t_map i b f item0, bc : Seq.seq b, c : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b) -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c) -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a) -> ([#"../06_map_precond.rs" 38 31 38 33] inv9 ab) -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b) -> ([#"../06_map_precond.rs" 38 61 38 63] inv9 bc) -> ([#"../06_map_precond.rs" 38 82 38 83] inv0 c) -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C06MapPrecond_Map_Type.t_map i b f item0, ab : Seq.seq b, b : C06MapPrecond_Map_Type.t_map i b f item0, bc : Seq.seq b, c : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b)
+   -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c)
+   -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a)
+   -> ([#"../06_map_precond.rs" 38 31 38 33] inv9 ab)
+   -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b)
+   -> ([#"../06_map_precond.rs" 38 61 38 63] inv9 bc)
+   -> ([#"../06_map_precond.rs" 38 82 38 83] inv0 c)
+   -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../06_map_precond.rs" 31 4 31 26] (self : C06MapPrecond_Map_Type.t_map i b f item0) : () =
     [#"../06_map_precond.rs" 28 4 28 10] ()
@@ -933,7 +1108,8 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
     requires {[#"../06_map_precond.rs" 31 21 31 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 31 21 31 25] inv0 self) -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 31 21 31 25] inv0 self)
+   -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : b)
   val invariant1 (self : b) : bool
     ensures { result = invariant1 self }
@@ -941,31 +1117,57 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   axiom inv1 : forall x : b . inv1 x = true
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv6 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv6 i
+     -> inv3 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i
+     -> inv1 b
+     -> inv2 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv4 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i -> inv1 b -> inv2 f -> inv3 e2 -> inv3 e1 -> inv4 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv6 i
+     -> inv1 b
+     -> inv2 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv4 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv6 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv7 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv4 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv6 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv7 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv4 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv6 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv7 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv4 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv7 func -> inv11 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv7 func
+     -> inv11 iter
+     -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -983,7 +1185,10 @@ module C06MapPrecond_Impl1_ProducesOne_Impl
   constant succ  : C06MapPrecond_Map_Type.t_map i b f item0
   predicate produces_one [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
-  goal vc_produces_one : ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ) -> ([#"../06_map_precond.rs" 142 26 142 33] inv1 visited) -> ([#"../06_map_precond.rs" 142 20 142 24] inv0 self) -> ([#"../06_map_precond.rs" 141 14 141 68] ([#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)) = produces0 self (Seq.singleton visited) succ)
+  goal vc_produces_one : ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ)
+   -> ([#"../06_map_precond.rs" 142 26 142 33] inv1 visited)
+   -> ([#"../06_map_precond.rs" 142 20 142 24] inv0 self)
+   -> ([#"../06_map_precond.rs" 141 14 141 68] ([#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv2 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv3 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)) = produces0 self (Seq.singleton visited) succ)
 end
 module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   type i
@@ -1085,7 +1290,8 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv4 i
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -1100,27 +1306,51 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv2 b
+     -> inv3 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv5 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv2 b -> inv3 f -> inv1 e2 -> inv1 e1 -> inv5 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+     -> inv2 b
+     -> inv3 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv5 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv4 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv6 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv5 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv6 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv5 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv4 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv6 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv5 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv6 func -> inv9 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv6 func
+     -> inv9 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1152,7 +1382,10 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv3 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -1162,13 +1395,19 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv6 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv6 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv6 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv6 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv6 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv6 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -1178,7 +1417,11 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv7 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv2 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   function produces_trans0 [#"../common.rs" 21 4 21 91] (a : i) (ab : Seq.seq item0) (b : i) (bc : Seq.seq item0) (c : i) : ()
     
   val produces_trans0 [#"../common.rs" 21 4 21 91] (a : i) (ab : Seq.seq item0) (b : i) (bc : Seq.seq item0) (c : i) : ()
@@ -1191,13 +1434,20 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv5 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv5 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv5 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv5 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   constant self  : C06MapPrecond_Map_Type.t_map i b f item0
   constant e  : item0
   constant r  : b
@@ -1205,7 +1455,20 @@ module C06MapPrecond_Impl1_ProducesOneInvariant_Impl
   constant iter  : i
   function produces_one_invariant [#"../06_map_precond.rs" 132 4 132 73] (self : C06MapPrecond_Map_Type.t_map i b f item0) (e : item0) (r : b) (f : borrowed f) (iter : i) : ()
     
-  goal vc_produces_one_invariant : ([#"../06_map_precond.rs" 132 65 132 69] inv4 iter) -> ([#"../06_map_precond.rs" 132 54 132 55] inv3 f) -> ([#"../06_map_precond.rs" 132 48 132 49] inv2 r) -> ([#"../06_map_precond.rs" 132 36 132 37] inv1 e) -> ([#"../06_map_precond.rs" 132 30 132 34] inv0 self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../06_map_precond.rs" 126 4 126 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i -> inv1 e2 -> inv1 e1 -> inv5 s -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)))
+  goal vc_produces_one_invariant : ([#"../06_map_precond.rs" 132 65 132 69] inv4 iter)
+   -> ([#"../06_map_precond.rs" 132 54 132 55] inv3 f)
+   -> ([#"../06_map_precond.rs" 132 48 132 49] inv2 r)
+   -> ([#"../06_map_precond.rs" 132 36 132 37] inv1 e)
+   -> ([#"../06_map_precond.rs" 132 30 132 34] inv0 self)
+   -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r)
+   -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self)
+   -> ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter)
+   -> ([#"../06_map_precond.rs" 126 4 126 12] forall i : i . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv4 i
+   -> inv1 e2
+   -> inv1 e1
+   -> inv5 s
+   -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+   -> produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.snoc (Seq.snoc (Seq.(++) (Seq.singleton e) s) e1) e2) i) && (let _ = () in ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)))
 end
 module C06MapPrecond_Impl0_Next
   type i
@@ -1265,7 +1528,8 @@ module C06MapPrecond_Impl0_Next
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv11 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i
+     -> inv11 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -1288,20 +1552,43 @@ module C06MapPrecond_Impl0_Next
     ensures { result = inv9 _x }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv9 b
+     -> inv7 f
+     -> inv11 e2
+     -> inv11 e1
+     -> inv12 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv9 b -> inv7 f -> inv11 e2 -> inv11 e1 -> inv12 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv9 b
+     -> inv7 f
+     -> inv11 e2
+     -> inv11 e1
+     -> inv12 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv0 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv2 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv12 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv12 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv12 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
@@ -1312,7 +1599,8 @@ module C06MapPrecond_Impl0_Next
     ensures { result = inv6 _x }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv2 func -> inv6 iter -> completed1 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv2 func
+     -> inv6 iter  -> completed1 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1353,7 +1641,10 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve4 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv9 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv7 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve4 ( ^ s)))
   function unnest_trans0 (self : f) (b : f) (c : f) : ()
   val unnest_trans0 (self : f) (b : f) (c : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b}
@@ -1363,13 +1654,19 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -1379,7 +1676,11 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv8 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv9 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0)))
   val invariant8 (self : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = invariant8 self }
@@ -1445,13 +1746,20 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv12 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv12 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv12 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv12 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -1469,11 +1777,13 @@ module C06MapPrecond_Impl0_Next
   predicate produces1 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv12 s /\ Seq.length s = Seq.length visited /\ produces0 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv12 s /\ Seq.length s = Seq.length visited /\ produces0 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv13 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces1 self visited succ }
     
@@ -1488,7 +1798,10 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../06_map_precond.rs" 142 38 142 42] inv10 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv10 self) -> ([#"../06_map_precond.rs" 142 26 142 33] inv9 visited) -> ([#"../06_map_precond.rs" 142 38 142 42] inv10 succ) -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces1 self (Seq.singleton visited) succ)
+  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv10 self)
+   -> ([#"../06_map_precond.rs" 142 26 142 33] inv9 visited)
+   -> ([#"../06_map_precond.rs" 142 38 142 42] inv10 succ)
+   -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces1 self (Seq.singleton visited) succ)
   predicate completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
    =
     [#"../06_map_precond.rs" 22 8 25 9] Snapshot.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
@@ -1513,7 +1826,15 @@ module C06MapPrecond_Impl0_Next
     requires {[#"../06_map_precond.rs" 132 65 132 69] inv0 iter}
     ensures { result = produces_one_invariant0 self e r f iter }
     
-  axiom produces_one_invariant0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, e : item0, r : b, f : borrowed f, iter : i . ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter) -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self) -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r) -> ([#"../06_map_precond.rs" 132 30 132 34] inv10 self) -> ([#"../06_map_precond.rs" 132 36 132 37] inv11 e) -> ([#"../06_map_precond.rs" 132 48 132 49] inv9 r) -> ([#"../06_map_precond.rs" 132 54 132 55] inv7 f) -> ([#"../06_map_precond.rs" 132 65 132 69] inv0 iter) -> ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e))
+  axiom produces_one_invariant0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, e : item0, r : b, f : borrowed f, iter : i . ([#"../06_map_precond.rs" 127 4 127 60] produces0 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) iter)
+   -> ([#"../06_map_precond.rs" 128 15 128 30]  * f = C06MapPrecond_Map_Type.map_func self)
+   -> ([#"../06_map_precond.rs" 129 15 129 57] postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) r)
+   -> ([#"../06_map_precond.rs" 132 30 132 34] inv10 self)
+   -> ([#"../06_map_precond.rs" 132 36 132 37] inv11 e)
+   -> ([#"../06_map_precond.rs" 132 48 132 49] inv9 r)
+   -> ([#"../06_map_precond.rs" 132 54 132 55] inv7 f)
+   -> ([#"../06_map_precond.rs" 132 65 132 69] inv0 iter)
+   -> ([#"../06_map_precond.rs" 131 14 131 70] next_precondition0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e)) && ([#"../06_map_precond.rs" 130 14 130 69] preservation_inv0 iter ( ^ f) (Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e))
   predicate resolve2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
@@ -1723,7 +2044,10 @@ module C06MapPrecond_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res}
     ensures { result = fn_mut_once0 self args res }
     
-  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
+  axiom fn_mut_once0_spec : forall self : f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 19 123 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 25 123 29] inv9 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 123 37 123 40] inv5 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 122 14 122 135] postcondition_once0 self args res = (exists s : borrowed f . inv6 s /\  * s = self /\ postcondition_mut0 s args res /\ resolve0 ( ^ s)))
   predicate unnest0 (self : f) (_2 : f)
   val unnest0 (self : f) (_2 : f) : bool
     ensures { result = unnest0 self _2 }
@@ -1737,13 +2061,19 @@ module C06MapPrecond_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c}
     ensures { result = unnest_trans0 self b c }
     
-  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
+  axiom unnest_trans0_spec : forall self : f, b : f, c : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 114 15 114 29] unnest0 self b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 115 15 115 26] unnest0 b c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 20 117 24] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 26 117 27] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 117 35 117 36] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 116 14 116 28] unnest0 self c)
   function unnest_refl0 (self : f) : ()
   val unnest_refl0 (self : f) : ()
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self}
     ensures { result = unnest_refl0 self }
     
-  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
+  axiom unnest_refl0_spec : forall self : f . ([#"../../../../../creusot-contracts/src/std/ops.rs" 110 19 110 23] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 109 14 109 31] unnest0 self self)
   function postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
     
   val postcondition_mut_unnest0 (self : borrowed f) (args : (item0, Snapshot.snap_ty (Seq.seq item0))) (res : b) : ()
@@ -1753,7 +2083,11 @@ module C06MapPrecond_Map
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res}
     ensures { result = postcondition_mut_unnest0 self args res }
     
-  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
+  axiom postcondition_mut_unnest0_spec : forall self : borrowed f, args : (item0, Snapshot.snap_ty (Seq.seq item0)), res : b . ([#"../../../../../creusot-contracts/src/std/ops.rs" 103 15 103 48] postcondition_mut0 self args res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 37 105 41] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 43 105 47] inv9 args)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 105 55 105 58] inv5 res)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 104 14 104 35] unnest0 ( * self) ( ^ self))
   predicate invariant7 (self : Seq.seq item0)
   val invariant7 (self : Seq.seq item0) : bool
     ensures { result = invariant7 self }
@@ -1801,34 +2135,59 @@ module C06MapPrecond_Map
     ensures { result = inv1 _x }
     
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv0 i
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
   use seq.Seq
   use seq.Seq
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv5 b
+     -> inv6 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i -> inv5 b -> inv6 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv0 i
+     -> inv5 b
+     -> inv6 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv0 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv2 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv7 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv0 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv2 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv2 func -> inv4 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv2 func
+     -> inv4 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -1872,15 +2231,23 @@ module C06MapPrecond_Map
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv7 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv7 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv7 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv7 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   let rec cfg map [#"../06_map_precond.rs" 170 0 173 17] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) (func : f) : C06MapPrecond_Map_Type.t_map i b f item0
-    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv0 i2 -> inv1 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv0 i2
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv0 iter}
@@ -1998,14 +2365,21 @@ module C06MapPrecond_Identity_Closure0
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv3 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv3 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv3 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv3 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   use prelude.Int16
   use C06MapPrecond_Identity_Closure0_Type as C06MapPrecond_Identity_Closure0
   predicate unnest0 [#"../06_map_precond.rs" 178 14 178 20] (self : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (_2 : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)
@@ -2137,14 +2511,21 @@ module C06MapPrecond_Identity
     requires {[#"../common.rs" 21 82 21 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv1 a) -> ([#"../common.rs" 21 31 21 33] inv6 ab) -> ([#"../common.rs" 21 52 21 53] inv1 b) -> ([#"../common.rs" 21 61 21 63] inv6 bc) -> ([#"../common.rs" 21 82 21 83] inv1 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv1 a)
+   -> ([#"../common.rs" 21 31 21 33] inv6 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv1 b)
+   -> ([#"../common.rs" 21 61 21 63] inv6 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv1 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate precondition0 [#"../06_map_precond.rs" 178 14 178 20] (self : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (args : (item0, Snapshot.snap_ty (Seq.seq item0)))
     
    =
@@ -2154,7 +2535,8 @@ module C06MapPrecond_Identity
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv1 i -> inv2 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv1 i
+     -> inv2 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2170,28 +2552,52 @@ module C06MapPrecond_Identity
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i
+     -> inv2 b
+     -> inv5 f
+     -> inv2 e2
+     -> inv2 e1
+     -> inv6 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i -> inv2 b -> inv5 f -> inv2 e2 -> inv2 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : item0 . forall f : borrowed (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv1 i
+     -> inv2 b
+     -> inv5 f
+     -> inv2 e2
+     -> inv2 e1
+     -> inv6 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv1 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv3 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv6 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv1 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv3 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv6 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv1 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv3 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv6 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i . forall iter : borrowed i . inv3 func -> inv4 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i . forall iter : borrowed i . inv3 func
+     -> inv4 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -2217,7 +2623,8 @@ module C06MapPrecond_Identity
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : i) (func : C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) : C06MapPrecond_Map_Type.t_map i item0 (C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i) item0
-    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv1 i2 -> inv2 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : item0 . inv1 i2
+     -> inv2 e  -> produces0 iter (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv1 iter}
@@ -2403,14 +2810,21 @@ module C06MapPrecond_Increment
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : u, ab : Seq.seq uint32, b : u, bc : Seq.seq uint32, c : u . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv5 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv5 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : u, ab : Seq.seq uint32, b : u, bc : Seq.seq uint32, c : u . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv5 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv5 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : u) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : u) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : u . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : u . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : borrowed u)
   val invariant1 (self : borrowed u) : bool
     ensures { result = invariant1 self }
@@ -2451,11 +2865,13 @@ module C06MapPrecond_Increment
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) (visited : Seq.seq uint32) (succ : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq uint32 . inv5 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) . inv6 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq uint32 . inv5 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)) . inv6 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) (visited : Seq.seq uint32) (succ : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) : bool
     ensures { result = produces0 self visited succ }
     
@@ -2473,7 +2889,14 @@ module C06MapPrecond_Increment
     requires {[#"../06_map_precond.rs" 38 82 38 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32, ab : Seq.seq uint32, b : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32, bc : Seq.seq uint32, c : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b) -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c) -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a) -> ([#"../06_map_precond.rs" 38 31 38 33] inv5 ab) -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b) -> ([#"../06_map_precond.rs" 38 61 38 63] inv5 bc) -> ([#"../06_map_precond.rs" 38 82 38 83] inv0 c) -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32, ab : Seq.seq uint32, b : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32, bc : Seq.seq uint32, c : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . ([#"../06_map_precond.rs" 35 15 35 32] produces0 a ab b)
+   -> ([#"../06_map_precond.rs" 36 15 36 32] produces0 b bc c)
+   -> ([#"../06_map_precond.rs" 38 22 38 23] inv0 a)
+   -> ([#"../06_map_precond.rs" 38 31 38 33] inv5 ab)
+   -> ([#"../06_map_precond.rs" 38 52 38 53] inv0 b)
+   -> ([#"../06_map_precond.rs" 38 61 38 63] inv5 bc)
+   -> ([#"../06_map_precond.rs" 38 82 38 83] inv0 c)
+   -> ([#"../06_map_precond.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../06_map_precond.rs" 31 4 31 26] (self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32) : ()
     
    =
@@ -2482,12 +2905,14 @@ module C06MapPrecond_Increment
     requires {[#"../06_map_precond.rs" 31 21 31 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . ([#"../06_map_precond.rs" 31 21 31 25] inv0 self) -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . ([#"../06_map_precond.rs" 31 21 31 25] inv0 self)
+   -> ([#"../06_map_precond.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : u . forall e : uint32 . inv2 i -> inv3 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : u . forall e : uint32 . inv2 i
+     -> inv3 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2495,27 +2920,51 @@ module C06MapPrecond_Increment
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i
+     -> inv3 b
+     -> inv7 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv5 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv7 f -> inv3 e2 -> inv3 e1 -> inv5 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : u . forall b : uint32 . forall f : borrowed (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i
+     -> inv3 b
+     -> inv7 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv5 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) (produced : Seq.seq uint32) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv2 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv5 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : u, func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u, produced : Seq.seq uint32 . ([#"../06_map_precond.rs" 93 24 93 28] inv2 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv5 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : u, func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u, produced : Seq.seq uint32 . ([#"../06_map_precond.rs" 93 24 93 28] inv2 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv5 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed u)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed u) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u . forall iter : borrowed u . inv4 func -> inv1 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u . forall iter : borrowed u . inv4 func
+     -> inv1 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -2535,7 +2984,8 @@ module C06MapPrecond_Increment
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : u) (func : C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32
-    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : u . forall e : uint32 . inv2 i2 -> inv3 e -> produces1 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : u . forall e : uint32 . inv2 i2
+     -> inv3 e  -> produces1 iter (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv2 iter}
@@ -2544,8 +2994,13 @@ module C06MapPrecond_Increment
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv0 result }
     
   let rec cfg increment [#"../06_map_precond.rs" 185 0 185 50] [@cfg:stackify] [@cfg:subregion_analysis] (iter : u) : ()
-    requires {[#"../06_map_precond.rs" 181 0 181 158] forall done' : borrowed u . inv1 done' -> completed0 done' -> (forall steps : Seq.seq uint32 . forall next : u . inv2 next -> produces1 ( ^ done') steps next -> steps = Seq.empty  /\  ^ done' = next)}
-    requires {[#"../06_map_precond.rs" 182 0 184 2] forall fin : u . forall prod : Seq.seq uint32 . inv2 fin -> produces1 iter prod fin -> (forall x : int . 0 <= x /\ x < Seq.length prod -> Seq.get prod x <= (10 : uint32))}
+    requires {[#"../06_map_precond.rs" 181 0 181 158] forall done' : borrowed u . inv1 done'
+     -> completed0 done'
+     -> (forall steps : Seq.seq uint32 . forall next : u . inv2 next
+     -> produces1 ( ^ done') steps next  -> steps = Seq.empty  /\  ^ done' = next)}
+    requires {[#"../06_map_precond.rs" 182 0 184 2] forall fin : u . forall prod : Seq.seq uint32 . inv2 fin
+     -> produces1 iter prod fin
+     -> (forall x : int . 0 <= x /\ x < Seq.length prod  -> Seq.get prod x <= (10 : uint32))}
     requires {[#"../06_map_precond.rs" 185 42 185 46] inv2 iter}
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -2569,7 +3024,8 @@ module C06MapPrecond_Increment
   BB2 {
     assert { [@expl:type invariant] inv0 i };
     assume { resolve0 i };
-    assert { [@expl:assertion] [#"../06_map_precond.rs" 193 4 196 5] forall fin : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . forall prod : Seq.seq uint32 . inv0 fin -> produces0 i prod fin -> (forall x : int . 0 <= x /\ x < Seq.length prod -> Seq.get prod x <= (11 : uint32)) };
+    assert { [@expl:assertion] [#"../06_map_precond.rs" 193 4 196 5] forall fin : C06MapPrecond_Map_Type.t_map u uint32 (C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u) uint32 . forall prod : Seq.seq uint32 . inv0 fin
+     -> produces0 i prod fin  -> (forall x : int . 0 <= x /\ x < Seq.length prod  -> Seq.get prod x <= (11 : uint32)) };
     goto BB3
   }
   BB3 {
@@ -2736,14 +3192,21 @@ module C06MapPrecond_Counter
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq uint32, b : i, bc : Seq.seq uint32, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv6 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv6 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq uint32, b : i, bc : Seq.seq uint32, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv6 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv6 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : borrowed i)
   val invariant1 (self : borrowed i) : bool
     ensures { result = invariant1 self }
@@ -2775,7 +3238,8 @@ module C06MapPrecond_Counter
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : uint32 . inv2 i -> inv3 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : uint32 . inv2 i
+     -> inv3 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -2791,27 +3255,51 @@ module C06MapPrecond_Counter
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i)
     
    =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i
+     -> inv3 b
+     -> inv5 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv6 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : bool
     ensures { result = preservation0 iter func }
     
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32)
     
    =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i -> inv3 b -> inv5 f -> inv3 e2 -> inv3 e1 -> inv6 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : uint32 . forall f : borrowed (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) . forall e2 : uint32 . forall e1 : uint32 . forall s : Seq.seq uint32 . inv2 i
+     -> inv3 b
+     -> inv5 f
+     -> inv3 e2
+     -> inv3 e1
+     -> inv6 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) (produced : Seq.seq uint32) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv2 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv4 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv6 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i, produced : Seq.seq uint32 . ([#"../06_map_precond.rs" 93 24 93 28] inv2 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv6 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i, produced : Seq.seq uint32 . ([#"../06_map_precond.rs" 93 24 93 28] inv2 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv4 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv6 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed0 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i . forall iter : borrowed i . inv4 func -> inv1 iter -> completed0 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i . forall iter : borrowed i . inv4 func
+     -> inv1 iter  -> completed0 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -2837,7 +3325,8 @@ module C06MapPrecond_Counter
     ensures { result = resolve0 self }
     
   val map0 [#"../06_map_precond.rs" 170 0 173 17] (iter : i) (func : C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) : C06MapPrecond_Map_Type.t_map i uint32 (C06MapPrecond_Counter_Closure2.c06mapprecond_counter_closure2 i) uint32
-    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : uint32 . inv2 i2 -> inv3 e -> produces0 iter (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../06_map_precond.rs" 166 0 166 131] forall i2 : i . forall e : uint32 . inv2 i2
+     -> inv3 e  -> produces0 iter (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../06_map_precond.rs" 167 11 167 41] reinitialize0 ()}
     requires {[#"../06_map_precond.rs" 168 11 168 51] preservation0 iter func}
     requires {[#"../06_map_precond.rs" 171 4 171 8] inv2 iter}
@@ -2846,8 +3335,12 @@ module C06MapPrecond_Counter
     ensures { [#"../06_map_precond.rs" 173 5 173 17] inv0 result }
     
   let rec cfg counter [#"../06_map_precond.rs" 201 0 201 48] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) : ()
-    requires {[#"../06_map_precond.rs" 199 0 199 158] forall done' : borrowed i . inv1 done' -> completed0 done' -> (forall steps : Seq.seq uint32 . forall next : i . inv2 next -> produces0 ( ^ done') steps next -> steps = Seq.empty  /\  ^ done' = next)}
-    requires {[#"../06_map_precond.rs" 200 0 200 92] forall fin : i . forall prod : Seq.seq uint32 . inv2 fin -> produces0 iter prod fin -> Seq.length prod <= UIntSize.to_int max0}
+    requires {[#"../06_map_precond.rs" 199 0 199 158] forall done' : borrowed i . inv1 done'
+     -> completed0 done'
+     -> (forall steps : Seq.seq uint32 . forall next : i . inv2 next
+     -> produces0 ( ^ done') steps next  -> steps = Seq.empty  /\  ^ done' = next)}
+    requires {[#"../06_map_precond.rs" 200 0 200 92] forall fin : i . forall prod : Seq.seq uint32 . inv2 fin
+     -> produces0 iter prod fin  -> Seq.length prod <= UIntSize.to_int max0}
     requires {[#"../06_map_precond.rs" 201 40 201 44] inv2 iter}
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -2997,7 +3490,8 @@ module C06MapPrecond_Impl0
     
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv9 i -> inv6 e -> produces1 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv9 i
+     -> inv6 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -3012,27 +3506,52 @@ module C06MapPrecond_Impl0
     ensures { result = unnest0 self _2 }
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
-    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
+     -> inv4 b
+     -> inv5 f
+     -> inv6 e2
+     -> inv6 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) : bool
     ensures { result = preservation0 iter func }
     
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
-    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i -> inv4 b -> inv5 f -> inv6 e2 -> inv6 e1 -> inv7 s -> unnest0 func ( * f) -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s)) -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
+    [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
+     -> inv4 b
+     -> inv5 f
+     -> inv6 e2
+     -> inv6 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
+     -> postcondition_mut0 f (e1, Snapshot.new (Seq.(++) produced s)) b
+     -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc (Seq.(++) produced s) e1))
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv9 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv10 func}
     requires {[#"../06_map_precond.rs" 93 42 93 50] inv7 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv9 iter) -> ([#"../06_map_precond.rs" 93 33 93 37] inv10 func) -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced) -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv9 iter)
+   -> ([#"../06_map_precond.rs" 93 33 93 37] inv10 func)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced)
+   -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
     
   predicate reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) =
-    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv10 func -> inv12 iter -> completed1 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../06_map_precond.rs" 118 8 123 9] forall func : f . forall iter : borrowed i . inv10 func
+     -> inv12 iter
+     -> completed1 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -3083,11 +3602,13 @@ module C06MapPrecond_Impl0
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
        * Seq.get fs 0 = C06MapPrecond_Map_Type.map_func self /\  ^ Seq.get fs (Seq.length visited - 1) = C06MapPrecond_Map_Type.map_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (C06MapPrecond_Map_Type.map_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
@@ -3102,22 +3623,30 @@ module C06MapPrecond_Impl0
     requires {[#"../06_map_precond.rs" 142 38 142 42] inv2 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv2 self) -> ([#"../06_map_precond.rs" 142 26 142 33] inv4 visited) -> ([#"../06_map_precond.rs" 142 38 142 42] inv2 succ) -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
+  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv2 self)
+   -> ([#"../06_map_precond.rs" 142 26 142 33] inv4 visited)
+   -> ([#"../06_map_precond.rs" 142 38 142 42] inv2 succ)
+   -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
   predicate completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
    =
     [#"../06_map_precond.rs" 22 8 25 9] Snapshot.inner (C06MapPrecond_Map_Type.map_produced ( ^ self)) = Seq.empty  /\ completed1 (Borrow.borrow_logic (C06MapPrecond_Map_Type.map_iter ( * self)) (C06MapPrecond_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C06MapPrecond_Map_Type.map_func ( * self) = C06MapPrecond_Map_Type.map_func ( ^ self)
   val completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
     ensures { result = completed0 self }
     
-  goal next_refn : [#"../06_map_precond.rs" 63 4 63 44] forall self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result /\ match result with
+  goal next_refn : [#"../06_map_precond.rs" 63 4 63 44] forall self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces_one0 ( * self) v ( ^ self)
-    end -> inv1 result /\ match result with
+    end
+   -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../06_map_precond.rs" 38 4 38 90] forall a : C06MapPrecond_Map_Type.t_map i b f item0 . forall ab : Seq.seq b . forall b : C06MapPrecond_Map_Type.t_map i b f item0 . forall bc : Seq.seq b . forall c : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../06_map_precond.rs" 31 4 31 26] forall self : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../06_map_precond.rs" 38 4 38 90] forall a : C06MapPrecond_Map_Type.t_map i b f item0 . forall ab : Seq.seq b . forall b : C06MapPrecond_Map_Type.t_map i b f item0 . forall bc : Seq.seq b . forall c : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../06_map_precond.rs" 31 4 31 26] forall self : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 self
+   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C06MapPrecond_Impl2
   type i
diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index fb1ead2e6c..4652e4992c 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -74,14 +74,21 @@ module C07Fuse_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv6 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv6 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv6 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv6 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant3 (self : i)
   val invariant3 (self : i) : bool
     ensures { result = invariant3 self }
@@ -322,14 +329,21 @@ module C07Fuse_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv1 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv1 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv1 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv1 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv1 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv1 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C07Fuse_Fuse_Type as C07Fuse_Fuse_Type
   predicate invariant0 (self : C07Fuse_Fuse_Type.t_fuse i)
   val invariant0 (self : C07Fuse_Fuse_Type.t_fuse i) : bool
@@ -356,7 +370,8 @@ module C07Fuse_Impl0_ProducesRefl_Impl
     
   constant self  : C07Fuse_Fuse_Type.t_fuse i
   function produces_refl [#"../07_fuse.rs" 55 4 55 26] (self : C07Fuse_Fuse_Type.t_fuse i) : ()
-  goal vc_produces_refl : ([#"../07_fuse.rs" 55 21 55 25] inv0 self) -> ([#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../07_fuse.rs" 55 21 55 25] inv0 self)
+   -> ([#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self)
 end
 module C07Fuse_Impl0_ProducesTrans_Impl
   type i
@@ -392,14 +407,21 @@ module C07Fuse_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq item0)
   val invariant1 (self : Seq.seq item0) : bool
     ensures { result = invariant1 self }
@@ -436,7 +458,14 @@ module C07Fuse_Impl0_ProducesTrans_Impl
   constant c  : C07Fuse_Fuse_Type.t_fuse i
   function produces_trans [#"../07_fuse.rs" 62 4 62 90] (a : C07Fuse_Fuse_Type.t_fuse i) (ab : Seq.seq item0) (b : C07Fuse_Fuse_Type.t_fuse i) (bc : Seq.seq item0) (c : C07Fuse_Fuse_Type.t_fuse i) : ()
     
-  goal vc_produces_trans : ([#"../07_fuse.rs" 62 82 62 83] inv0 c) -> ([#"../07_fuse.rs" 62 61 62 63] inv1 bc) -> ([#"../07_fuse.rs" 62 52 62 53] inv0 b) -> ([#"../07_fuse.rs" 62 31 62 33] inv1 ab) -> ([#"../07_fuse.rs" 62 22 62 23] inv0 a) -> ([#"../07_fuse.rs" 60 15 60 32] produces0 b bc c) -> ([#"../07_fuse.rs" 59 15 59 32] produces0 a ab b) -> ([#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../07_fuse.rs" 62 82 62 83] inv0 c)
+   -> ([#"../07_fuse.rs" 62 61 62 63] inv1 bc)
+   -> ([#"../07_fuse.rs" 62 52 62 53] inv0 b)
+   -> ([#"../07_fuse.rs" 62 31 62 33] inv1 ab)
+   -> ([#"../07_fuse.rs" 62 22 62 23] inv0 a)
+   -> ([#"../07_fuse.rs" 60 15 60 32] produces0 b bc c)
+   -> ([#"../07_fuse.rs" 59 15 59 32] produces0 a ab b)
+   -> ([#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c)
 end
 module C07Fuse_Impl1_IsFused_Impl
   type i
@@ -482,14 +511,21 @@ module C07Fuse_Impl1_IsFused_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C07Fuse_Fuse_Type as C07Fuse_Fuse_Type
   predicate invariant2 (self : C07Fuse_Fuse_Type.t_fuse i)
   val invariant2 (self : C07Fuse_Fuse_Type.t_fuse i) : bool
@@ -542,14 +578,21 @@ module C07Fuse_Impl1_IsFused_Impl
     requires {[#"../07_fuse.rs" 62 82 62 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : C07Fuse_Fuse_Type.t_fuse i, ab : Seq.seq item0, b : C07Fuse_Fuse_Type.t_fuse i, bc : Seq.seq item0, c : C07Fuse_Fuse_Type.t_fuse i . ([#"../07_fuse.rs" 59 15 59 32] produces0 a ab b) -> ([#"../07_fuse.rs" 60 15 60 32] produces0 b bc c) -> ([#"../07_fuse.rs" 62 22 62 23] inv2 a) -> ([#"../07_fuse.rs" 62 31 62 33] inv1 ab) -> ([#"../07_fuse.rs" 62 52 62 53] inv2 b) -> ([#"../07_fuse.rs" 62 61 62 63] inv1 bc) -> ([#"../07_fuse.rs" 62 82 62 83] inv2 c) -> ([#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : C07Fuse_Fuse_Type.t_fuse i, ab : Seq.seq item0, b : C07Fuse_Fuse_Type.t_fuse i, bc : Seq.seq item0, c : C07Fuse_Fuse_Type.t_fuse i . ([#"../07_fuse.rs" 59 15 59 32] produces0 a ab b)
+   -> ([#"../07_fuse.rs" 60 15 60 32] produces0 b bc c)
+   -> ([#"../07_fuse.rs" 62 22 62 23] inv2 a)
+   -> ([#"../07_fuse.rs" 62 31 62 33] inv1 ab)
+   -> ([#"../07_fuse.rs" 62 52 62 53] inv2 b)
+   -> ([#"../07_fuse.rs" 62 61 62 63] inv1 bc)
+   -> ([#"../07_fuse.rs" 62 82 62 83] inv2 c)  -> ([#"../07_fuse.rs" 61 14 61 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../07_fuse.rs" 55 4 55 26] (self : C07Fuse_Fuse_Type.t_fuse i) : () =
     [#"../07_fuse.rs" 52 4 52 10] ()
   val produces_refl0 [#"../07_fuse.rs" 55 4 55 26] (self : C07Fuse_Fuse_Type.t_fuse i) : ()
     requires {[#"../07_fuse.rs" 55 21 55 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : C07Fuse_Fuse_Type.t_fuse i . ([#"../07_fuse.rs" 55 21 55 25] inv2 self) -> ([#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : C07Fuse_Fuse_Type.t_fuse i . ([#"../07_fuse.rs" 55 21 55 25] inv2 self)
+   -> ([#"../07_fuse.rs" 54 14 54 45] produces0 self (Seq.empty ) self)
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -564,7 +607,12 @@ module C07Fuse_Impl1_IsFused_Impl
   constant next  : C07Fuse_Fuse_Type.t_fuse i
   function is_fused [#"../07_fuse.rs" 81 4 81 62] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) (steps : Seq.seq item0) (next : C07Fuse_Fuse_Type.t_fuse i) : ()
     
-  goal vc_is_fused : ([#"../07_fuse.rs" 81 51 81 55] inv2 next) -> ([#"../07_fuse.rs" 81 27 81 32] inv1 steps) -> ([#"../07_fuse.rs" 81 21 81 25] inv0 self) -> ([#"../07_fuse.rs" 79 15 79 44] produces0 ( ^ self) steps next) -> ([#"../07_fuse.rs" 78 15 78 31] completed0 self) -> ([#"../07_fuse.rs" 80 14 80 50] steps = Seq.empty  /\  ^ self = next)
+  goal vc_is_fused : ([#"../07_fuse.rs" 81 51 81 55] inv2 next)
+   -> ([#"../07_fuse.rs" 81 27 81 32] inv1 steps)
+   -> ([#"../07_fuse.rs" 81 21 81 25] inv0 self)
+   -> ([#"../07_fuse.rs" 79 15 79 44] produces0 ( ^ self) steps next)
+   -> ([#"../07_fuse.rs" 78 15 78 31] completed0 self)
+   -> ([#"../07_fuse.rs" 80 14 80 50] steps = Seq.empty  /\  ^ self = next)
 end
 module C07Fuse_Impl0
   type i
@@ -648,12 +696,17 @@ module C07Fuse_Impl0
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal next_refn : [#"../07_fuse.rs" 39 4 39 44] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
+  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../07_fuse.rs" 39 4 39 44] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
@@ -729,5 +782,7 @@ module C07Fuse_Impl1
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  goal is_fused_refn : [#"../07_fuse.rs" 81 4 81 62] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . forall steps : Seq.seq item0 . forall next : C07Fuse_Fuse_Type.t_fuse i . inv0 next /\ inv1 steps /\ inv2 self /\ produces0 ( ^ self) steps next /\ completed0 self -> inv0 next /\ inv1 steps /\ inv2 self /\ produces0 ( ^ self) steps next /\ completed0 self /\ (forall result : () . steps = Seq.empty  /\  ^ self = next -> steps = Seq.empty  /\  ^ self = next)
+  goal is_fused_refn : [#"../07_fuse.rs" 81 4 81 62] forall self : borrowed (C07Fuse_Fuse_Type.t_fuse i) . forall steps : Seq.seq item0 . forall next : C07Fuse_Fuse_Type.t_fuse i . inv0 next /\ inv1 steps /\ inv2 self /\ produces0 ( ^ self) steps next /\ completed0 self
+   -> inv0 next /\ inv1 steps /\ inv2 self /\ produces0 ( ^ self) steps next /\ completed0 self /\ (forall result : () . steps = Seq.empty  /\  ^ self = next
+   -> steps = Seq.empty  /\  ^ self = next)
 end
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index 6f9a4b9ac4..74feab7bd9 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -98,7 +98,8 @@ module C08CollectExtend_Extend
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant6 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model2 self)
   val invariant6 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -144,14 +145,22 @@ module C08CollectExtend_Extend
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv3 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv8 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv3 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv8 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv3 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv3 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv8 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv3 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv8 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv3 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : i) : ()
   val produces_refl0 (self : i) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
   predicate invariant3 (self : i)
   val invariant3 (self : i) : bool
     ensures { result = invariant3 self }
@@ -482,7 +491,8 @@ module C08CollectExtend_Collect
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv6 (shallow_model0 self)
   val invariant5 (self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -528,14 +538,22 @@ module C08CollectExtend_Collect
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv6 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv6 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv2 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv6 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv2 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv6 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv2 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : i) : ()
   val produces_refl0 (self : i) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
   predicate invariant2 (self : i)
   val invariant2 (self : i) : bool
     ensures { result = invariant2 self }
@@ -577,7 +595,8 @@ module C08CollectExtend_Collect
     ensures { result = index_logic0 self ix }
     
   predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve6 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve6 (index_logic0 self i)
   val resolve5 (self : Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve5 self }
     
@@ -872,7 +891,14 @@ module C08CollectExtend_ExtendIndex
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq uint32, b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq uint32, c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv3 a) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv5 ab) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv3 b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv5 bc) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv3 c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq uint32, b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq uint32, c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv3 a)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv5 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv3 b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv5 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv3 c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global)) : ()
     
@@ -882,7 +908,8 @@ module C08CollectExtend_ExtendIndex
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
   use prelude.Borrow
   predicate invariant6 (self : borrowed (Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter uint32 (Alloc_Alloc_Global_Type.t_global)))
     
@@ -934,7 +961,8 @@ module C08CollectExtend_ExtendIndex
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -969,7 +997,8 @@ module C08CollectExtend_ExtendIndex
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv5 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   function shallow_model2 (self : slice uint32) : Seq.seq uint32 =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model6 self
   val shallow_model2 (self : slice uint32) : Seq.seq uint32
@@ -995,7 +1024,8 @@ module C08CollectExtend_ExtendIndex
     ensures { result = index_logic0 self ix }
     
   predicate resolve1 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve1 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve1 self }
     
@@ -1147,7 +1177,8 @@ module C08CollectExtend_CollectExample
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1190,14 +1221,22 @@ module C08CollectExtend_CollectExample
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq uint32, b : i, bc : Seq.seq uint32, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv1 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv1 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq uint32, b : i, bc : Seq.seq uint32, c : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv1 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv1 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : i) : ()
   val produces_refl0 (self : i) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -1218,7 +1257,8 @@ module C08CollectExtend_CollectExample
     ensures { result = resolve1 self }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve1 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve1 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -1232,7 +1272,9 @@ module C08CollectExtend_CollectExample
     ensures { [#"../08_collect_extend.rs" 42 40 42 52] inv3 result }
     
   let rec cfg collect_example [#"../08_collect_extend.rs" 61 0 61 56] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) : ()
-    requires {[#"../08_collect_extend.rs" 60 0 60 130] forall fin : i . forall prod : Seq.seq uint32 . inv0 fin -> produces0 iter prod fin -> (forall i : int . 0 <= i /\ i < Seq.length prod -> UInt32.to_int (Seq.get prod i) = i)}
+    requires {[#"../08_collect_extend.rs" 60 0 60 130] forall fin : i . forall prod : Seq.seq uint32 . inv0 fin
+     -> produces0 iter prod fin
+     -> (forall i : int . 0 <= i /\ i < Seq.length prod  -> UInt32.to_int (Seq.get prod i) = i)}
     requires {[#"../08_collect_extend.rs" 61 48 61 52] inv0 iter}
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1252,7 +1294,8 @@ module C08CollectExtend_CollectExample
   }
   BB2 {
     assume { resolve0 v };
-    assert { [@expl:assertion] [#"../08_collect_extend.rs" 64 4 64 75] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) -> UInt32.to_int (index_logic0 v i) = i };
+    assert { [@expl:assertion] [#"../08_collect_extend.rs" 64 4 64 75] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 v)
+     -> UInt32.to_int (index_logic0 v i) = i };
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index add4799173..a3c74943ee 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -55,7 +55,11 @@ module C09Empty_Impl0_ProducesTrans_Impl
   constant c  : C09Empty_Empty_Type.t_empty t
   function produces_trans [#"../09_empty.rs" 35 4 35 90] (a : C09Empty_Empty_Type.t_empty t) (ab : Seq.seq t) (b : C09Empty_Empty_Type.t_empty t) (bc : Seq.seq t) (c : C09Empty_Empty_Type.t_empty t) : ()
     
-  goal vc_produces_trans : ([#"../09_empty.rs" 35 61 35 63] inv0 bc) -> ([#"../09_empty.rs" 35 31 35 33] inv0 ab) -> ([#"../09_empty.rs" 33 15 33 32] produces0 b bc c) -> ([#"../09_empty.rs" 32 15 32 32] produces0 a ab b) -> ([#"../09_empty.rs" 34 14 34 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../09_empty.rs" 35 61 35 63] inv0 bc)
+   -> ([#"../09_empty.rs" 35 31 35 33] inv0 ab)
+   -> ([#"../09_empty.rs" 33 15 33 32] produces0 b bc c)
+   -> ([#"../09_empty.rs" 32 15 32 32] produces0 a ab b)
+   -> ([#"../09_empty.rs" 34 14 34 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -180,12 +184,17 @@ module C09Empty_Impl0
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self -> (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 self -> (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self
+   -> (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 self
+   -> (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/10_once.mlcfg b/creusot/tests/should_succeed/iterators/10_once.mlcfg
index 7ff8808fd4..41a028fcd6 100644
--- a/creusot/tests/should_succeed/iterators/10_once.mlcfg
+++ b/creusot/tests/should_succeed/iterators/10_once.mlcfg
@@ -49,7 +49,8 @@ module C10Once_Impl0_ProducesRefl_Impl
     
   constant self  : C10Once_Once_Type.t_once t
   function produces_refl [#"../10_once.rs" 31 4 31 26] (self : C10Once_Once_Type.t_once t) : ()
-  goal vc_produces_refl : ([#"../10_once.rs" 31 21 31 25] inv0 self) -> ([#"../10_once.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../10_once.rs" 31 21 31 25] inv0 self)
+   -> ([#"../10_once.rs" 30 14 30 45] produces0 self (Seq.empty ) self)
 end
 module C10Once_Impl0_ProducesTrans_Impl
   type t
@@ -100,7 +101,14 @@ module C10Once_Impl0_ProducesTrans_Impl
   constant c  : C10Once_Once_Type.t_once t
   function produces_trans [#"../10_once.rs" 38 4 38 90] (a : C10Once_Once_Type.t_once t) (ab : Seq.seq t) (b : C10Once_Once_Type.t_once t) (bc : Seq.seq t) (c : C10Once_Once_Type.t_once t) : ()
     
-  goal vc_produces_trans : ([#"../10_once.rs" 38 82 38 83] inv0 c) -> ([#"../10_once.rs" 38 61 38 63] inv1 bc) -> ([#"../10_once.rs" 38 52 38 53] inv0 b) -> ([#"../10_once.rs" 38 31 38 33] inv1 ab) -> ([#"../10_once.rs" 38 22 38 23] inv0 a) -> ([#"../10_once.rs" 36 15 36 32] produces0 b bc c) -> ([#"../10_once.rs" 35 15 35 32] produces0 a ab b) -> ([#"../10_once.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../10_once.rs" 38 82 38 83] inv0 c)
+   -> ([#"../10_once.rs" 38 61 38 63] inv1 bc)
+   -> ([#"../10_once.rs" 38 52 38 53] inv0 b)
+   -> ([#"../10_once.rs" 38 31 38 33] inv1 ab)
+   -> ([#"../10_once.rs" 38 22 38 23] inv0 a)
+   -> ([#"../10_once.rs" 36 15 36 32] produces0 b bc c)
+   -> ([#"../10_once.rs" 35 15 35 32] produces0 a ab b)
+   -> ([#"../10_once.rs" 37 14 37 42] produces0 a (Seq.(++) ab bc) c)
 end
 module C10Once_Impl0_Next
   type t
@@ -270,13 +278,18 @@ module C10Once_Impl0
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
+  goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv1 self
+   -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end
+   -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
index e18cf52a0c..d91ac59ba6 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
+++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
@@ -27,14 +27,16 @@ module C11Repeat_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a)
     
    =
-    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
+    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   constant self  : C11Repeat_Repeat_Type.t_repeat a
   function produces_refl [#"../11_repeat.rs" 33 4 33 26] (self : C11Repeat_Repeat_Type.t_repeat a) : ()
-  goal vc_produces_refl : ([#"../11_repeat.rs" 33 21 33 25] inv0 self) -> ([#"../11_repeat.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../11_repeat.rs" 33 21 33 25] inv0 self)
+   -> ([#"../11_repeat.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
 end
 module C11Repeat_Impl0_ProducesTrans_Impl
   type a
@@ -65,7 +67,8 @@ module C11Repeat_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a)
     
    =
-    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
+    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
@@ -76,7 +79,14 @@ module C11Repeat_Impl0_ProducesTrans_Impl
   constant c  : C11Repeat_Repeat_Type.t_repeat a
   function produces_trans [#"../11_repeat.rs" 40 4 40 90] (a : C11Repeat_Repeat_Type.t_repeat a) (ab : Seq.seq a) (b : C11Repeat_Repeat_Type.t_repeat a) (bc : Seq.seq a) (c : C11Repeat_Repeat_Type.t_repeat a) : ()
     
-  goal vc_produces_trans : ([#"../11_repeat.rs" 40 82 40 83] inv0 c) -> ([#"../11_repeat.rs" 40 61 40 63] inv1 bc) -> ([#"../11_repeat.rs" 40 52 40 53] inv0 b) -> ([#"../11_repeat.rs" 40 31 40 33] inv1 ab) -> ([#"../11_repeat.rs" 40 22 40 23] inv0 a) -> ([#"../11_repeat.rs" 38 15 38 32] produces0 b bc c) -> ([#"../11_repeat.rs" 37 15 37 32] produces0 a ab b) -> ([#"../11_repeat.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../11_repeat.rs" 40 82 40 83] inv0 c)
+   -> ([#"../11_repeat.rs" 40 61 40 63] inv1 bc)
+   -> ([#"../11_repeat.rs" 40 52 40 53] inv0 b)
+   -> ([#"../11_repeat.rs" 40 31 40 33] inv1 ab)
+   -> ([#"../11_repeat.rs" 40 22 40 23] inv0 a)
+   -> ([#"../11_repeat.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../11_repeat.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../11_repeat.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -132,7 +142,8 @@ module C11Repeat_Impl0_Next
   predicate produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a)
     
    =
-    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
+    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
@@ -239,17 +250,23 @@ module C11Repeat_Impl0
   predicate produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a)
     
    =
-    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
+    [#"../11_repeat.rs" 24 8 27 9] self = o /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = C11Repeat_Repeat_Type.repeat_element self)
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../11_repeat.rs" 33 4 33 26] forall self : C11Repeat_Repeat_Type.t_repeat a . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal produces_trans_refn : [#"../11_repeat.rs" 40 4 40 90] forall a : C11Repeat_Repeat_Type.t_repeat a . forall ab : Seq.seq a . forall b : C11Repeat_Repeat_Type.t_repeat a . forall bc : Seq.seq a . forall c : C11Repeat_Repeat_Type.t_repeat a . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal next_refn : [#"../11_repeat.rs" 46 4 46 35] forall self : borrowed (C11Repeat_Repeat_Type.t_repeat a) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option a . inv3 result /\ match result with
+  goal produces_refl_refn : [#"../11_repeat.rs" 33 4 33 26] forall self : C11Repeat_Repeat_Type.t_repeat a . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../11_repeat.rs" 40 4 40 90] forall a : C11Repeat_Repeat_Type.t_repeat a . forall ab : Seq.seq a . forall b : C11Repeat_Repeat_Type.t_repeat a . forall bc : Seq.seq a . forall c : C11Repeat_Repeat_Type.t_repeat a . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../11_repeat.rs" 46 4 46 35] forall self : borrowed (C11Repeat_Repeat_Type.t_repeat a) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option a . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
index b903c0cfd3..fc06132650 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
@@ -71,14 +71,21 @@ module C12Zip_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b) -> ([#"../common.rs" 19 15 19 32] produces2 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces2 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : a) (visited : Seq.seq item0) (o : a)
   val produces1 [#"../common.rs" 8 4 8 65] (self : a) (visited : Seq.seq item0) (o : a) : bool
@@ -96,14 +103,21 @@ module C12Zip_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C12Zip_Zip_Type as C12Zip_Zip_Type
   predicate invariant0 (self : C12Zip_Zip_Type.t_zip a b)
   val invariant0 (self : C12Zip_Zip_Type.t_zip a b) : bool
@@ -124,14 +138,16 @@ module C12Zip_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b)
     
    =
-    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv1 p2 /\ inv2 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
+    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv1 p2 /\ inv2 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
   val produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b) : bool
     ensures { result = produces0 self visited tl }
     
   use seq.Seq
   constant self  : C12Zip_Zip_Type.t_zip a b
   function produces_refl [#"../12_zip.rs" 41 4 41 26] (self : C12Zip_Zip_Type.t_zip a b) : ()
-  goal vc_produces_refl : ([#"../12_zip.rs" 41 21 41 25] inv0 self) -> ([#"../12_zip.rs" 40 14 40 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../12_zip.rs" 41 21 41 25] inv0 self)
+   -> ([#"../12_zip.rs" 40 14 40 45] produces0 self (Seq.empty ) self)
 end
 module C12Zip_Impl0_ProducesTrans_Impl
   type a
@@ -192,14 +208,21 @@ module C12Zip_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv5 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b) -> ([#"../common.rs" 19 15 19 32] produces2 b bc c) -> ([#"../common.rs" 21 22 21 23] inv5 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv5 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv5 c) -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces2 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv5 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv5 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv5 c)  -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
     requires {[#"../common.rs" 15 21 15 25] inv5 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv5 self) -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv5 self)
+   -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : a) (visited : Seq.seq item0) (o : a)
   val produces1 [#"../common.rs" 8 4 8 65] (self : a) (visited : Seq.seq item0) (o : a) : bool
@@ -217,14 +240,21 @@ module C12Zip_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv4 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv4 a) -> ([#"../common.rs" 21 31 21 33] inv3 ab) -> ([#"../common.rs" 21 52 21 53] inv4 b) -> ([#"../common.rs" 21 61 21 63] inv3 bc) -> ([#"../common.rs" 21 82 21 83] inv4 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv4 a)
+   -> ([#"../common.rs" 21 31 21 33] inv3 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv4 b)
+   -> ([#"../common.rs" 21 61 21 63] inv3 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv4 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
     requires {[#"../common.rs" 15 21 15 25] inv4 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv4 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv4 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq (item0, item1))
   val invariant1 (self : Seq.seq (item0, item1)) : bool
     ensures { result = invariant1 self }
@@ -255,7 +285,8 @@ module C12Zip_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b)
     
    =
-    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv2 p2 /\ inv3 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
+    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv2 p2 /\ inv3 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
   val produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b) : bool
     ensures { result = produces0 self visited tl }
     
@@ -266,7 +297,14 @@ module C12Zip_Impl0_ProducesTrans_Impl
   constant c  : C12Zip_Zip_Type.t_zip a b
   function produces_trans [#"../12_zip.rs" 48 4 48 90] (a : C12Zip_Zip_Type.t_zip a b) (ab : Seq.seq (item0, item1)) (b : C12Zip_Zip_Type.t_zip a b) (bc : Seq.seq (item0, item1)) (c : C12Zip_Zip_Type.t_zip a b) : ()
     
-  goal vc_produces_trans : ([#"../12_zip.rs" 48 82 48 83] inv0 c) -> ([#"../12_zip.rs" 48 61 48 63] inv1 bc) -> ([#"../12_zip.rs" 48 52 48 53] inv0 b) -> ([#"../12_zip.rs" 48 31 48 33] inv1 ab) -> ([#"../12_zip.rs" 48 22 48 23] inv0 a) -> ([#"../12_zip.rs" 46 15 46 32] produces0 b bc c) -> ([#"../12_zip.rs" 45 15 45 32] produces0 a ab b) -> ([#"../12_zip.rs" 47 14 47 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../12_zip.rs" 48 82 48 83] inv0 c)
+   -> ([#"../12_zip.rs" 48 61 48 63] inv1 bc)
+   -> ([#"../12_zip.rs" 48 52 48 53] inv0 b)
+   -> ([#"../12_zip.rs" 48 31 48 33] inv1 ab)
+   -> ([#"../12_zip.rs" 48 22 48 23] inv0 a)
+   -> ([#"../12_zip.rs" 46 15 46 32] produces0 b bc c)
+   -> ([#"../12_zip.rs" 45 15 45 32] produces0 a ab b)
+   -> ([#"../12_zip.rs" 47 14 47 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -371,14 +409,21 @@ module C12Zip_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b) -> ([#"../common.rs" 19 15 19 32] produces2 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv9 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv9 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : b, ab : Seq.seq item1, b : b, bc : Seq.seq item1, c : b . ([#"../common.rs" 18 15 18 32] produces2 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces2 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv9 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv9 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces2 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
   val produces_refl1 [#"../common.rs" 15 4 15 27] (self : b) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : b . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces2 self (Seq.empty ) self)
   predicate invariant3 (self : b)
   val invariant3 (self : b) : bool
     ensures { result = invariant3 self }
@@ -424,14 +469,21 @@ module C12Zip_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv10 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv10 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : a, ab : Seq.seq item0, b : a, bc : Seq.seq item0, c : a . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv10 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv10 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : a) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : a . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant0 (self : a)
   val invariant0 (self : a) : bool
     ensures { result = invariant0 self }
@@ -447,7 +499,8 @@ module C12Zip_Impl0_Next
   predicate produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b)
     
    =
-    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv9 p2 /\ inv10 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
+    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv9 p2 /\ inv10 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
   val produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b) : bool
     ensures { result = produces0 self visited tl }
     
@@ -765,17 +818,23 @@ module C12Zip_Impl0
   predicate produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b)
     
    =
-    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv4 p2 /\ inv5 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
+    [#"../12_zip.rs" 29 8 35 9] exists p2 : Seq.seq item1 . exists p1 : Seq.seq item0 . inv4 p2 /\ inv5 p1 /\ Seq.length p1 = Seq.length p2 /\ Seq.length p2 = Seq.length visited /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> Seq.get visited i = (Seq.get p1 i, Seq.get p2 i)) /\ produces1 (C12Zip_Zip_Type.zip_a self) p1 (C12Zip_Zip_Type.zip_a tl) /\ produces2 (C12Zip_Zip_Type.zip_b self) p2 (C12Zip_Zip_Type.zip_b tl)
   val produces0 [#"../12_zip.rs" 28 4 28 65] (self : C12Zip_Zip_Type.t_zip a b) (visited : Seq.seq (item0, item1)) (tl : C12Zip_Zip_Type.t_zip a b) : bool
     ensures { result = produces0 self visited tl }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../12_zip.rs" 41 4 41 26] forall self : C12Zip_Zip_Type.t_zip a b . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal produces_trans_refn : [#"../12_zip.rs" 48 4 48 90] forall a : C12Zip_Zip_Type.t_zip a b . forall ab : Seq.seq (item0, item1) . forall b : C12Zip_Zip_Type.t_zip a b . forall bc : Seq.seq (item0, item1) . forall c : C12Zip_Zip_Type.t_zip a b . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal next_refn : [#"../12_zip.rs" 54 4 54 44] forall self : borrowed (C12Zip_Zip_Type.t_zip a b) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option (item0, item1) . inv3 result /\ match result with
+  goal produces_refl_refn : [#"../12_zip.rs" 41 4 41 26] forall self : C12Zip_Zip_Type.t_zip a b . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../12_zip.rs" 48 4 48 90] forall a : C12Zip_Zip_Type.t_zip a b . forall ab : Seq.seq (item0, item1) . forall b : C12Zip_Zip_Type.t_zip a b . forall bc : Seq.seq (item0, item1) . forall c : C12Zip_Zip_Type.t_zip a b . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../12_zip.rs" 54 4 54 44] forall self : borrowed (C12Zip_Zip_Type.t_zip a b) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option (item0, item1) . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
index 3601063d99..4b4056760f 100644
--- a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
+++ b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
@@ -41,14 +41,21 @@ module C13Cloned_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq t)
   val invariant1 (self : Seq.seq t) : bool
     ensures { result = invariant1 self }
@@ -73,14 +80,16 @@ module C13Cloned_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i)
     
    =
-    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv1 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv1 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   constant self  : C13Cloned_Cloned_Type.t_cloned i
   function produces_refl [#"../13_cloned.rs" 39 4 39 26] (self : C13Cloned_Cloned_Type.t_cloned i) : ()
-  goal vc_produces_refl : ([#"../13_cloned.rs" 39 21 39 25] inv0 self) -> ([#"../13_cloned.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../13_cloned.rs" 39 21 39 25] inv0 self)
+   -> ([#"../13_cloned.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
 end
 module C13Cloned_Impl0_ProducesTrans_Impl
   type i
@@ -115,14 +124,21 @@ module C13Cloned_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant2 (self : Seq.seq t)
   val invariant2 (self : Seq.seq t) : bool
     ensures { result = invariant2 self }
@@ -157,7 +173,8 @@ module C13Cloned_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i)
     
    =
-    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv2 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv2 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
@@ -168,7 +185,14 @@ module C13Cloned_Impl0_ProducesTrans_Impl
   constant c  : C13Cloned_Cloned_Type.t_cloned i
   function produces_trans [#"../13_cloned.rs" 46 4 46 90] (a : C13Cloned_Cloned_Type.t_cloned i) (ab : Seq.seq t) (b : C13Cloned_Cloned_Type.t_cloned i) (bc : Seq.seq t) (c : C13Cloned_Cloned_Type.t_cloned i) : ()
     
-  goal vc_produces_trans : ([#"../13_cloned.rs" 46 82 46 83] inv0 c) -> ([#"../13_cloned.rs" 46 61 46 63] inv1 bc) -> ([#"../13_cloned.rs" 46 52 46 53] inv0 b) -> ([#"../13_cloned.rs" 46 31 46 33] inv1 ab) -> ([#"../13_cloned.rs" 46 22 46 23] inv0 a) -> ([#"../13_cloned.rs" 44 15 44 32] produces0 b bc c) -> ([#"../13_cloned.rs" 43 15 43 32] produces0 a ab b) -> ([#"../13_cloned.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../13_cloned.rs" 46 82 46 83] inv0 c)
+   -> ([#"../13_cloned.rs" 46 61 46 63] inv1 bc)
+   -> ([#"../13_cloned.rs" 46 52 46 53] inv0 b)
+   -> ([#"../13_cloned.rs" 46 31 46 33] inv1 ab)
+   -> ([#"../13_cloned.rs" 46 22 46 23] inv0 a)
+   -> ([#"../13_cloned.rs" 44 15 44 32] produces0 b bc c)
+   -> ([#"../13_cloned.rs" 43 15 43 32] produces0 a ab b)
+   -> ([#"../13_cloned.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -257,14 +281,21 @@ module C13Cloned_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv6 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv6 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv6 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv6 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -278,7 +309,8 @@ module C13Cloned_Impl0_Next
   predicate produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i)
     
    =
-    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv6 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv6 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
@@ -294,7 +326,8 @@ module C13Cloned_Impl0_Next
     
   val cloned0 (self : Core_Option_Option_Type.t_option t) : Core_Option_Option_Type.t_option t
     requires {inv4 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 92 16 92 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 92 16 92 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : t . inv5 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some t) }
     ensures { inv2 result }
     
@@ -425,16 +458,22 @@ module C13Cloned_Impl0
   predicate produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i)
     
    =
-    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv4 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../13_cloned.rs" 29 8 33 9] exists s : Seq.seq t . inv4 s /\ produces1 (C13Cloned_Cloned_Type.cloned_iter self) s (C13Cloned_Cloned_Type.cloned_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../13_cloned.rs" 46 4 46 90] forall a : C13Cloned_Cloned_Type.t_cloned i . forall ab : Seq.seq t . forall b : C13Cloned_Cloned_Type.t_cloned i . forall bc : Seq.seq t . forall c : C13Cloned_Cloned_Type.t_cloned i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../13_cloned.rs" 39 4 39 26] forall self : C13Cloned_Cloned_Type.t_cloned i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../13_cloned.rs" 52 4 52 35] forall self : borrowed (C13Cloned_Cloned_Type.t_cloned i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  goal produces_trans_refn : [#"../13_cloned.rs" 46 4 46 90] forall a : C13Cloned_Cloned_Type.t_cloned i . forall ab : Seq.seq t . forall b : C13Cloned_Cloned_Type.t_cloned i . forall bc : Seq.seq t . forall c : C13Cloned_Cloned_Type.t_cloned i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../13_cloned.rs" 39 4 39 26] forall self : C13Cloned_Cloned_Type.t_cloned i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../13_cloned.rs" 52 4 52 35] forall self : borrowed (C13Cloned_Cloned_Type.t_cloned i) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/14_copied.mlcfg b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
index eaf3255cce..2ea11a6d0b 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.mlcfg
+++ b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
@@ -41,14 +41,21 @@ module C14Copied_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq t)
   val invariant1 (self : Seq.seq t) : bool
     ensures { result = invariant1 self }
@@ -73,14 +80,16 @@ module C14Copied_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i)
     
    =
-    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv1 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv1 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   constant self  : C14Copied_Copied_Type.t_copied i
   function produces_refl [#"../14_copied.rs" 39 4 39 26] (self : C14Copied_Copied_Type.t_copied i) : ()
-  goal vc_produces_refl : ([#"../14_copied.rs" 39 21 39 25] inv0 self) -> ([#"../14_copied.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../14_copied.rs" 39 21 39 25] inv0 self)
+   -> ([#"../14_copied.rs" 38 14 38 45] produces0 self (Seq.empty ) self)
 end
 module C14Copied_Impl0_ProducesTrans_Impl
   type i
@@ -115,14 +124,21 @@ module C14Copied_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant2 (self : Seq.seq t)
   val invariant2 (self : Seq.seq t) : bool
     ensures { result = invariant2 self }
@@ -157,7 +173,8 @@ module C14Copied_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i)
     
    =
-    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv2 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv2 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
@@ -168,7 +185,14 @@ module C14Copied_Impl0_ProducesTrans_Impl
   constant c  : C14Copied_Copied_Type.t_copied i
   function produces_trans [#"../14_copied.rs" 46 4 46 90] (a : C14Copied_Copied_Type.t_copied i) (ab : Seq.seq t) (b : C14Copied_Copied_Type.t_copied i) (bc : Seq.seq t) (c : C14Copied_Copied_Type.t_copied i) : ()
     
-  goal vc_produces_trans : ([#"../14_copied.rs" 46 82 46 83] inv0 c) -> ([#"../14_copied.rs" 46 61 46 63] inv1 bc) -> ([#"../14_copied.rs" 46 52 46 53] inv0 b) -> ([#"../14_copied.rs" 46 31 46 33] inv1 ab) -> ([#"../14_copied.rs" 46 22 46 23] inv0 a) -> ([#"../14_copied.rs" 44 15 44 32] produces0 b bc c) -> ([#"../14_copied.rs" 43 15 43 32] produces0 a ab b) -> ([#"../14_copied.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../14_copied.rs" 46 82 46 83] inv0 c)
+   -> ([#"../14_copied.rs" 46 61 46 63] inv1 bc)
+   -> ([#"../14_copied.rs" 46 52 46 53] inv0 b)
+   -> ([#"../14_copied.rs" 46 31 46 33] inv1 ab)
+   -> ([#"../14_copied.rs" 46 22 46 23] inv0 a)
+   -> ([#"../14_copied.rs" 44 15 44 32] produces0 b bc c)
+   -> ([#"../14_copied.rs" 43 15 43 32] produces0 a ab b)
+   -> ([#"../14_copied.rs" 45 14 45 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -257,14 +281,21 @@ module C14Copied_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv6 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv6 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq t, b : i, bc : Seq.seq t, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv6 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv6 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -278,7 +309,8 @@ module C14Copied_Impl0_Next
   predicate produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i)
     
    =
-    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv6 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv6 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
@@ -294,7 +326,8 @@ module C14Copied_Impl0_Next
     
   val copied0 (self : Core_Option_Option_Type.t_option t) : Core_Option_Option_Type.t_option t
     requires {inv4 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 86 16 86 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 86 16 86 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : t . inv5 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some t) }
     ensures { inv2 result }
     
@@ -425,16 +458,22 @@ module C14Copied_Impl0
   predicate produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i)
     
    =
-    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv4 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> Seq.get visited i = Seq.get s i)
+    [#"../14_copied.rs" 29 8 33 9] exists s : Seq.seq t . inv4 s /\ produces1 (C14Copied_Copied_Type.copied_iter self) s (C14Copied_Copied_Type.copied_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> Seq.get visited i = Seq.get s i)
   val produces0 [#"../14_copied.rs" 28 4 28 64] (self : C14Copied_Copied_Type.t_copied i) (visited : Seq.seq t) (o : C14Copied_Copied_Type.t_copied i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 self -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv3 result /\ match result with
+    end
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index 2ab58425ae..8f88f82844 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -63,14 +63,21 @@ module C15Enumerate_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use prelude.UIntSize
   predicate completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed0 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
@@ -83,7 +90,11 @@ module C15Enumerate_Impl0_ProducesRefl_Impl
   use prelude.UIntSize
   use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
   predicate invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
-    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv2 i -> inv1 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv3 i -> completed0 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
+    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv2 i
+     -> inv1 s
+     -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i
+     -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv3 i
+     -> completed0 i  -> produces1 ( * i) (Seq.empty ) ( ^ i))
   val invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = invariant0 self }
     
@@ -100,14 +111,16 @@ module C15Enumerate_Impl0_ProducesRefl_Impl
   predicate produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i)
     
    =
-    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv1 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
+    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv1 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
   val produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = produces0 self visited o }
     
   use seq.Seq
   constant self  : C15Enumerate_Enumerate_Type.t_enumerate i
   function produces_refl [#"../15_enumerate.rs" 40 4 40 26] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
-  goal vc_produces_refl : ([#"../15_enumerate.rs" 40 21 40 25] inv0 self) -> ([#"../15_enumerate.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../15_enumerate.rs" 40 21 40 25] inv0 self)
+   -> ([#"../15_enumerate.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
 end
 module C15Enumerate_Impl0_ProducesTrans_Impl
   type i
@@ -158,14 +171,21 @@ module C15Enumerate_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv3 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv3 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv3 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv3 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv3 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv3 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv3 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv3 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv3 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use prelude.UIntSize
   predicate invariant1 (self : Seq.seq (usize, item0))
   val invariant1 (self : Seq.seq (usize, item0)) : bool
@@ -187,7 +207,11 @@ module C15Enumerate_Impl0_ProducesTrans_Impl
   use prelude.UIntSize
   use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
   predicate invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
-    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv3 i -> inv2 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv4 i -> completed0 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
+    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv3 i
+     -> inv2 s
+     -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i
+     -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv4 i
+     -> completed0 i  -> produces1 ( * i) (Seq.empty ) ( ^ i))
   val invariant0 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = invariant0 self }
     
@@ -205,7 +229,8 @@ module C15Enumerate_Impl0_ProducesTrans_Impl
   predicate produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i)
     
    =
-    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv2 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
+    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv2 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
   val produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = produces0 self visited o }
     
@@ -216,7 +241,14 @@ module C15Enumerate_Impl0_ProducesTrans_Impl
   constant c  : C15Enumerate_Enumerate_Type.t_enumerate i
   function produces_trans [#"../15_enumerate.rs" 47 4 47 90] (a : C15Enumerate_Enumerate_Type.t_enumerate i) (ab : Seq.seq (usize, item0)) (b : C15Enumerate_Enumerate_Type.t_enumerate i) (bc : Seq.seq (usize, item0)) (c : C15Enumerate_Enumerate_Type.t_enumerate i) : ()
     
-  goal vc_produces_trans : ([#"../15_enumerate.rs" 47 82 47 83] inv0 c) -> ([#"../15_enumerate.rs" 47 61 47 63] inv1 bc) -> ([#"../15_enumerate.rs" 47 52 47 53] inv0 b) -> ([#"../15_enumerate.rs" 47 31 47 33] inv1 ab) -> ([#"../15_enumerate.rs" 47 22 47 23] inv0 a) -> ([#"../15_enumerate.rs" 45 15 45 32] produces0 b bc c) -> ([#"../15_enumerate.rs" 44 15 44 32] produces0 a ab b) -> ([#"../15_enumerate.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../15_enumerate.rs" 47 82 47 83] inv0 c)
+   -> ([#"../15_enumerate.rs" 47 61 47 63] inv1 bc)
+   -> ([#"../15_enumerate.rs" 47 52 47 53] inv0 b)
+   -> ([#"../15_enumerate.rs" 47 31 47 33] inv1 ab)
+   -> ([#"../15_enumerate.rs" 47 22 47 23] inv0 a)
+   -> ([#"../15_enumerate.rs" 45 15 45 32] produces0 b bc c)
+   -> ([#"../15_enumerate.rs" 44 15 44 32] produces0 a ab b)
+   -> ([#"../15_enumerate.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -263,7 +295,11 @@ module C15Enumerate_Impl0_Next
     
   use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
   predicate invariant6 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
-    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv0 i -> inv5 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv4 i -> completed1 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
+    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv0 i
+     -> inv5 s
+     -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i
+     -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv4 i
+     -> completed1 i  -> produces1 ( * i) (Seq.empty ) ( ^ i))
   val invariant6 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = invariant6 self }
     
@@ -325,13 +361,20 @@ module C15Enumerate_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv0 a) -> ([#"../common.rs" 21 31 21 33] inv5 ab) -> ([#"../common.rs" 21 52 21 53] inv0 b) -> ([#"../common.rs" 21 61 21 63] inv5 bc) -> ([#"../common.rs" 21 82 21 83] inv0 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv0 a)
+   -> ([#"../common.rs" 21 31 21 33] inv5 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv0 b)
+   -> ([#"../common.rs" 21 61 21 63] inv5 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv0 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv0 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant0 (self : i)
   val invariant0 (self : i) : bool
     ensures { result = invariant0 self }
@@ -343,7 +386,8 @@ module C15Enumerate_Impl0_Next
   predicate produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i)
     
    =
-    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv5 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
+    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv5 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
   val produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = produces0 self visited o }
     
@@ -490,7 +534,11 @@ module C15Enumerate_Enumerate
     
   use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
   predicate invariant3 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
-    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv1 i -> inv2 s -> produces0 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv0 i -> completed0 i -> produces0 ( * i) (Seq.empty ) ( ^ i))
+    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv1 i
+     -> inv2 s
+     -> produces0 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i
+     -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv0 i
+     -> completed0 i  -> produces0 ( * i) (Seq.empty ) ( ^ i))
   val invariant3 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = invariant3 self }
     
@@ -524,21 +572,30 @@ module C15Enumerate_Enumerate
     requires {[#"../common.rs" 21 82 21 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b) -> ([#"../common.rs" 19 15 19 32] produces0 b bc c) -> ([#"../common.rs" 21 22 21 23] inv1 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv1 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv1 c) -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces0 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces0 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv1 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv1 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv1 c)  -> ([#"../common.rs" 20 14 20 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self)
+   -> ([#"../common.rs" 14 14 14 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : borrowed i)
   val invariant0 (self : borrowed i) : bool
     ensures { result = invariant0 self }
     
   axiom inv0 : forall x : borrowed i . inv0 x = true
   let rec cfg enumerate [#"../15_enumerate.rs" 81 0 81 54] [@cfg:stackify] [@cfg:subregion_analysis] (iter : i) : C15Enumerate_Enumerate_Type.t_enumerate i
-    requires {[#"../15_enumerate.rs" 79 0 79 75] forall i : borrowed i . inv0 i -> completed0 i -> produces0 ( * i) (Seq.empty ) ( ^ i)}
-    requires {[#"../15_enumerate.rs" 80 0 80 93] forall i : i . forall s : Seq.seq item0 . inv1 i -> inv2 s -> produces0 iter s i -> Seq.length s < UIntSize.to_int max0}
+    requires {[#"../15_enumerate.rs" 79 0 79 75] forall i : borrowed i . inv0 i
+     -> completed0 i  -> produces0 ( * i) (Seq.empty ) ( ^ i)}
+    requires {[#"../15_enumerate.rs" 80 0 80 93] forall i : i . forall s : Seq.seq item0 . inv1 i
+     -> inv2 s  -> produces0 iter s i  -> Seq.length s < UIntSize.to_int max0}
     requires {[#"../15_enumerate.rs" 81 30 81 34] inv1 iter}
     ensures { [#"../15_enumerate.rs" 81 42 81 54] inv3 result }
     
@@ -622,7 +679,11 @@ module C15Enumerate_Impl0
     
   use C15Enumerate_Enumerate_Type as C15Enumerate_Enumerate_Type
   predicate invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) =
-    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv5 i -> inv4 s -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv6 i -> completed1 i -> produces1 ( * i) (Seq.empty ) ( ^ i))
+    [#"../15_enumerate.rs" 73 12 74 79] (forall i : i . forall s : Seq.seq item0 . inv5 i
+     -> inv4 s
+     -> produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s i
+     -> UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + Seq.length s < UIntSize.to_int max0) /\ (forall i : borrowed i . inv6 i
+     -> completed1 i  -> produces1 ( * i) (Seq.empty ) ( ^ i))
   val invariant2 [#"../15_enumerate.rs" 71 4 71 30] (self : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = invariant2 self }
     
@@ -661,7 +722,8 @@ module C15Enumerate_Impl0
   predicate produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i)
     
    =
-    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv4 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
+    [#"../15_enumerate.rs" 29 8 34 9] Seq.length visited = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count o) - UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) /\ (exists s : Seq.seq item0 . inv4 s /\ produces1 (C15Enumerate_Enumerate_Type.enumerate_iter self) s (C15Enumerate_Enumerate_Type.enumerate_iter o) /\ Seq.length visited = Seq.length s /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (let (a, _) = Seq.get visited i in a) = UIntSize.to_int (C15Enumerate_Enumerate_Type.enumerate_count self) + i /\ (let (_, a) = Seq.get visited i in a) = Seq.get s i))
   val produces0 [#"../15_enumerate.rs" 28 4 28 64] (self : C15Enumerate_Enumerate_Type.t_enumerate i) (visited : Seq.seq (usize, item0)) (o : C15Enumerate_Enumerate_Type.t_enumerate i) : bool
     ensures { result = produces0 self visited o }
     
@@ -672,15 +734,20 @@ module C15Enumerate_Impl0
   val completed0 [#"../15_enumerate.rs" 22 4 22 35] (self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i)) : bool
     ensures { result = completed0 self }
     
-  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 self -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv1 result /\ match result with
+  goal next_refn : [#"../15_enumerate.rs" 53 4 53 44] forall self : borrowed (C15Enumerate_Enumerate_Type.t_enumerate i) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option (usize, item0) . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv1 result /\ match result with
+    end
+   -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 self -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../15_enumerate.rs" 47 4 47 90] forall a : C15Enumerate_Enumerate_Type.t_enumerate i . forall ab : Seq.seq (usize, item0) . forall b : C15Enumerate_Enumerate_Type.t_enumerate i . forall bc : Seq.seq (usize, item0) . forall c : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../15_enumerate.rs" 40 4 40 26] forall self : C15Enumerate_Enumerate_Type.t_enumerate i . inv2 self
+   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C15Enumerate_Impl1
   type i
diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg
index d96ac87670..dd2135fe79 100644
--- a/creusot/tests/should_succeed/iterators/16_take.mlcfg
+++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg
@@ -53,14 +53,21 @@ module C16Take_Impl0_ProducesRefl_Impl
     requires {[#"../common.rs" 21 82 21 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv1 a) -> ([#"../common.rs" 21 31 21 33] inv2 ab) -> ([#"../common.rs" 21 52 21 53] inv1 b) -> ([#"../common.rs" 21 61 21 63] inv2 bc) -> ([#"../common.rs" 21 82 21 83] inv1 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv1 a)
+   -> ([#"../common.rs" 21 31 21 33] inv2 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv1 b)
+   -> ([#"../common.rs" 21 61 21 63] inv2 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv1 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   use C16Take_Take_Type as C16Take_Take_Type
   predicate invariant0 (self : C16Take_Take_Type.t_take i)
   val invariant0 (self : C16Take_Take_Type.t_take i) : bool
@@ -83,7 +90,8 @@ module C16Take_Impl0_ProducesRefl_Impl
     
   constant self  : C16Take_Take_Type.t_take i
   function produces_refl [#"../16_take.rs" 40 4 40 26] (self : C16Take_Take_Type.t_take i) : ()
-  goal vc_produces_refl : ([#"../16_take.rs" 40 21 40 25] inv0 self) -> ([#"../16_take.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
+  goal vc_produces_refl : ([#"../16_take.rs" 40 21 40 25] inv0 self)
+   -> ([#"../16_take.rs" 39 14 39 45] produces0 self (Seq.empty ) self)
 end
 module C16Take_Impl0_ProducesTrans_Impl
   type i
@@ -119,14 +127,21 @@ module C16Take_Impl0_ProducesTrans_Impl
     requires {[#"../common.rs" 21 82 21 83] inv2 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv2 a) -> ([#"../common.rs" 21 31 21 33] inv1 ab) -> ([#"../common.rs" 21 52 21 53] inv2 b) -> ([#"../common.rs" 21 61 21 63] inv1 bc) -> ([#"../common.rs" 21 82 21 83] inv2 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv2 a)
+   -> ([#"../common.rs" 21 31 21 33] inv1 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv2 b)
+   -> ([#"../common.rs" 21 61 21 63] inv1 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv2 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv2 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv2 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Seq.seq item0)
   val invariant1 (self : Seq.seq item0) : bool
     ensures { result = invariant1 self }
@@ -159,7 +174,14 @@ module C16Take_Impl0_ProducesTrans_Impl
   constant c  : C16Take_Take_Type.t_take i
   function produces_trans [#"../16_take.rs" 47 4 47 90] (a : C16Take_Take_Type.t_take i) (ab : Seq.seq item0) (b : C16Take_Take_Type.t_take i) (bc : Seq.seq item0) (c : C16Take_Take_Type.t_take i) : ()
     
-  goal vc_produces_trans : ([#"../16_take.rs" 47 82 47 83] inv0 c) -> ([#"../16_take.rs" 47 61 47 63] inv1 bc) -> ([#"../16_take.rs" 47 52 47 53] inv0 b) -> ([#"../16_take.rs" 47 31 47 33] inv1 ab) -> ([#"../16_take.rs" 47 22 47 23] inv0 a) -> ([#"../16_take.rs" 45 15 45 32] produces0 b bc c) -> ([#"../16_take.rs" 44 15 44 32] produces0 a ab b) -> ([#"../16_take.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
+  goal vc_produces_trans : ([#"../16_take.rs" 47 82 47 83] inv0 c)
+   -> ([#"../16_take.rs" 47 61 47 63] inv1 bc)
+   -> ([#"../16_take.rs" 47 52 47 53] inv0 b)
+   -> ([#"../16_take.rs" 47 31 47 33] inv1 ab)
+   -> ([#"../16_take.rs" 47 22 47 23] inv0 a)
+   -> ([#"../16_take.rs" 45 15 45 32] produces0 b bc c)
+   -> ([#"../16_take.rs" 44 15 44 32] produces0 a ab b)
+   -> ([#"../16_take.rs" 46 14 46 42] produces0 a (Seq.(++) ab bc) c)
 end
 module Core_Option_Option_Type
   type t_option 't =
@@ -221,14 +243,21 @@ module C16Take_Impl0_Next
     requires {[#"../common.rs" 21 82 21 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b) -> ([#"../common.rs" 19 15 19 32] produces1 b bc c) -> ([#"../common.rs" 21 22 21 23] inv1 a) -> ([#"../common.rs" 21 31 21 33] inv4 ab) -> ([#"../common.rs" 21 52 21 53] inv1 b) -> ([#"../common.rs" 21 61 21 63] inv4 bc) -> ([#"../common.rs" 21 82 21 83] inv1 c) -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : i, ab : Seq.seq item0, b : i, bc : Seq.seq item0, c : i . ([#"../common.rs" 18 15 18 32] produces1 a ab b)
+   -> ([#"../common.rs" 19 15 19 32] produces1 b bc c)
+   -> ([#"../common.rs" 21 22 21 23] inv1 a)
+   -> ([#"../common.rs" 21 31 21 33] inv4 ab)
+   -> ([#"../common.rs" 21 52 21 53] inv1 b)
+   -> ([#"../common.rs" 21 61 21 63] inv4 bc)
+   -> ([#"../common.rs" 21 82 21 83] inv1 c)  -> ([#"../common.rs" 20 14 20 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
   val produces_refl0 [#"../common.rs" 15 4 15 27] (self : i) : ()
     requires {[#"../common.rs" 15 21 15 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self) -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : i . ([#"../common.rs" 15 21 15 25] inv1 self)
+   -> ([#"../common.rs" 14 14 14 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : i)
   val invariant1 (self : i) : bool
     ensures { result = invariant1 self }
@@ -401,13 +430,18 @@ module C16Take_Impl0
     ensures { result = produces0 self visited o }
     
   use seq.Seq
-  goal produces_refl_refn : [#"../16_take.rs" 40 4 40 26] forall self : C16Take_Take_Type.t_take i . inv0 self -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../16_take.rs" 53 4 53 41] forall self : borrowed (C16Take_Take_Type.t_take i) . inv1 self -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv2 result /\ match result with
+  goal produces_refl_refn : [#"../16_take.rs" 40 4 40 26] forall self : C16Take_Take_Type.t_take i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal next_refn : [#"../16_take.rs" 53 4 53 41] forall self : borrowed (C16Take_Take_Type.t_take i) . inv1 self
+   -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
-    end -> inv2 result /\ match result with
+    end
+   -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../16_take.rs" 47 4 47 90] forall a : C16Take_Take_Type.t_take i . forall ab : Seq.seq item0 . forall b : C16Take_Take_Type.t_take i . forall bc : Seq.seq item0 . forall c : C16Take_Take_Type.t_take i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_trans_refn : [#"../16_take.rs" 47 4 47 90] forall a : C16Take_Take_Type.t_take i . forall ab : Seq.seq item0 . forall b : C16Take_Take_Type.t_take i . forall bc : Seq.seq item0 . forall c : C16Take_Take_Type.t_take i . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index 7fe060c320..e9e5e27054 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -74,11 +74,17 @@ module Knapsack_M_Impl
   constant i  : int
   constant w  : int
   function m [#"../knapsack.rs" 34 0 34 57] (items : Seq.seq (Knapsack_Item_Type.t_item name)) (i : int) (w : int) : int
-  goal vc_m : ([#"../knapsack.rs" 34 11 34 16] inv0 items) -> ([#"../knapsack.rs" 32 11 32 17] 0 <= w) -> ([#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items) -> match i = 0 with
+  goal vc_m : ([#"../knapsack.rs" 34 11 34 16] inv0 items)
+   -> ([#"../knapsack.rs" 32 11 32 17] 0 <= w)
+   -> ([#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items)
+   -> match i = 0 with
     | True -> [#"../knapsack.rs" 33 10 33 21] 0 >= 0
     | False -> match UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1))) > w with
-      | True -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0) -> ([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0))
-      | False -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0) -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0) -> ([#"../knapsack.rs" 33 10 33 21] MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (Knapsack_Item_Type.item_value (Seq.get items (i - 1)))) >= 0)))
+      | True -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0)
+       -> ([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0))
+      | False -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) w >= 0)
+       -> ((([#"../knapsack.rs" 34 11 34 16] inv0 items) && ([#"../knapsack.rs" 32 11 32 17] 0 <= w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack.rs" 31 11 31 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack.rs" 30 10 30 11] i) /\ ([#"../knapsack.rs" 30 10 30 11] i - 1) < ([#"../knapsack.rs" 30 10 30 11] i)) /\ (([#"../knapsack.rs" 33 10 33 21] m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0)
+       -> ([#"../knapsack.rs" 33 10 33 21] MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (Knapsack_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (Knapsack_Item_Type.item_value (Seq.get items (i - 1)))) >= 0)))
       end
     end
 end
@@ -156,7 +162,8 @@ module Knapsack_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv16 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv16 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv16 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
   predicate invariant16 (self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -280,7 +287,8 @@ module Knapsack_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max1)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max1)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -299,7 +307,8 @@ module Knapsack_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv7 (shallow_model3 self)
   val invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -327,7 +336,8 @@ module Knapsack_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv17 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max1)
+  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv17 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max1)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -376,7 +386,8 @@ module Knapsack_Knapsack01Dyn
   use prelude.Slice
   use seq.Seq
   predicate resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) : bool
     ensures { result = resolve_elswhere1 self old' fin }
     
@@ -411,7 +422,8 @@ module Knapsack_Knapsack01Dyn
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)))
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -538,7 +550,8 @@ module Knapsack_Knapsack01Dyn
     ensures { result = index_logic3 self ix }
     
   predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> resolve6 (index_logic3 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+     -> resolve6 (index_logic3 self i)
   val resolve5 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve5 self }
     
@@ -552,7 +565,8 @@ module Knapsack_Knapsack01Dyn
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve5 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve5 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -577,11 +591,14 @@ module Knapsack_Knapsack01Dyn
     requires {[#"../knapsack.rs" 34 11 34 16] inv8 items}
     ensures { result = m0 items i w }
     
-  axiom m0_spec : forall items : Seq.seq (Knapsack_Item_Type.t_item name), i : int, w : int . ([#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items) -> ([#"../knapsack.rs" 32 11 32 17] 0 <= w) -> ([#"../knapsack.rs" 34 11 34 16] inv8 items) -> ([#"../knapsack.rs" 33 10 33 21] m0 items i w >= 0)
+  axiom m0_spec : forall items : Seq.seq (Knapsack_Item_Type.t_item name), i : int, w : int . ([#"../knapsack.rs" 31 11 31 37] 0 <= i /\ i <= Seq.length items)
+   -> ([#"../knapsack.rs" 32 11 32 17] 0 <= w)
+   -> ([#"../knapsack.rs" 34 11 34 16] inv8 items)  -> ([#"../knapsack.rs" 33 10 33 21] m0 items i w >= 0)
   val from_elem1 (elem : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (n : usize) : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)
     requires {inv4 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model1 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic0 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic0 result i = elem }
     ensures { inv5 result }
     
   val len0 (self : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : usize
@@ -591,13 +608,15 @@ module Knapsack_Knapsack01Dyn
   val from_elem0 (elem : usize) (n : usize) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     requires {inv3 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model3 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic3 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic3 result i = elem }
     ensures { inv4 result }
     
   let rec cfg knapsack01_dyn [#"../knapsack.rs" 48 0 48 91] [@cfg:stackify] [@cfg:subregion_analysis] (items : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (max_weight : usize) : Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)
     requires {[#"../knapsack.rs" 45 11 45 34] Seq.length (shallow_model0 items) < 10000000}
     requires {[#"../knapsack.rs" 46 11 46 33] UIntSize.to_int max_weight < 10000000}
-    requires {[#"../knapsack.rs" 47 0 47 86] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 items) -> UIntSize.to_int (Knapsack_Item_Type.item_value (index_logic2 items i)) <= 10000000}
+    requires {[#"../knapsack.rs" 47 0 47 86] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 items)
+     -> UIntSize.to_int (Knapsack_Item_Type.item_value (index_logic2 items i)) <= 10000000}
     requires {[#"../knapsack.rs" 48 28 48 33] inv0 items}
     ensures { [#"../knapsack.rs" 48 75 48 91] inv2 result }
     
@@ -687,9 +706,12 @@ module Knapsack_Knapsack01Dyn
   }
   BB8 {
     invariant { [#"../knapsack.rs" 52 16 52 53] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
-    invariant { [#"../knapsack.rs" 52 4 52 55] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
-    invariant { [#"../knapsack.rs" 52 4 52 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
-    invariant { [#"../knapsack.rs" 52 4 52 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
+    invariant { [#"../knapsack.rs" 52 4 52 55] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value)
+     -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
+    invariant { [#"../knapsack.rs" 52 4 52 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
+    invariant { [#"../knapsack.rs" 52 4 52 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB9
   }
   BB9 {
@@ -732,10 +754,14 @@ module Knapsack_Knapsack01Dyn
   }
   BB18 {
     invariant { [#"../knapsack.rs" 66 20 66 57] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
-    invariant { [#"../knapsack.rs" 66 8 66 59] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
-    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
-    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . 0 <= ww /\ ww <= UIntSize.to_int w - 1 -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
-    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
+    invariant { [#"../knapsack.rs" 66 8 66 59] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value)
+     -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
+    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
+    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . 0 <= ww /\ ww <= UIntSize.to_int w - 1
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
+    invariant { [#"../knapsack.rs" 66 8 66 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 5d7b48fbd6..5d2b468df2 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -73,9 +73,12 @@ module KnapsackFull_SumWeights_Impl
   constant i  : int
   function sum_weights [#"../knapsack_full.rs" 27 0 27 56] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
     
-  goal vc_sum_weights : ([#"../knapsack_full.rs" 27 21 27 22] inv0 s) -> ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s) -> match i = Seq.length s with
+  goal vc_sum_weights : ([#"../knapsack_full.rs" 27 21 27 22] inv0 s)
+   -> ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s)
+   -> match i = Seq.length s with
     | True -> [#"../knapsack_full.rs" 26 10 26 21] 0 >= 0
-    | False -> ((([#"../knapsack_full.rs" 27 21 27 22] inv0 s) && ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i + 1 /\ i + 1 <= Seq.length s)) /\ 0 <= ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i) /\ ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - (i + 1)) < ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i)) /\ (([#"../knapsack_full.rs" 26 10 26 21] sum_weights s (i + 1) >= 0) -> ([#"../knapsack_full.rs" 26 10 26 21] UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get s i)) + sum_weights s (i + 1) >= 0))
+    | False -> ((([#"../knapsack_full.rs" 27 21 27 22] inv0 s) && ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i + 1 /\ i + 1 <= Seq.length s)) /\ 0 <= ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i) /\ ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - (i + 1)) < ([#"../knapsack_full.rs" 24 10 24 19] Seq.length s - i)) /\ (([#"../knapsack_full.rs" 26 10 26 21] sum_weights s (i + 1) >= 0)
+     -> ([#"../knapsack_full.rs" 26 10 26 21] UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get s i)) + sum_weights s (i + 1) >= 0))
     end
 end
 module KnapsackFull_SumValues_Impl
@@ -92,7 +95,8 @@ module KnapsackFull_SumValues_Impl
   constant i  : int
   function sum_values [#"../knapsack_full.rs" 37 0 37 55] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
     
-  goal vc_sum_values : ([#"../knapsack_full.rs" 36 11 36 33] i >= 0 /\ i <= Seq.length s) -> match i = Seq.length s with
+  goal vc_sum_values : ([#"../knapsack_full.rs" 36 11 36 33] i >= 0 /\ i <= Seq.length s)
+   -> match i = Seq.length s with
     | True -> true
     | False -> ([#"../knapsack_full.rs" 36 11 36 33] i + 1 >= 0 /\ i + 1 <= Seq.length s) /\ 0 <= ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - i) /\ ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - (i + 1)) < ([#"../knapsack_full.rs" 35 10 35 19] Seq.length s - i)
     end
@@ -111,7 +115,9 @@ module KnapsackFull_SubseqRev_Impl
   constant s2  : Seq.seq t
   constant i2  : int
   predicate subseq_rev [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq t) (i1 : int) (s2 : Seq.seq t) (i2 : int)
-  goal vc_subseq_rev : ([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2) -> ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1) -> match i2 = 0 with
+  goal vc_subseq_rev : ([#"../knapsack_full.rs" 47 11 47 36] 0 <= i2 /\ i2 <= Seq.length s2)
+   -> ([#"../knapsack_full.rs" 46 11 46 36] 0 <= i1 /\ i1 <= Seq.length s1)
+   -> match i2 = 0 with
     | True -> true
     | False -> if i1 < Seq.length s1 then
       if Seq.get s1 i1 = Seq.get s2 (i2 - 1) then
@@ -177,7 +183,8 @@ module KnapsackFull_M_Impl
     requires {[#"../knapsack_full.rs" 27 21 27 22] inv1 s}
     ensures { result = sum_weights0 s i }
     
-  axiom sum_weights0_spec : forall s : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int . ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s) -> ([#"../knapsack_full.rs" 27 21 27 22] inv1 s) -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
+  axiom sum_weights0_spec : forall s : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int . ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s)
+   -> ([#"../knapsack_full.rs" 27 21 27 22] inv1 s)  -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
   use seq.Seq
   predicate subseq_rev0 [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i1 : int) (s2 : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i2 : int)
     
@@ -196,11 +203,29 @@ module KnapsackFull_M_Impl
   constant w  : int
   function m [#"../knapsack_full.rs" 66 0 66 57] (items : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) (w : int) : int
     
-  goal vc_m : ([#"../knapsack_full.rs" 66 11 66 16] inv0 items) -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) -> ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items) -> match i = 0 with
-    | True -> let result = 0 in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)
+  goal vc_m : ([#"../knapsack_full.rs" 66 11 66 16] inv0 items)
+   -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w)
+   -> ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items)
+   -> match i = 0 with
+    | True -> let result = 0 in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+     -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w
+     -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)
     | False -> match UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))) > w with
-      | True -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0) -> (let result = m items (i - 1) w in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)))
-      | False -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0) -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))) -> sum_values0 s j <= m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))))) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0) -> (let result = MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (KnapsackFull_Item_Type.item_value (Seq.get items (i - 1)))) in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0))))
+      | True -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+       -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w
+       -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0)
+       -> (let result = m items (i - 1) w in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+       -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w
+       -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0)))
+      | False -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+       -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w
+       -> sum_values0 s j <= m items (i - 1) w) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) w >= 0)
+       -> ((([#"../knapsack_full.rs" 66 11 66 16] inv0 items) && ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) && ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i - 1 /\ i - 1 <= Seq.length items)) /\ 0 <= ([#"../knapsack_full.rs" 59 10 59 11] i) /\ ([#"../knapsack_full.rs" 59 10 59 11] i - 1) < ([#"../knapsack_full.rs" 59 10 59 11] i)) /\ (([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+       -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items (i - 1) /\ sum_weights0 s j <= w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))
+       -> sum_values0 s j <= m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1))))) && ([#"../knapsack_full.rs" 62 10 62 21] m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) >= 0)
+       -> (let result = MinMax.max (m items (i - 1) w) (m items (i - 1) (w - UIntSize.to_int (KnapsackFull_Item_Type.item_weight (Seq.get items (i - 1)))) + UIntSize.to_int (KnapsackFull_Item_Type.item_value (Seq.get items (i - 1)))) in ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv1 s
+       -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w
+       -> sum_values0 s j <= result) && ([#"../knapsack_full.rs" 62 10 62 21] result >= 0))))
       end
     end
 end
@@ -306,7 +331,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv22 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv22 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max1)
+  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv22 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max1)
   predicate invariant22 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -463,7 +489,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max1)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max1)
   predicate invariant8 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -482,7 +509,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max1)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model3 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -514,7 +542,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -564,7 +593,9 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv2 self}
     ensures { result = is_empty_log0 self }
     
-  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv2 self) -> ([#"../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
+  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self
+   -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
   function range_inclusive_len0 (r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : int =
     [#"../../../../creusot-contracts/src/std/iter/range.rs" 47 4 50 5] if is_empty_log0 r then
       0
@@ -575,11 +606,14 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv2 r}
     ensures { result = range_inclusive_len0 r }
     
-  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv2 r) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
+  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv2 r)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
   predicate produces1 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (visited : Seq.seq usize) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self
+     -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
   val produces1 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (visited : Seq.seq usize) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : bool
     ensures { result = produces1 self visited o }
     
@@ -597,7 +631,14 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv2 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, ab : Seq.seq usize, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, bc : Seq.seq usize, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces1 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces1 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv2 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv10 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv2 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv10 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv2 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, ab : Seq.seq usize, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, bc : Seq.seq usize, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces1 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces1 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv2 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv10 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv2 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv10 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv2 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : () =
     [#"../../../../creusot-contracts/src/std/iter/range.rs" 74 4 74 10] ()
@@ -605,7 +646,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv2 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces1 self (Seq.empty ) self)
   predicate invariant2 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant2 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : bool
@@ -628,7 +670,9 @@ module KnapsackFull_Knapsack01Dyn
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -644,13 +688,21 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -697,7 +749,8 @@ module KnapsackFull_Knapsack01Dyn
     ensures { result = index_logic5 self ix }
     
   predicate resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> resolve8 (index_logic5 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+     -> resolve8 (index_logic5 self i)
   val resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve7 self }
     
@@ -712,7 +765,8 @@ module KnapsackFull_Knapsack01Dyn
   predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve7 (index_logic0 self i)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve7 (index_logic0 self i)
   val resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve5 self }
     
@@ -752,7 +806,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../knapsack_full.rs" 27 21 27 22] inv3 s}
     ensures { result = sum_weights0 s i }
     
-  axiom sum_weights0_spec : forall s : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int . ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s) -> ([#"../knapsack_full.rs" 27 21 27 22] inv3 s) -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
+  axiom sum_weights0_spec : forall s : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int . ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s)
+   -> ([#"../knapsack_full.rs" 27 21 27 22] inv3 s)  -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
   function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : KnapsackFull_Item_Type.t_item name
     
    =
@@ -776,7 +831,8 @@ module KnapsackFull_Knapsack01Dyn
     
   use prelude.Slice
   predicate resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) : bool
     ensures { result = resolve_elswhere1 self old' fin }
     
@@ -810,7 +866,8 @@ module KnapsackFull_Knapsack01Dyn
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)))
     
    =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -919,7 +976,8 @@ module KnapsackFull_Knapsack01Dyn
     requires {inv6 end'}
     ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 220 26 220 53] start_log0 result = start }
     ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 221 26 221 49] end_log0 result = end' }
-    ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end' -> not is_empty_log0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end'
+     -> not is_empty_log0 result }
     ensures { inv2 result }
     
   predicate resolve1 (self : KnapsackFull_Item_Type.t_item name)
@@ -987,7 +1045,12 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../knapsack_full.rs" 66 11 66 16] inv11 items}
     ensures { result = m0 items i w }
     
-  axiom m0_spec : forall items : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int, w : int . ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items) -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w) -> ([#"../knapsack_full.rs" 66 11 66 16] inv11 items) -> ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w -> sum_values0 s j <= m0 items i w) && ([#"../knapsack_full.rs" 62 10 62 21] m0 items i w >= 0)
+  axiom m0_spec : forall items : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int, w : int . ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items)
+   -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w)
+   -> ([#"../knapsack_full.rs" 66 11 66 16] inv11 items)
+   -> ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s
+   -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w
+   -> sum_values0 s j <= m0 items i w) && ([#"../knapsack_full.rs" 62 10 62 21] m0 items i w >= 0)
   use prelude.Snapshot
   use prelude.Snapshot
   use prelude.Snapshot
@@ -1014,7 +1077,8 @@ module KnapsackFull_Knapsack01Dyn
   val from_elem1 (elem : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (n : usize) : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)
     requires {inv7 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model1 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic0 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic0 result i = elem }
     ensures { inv8 result }
     
   val len0 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : usize
@@ -1024,17 +1088,21 @@ module KnapsackFull_Knapsack01Dyn
   val from_elem0 (elem : usize) (n : usize) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     requires {inv6 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model3 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic5 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic5 result i = elem }
     ensures { inv7 result }
     
   let rec cfg knapsack01_dyn [#"../knapsack_full.rs" 85 0 85 91] [@cfg:stackify] [@cfg:subregion_analysis] (items : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (max_weight : usize) : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)
     requires {[#"../knapsack_full.rs" 77 11 77 34] Seq.length (shallow_model0 items) < 10000000}
     requires {[#"../knapsack_full.rs" 78 11 78 33] UIntSize.to_int max_weight < 10000000}
-    requires {[#"../knapsack_full.rs" 79 0 79 86] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 items) -> UIntSize.to_int (KnapsackFull_Item_Type.item_value (index_logic4 items i)) <= 10000000}
+    requires {[#"../knapsack_full.rs" 79 0 79 86] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 items)
+     -> UIntSize.to_int (KnapsackFull_Item_Type.item_value (index_logic4 items i)) <= 10000000}
     requires {[#"../knapsack_full.rs" 85 28 85 33] inv4 items}
     ensures { [#"../knapsack_full.rs" 80 10 80 60] sum_weights0 (shallow_model4 result) (Seq.length (shallow_model4 result)) <= UIntSize.to_int max_weight }
     ensures { [#"../knapsack_full.rs" 81 10 81 54] subseq_rev0 (shallow_model4 result) 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) }
-    ensures { [#"../knapsack_full.rs" 82 0 84 2] forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s -> subseq_rev0 s 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) /\ sum_weights0 s (Seq.length s) <= UIntSize.to_int max_weight -> sum_values0 s (Seq.length s) <= sum_values0 (shallow_model4 result) (Seq.length (shallow_model4 result)) }
+    ensures { [#"../knapsack_full.rs" 82 0 84 2] forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s
+     -> subseq_rev0 s 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) /\ sum_weights0 s (Seq.length s) <= UIntSize.to_int max_weight
+     -> sum_values0 s (Seq.length s) <= sum_values0 (shallow_model4 result) (Seq.length (shallow_model4 result)) }
     ensures { [#"../knapsack_full.rs" 85 75 85 91] inv5 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1159,9 +1227,12 @@ module KnapsackFull_Knapsack01Dyn
     invariant { [#"../knapsack_full.rs" 88 4 88 55] inv0 iter };
     invariant { [#"../knapsack_full.rs" 88 4 88 55] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../knapsack_full.rs" 88 16 88 53] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
-    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
-    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (Snapshot.inner produced) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
-    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
+    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value)
+     -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
+    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (Snapshot.inner produced) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
+    invariant { [#"../knapsack_full.rs" 88 4 88 55] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB13
   }
   BB13 {
@@ -1245,10 +1316,14 @@ module KnapsackFull_Knapsack01Dyn
     invariant { [#"../knapsack_full.rs" 98 8 98 59] inv2 iter1 };
     invariant { [#"../knapsack_full.rs" 98 8 98 59] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
     invariant { [#"../knapsack_full.rs" 98 20 98 57] Seq.length (shallow_model0 items) + 1 = Seq.length (shallow_model1 best_value) };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value) -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . 0 <= ww /\ ww <= Seq.length (Snapshot.inner produced1) - 1 -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
-    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 best_value)
+     -> UIntSize.to_int max_weight + 1 = Seq.length (shallow_model3 (index_logic0 best_value i)) };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= UIntSize.to_int i /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) = m0 (shallow_model0 items) ii ww };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . 0 <= ww /\ ww <= Seq.length (Snapshot.inner produced1) - 1
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value (UIntSize.to_int i + 1))) ww) = m0 (shallow_model0 items) (UIntSize.to_int i + 1) ww };
+    invariant { [#"../knapsack_full.rs" 98 8 98 59] forall ww : int . forall ii : int . 0 <= ii /\ ii <= Seq.length (shallow_model0 items) /\ 0 <= ww /\ ww <= UIntSize.to_int max_weight
+     -> UIntSize.to_int (Seq.get (shallow_model3 (index_logic0 best_value ii)) ww) <= 10000000 * ii };
     goto BB31
   }
   BB31 {
@@ -1379,9 +1454,18 @@ module KnapsackFull_Knapsack01Dyn
   BB55 {
     invariant { [#"../knapsack_full.rs" 123 16 123 34] UIntSize.to_int j <= Seq.length (shallow_model0 items) };
     invariant { [#"../knapsack_full.rs" 124 16 124 43] UIntSize.to_int left_weight <= UIntSize.to_int max_weight };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result) -> index_logic2 result i = Seq.get r i) /\ sum_weights0 r (Seq.length (shallow_model4 result)) <= UIntSize.to_int left_weight -> sum_weights0 r 0 <= UIntSize.to_int max_weight };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result) -> index_logic2 result i = Seq.get r i) /\ sum_values0 r (Seq.length (shallow_model4 result)) = m0 (shallow_model0 items) (UIntSize.to_int j) (UIntSize.to_int left_weight) -> sum_values0 r 0 = m0 (shallow_model0 items) (Seq.length (shallow_model0 items)) (UIntSize.to_int max_weight) };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result) -> index_logic2 result i = Seq.get r i) /\ subseq_rev0 r (Seq.length (shallow_model4 result)) (shallow_model0 items) (UIntSize.to_int j) -> subseq_rev0 r 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) };
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+     -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
+     -> index_logic2 result i = Seq.get r i) /\ sum_weights0 r (Seq.length (shallow_model4 result)) <= UIntSize.to_int left_weight
+     -> sum_weights0 r 0 <= UIntSize.to_int max_weight };
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+     -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
+     -> index_logic2 result i = Seq.get r i) /\ sum_values0 r (Seq.length (shallow_model4 result)) = m0 (shallow_model0 items) (UIntSize.to_int j) (UIntSize.to_int left_weight)
+     -> sum_values0 r 0 = m0 (shallow_model0 items) (Seq.length (shallow_model0 items)) (UIntSize.to_int max_weight) };
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+     -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
+     -> index_logic2 result i = Seq.get r i) /\ subseq_rev0 r (Seq.length (shallow_model4 result)) (shallow_model0 items) (UIntSize.to_int j)
+     -> subseq_rev0 r 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) };
     goto BB56
   }
   BB56 {
diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg
index 88e4b68bbb..e4303a0404 100644
--- a/creusot/tests/should_succeed/list_index_mut.mlcfg
+++ b/creusot/tests/should_succeed/list_index_mut.mlcfg
@@ -71,7 +71,8 @@ module ListIndexMut_IndexMut
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list))) : Core_Option_Option_Type.t_option (borrowed (ListIndexMut_List_Type.t_list))
     requires {inv0 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (ListIndexMut_List_Type.t_list) . inv1 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv2 result }
     
@@ -129,7 +130,8 @@ module ListIndexMut_IndexMut
     ensures { [#"../list_index_mut.rs" 33 10 33 37] Core_Option_Option_Type.C_Some ( * result) = get0 ( * l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 34 10 34 40] Core_Option_Option_Type.C_Some ( ^ result) = get0 ( ^ l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 35 10 35 34] len0 ( ^ l) = len0 ( * l) }
-    ensures { [#"../list_index_mut.rs" 36 0 36 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( * l) i = get0 ( ^ l) i }
+    ensures { [#"../list_index_mut.rs" 36 0 36 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix
+     -> get0 ( * l) i = get0 ( ^ l) i }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : borrowed uint32;
@@ -162,8 +164,12 @@ module ListIndexMut_IndexMut
     invariant { [#"../list_index_mut.rs" 40 16 40 45] (0 : usize) <= ix /\ UIntSize.to_int ix < len0 ( * l) };
     invariant { [#"../list_index_mut.rs" 41 16 41 52] get0 ( * l) (UIntSize.to_int ix) = get0 ( * Snapshot.inner old_l) (shallow_model1 old_ix) };
     invariant { [#"../list_index_mut.rs" 42 16 42 55] get0 ( ^ l) (UIntSize.to_int ix) = get0 ( ^ Snapshot.inner old_l) (shallow_model1 old_ix) };
-    invariant { [#"../list_index_mut.rs" 40 4 40 47] len0 ( ^ l) = len0 ( * l) -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
-    invariant { [#"../list_index_mut.rs" 40 4 40 47] (forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( ^ l) i = get0 ( * l) i) -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l) /\ i <> shallow_model1 old_ix -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i) };
+    invariant { [#"../list_index_mut.rs" 40 4 40 47] len0 ( ^ l) = len0 ( * l)
+     -> len0 ( ^ Snapshot.inner old_l) = len0 ( * Snapshot.inner old_l) };
+    invariant { [#"../list_index_mut.rs" 40 4 40 47] (forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix
+     -> get0 ( ^ l) i = get0 ( * l) i)
+     -> (forall i : int . 0 <= i /\ i < len0 ( * Snapshot.inner old_l) /\ i <> shallow_model1 old_ix
+     -> get0 ( ^ Snapshot.inner old_l) i = get0 ( * Snapshot.inner old_l) i) };
     goto BB4
   }
   BB4 {
@@ -254,13 +260,15 @@ module ListIndexMut_Write
     ensures { [#"../list_index_mut.rs" 33 10 33 37] Core_Option_Option_Type.C_Some ( * result) = get0 ( * l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 34 10 34 40] Core_Option_Option_Type.C_Some ( ^ result) = get0 ( ^ l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 35 10 35 34] len0 ( ^ l) = len0 ( * l) }
-    ensures { [#"../list_index_mut.rs" 36 0 36 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( * l) i = get0 ( ^ l) i }
+    ensures { [#"../list_index_mut.rs" 36 0 36 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix
+     -> get0 ( * l) i = get0 ( ^ l) i }
     
   let rec cfg write [#"../list_index_mut.rs" 63 0 63 45] [@cfg:stackify] [@cfg:subregion_analysis] (l : borrowed (ListIndexMut_List_Type.t_list)) (ix : usize) (v : uint32) : ()
     requires {[#"../list_index_mut.rs" 59 11 59 24] UIntSize.to_int ix < len0 ( * l)}
     ensures { [#"../list_index_mut.rs" 60 10 60 34] Core_Option_Option_Type.C_Some v = get0 ( ^ l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 61 10 61 31] len0 ( ^ l) = len0 ( * l) }
-    ensures { [#"../list_index_mut.rs" 62 0 62 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( * l) i = get0 ( ^ l) i }
+    ensures { [#"../list_index_mut.rs" 62 0 62 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix
+     -> get0 ( * l) i = get0 ( ^ l) i }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -327,7 +335,8 @@ module ListIndexMut_F
     requires {[#"../list_index_mut.rs" 59 11 59 24] UIntSize.to_int ix < len0 ( * l)}
     ensures { [#"../list_index_mut.rs" 60 10 60 34] Core_Option_Option_Type.C_Some v = get0 ( ^ l) (UIntSize.to_int ix) }
     ensures { [#"../list_index_mut.rs" 61 10 61 31] len0 ( ^ l) = len0 ( * l) }
-    ensures { [#"../list_index_mut.rs" 62 0 62 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix -> get0 ( * l) i = get0 ( ^ l) i }
+    ensures { [#"../list_index_mut.rs" 62 0 62 87] forall i : int . 0 <= i /\ i < len0 ( * l) /\ i <> UIntSize.to_int ix
+     -> get0 ( * l) i = get0 ( ^ l) i }
     
   let rec cfg f [#"../list_index_mut.rs" 67 0 67 10] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index dd254777a5..d5dac98cd6 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -81,7 +81,8 @@ module ListReversalLasso_Impl1_Index
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model1 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -218,7 +219,8 @@ module ListReversalLasso_Impl2_IndexMut
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model0 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -291,7 +293,8 @@ module ListReversalLasso_Impl2_IndexMut
     
   use prelude.Slice
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -327,7 +330,8 @@ module ListReversalLasso_Impl2_IndexMut
     ensures { [#"../list_reversal_lasso.rs" 37 14 37 47]  * result = index_logic0 ( * self) i }
     ensures { [#"../list_reversal_lasso.rs" 38 14 38 47]  ^ result = index_logic0 ( ^ self) i }
     ensures { [#"../list_reversal_lasso.rs" 39 14 39 47] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( * self))) = Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( ^ self))) }
-    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j -> index_logic0 ( ^ self) j = index_logic0 ( * self) j }
+    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j
+     -> index_logic0 ( ^ self) j = index_logic0 ( * self) j }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : borrowed usize;
@@ -391,7 +395,8 @@ module ListReversalLasso_Impl4_ListReversalSafe
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -432,7 +437,8 @@ module ListReversalLasso_Impl4_ListReversalSafe
     ensures { [#"../list_reversal_lasso.rs" 37 14 37 47]  * result = index_logic0 ( * self) i }
     ensures { [#"../list_reversal_lasso.rs" 38 14 38 47]  ^ result = index_logic0 ( ^ self) i }
     ensures { [#"../list_reversal_lasso.rs" 39 14 39 47] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( * self))) = Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( ^ self))) }
-    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j -> index_logic0 ( ^ self) j = index_logic0 ( * self) j }
+    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j
+     -> index_logic0 ( ^ self) j = index_logic0 ( * self) j }
     
   val index0 [#"../list_reversal_lasso.rs" 30 4 30 35] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize) : usize
     requires {[#"../list_reversal_lasso.rs" 28 15 28 34] nonnull_ptr0 self i}
@@ -448,7 +454,8 @@ module ListReversalLasso_Impl4_ListReversalSafe
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
-    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i -> index_logic0 self i = null0 \/ nonnull_ptr0 self (index_logic0 self i)
+    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i
+     -> index_logic0 self i = null0 \/ nonnull_ptr0 self (index_logic0 self i)
   val mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory) : bool
     ensures { result = mem_is_well_formed0 self }
     
@@ -541,7 +548,8 @@ module ListReversalLasso_Impl4_ListReversalList
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -599,11 +607,13 @@ module ListReversalLasso_Impl4_ListReversalList
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h
+     -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j
+     -> Seq.get s i <> Seq.get s j)
   val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
     ensures { result = list_seg0 self first s last l h }
     
@@ -635,7 +645,8 @@ module ListReversalLasso_Impl4_ListReversalList
     ensures { [#"../list_reversal_lasso.rs" 37 14 37 47]  * result = index_logic1 ( * self) i }
     ensures { [#"../list_reversal_lasso.rs" 38 14 38 47]  ^ result = index_logic1 ( ^ self) i }
     ensures { [#"../list_reversal_lasso.rs" 39 14 39 47] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( * self))) = Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( ^ self))) }
-    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j -> index_logic1 ( ^ self) j = index_logic1 ( * self) j }
+    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j
+     -> index_logic1 ( ^ self) j = index_logic1 ( * self) j }
     
   predicate resolve0 (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -767,7 +778,8 @@ module ListReversalLasso_Impl4_ListReversalLoop
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -825,11 +837,13 @@ module ListReversalLasso_Impl4_ListReversalLoop
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h
+     -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j
+     -> Seq.get s i <> Seq.get s j)
   val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
     ensures { result = list_seg0 self first s last l h }
     
@@ -859,7 +873,8 @@ module ListReversalLasso_Impl4_ListReversalLoop
     ensures { [#"../list_reversal_lasso.rs" 37 14 37 47]  * result = index_logic1 ( * self) i }
     ensures { [#"../list_reversal_lasso.rs" 38 14 38 47]  ^ result = index_logic1 ( ^ self) i }
     ensures { [#"../list_reversal_lasso.rs" 39 14 39 47] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( * self))) = Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( ^ self))) }
-    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j -> index_logic1 ( ^ self) j = index_logic1 ( * self) j }
+    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j
+     -> index_logic1 ( ^ self) j = index_logic1 ( * self) j }
     
   use seq.Seq
   use seq_ext.SeqExt
@@ -915,9 +930,12 @@ module ListReversalLasso_Impl4_ListReversalLoop
   }
   BB2 {
     invariant { [#"../list_reversal_lasso.rs" 129 20 129 48] 0 <= Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s) + 1 };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n = Seq.length (Snapshot.inner s) + 1 -> l = null0 /\ r = index_logic0 s 0 /\ nonnull_ptr0 ( * self) r /\ index_logic1 ( * self) r = index_logic0 s (Seq.length (Snapshot.inner s) - 1) /\ list_seg0 ( * self) (index_logic0 s (Seq.length (Snapshot.inner s) - 1)) (Reverse.reverse (Snapshot.inner s)) (index_logic0 s 0) 0 (Seq.length (Snapshot.inner s) - 1) };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s) -> list_seg0 ( * self) l (Snapshot.inner s) (index_logic0 s 0) (Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
-    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s) -> list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s)) null0 (Seq.length (Snapshot.inner s) - Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n = Seq.length (Snapshot.inner s) + 1
+     -> l = null0 /\ r = index_logic0 s 0 /\ nonnull_ptr0 ( * self) r /\ index_logic1 ( * self) r = index_logic0 s (Seq.length (Snapshot.inner s) - 1) /\ list_seg0 ( * self) (index_logic0 s (Seq.length (Snapshot.inner s) - 1)) (Reverse.reverse (Snapshot.inner s)) (index_logic0 s 0) 0 (Seq.length (Snapshot.inner s) - 1) };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s)
+     -> list_seg0 ( * self) l (Snapshot.inner s) (index_logic0 s 0) (Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
+    invariant { [#"../list_reversal_lasso.rs" 129 8 129 50] Snapshot.inner n <= Seq.length (Snapshot.inner s)
+     -> list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s)) null0 (Seq.length (Snapshot.inner s) - Snapshot.inner n) (Seq.length (Snapshot.inner s)) };
     goto BB3
   }
   BB3 {
@@ -928,7 +946,8 @@ module ListReversalLasso_Impl4_ListReversalLoop
       end
   }
   BB4 {
-    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 138 12 138 77] Snapshot.inner n = Seq.length (Snapshot.inner s) -> l = Seq.get (Reverse.reverse (Snapshot.inner s)) (Seq.length (Snapshot.inner s) - 1) };
+    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 138 12 138 77] Snapshot.inner n = Seq.length (Snapshot.inner s)
+     -> l = Seq.get (Reverse.reverse (Snapshot.inner s)) (Seq.length (Snapshot.inner s) - 1) };
     [#"../list_reversal_lasso.rs" 139 39 139 43] _25 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 139 39 139 43] self <- { self with current = ( ^ _25) ; };
     [#"../list_reversal_lasso.rs" 139 43 139 46] _24 <- ([#"../list_reversal_lasso.rs" 139 43 139 46] index_mut0 _25 l);
@@ -970,7 +989,8 @@ module ListReversalLasso_Impl4_ListReversalLoop
   }
   BB9 {
     assume { resolve0 self };
-    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 143 8 145 54] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner s) -> Seq.get (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Snapshot.inner s) 1 (Seq.length (Snapshot.inner s))))) i = (if i = 0 then
+    assert { [@expl:assertion] [#"../list_reversal_lasso.rs" 143 8 145 54] forall i : int . 0 <= i /\ i < Seq.length (Snapshot.inner s)
+     -> Seq.get (Seq.(++) (Seq.singleton (index_logic0 s 0)) (Reverse.reverse (SeqExt.subsequence (Snapshot.inner s) 1 (Seq.length (Snapshot.inner s))))) i = (if i = 0 then
       index_logic0 s 0
     else
       Seq.get (Reverse.reverse (Snapshot.inner s)) (i - 1)
@@ -1009,7 +1029,8 @@ module ListReversalLasso_Impl4_ListReversalLasso
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model0 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1067,11 +1088,13 @@ module ListReversalLasso_Impl4_ListReversalLasso
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic2 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h
+     -> nonnull_ptr0 self (Seq.get s i) /\ index_logic2 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j
+     -> Seq.get s i <> Seq.get s j)
   val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
     ensures { result = list_seg0 self first s last l h }
     
@@ -1082,7 +1105,8 @@ module ListReversalLasso_Impl4_ListReversalLasso
       Seq.get s1 (Seq.length s1 - 1)
     else
       Seq.get s2 0
-     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2 -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
+     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2
+     -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
   val lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize) : bool
     ensures { result = lasso0 self first s1 s2 }
     
@@ -1105,7 +1129,8 @@ module ListReversalLasso_Impl4_ListReversalLasso
     ensures { [#"../list_reversal_lasso.rs" 37 14 37 47]  * result = index_logic2 ( * self) i }
     ensures { [#"../list_reversal_lasso.rs" 38 14 38 47]  ^ result = index_logic2 ( ^ self) i }
     ensures { [#"../list_reversal_lasso.rs" 39 14 39 47] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( * self))) = Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 ( ^ self))) }
-    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j -> index_logic2 ( ^ self) j = index_logic2 ( * self) j }
+    ensures { [#"../list_reversal_lasso.rs" 40 4 40 113] forall j : usize . nonnull_ptr0 ( * self) j /\ i <> j
+     -> index_logic2 ( ^ self) j = index_logic2 ( * self) j }
     
   predicate resolve0 (self : borrowed (ListReversalLasso_Memory_Type.t_memory)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -1162,13 +1187,16 @@ module ListReversalLasso_Impl4_ListReversalLasso
       index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)
     else
       index_logic0 s2 0
-     in Snapshot.inner n <= Seq.length (Snapshot.inner s1) -> list_seg0 ( * self) l (Snapshot.inner s1) mid (Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s1)) null0 (Seq.length (Snapshot.inner s1) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) };
-    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] Seq.length (Snapshot.inner s1) < Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) -> list_seg0 ( * self) l (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Snapshot.inner n - Seq.length (Snapshot.inner s1)) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Reverse.reverse (Snapshot.inner s1)) null0 0 (Seq.length (Snapshot.inner s1)) };
+     in Snapshot.inner n <= Seq.length (Snapshot.inner s1)
+     -> list_seg0 ( * self) l (Snapshot.inner s1) mid (Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s1)) null0 (Seq.length (Snapshot.inner s1) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) };
+    invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] Seq.length (Snapshot.inner s1) < Snapshot.inner n /\ Snapshot.inner n <= Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2)
+     -> list_seg0 ( * self) l (Snapshot.inner s2) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Snapshot.inner n - Seq.length (Snapshot.inner s1)) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) r (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s2)) /\ list_seg0 ( * self) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) (Reverse.reverse (Snapshot.inner s1)) null0 0 (Seq.length (Snapshot.inner s1)) };
     invariant { [#"../list_reversal_lasso.rs" 172 8 172 60] let mid = if Seq.length (Snapshot.inner s2) = 0 then
       index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)
     else
       index_logic0 s2 (Seq.length (Snapshot.inner s2) - 1)
-     in Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) < Snapshot.inner n -> list_seg0 ( * self) l (Reverse.reverse (Snapshot.inner s1)) null0 (Snapshot.inner n - Seq.length (Snapshot.inner s1) - Seq.length (Snapshot.inner s2)) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) r (Snapshot.inner s1) mid (2 * Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) };
+     in Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) < Snapshot.inner n
+     -> list_seg0 ( * self) l (Reverse.reverse (Snapshot.inner s1)) null0 (Snapshot.inner n - Seq.length (Snapshot.inner s1) - Seq.length (Snapshot.inner s2)) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) r (Snapshot.inner s1) mid (2 * Seq.length (Snapshot.inner s1) + Seq.length (Snapshot.inner s2) - Snapshot.inner n) (Seq.length (Snapshot.inner s1)) /\ list_seg0 ( * self) mid (Reverse.reverse (Snapshot.inner s2)) (index_logic0 s1 (Seq.length (Snapshot.inner s1) - 1)) 0 (Seq.length (Snapshot.inner s2)) };
     goto BB3
   }
   BB3 {
@@ -1245,21 +1273,27 @@ module ListReversalLasso_Impl4_FindPtrInSeq_Impl
   constant p  : int
   function find_ptr_in_seq [#"../list_reversal_lasso.rs" 204 4 204 66] (s : Seq.seq usize) (i : int) (p : int) : Core_Option_Option_Type.t_option int
     
-  goal vc_find_ptr_in_seq : ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s) -> match i = Seq.length s with
+  goal vc_find_ptr_in_seq : ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s)
+   -> match i = Seq.length s with
     | True -> [#"../list_reversal_lasso.rs" 199 14 202 5] match Core_Option_Option_Type.C_None with
-      | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+      | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+       -> UIntSize.to_int (Seq.get s j) <> p
       | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
       end
     | False -> match UIntSize.to_int (Seq.get s i) = p with
       | True -> [#"../list_reversal_lasso.rs" 199 14 202 5] match Core_Option_Option_Type.C_Some i with
-        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+         -> UIntSize.to_int (Seq.get s j) <> p
         | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
         end
       | False -> (([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i + 1 /\ i + 1 <= Seq.length s) /\ 0 <= ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - i) /\ ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - (i + 1)) < ([#"../list_reversal_lasso.rs" 203 14 203 25] Seq.length s - i)) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq s (i + 1) p with
-        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s
+         -> UIntSize.to_int (Seq.get s j) <> p
         | Core_Option_Option_Type.C_Some j -> i + 1 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
-        end) -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq s (i + 1) p with
-        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+        end)
+       -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq s (i + 1) p with
+        | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+         -> UIntSize.to_int (Seq.get s j) <> p
         | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
         end))
       end
@@ -1287,25 +1321,42 @@ module ListReversalLasso_Impl4_Pigeon_Impl
     requires {[#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s}
     ensures { result = find_ptr_in_seq0 s i p }
     
-  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s) -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
-    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s)
+   -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
+    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+     -> UIntSize.to_int (Seq.get s j) <> p
     | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
     end)
   constant s  : Seq.seq usize
   constant n  : int
   function pigeon [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
-  goal vc_pigeon : ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n) -> ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n) -> match n = 0 with
+  goal vc_pigeon : ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+   -> Seq.get s i <> Seq.get s j)
+   -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+   -> UIntSize.to_int (Seq.get s i) < n)
+   -> ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n)
+   -> match n = 0 with
     | True -> ([#"../list_reversal_lasso.rs" 217 14 217 20] true) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
     | False -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= 0 /\ 0 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s 0 (n - 1) with
-      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> n - 1
+      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s
+       -> UIntSize.to_int (Seq.get s j) <> n - 1
       | Core_Option_Option_Type.C_Some j -> 0 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = n - 1
-      end) -> match find_ptr_in_seq0 s 0 (n - 1) with
-      | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n - 1) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
+      end)
+     -> match find_ptr_in_seq0 s 0 (n - 1) with
+      | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+       -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+       -> UIntSize.to_int (Seq.get s i) < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n - 1)
+       -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon s (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
       | Core_Option_Option_Type.C_Some i -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i + 1 /\ i + 1 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s (i + 1) (n - 1) with
-        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> n - 1
+        | Core_Option_Option_Type.C_None -> forall j : int . i + 1 <= j /\ j < Seq.length s
+         -> UIntSize.to_int (Seq.get s j) <> n - 1
         | Core_Option_Option_Type.C_Some j -> i + 1 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = n - 1
-        end) -> match find_ptr_in_seq0 s (i + 1) (n - 1) with
-        | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ 0 <= j /\ j < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ i' <> j -> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i' <> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) -> UIntSize.to_int (Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i') < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) <= n - 1) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
+        end)
+       -> match find_ptr_in_seq0 s (i + 1) (n - 1) with
+        | Core_Option_Option_Type.C_None -> ((([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ 0 <= j /\ j < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) /\ i' <> j
+         -> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i' <> Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i' : int . 0 <= i' /\ i' < Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s)))
+         -> UIntSize.to_int (Seq.get (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) i') < n - 1) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n - 1)) /\ 0 <= ([#"../list_reversal_lasso.rs" 218 14 218 15] n) /\ ([#"../list_reversal_lasso.rs" 218 14 218 15] n - 1) < ([#"../list_reversal_lasso.rs" 218 14 218 15] n)) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) <= n - 1)
+         -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon (Seq.(++) (SeqExt.subsequence s 0 i) (SeqExt.subsequence s (i + 1) (Seq.length s))) (n - 1)) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n))
         | Core_Option_Option_Type.C_Some _ -> ([#"../list_reversal_lasso.rs" 217 14 217 20] true) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
         end)
       end)
@@ -1340,7 +1391,8 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1378,8 +1430,10 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
     requires {[#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s}
     ensures { result = find_ptr_in_seq0 s i p }
     
-  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s) -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
-    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s)
+   -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
+    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+     -> UIntSize.to_int (Seq.get s j) <> p
     | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
     end)
   use seq.Seq
@@ -1397,11 +1451,18 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
   )
   val pigeon0 [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
     requires {[#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n}
-    requires {[#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n}
-    requires {[#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j}
+    requires {[#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (Seq.get s i) < n}
+    requires {[#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+     -> Seq.get s i <> Seq.get s j}
     ensures { result = pigeon0 s n }
     
-  axiom pigeon0_spec : forall s : Seq.seq usize, n : int . ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n) -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n) -> ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s n) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
+  axiom pigeon0_spec : forall s : Seq.seq usize, n : int . ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n)
+   -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+   -> UIntSize.to_int (Seq.get s i) < n)
+   -> ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+   -> Seq.get s i <> Seq.get s j)
+   -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s n) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
   predicate nonnull_ptr0 [#"../list_reversal_lasso.rs" 49 4 49 44] (self : ListReversalLasso_Memory_Type.t_memory) (i : usize)
     
    =
@@ -1416,11 +1477,13 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h
+     -> nonnull_ptr0 self (Seq.get s i) /\ index_logic1 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j
+     -> Seq.get s i <> Seq.get s j)
   val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
     ensures { result = list_seg0 self first s last l h }
     
@@ -1431,7 +1494,8 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
       Seq.get s1 (Seq.length s1 - 1)
     else
       Seq.get s2 0
-     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2 -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
+     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2
+     -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
   val lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize) : bool
     ensures { result = lasso0 self first s1 s2 }
     
@@ -1447,7 +1511,8 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
-    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i -> index_logic1 self i = null0 \/ nonnull_ptr0 self (index_logic1 self i)
+    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i
+     -> index_logic1 self i = null0 \/ nonnull_ptr0 self (index_logic1 self i)
   val mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory) : bool
     ensures { result = mem_is_well_formed0 self }
     
@@ -1457,20 +1522,30 @@ module ListReversalLasso_Impl4_FindLassoAux_Impl
   constant s  : Seq.seq usize
   function find_lasso_aux [#"../list_reversal_lasso.rs" 244 4 244 95] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (last : usize) (s : Seq.seq usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
     
-  goal vc_find_lasso_aux : ([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s)) -> ([#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last) -> ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self) -> match last = null0 with
+  goal vc_find_lasso_aux : ([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s))
+   -> ([#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last)
+   -> ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)
+   -> match last = null0 with
     | True -> [#"../list_reversal_lasso.rs" 239 14 242 5] match (s, Core_Option_Option_Type.C_None) with
       | (s, Core_Option_Option_Type.C_None) -> list0 self first s
       | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
       end
     | False -> ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= 0 /\ 0 <= Seq.length s) /\ (([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
-      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> UIntSize.to_int last
+      | Core_Option_Option_Type.C_None -> forall j : int . 0 <= j /\ j < Seq.length s
+       -> UIntSize.to_int (Seq.get s j) <> UIntSize.to_int last
       | Core_Option_Option_Type.C_Some j -> 0 <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = UIntSize.to_int last
-      end) -> match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
-      | Core_Option_Option_Type.C_None -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 (ListReversalLasso_Memory_Type.memory_0 self)) /\ (([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) <= UIntSize.to_int max0) -> (([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) -> match pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) with
+      end)
+     -> match find_ptr_in_seq0 s 0 (UIntSize.to_int last) with
+      | Core_Option_Option_Type.C_None -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 (ListReversalLasso_Memory_Type.memory_0 self)) /\ (([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) <= UIntSize.to_int max0)
+       -> (([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+       -> Seq.get s i <> Seq.get s j) && ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+       -> UIntSize.to_int (Seq.get s i) < Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) && ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) /\ (([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)))
+       -> match pigeon0 s (Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self))) with
         | True -> ((([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first (Seq.snoc s last) (index_logic1 self last) 0 (Seq.length (Seq.snoc s last))) && ([#"../list_reversal_lasso.rs" 237 15 237 53] index_logic1 self last = null0 \/ nonnull_ptr0 self (index_logic1 self last)) && ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)) /\ 0 <= ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length s) /\ ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length (Seq.snoc s last)) < ([#"../list_reversal_lasso.rs" 243 4 243 39] Seq.length (shallow_model0 (ListReversalLasso_Memory_Type.memory_0 self)) - Seq.length s)) /\ (([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux self first (index_logic1 self last) (Seq.snoc s last) with
           | (s, Core_Option_Option_Type.C_None) -> list0 self first s
           | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
-          end) -> ([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux self first (index_logic1 self last) (Seq.snoc s last) with
+          end)
+         -> ([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux self first (index_logic1 self last) (Seq.snoc s last) with
           | (s, Core_Option_Option_Type.C_None) -> list0 self first s
           | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
           end))
@@ -1515,7 +1590,8 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1552,11 +1628,13 @@ module ListReversalLasso_Impl4_FindLasso_Impl
       last
     else
       Seq.get s l
-    ) /\ (forall i : int . l <= i /\ i < h -> nonnull_ptr0 self (Seq.get s i) /\ index_logic0 self (Seq.get s i) = (if i = h - 1 then
+    ) /\ (forall i : int . l <= i /\ i < h
+     -> nonnull_ptr0 self (Seq.get s i) /\ index_logic0 self (Seq.get s i) = (if i = h - 1 then
       last
     else
       Seq.get s (i + 1)
-    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j -> Seq.get s i <> Seq.get s j)
+    )) /\ (forall j : int . forall i : int . l <= i /\ i < h /\ l <= j /\ j < h /\ i <> j
+     -> Seq.get s i <> Seq.get s j)
   val list_seg0 [#"../list_reversal_lasso.rs" 81 4 81 81] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s : Seq.seq usize) (last : usize) (l : int) (h : int) : bool
     ensures { result = list_seg0 self first s last l h }
     
@@ -1573,8 +1651,10 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     requires {[#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s}
     ensures { result = find_ptr_in_seq0 s i p }
     
-  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s) -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
-    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s -> UIntSize.to_int (Seq.get s j) <> p
+  axiom find_ptr_in_seq0_spec : forall s : Seq.seq usize, i : int, p : int . ([#"../list_reversal_lasso.rs" 198 15 198 37] 0 <= i /\ i <= Seq.length s)
+   -> ([#"../list_reversal_lasso.rs" 199 14 202 5] match find_ptr_in_seq0 s i p with
+    | Core_Option_Option_Type.C_None -> forall j : int . i <= j /\ j < Seq.length s
+     -> UIntSize.to_int (Seq.get s j) <> p
     | Core_Option_Option_Type.C_Some j -> i <= j /\ j < Seq.length s /\ UIntSize.to_int (Seq.get s j) = p
     end)
   use seq_ext.SeqExt
@@ -1594,11 +1674,18 @@ module ListReversalLasso_Impl4_FindLasso_Impl
   )
   val pigeon0 [#"../list_reversal_lasso.rs" 219 4 219 42] (s : Seq.seq usize) (n : int) : bool
     requires {[#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n}
-    requires {[#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n}
-    requires {[#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j}
+    requires {[#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+     -> UIntSize.to_int (Seq.get s i) < n}
+    requires {[#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+     -> Seq.get s i <> Seq.get s j}
     ensures { result = pigeon0 s n }
     
-  axiom pigeon0_spec : forall s : Seq.seq usize, n : int . ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n) -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s -> UIntSize.to_int (Seq.get s i) < n) -> ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j -> Seq.get s i <> Seq.get s j) -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s n) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
+  axiom pigeon0_spec : forall s : Seq.seq usize, n : int . ([#"../list_reversal_lasso.rs" 213 15 213 21] 0 <= n)
+   -> ([#"../list_reversal_lasso.rs" 214 4 214 67] forall i : int . 0 <= i /\ i < Seq.length s
+   -> UIntSize.to_int (Seq.get s i) < n)
+   -> ([#"../list_reversal_lasso.rs" 215 4 215 113] forall j : int . forall i : int . 0 <= i /\ i < Seq.length s /\ 0 <= j /\ j < Seq.length s /\ i <> j
+   -> Seq.get s i <> Seq.get s j)
+   -> ([#"../list_reversal_lasso.rs" 217 14 217 20] pigeon0 s n) && ([#"../list_reversal_lasso.rs" 216 14 216 26] Seq.length s <= n)
   predicate lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize)
     
    =
@@ -1606,7 +1693,8 @@ module ListReversalLasso_Impl4_FindLasso_Impl
       Seq.get s1 (Seq.length s1 - 1)
     else
       Seq.get s2 0
-     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2 -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
+     in Seq.length s1 > 0 /\ (forall j : int . forall i : int . 0 <= i /\ i < Seq.length s1 /\ 0 <= j /\ j < Seq.length s2
+     -> Seq.get s1 i <> Seq.get s2 j) /\ list_seg0 self first s1 mid 0 (Seq.length s1) /\ list_seg0 self mid s2 (Seq.get s1 (Seq.length s1 - 1)) 0 (Seq.length s2)
   val lasso0 [#"../list_reversal_lasso.rs" 151 4 151 70] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) (s1 : Seq.seq usize) (s2 : Seq.seq usize) : bool
     ensures { result = lasso0 self first s1 s2 }
     
@@ -1622,7 +1710,8 @@ module ListReversalLasso_Impl4_FindLasso_Impl
   predicate mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory)
     
    =
-    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i -> index_logic0 self i = null0 \/ nonnull_ptr0 self (index_logic0 self i)
+    [#"../list_reversal_lasso.rs" 56 8 58 9] forall i : usize . nonnull_ptr0 self i
+     -> index_logic0 self i = null0 \/ nonnull_ptr0 self (index_logic0 self i)
   val mem_is_well_formed0 [#"../list_reversal_lasso.rs" 55 4 55 43] (self : ListReversalLasso_Memory_Type.t_memory) : bool
     ensures { result = mem_is_well_formed0 self }
     
@@ -1646,7 +1735,10 @@ module ListReversalLasso_Impl4_FindLasso_Impl
     requires {[#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s)}
     ensures { result = find_lasso_aux0 self first last s }
     
-  axiom find_lasso_aux0_spec : forall self : ListReversalLasso_Memory_Type.t_memory, first : usize, last : usize, s : Seq.seq usize . ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self) -> ([#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last) -> ([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s)) -> ([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux0 self first last s with
+  axiom find_lasso_aux0_spec : forall self : ListReversalLasso_Memory_Type.t_memory, first : usize, last : usize, s : Seq.seq usize . ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)
+   -> ([#"../list_reversal_lasso.rs" 237 15 237 53] last = null0 \/ nonnull_ptr0 self last)
+   -> ([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first s last 0 (Seq.length s))
+   -> ([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux0 self first last s with
     | (s, Core_Option_Option_Type.C_None) -> list0 self first s
     | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
     end)
@@ -1655,10 +1747,13 @@ module ListReversalLasso_Impl4_FindLasso_Impl
   constant first  : usize
   function find_lasso [#"../list_reversal_lasso.rs" 270 4 270 71] (self : ListReversalLasso_Memory_Type.t_memory) (first : usize) : (Seq.seq usize, Core_Option_Option_Type.t_option (Seq.seq usize))
     
-  goal vc_find_lasso : ([#"../list_reversal_lasso.rs" 265 15 265 55] first = null0 \/ nonnull_ptr0 self first) -> ([#"../list_reversal_lasso.rs" 264 15 264 40] mem_is_well_formed0 self) -> (([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first (Seq.empty : Seq.seq usize) first 0 (Seq.length (Seq.empty : Seq.seq usize))) && ([#"../list_reversal_lasso.rs" 237 15 237 53] first = null0 \/ nonnull_ptr0 self first) && ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)) /\ (([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
+  goal vc_find_lasso : ([#"../list_reversal_lasso.rs" 265 15 265 55] first = null0 \/ nonnull_ptr0 self first)
+   -> ([#"../list_reversal_lasso.rs" 264 15 264 40] mem_is_well_formed0 self)
+   -> (([#"../list_reversal_lasso.rs" 238 15 238 56] list_seg0 self first (Seq.empty : Seq.seq usize) first 0 (Seq.length (Seq.empty : Seq.seq usize))) && ([#"../list_reversal_lasso.rs" 237 15 237 53] first = null0 \/ nonnull_ptr0 self first) && ([#"../list_reversal_lasso.rs" 236 15 236 40] mem_is_well_formed0 self)) /\ (([#"../list_reversal_lasso.rs" 239 14 242 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
     | (s, Core_Option_Option_Type.C_None) -> list0 self first s
     | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
-    end) -> ([#"../list_reversal_lasso.rs" 266 14 269 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
+    end)
+   -> ([#"../list_reversal_lasso.rs" 266 14 269 5] match find_lasso_aux0 self first first (Seq.empty : Seq.seq usize) with
     | (s, Core_Option_Option_Type.C_None) -> list0 self first s
     | (s1, Core_Option_Option_Type.C_Some s2) -> lasso0 self first s1 s2
     end))
diff --git a/creusot/tests/should_succeed/mc91.mlcfg b/creusot/tests/should_succeed/mc91.mlcfg
index 98d1a1ce57..3962018ac5 100644
--- a/creusot/tests/should_succeed/mc91.mlcfg
+++ b/creusot/tests/should_succeed/mc91.mlcfg
@@ -3,7 +3,8 @@ module Mc91_Mc91
   use prelude.UInt32
   use prelude.Int
   let rec cfg mc91 [#"../mc91.rs" 7 0 7 26] [@cfg:stackify] [@cfg:subregion_analysis] (x : uint32) : uint32
-    ensures { [#"../mc91.rs" 5 0 6 40] x <= (100 : uint32) -> result = (91 : uint32) /\ x > (100 : uint32) -> result = x - (10 : uint32) }
+    ensures { [#"../mc91.rs" 5 0 6 40] x <= (100 : uint32)
+     -> result = (91 : uint32) /\ x > (100 : uint32)  -> result = x - (10 : uint32) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : uint32;
diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg
index eac5236a85..0b79cec7d9 100644
--- a/creusot/tests/should_succeed/mutex.mlcfg
+++ b/creusot/tests/should_succeed/mutex.mlcfg
@@ -512,5 +512,6 @@ module Mutex_Impl3
   val precondition0 [#"../mutex.rs" 91 4 91 33] (self : Mutex_AddsTwo_Type.t_addstwo) : bool
     ensures { result = precondition0 self }
     
-  goal call_refn : [#"../mutex.rs" 100 4 100 23] forall self : Mutex_AddsTwo_Type.t_addstwo . inv0 self /\ precondition0 self -> (forall result : () . inv1 result /\ postcondition0 self result)
+  goal call_refn : [#"../mutex.rs" 100 4 100 23] forall self : Mutex_AddsTwo_Type.t_addstwo . inv0 self /\ precondition0 self
+   -> (forall result : () . inv1 result /\ postcondition0 self result)
 end
diff --git a/creusot/tests/should_succeed/option.mlcfg b/creusot/tests/should_succeed/option.mlcfg
index 467ea4307a..0f481b4fa3 100644
--- a/creusot/tests/should_succeed/option.mlcfg
+++ b/creusot/tests/should_succeed/option.mlcfg
@@ -110,7 +110,8 @@ module Option_TestOption
     
   axiom inv0 : forall x : Core_Option_Option_Type.t_option int32 . inv0 x = true
   val flatten0 (self : Core_Option_Option_Type.t_option (Core_Option_Option_Type.t_option int32)) : Core_Option_Option_Type.t_option int32
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 120 16 120 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 120 16 120 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ self = Core_Option_Option_Type.C_Some result }
     ensures { inv1 result }
     
@@ -121,25 +122,29 @@ module Option_TestOption
     
   val cloned1 (self : Core_Option_Option_Type.t_option (borrowed int32)) : Core_Option_Option_Type.t_option int32
     requires {inv5 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 109 16 109 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 109 16 109 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : borrowed int32 . inv4 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some ( * t) /\ resolve0 t) }
     ensures { inv1 result }
     
   val cloned0 (self : Core_Option_Option_Type.t_option int32) : Core_Option_Option_Type.t_option int32
     requires {inv8 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 92 16 92 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 92 16 92 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : int32 . inv7 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some t) }
     ensures { inv1 result }
     
   val copied1 (self : Core_Option_Option_Type.t_option (borrowed int32)) : Core_Option_Option_Type.t_option int32
     requires {inv5 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 100 16 100 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 100 16 100 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : borrowed int32 . inv4 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some ( * t) /\ resolve0 t) }
     ensures { inv1 result }
     
   val copied0 (self : Core_Option_Option_Type.t_option int32) : Core_Option_Option_Type.t_option int32
     requires {inv8 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 86 16 86 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 86 16 86 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ (exists t : int32 . inv7 t /\ self = Core_Option_Option_Type.C_Some t /\ result = Core_Option_Option_Type.C_Some t) }
     ensures { inv1 result }
     
@@ -151,7 +156,8 @@ module Option_TestOption
     
   val unwrap_or_default0 (self : Core_Option_Option_Type.t_option int32) : int32
     requires {inv1 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 78 16 78 64] self = Core_Option_Option_Type.C_None -> is_default0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 78 16 78 64] self = Core_Option_Option_Type.C_None
+     -> is_default0 result }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ self = Core_Option_Option_Type.C_Some result }
     ensures { inv2 result }
     
@@ -169,14 +175,16 @@ module Option_TestOption
   val or0 (self : Core_Option_Option_Type.t_option int32) (optb : Core_Option_Option_Type.t_option int32) : Core_Option_Option_Type.t_option int32
     requires {inv1 self}
     requires {inv1 optb}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 68 16 68 59] self = Core_Option_Option_Type.C_None -> result = optb }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 68 16 68 59] self = Core_Option_Option_Type.C_None
+     -> result = optb }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ result = self }
     ensures { inv1 result }
     
   val and0 (self : Core_Option_Option_Type.t_option int32) (optb : Core_Option_Option_Type.t_option int32) : Core_Option_Option_Type.t_option int32
     requires {inv1 self}
     requires {inv1 optb}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 64 16 64 59] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 64 16 64 59] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ result = optb }
     ensures { inv1 result }
     
@@ -192,7 +200,8 @@ module Option_TestOption
     
   val as_ref0 (self : Core_Option_Option_Type.t_option int32) : Core_Option_Option_Type.t_option int32
     requires {inv0 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 59 16 61 18] self = Core_Option_Option_Type.C_None \/ (exists r : int32 . inv7 r /\ result = Core_Option_Option_Type.C_Some r /\ self = Core_Option_Option_Type.C_Some r) }
     ensures { inv8 result }
     
@@ -208,14 +217,16 @@ module Option_TestOption
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option int32)) : Core_Option_Option_Type.t_option (borrowed int32)
     requires {inv3 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed int32 . inv4 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv5 result }
     
   val unwrap_or0 (self : Core_Option_Option_Type.t_option int32) (default : int32) : int32
     requires {inv1 self}
     requires {inv2 default}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 47 16 47 62] self = Core_Option_Option_Type.C_None -> result = default }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 47 16 47 62] self = Core_Option_Option_Type.C_None
+     -> result = default }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self = Core_Option_Option_Type.C_None \/ self = Core_Option_Option_Type.C_Some result }
     ensures { inv2 result }
     
diff --git a/creusot/tests/should_succeed/ord_trait.mlcfg b/creusot/tests/should_succeed/ord_trait.mlcfg
index af0d60501e..832ad1edcb 100644
--- a/creusot/tests/should_succeed/ord_trait.mlcfg
+++ b/creusot/tests/should_succeed/ord_trait.mlcfg
@@ -29,7 +29,9 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -37,7 +39,10 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -45,7 +50,10 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -56,13 +64,19 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -73,7 +87,9 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -84,7 +100,9 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -95,7 +113,9 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -106,7 +126,9 @@ module OrdTrait_X
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant1 (self : t)
   val invariant1 (self : t) : bool
     ensures { result = invariant1 self }
@@ -206,7 +228,9 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -214,7 +238,10 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -222,7 +249,10 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -233,13 +263,19 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -250,7 +286,9 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -261,7 +299,9 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -272,7 +312,9 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -283,7 +325,9 @@ module OrdTrait_GtOrLe
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant0 (self : t)
   val invariant0 (self : t) : bool
     ensures { result = invariant0 self }
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index afeac33309..0f7f07408d 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -166,9 +166,14 @@ module RedBlackTree_Impl0_ModelAccHasMapping_Impl
   constant k  : deep_model_ty0
   function model_acc_has_mapping [#"../red_black_tree.rs" 68 4 72 5] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
-  goal vc_model_acc_has_mapping : ([#"../red_black_tree.rs" 71 8 71 9] inv2 k) -> ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) -> ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> match self with
+  goal vc_model_acc_has_mapping : ([#"../red_black_tree.rs" 71 8 71 9] inv2 k)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu)
+   -> ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)
+   -> match self with
     | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)
-    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 left)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 left accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 left k v)) -> (let _ = model_acc_has_mapping left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v)) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)))))
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 left)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 left accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 left k v))
+     -> (let _ = model_acc_has_mapping left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v))
+     -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)))))
     end
 end
 module Core_Cmp_Ordering_Type
@@ -197,7 +202,9 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -205,7 +212,10 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -213,7 +223,10 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -224,13 +237,19 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -241,7 +260,9 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -252,7 +273,9 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -263,7 +286,9 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -274,7 +299,9 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant3 (self : v)
   val invariant3 (self : v) : bool
     ensures { result = invariant3 self }
@@ -350,9 +377,18 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv2 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv2 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv2 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv3 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv3 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv3 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv3 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -369,9 +405,20 @@ module RedBlackTree_Impl0_HasMappingModelAcc_Impl
   constant k  : deep_model_ty0
   function has_mapping_model_acc [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
-  goal vc_has_mapping_model_acc : ([#"../red_black_tree.rs" 89 81 89 82] inv2 k) -> ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu) -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) -> ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> match self with
-    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v
-    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 left) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 left)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 left k v -> Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v) -> (let _ = has_mapping_model_acc left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu2) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 right) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 right)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 right k v -> Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v) -> (let _ = has_mapping_model_acc right accu2 k in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v)) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v))))))
+  goal vc_has_mapping_model_acc : ([#"../red_black_tree.rs" 89 81 89 82] inv2 k)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self)
+   -> ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> match self with
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v
+     -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v
+    | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left _ key val' right)) -> (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 left) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 left)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v
+     -> has_mapping0 left k v  -> Map.get (model_acc0 left accu) k = Core_Option_Option_Type.C_Some v)
+     -> (let _ = has_mapping_model_acc left accu k in let accu1 = model_acc0 left accu in let accu2 = Map.set accu1 (deep_model0 key) (Core_Option_Option_Type.C_Some val') in (([#"../red_black_tree.rs" 89 81 89 82] inv2 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv1 accu2) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 right) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 right)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v
+     -> has_mapping0 right k v  -> Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v)
+     -> (let _ = has_mapping_model_acc right accu2 k in (([#"../red_black_tree.rs" 71 8 71 9] inv2 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv1 accu2) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 right)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 right accu2) k = Map.get accu2 k \/ (exists v : v . inv3 v /\ Map.get (model_acc0 right accu2) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 right k v))
+     -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv3 v
+     -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v))))))
     end
 end
 module RedBlackTree_Impl0_HasMappingModel_Impl
@@ -393,7 +440,9 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -401,7 +450,10 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -409,7 +461,10 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -420,13 +475,19 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -437,7 +498,9 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -448,7 +511,9 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -459,7 +524,9 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -470,7 +537,9 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use Core_Option_Option_Type as Core_Option_Option_Type
   use map.Map
   predicate invariant3 (self : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v))
@@ -546,9 +615,18 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv1 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv3 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv1 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv3 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv1 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv2 v -> inv1 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv2 v -> inv1 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv2 v
+     -> inv1 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv2 v
+     -> inv1 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -574,7 +652,12 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv1 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv3 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv1 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv3 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv1 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   use map.Const
   function shallow_model0 [#"../red_black_tree.rs" 172 4 172 50] (self : RedBlackTree_Tree_Type.t_tree k v) : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)
     
@@ -587,7 +670,15 @@ module RedBlackTree_Impl0_HasMappingModel_Impl
   constant k  : deep_model_ty0
   function has_mapping_model [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
-  goal vc_has_mapping_model : ([#"../red_black_tree.rs" 110 31 110 32] inv1 k) -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) -> ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> (([#"../red_black_tree.rs" 71 8 71 9] inv1 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Map.get (Const.const (Core_Option_Option_Type.C_None)) k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v)) -> (let _ = model_acc_has_mapping0 self (Const.const (Core_Option_Option_Type.C_None)) k in (([#"../red_black_tree.rs" 89 81 89 82] inv1 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v -> has_mapping0 self k v -> Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v)))))
+  goal vc_has_mapping_model : ([#"../red_black_tree.rs" 110 31 110 32] inv1 k)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self)
+   -> ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> (([#"../red_black_tree.rs" 71 8 71 9] inv1 k) && ([#"../red_black_tree.rs" 70 8 70 12] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)) /\ (([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Map.get (Const.const (Core_Option_Option_Type.C_None)) k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+   -> (let _ = model_acc_has_mapping0 self (Const.const (Core_Option_Option_Type.C_None)) k in (([#"../red_black_tree.rs" 89 81 89 82] inv1 k) && ([#"../red_black_tree.rs" 89 35 89 39] inv3 (Const.const (Core_Option_Option_Type.C_None))) && ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) && ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v
+   -> has_mapping0 self k v
+   -> Map.get (model_acc0 self (Const.const (Core_Option_Option_Type.C_None))) k = Core_Option_Option_Type.C_Some v)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v
+   -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v)))))
 end
 module RedBlackTree_Impl0_HasMappingInj_Impl
   type k
@@ -619,7 +710,9 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -627,7 +720,10 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -635,7 +731,10 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -646,13 +745,19 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv1 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -663,7 +768,9 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -674,7 +781,9 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -685,7 +794,9 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -696,7 +807,9 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv1 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv1 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant2 (self : v)
   val invariant2 (self : v) : bool
     ensures { result = invariant2 self }
@@ -769,9 +882,18 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv1 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv3 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv1 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv3 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv1 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv2 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv2 v -> inv1 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv2 v -> inv1 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv2 v
+     -> inv1 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv2 v
+     -> inv1 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -797,7 +919,12 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv1 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv3 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv1 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv3 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv1 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv2 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -808,14 +935,27 @@ module RedBlackTree_Impl0_HasMappingInj_Impl
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv1 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv1 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv1 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v
+   -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
   constant self  : RedBlackTree_Tree_Type.t_tree k v
   constant k  : deep_model_ty0
   constant v1  : v
   constant v2  : v
   function has_mapping_inj [#"../red_black_tree.rs" 125 4 127 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) (v1 : v) (v2 : v) : ()
     
-  goal vc_has_mapping_inj : ([#"../red_black_tree.rs" 125 55 125 57] inv2 v2) -> ([#"../red_black_tree.rs" 125 48 125 50] inv2 v1) -> ([#"../red_black_tree.rs" 125 29 125 30] inv1 k) -> ([#"../red_black_tree.rs" 125 23 125 27] inv0 self) -> ([#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2) -> ([#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1) -> ([#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self) -> (([#"../red_black_tree.rs" 110 31 110 32] inv1 k) && ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) && ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v)) -> (let _ = has_mapping_model0 self k in match Map.get (shallow_model0 self) k with
+  goal vc_has_mapping_inj : ([#"../red_black_tree.rs" 125 55 125 57] inv2 v2)
+   -> ([#"../red_black_tree.rs" 125 48 125 50] inv2 v1)
+   -> ([#"../red_black_tree.rs" 125 29 125 30] inv1 k)
+   -> ([#"../red_black_tree.rs" 125 23 125 27] inv0 self)
+   -> ([#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2)
+   -> ([#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1)
+   -> ([#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self)
+   -> (([#"../red_black_tree.rs" 110 31 110 32] inv1 k) && ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) && ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)) /\ (([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv2 v
+   -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
+   -> (let _ = has_mapping_model0 self k in match Map.get (shallow_model0 self) k with
     | Core_Option_Option_Type.C_None -> [#"../red_black_tree.rs" 124 14 124 22] v1 = v2
     | Core_Option_Option_Type.C_Some _v -> [#"../red_black_tree.rs" 124 14 124 22] v1 = v2
     end))
@@ -912,10 +1052,17 @@ module RedBlackTree_Impl1_HasMapping_Impl
   constant v  : v
   predicate has_mapping [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
-  goal vc_has_mapping : ([#"../red_black_tree.rs" 140 44 140 45] inv2 v) -> ([#"../red_black_tree.rs" 140 25 140 26] inv1 k) -> ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> (if k = deep_model0 (RedBlackTree_Node_Type.node_key self) then
-    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ v = RedBlackTree_Node_Type.node_val self) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
+  goal vc_has_mapping : ([#"../red_black_tree.rs" 140 44 140 45] inv2 v)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv1 k)
+   -> ([#"../red_black_tree.rs" 140 19 140 23] inv0 self)
+   -> (if k = deep_model0 (RedBlackTree_Node_Type.node_key self) then
+    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node
+     -> self = node
+     -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ v = RedBlackTree_Node_Type.node_val self) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
   else
-    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ false) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
+    [#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node
+     -> self = node
+     -> ((has_mapping0 (RedBlackTree_Node_Type.node_left self) k v \/ has_mapping0 (RedBlackTree_Node_Type.node_right self) k v) \/ false) = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v
   )
 end
 module RedBlackTree_Cp_Type
@@ -944,11 +1091,14 @@ module RedBlackTree_Impl9_Height_Impl
   use prelude.Int
   constant self  : RedBlackTree_Tree_Type.t_tree k v
   function height [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int
-  goal vc_height : ([#"../red_black_tree.rs" 296 14 296 18] inv0 self) -> match self with
+  goal vc_height : ([#"../red_black_tree.rs" 296 14 296 18] inv0 self)
+   -> match self with
     | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_None) -> [#"../red_black_tree.rs" 295 14 295 25] 0 >= 0
     | RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some (RedBlackTree_Node_Type.C_Node left color _ _ _)) -> match color with
-      | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0) -> ([#"../red_black_tree.rs" 295 14 295 25] height left >= 0))
-      | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0) -> ([#"../red_black_tree.rs" 295 14 295 25] height left + 1 >= 0))
+      | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0)
+       -> ([#"../red_black_tree.rs" 295 14 295 25] height left >= 0))
+      | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv0 left) /\ (([#"../red_black_tree.rs" 295 14 295 25] height left >= 0)
+       -> ([#"../red_black_tree.rs" 295 14 295 25] height left + 1 >= 0))
       end
     end
 end
@@ -1000,12 +1150,20 @@ module RedBlackTree_Impl10_Height_Impl
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv2 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv2 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv2 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   constant self  : RedBlackTree_Node_Type.t_node k v
   function height [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int
-  goal vc_height : ([#"../red_black_tree.rs" 328 14 328 18] inv0 self) -> match RedBlackTree_Node_Type.node_color self with
-    | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
-    | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height0 (RedBlackTree_Node_Type.node_left self) + 1 = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
+  goal vc_height : ([#"../red_black_tree.rs" 328 14 328 18] inv0 self)
+   -> match RedBlackTree_Node_Type.node_color self with
+    | RedBlackTree_Color_Type.C_Red -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0)
+     -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+     -> self = node
+     -> height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
+    | RedBlackTree_Color_Type.C_Black -> ([#"../red_black_tree.rs" 296 14 296 18] inv2 (RedBlackTree_Node_Type.node_left self)) /\ (([#"../red_black_tree.rs" 295 14 295 25] height0 (RedBlackTree_Node_Type.node_left self) >= 0)
+     -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+     -> self = node
+     -> height0 (RedBlackTree_Node_Type.node_left self) + 1 = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node))))
     end
 end
 module RedBlackTree_Impl13_IsRed
@@ -1129,7 +1287,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -1137,7 +1297,10 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -1145,7 +1308,10 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -1156,13 +1322,19 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -1173,7 +1345,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -1184,7 +1358,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -1195,7 +1371,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -1206,7 +1384,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use RedBlackTree_Node_Type as RedBlackTree_Node_Type
   predicate invariant8 (self : borrowed (RedBlackTree_Node_Type.t_node k v))
   val invariant8 (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : bool
@@ -1306,7 +1486,8 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv3 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -1316,7 +1497,9 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv5 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   function deep_model0 (self : k) : deep_model_ty0
   val deep_model0 (self : k) : deep_model_ty0
     ensures { result = deep_model0 self }
@@ -1341,11 +1524,17 @@ module RedBlackTree_Impl14_RotateRight
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv10 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv11 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv10 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv11 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv10 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -1378,7 +1567,13 @@ module RedBlackTree_Impl14_RotateRight
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -1665,7 +1860,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -1673,7 +1870,10 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -1681,7 +1881,10 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -1692,13 +1895,19 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv11 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -1709,7 +1918,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -1720,7 +1931,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -1731,7 +1944,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -1742,7 +1957,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv11 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv11 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv11 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use RedBlackTree_Node_Type as RedBlackTree_Node_Type
   predicate invariant8 (self : borrowed (RedBlackTree_Node_Type.t_node k v))
   val invariant8 (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : bool
@@ -1842,7 +2059,8 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv3 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -1852,7 +2070,9 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv5 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   function deep_model0 (self : k) : deep_model_ty0
   val deep_model0 (self : k) : deep_model_ty0
     ensures { result = deep_model0 self }
@@ -1877,11 +2097,17 @@ module RedBlackTree_Impl14_RotateLeft
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv10 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv11 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv10 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv11 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv10 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -1914,7 +2140,13 @@ module RedBlackTree_Impl14_RotateLeft
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv11 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv11 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -2175,7 +2407,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv9 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -2183,7 +2417,10 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv9 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -2191,7 +2428,10 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv9 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -2202,13 +2442,19 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv9 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv9 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv9 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv9 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -2219,7 +2465,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv9 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -2230,7 +2478,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv9 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -2241,7 +2491,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv9 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -2252,7 +2504,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv9 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv9 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv9 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv9 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv9 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use RedBlackTree_Tree_Type as RedBlackTree_Tree_Type
   predicate invariant10 (self : RedBlackTree_Tree_Type.t_tree k v)
   val invariant10 (self : RedBlackTree_Tree_Type.t_tree k v) : bool
@@ -2379,11 +2633,17 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv8 v}
     ensures { result = has_mapping0 self k v }
     
-  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv7 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv9 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv8 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv7 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv9 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv8 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node
+   -> self = node
+   -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv8 v -> inv9 k -> has_mapping0 self k v = has_mapping0 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv9 k  -> has_mapping0 self k v = has_mapping0 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -2400,7 +2660,8 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv10 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -2410,7 +2671,9 @@ module RedBlackTree_Impl14_FlipColors
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv7 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv7 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv7 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv3 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   function color0 [#"../red_black_tree.rs" 256 4 256 27] (self : RedBlackTree_Tree_Type.t_tree k v) : RedBlackTree_Color_Type.t_color
     
    =
@@ -2440,7 +2703,13 @@ module RedBlackTree_Impl14_FlipColors
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv8 v -> inv9 k -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv8 v -> inv9 k -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv9 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv9 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -2491,7 +2760,8 @@ module RedBlackTree_Impl14_FlipColors
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv4 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv1 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv5 result }
     
@@ -2653,7 +2923,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -2661,7 +2933,10 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -2669,7 +2944,10 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -2680,13 +2958,19 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -2697,7 +2981,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -2708,7 +2994,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -2719,7 +3007,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -2730,7 +3020,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant3 (self : RedBlackTree_Tree_Type.t_tree k v)
   val invariant3 (self : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = invariant3 self }
@@ -2838,7 +3130,8 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv9 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv9 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv9 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -2848,7 +3141,9 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv0 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv4 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv4 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   function deep_model0 (self : k) : deep_model_ty0
   val deep_model0 (self : k) : deep_model_ty0
     ensures { result = deep_model0 self }
@@ -2873,11 +3168,17 @@ module RedBlackTree_Impl14_Balance
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv7 v}
     ensures { result = has_mapping0 self k v }
     
-  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv8 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv7 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv4 node -> self = node -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv8 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv7 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv4 node
+   -> self = node
+   -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv7 v -> inv8 k -> has_mapping0 self k v = has_mapping0 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv7 v
+     -> inv8 k  -> has_mapping0 self k v = has_mapping0 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -2900,7 +3201,13 @@ module RedBlackTree_Impl14_Balance
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv7 v -> inv8 k -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv7 v -> inv8 k -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv7 v
+     -> inv8 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv7 v
+     -> inv8 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -2964,7 +3271,8 @@ module RedBlackTree_Impl14_Balance
     
   val as_ref0 (self : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)) : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)
     requires {inv5 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 59 16 61 18] self = Core_Option_Option_Type.C_None \/ (exists r : RedBlackTree_Node_Type.t_node k v . inv1 r /\ result = Core_Option_Option_Type.C_Some r /\ self = Core_Option_Option_Type.C_Some r) }
     ensures { inv6 result }
     
@@ -2986,18 +3294,26 @@ module RedBlackTree_Impl14_Balance
     
   let rec cfg balance [#"../red_black_tree.rs" 510 4 510 25] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 491 15 491 43] internal_invariant0 ( * self)}
-    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
-    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
-    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> false}
+    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
+    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
+    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> false}
     requires {[#"../red_black_tree.rs" 510 20 510 24] inv2 self}
     ensures { [#"../red_black_tree.rs" 497 14 497 42] same_mappings0 ( * self) ( ^ self) }
     ensures { [#"../red_black_tree.rs" 498 14 498 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 499 14 499 50] height0 ( * self) = height0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black ->  * self =  ^ self }
-    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black
+     ->  * self =  ^ self }
+    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -3238,7 +3554,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -3246,7 +3564,10 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -3254,7 +3575,10 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -3265,13 +3589,19 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -3282,7 +3612,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -3293,7 +3625,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -3304,7 +3638,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -3315,7 +3651,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant5 (self : deep_model_ty0)
   val invariant5 (self : deep_model_ty0) : bool
     ensures { result = invariant5 self }
@@ -3419,7 +3757,12 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv4 v}
     ensures { result = has_mapping0 self k v }
     
-  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv5 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv4 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv5 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv4 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node
+   -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   use prelude.Int
   function height1 [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int =
     [#"../red_black_tree.rs" 298 12 306 13] match self with
@@ -3433,7 +3776,8 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv10 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -3443,7 +3787,9 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv0 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   use RedBlackTree_Cp_Type as RedBlackTree_Cp_Type
   predicate match_t0 [#"../red_black_tree.rs" 232 4 232 52] (self : RedBlackTree_Cp_Type.t_cp) (tree : RedBlackTree_Tree_Type.t_tree k v)
     
@@ -3491,7 +3837,13 @@ module RedBlackTree_Impl14_MoveRedLeft
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -3521,7 +3873,8 @@ module RedBlackTree_Impl14_MoveRedLeft
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 self k v = has_mapping0 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 self k v = has_mapping0 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -3566,7 +3919,8 @@ module RedBlackTree_Impl14_MoveRedLeft
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv7 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv8 result }
     
@@ -3589,14 +3943,24 @@ module RedBlackTree_Impl14_MoveRedLeft
     requires {[#"../red_black_tree.rs" 526 15 526 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)}
     requires {[#"../red_black_tree.rs" 542 26 542 30] inv3 self}
     ensures { [#"../red_black_tree.rs" 527 14 527 44] internal_invariant0 ( * result) }
-    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant0 ( ^ result) /\ height0 ( * result) = height0 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( ^ result) k v -> has_mapping0 ( * result) k v) -> internal_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 531 4 531 97] height0 ( * result) = height0 ( ^ result) -> height0 ( * self) = height0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant0 ( ^ result) /\ height0 ( * result) = height0 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 ( ^ result) k v  -> has_mapping0 ( * result) k v)  -> internal_invariant0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 531 4 531 97] height0 ( * result) = height0 ( ^ result)
+     -> height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 532 14 532 42] RedBlackTree_Node_Type.node_key ( * self) = RedBlackTree_Node_Type.node_key ( * result) }
-    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( * result) k v -> has_mapping0 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( * self) k v /\ le_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) -> has_mapping0 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( ^ self) k v = (has_mapping0 ( ^ result) k v \/ has_mapping0 ( * self) k v /\ not has_mapping0 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 ( * result) k v  -> has_mapping0 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping0 ( * self) k v /\ le_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key ( * self)))
+     -> has_mapping0 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping0 ( ^ self) k v = (has_mapping0 ( ^ result) k v \/ has_mapping0 ( * self) k v /\ not has_mapping0 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 538 14 539 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant0 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant0 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 542 35 542 44] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -3802,7 +4166,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -3810,7 +4176,10 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -3818,7 +4187,10 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -3829,13 +4201,19 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv5 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -3846,7 +4224,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -3857,7 +4237,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -3868,7 +4250,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -3879,7 +4263,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv5 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv5 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv5 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant5 (self : deep_model_ty0)
   val invariant5 (self : deep_model_ty0) : bool
     ensures { result = invariant5 self }
@@ -3983,7 +4369,12 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv4 v}
     ensures { result = has_mapping0 self k v }
     
-  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv5 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv4 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping0_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv0 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv5 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv4 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node
+   -> has_mapping0 self k v = has_mapping1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   use prelude.Int
   function height1 [#"../red_black_tree.rs" 296 4 296 26] (self : RedBlackTree_Tree_Type.t_tree k v) : int =
     [#"../red_black_tree.rs" 298 12 306 13] match self with
@@ -3997,7 +4388,8 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv10 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
+  axiom height1_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv10 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height1 self >= 0)
   function height0 [#"../red_black_tree.rs" 328 4 328 26] (self : RedBlackTree_Node_Type.t_node k v) : int =
     [#"../red_black_tree.rs" 330 12 333 13] match RedBlackTree_Node_Type.node_color self with
       | RedBlackTree_Color_Type.C_Red -> height1 (RedBlackTree_Node_Type.node_left self)
@@ -4007,7 +4399,9 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv0 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node -> self = node -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height0_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv0 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv6 node
+   -> self = node  -> height0 self = height1 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   use RedBlackTree_Cp_Type as RedBlackTree_Cp_Type
   predicate match_t0 [#"../red_black_tree.rs" 232 4 232 52] (self : RedBlackTree_Cp_Type.t_cp) (tree : RedBlackTree_Tree_Type.t_tree k v)
     
@@ -4055,7 +4449,13 @@ module RedBlackTree_Impl14_MoveRedRight
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping1 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -4085,7 +4485,8 @@ module RedBlackTree_Impl14_MoveRedRight
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 self k v = has_mapping0 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 self k v = has_mapping0 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -4118,7 +4519,8 @@ module RedBlackTree_Impl14_MoveRedRight
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv7 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv8 result }
     
@@ -4141,14 +4543,24 @@ module RedBlackTree_Impl14_MoveRedRight
     requires {[#"../red_black_tree.rs" 555 15 555 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)))) ( * self)}
     requires {[#"../red_black_tree.rs" 571 27 571 31] inv3 self}
     ensures { [#"../red_black_tree.rs" 556 14 556 44] internal_invariant0 ( * result) }
-    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant0 ( ^ result) /\ height0 ( * result) = height0 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( ^ result) k v -> has_mapping0 ( * result) k v) -> internal_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 560 4 560 97] height0 ( * result) = height0 ( ^ result) -> height0 ( * self) = height0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant0 ( ^ result) /\ height0 ( * result) = height0 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 ( ^ result) k v  -> has_mapping0 ( * result) k v)  -> internal_invariant0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 560 4 560 97] height0 ( * result) = height0 ( ^ result)
+     -> height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 561 14 561 42] RedBlackTree_Node_Type.node_key ( * result) = RedBlackTree_Node_Type.node_key ( * self) }
-    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( * result) k v -> has_mapping0 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( * self) k v /\ le_log0 (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) k -> has_mapping0 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv4 v -> inv5 k -> has_mapping0 ( ^ self) k v = (has_mapping0 ( ^ result) k v \/ has_mapping0 ( * self) k v /\ not has_mapping0 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k  -> has_mapping0 ( * result) k v  -> has_mapping0 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping0 ( * self) k v /\ le_log0 (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) k
+     -> has_mapping0 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv4 v
+     -> inv5 k
+     -> has_mapping0 ( ^ self) k v = (has_mapping0 ( ^ result) k v \/ has_mapping0 ( * self) k v /\ not has_mapping0 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 567 14 568 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant0 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant0 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant0 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 571 36 571 45] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -4276,7 +4688,9 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -4284,7 +4698,10 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -4292,7 +4709,10 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -4303,13 +4723,19 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -4320,7 +4746,9 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -4331,7 +4759,9 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -4342,7 +4772,9 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -4353,7 +4785,9 @@ module RedBlackTree_Impl15_New
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant3 (self : deep_model_ty0)
   val invariant3 (self : deep_model_ty0) : bool
     ensures { result = invariant3 self }
@@ -4417,7 +4851,8 @@ module RedBlackTree_Impl15_New
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv0 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv0 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv0 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -4446,7 +4881,13 @@ module RedBlackTree_Impl15_New
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -4540,7 +4981,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -4548,7 +4991,10 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -4556,7 +5002,10 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -4567,13 +5016,19 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -4584,7 +5039,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -4595,7 +5052,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -4606,7 +5065,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -4617,7 +5078,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant10 (self : deep_model_ty0)
   val invariant10 (self : deep_model_ty0) : bool
     ensures { result = invariant10 self }
@@ -4785,7 +5248,8 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv3 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv3 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -4800,7 +5264,13 @@ module RedBlackTree_Impl15_InsertRec
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv5 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv5 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -4845,7 +5315,9 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv9 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv9 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv9 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node  -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   predicate has_mapping1 [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
    =
@@ -4856,11 +5328,17 @@ module RedBlackTree_Impl15_InsertRec
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv5 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv9 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv5 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv9 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv5 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv5 v -> inv10 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv10 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -4881,18 +5359,26 @@ module RedBlackTree_Impl15_InsertRec
     
   val balance0 [#"../red_black_tree.rs" 510 4 510 25] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 491 15 491 43] internal_invariant1 ( * self)}
-    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
-    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
-    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> false}
+    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
+    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
+    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> false}
     requires {[#"../red_black_tree.rs" 510 20 510 24] inv11 self}
     ensures { [#"../red_black_tree.rs" 497 14 497 42] same_mappings0 ( * self) ( ^ self) }
     ensures { [#"../red_black_tree.rs" 498 14 498 42] internal_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 499 14 499 50] height1 ( * self) = height1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black ->  * self =  ^ self }
-    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black
+     ->  * self =  ^ self }
+    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
     
   predicate resolve5 (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -4936,7 +5422,8 @@ module RedBlackTree_Impl15_InsertRec
     ensures { [#"../red_black_tree.rs" 595 14 595 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 596 14 597 39] match_t0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) /\ color0 ( * self) = RedBlackTree_Color_Type.C_Red \/ color_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 598 14 598 56] has_mapping0 ( ^ self) (deep_model0 key) val' }
-    ensures { [#"../red_black_tree.rs" 599 4 599 127] forall v : v . forall k : deep_model_ty0 . inv5 v -> inv10 k -> k = deep_model0 key \/ has_mapping0 ( * self) k v = has_mapping0 ( ^ self) k v }
+    ensures { [#"../red_black_tree.rs" 599 4 599 127] forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv10 k  -> k = deep_model0 key \/ has_mapping0 ( * self) k v = has_mapping0 ( ^ self) k v }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -5173,7 +5660,9 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -5181,7 +5670,10 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -5189,7 +5681,10 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -5200,13 +5695,19 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -5217,7 +5718,9 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -5228,7 +5731,9 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -5239,7 +5744,9 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -5250,7 +5757,9 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use Core_Option_Option_Type as Core_Option_Option_Type
   use map.Map
   predicate invariant11 (self : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v))
@@ -5419,7 +5928,8 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv0 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv0 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv0 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -5444,7 +5954,13 @@ module RedBlackTree_Impl15_Insert
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv5 v -> inv6 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv5 v -> inv6 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv6 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv6 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -5486,7 +6002,10 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv6 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv10 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv6 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv5 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv0 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv10 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv6 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv5 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -5501,7 +6020,12 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv6 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv10 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv6 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv5 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv0 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv10 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv6 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv5 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -5512,7 +6036,11 @@ module RedBlackTree_Impl15_Insert
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv6 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv6 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv5 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv0 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv6 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv5 v
+   -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
   predicate resolve1 (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve1 (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) : bool
@@ -5531,7 +6059,8 @@ module RedBlackTree_Impl15_Insert
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv7 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv8 result }
     
@@ -5563,7 +6092,8 @@ module RedBlackTree_Impl15_Insert
     ensures { [#"../red_black_tree.rs" 595 14 595 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 596 14 597 39] match_t0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) /\ color0 ( * self) = RedBlackTree_Color_Type.C_Red \/ color_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 598 14 598 56] has_mapping0 ( ^ self) (deep_model0 key) val' }
-    ensures { [#"../red_black_tree.rs" 599 4 599 127] forall v : v . forall k : deep_model_ty0 . inv5 v -> inv6 k -> k = deep_model0 key \/ has_mapping0 ( * self) k v = has_mapping0 ( ^ self) k v }
+    ensures { [#"../red_black_tree.rs" 599 4 599 127] forall v : v . forall k : deep_model_ty0 . inv5 v
+     -> inv6 k  -> k = deep_model0 key \/ has_mapping0 ( * self) k v = has_mapping0 ( ^ self) k v }
     
   let rec cfg insert [#"../red_black_tree.rs" 626 4 626 44] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) (key : k) (val' : v) : ()
     requires {[#"../red_black_tree.rs" 623 15 623 34] invariant0 ( * self)}
@@ -5706,7 +6236,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -5714,7 +6246,10 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -5722,7 +6257,10 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -5733,13 +6271,19 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -5750,7 +6294,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -5761,7 +6307,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -5772,7 +6320,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -5783,7 +6333,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant10 (self : deep_model_ty0)
   val invariant10 (self : deep_model_ty0) : bool
     ensures { result = invariant10 self }
@@ -5931,7 +6483,8 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv8 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv8 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv8 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   use RedBlackTree_Cp_Type as RedBlackTree_Cp_Type
   function cpn0 [#"../red_black_tree.rs" 226 0 226 36] (c : RedBlackTree_Color_Type.t_color) (l : RedBlackTree_Cp_Type.t_cp) (r : RedBlackTree_Cp_Type.t_cp) : RedBlackTree_Cp_Type.t_cp
     
@@ -5964,7 +6517,13 @@ module RedBlackTree_Impl15_DeleteMaxRec
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -6005,7 +6564,9 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv3 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv3 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv3 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node  -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   predicate has_mapping1 [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
    =
@@ -6016,11 +6577,17 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv9 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv3 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv9 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv3 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv9 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -6041,18 +6608,26 @@ module RedBlackTree_Impl15_DeleteMaxRec
     
   val balance0 [#"../red_black_tree.rs" 510 4 510 25] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 491 15 491 43] internal_invariant1 ( * self)}
-    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
-    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
-    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> false}
+    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
+    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
+    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> false}
     requires {[#"../red_black_tree.rs" 510 20 510 24] inv4 self}
     ensures { [#"../red_black_tree.rs" 497 14 497 42] same_mappings0 ( * self) ( ^ self) }
     ensures { [#"../red_black_tree.rs" 498 14 498 42] internal_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 499 14 499 50] height1 ( * self) = height1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black ->  * self =  ^ self }
-    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black
+     ->  * self =  ^ self }
+    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
     
   val move_red_right0 [#"../red_black_tree.rs" 571 4 571 45] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : borrowed (RedBlackTree_Node_Type.t_node k v)
     requires {[#"../red_black_tree.rs" 553 15 553 40] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_left ( * self)) <> Core_Option_Option_Type.C_None}
@@ -6060,14 +6635,24 @@ module RedBlackTree_Impl15_DeleteMaxRec
     requires {[#"../red_black_tree.rs" 555 15 555 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)))) ( * self)}
     requires {[#"../red_black_tree.rs" 571 27 571 31] inv4 self}
     ensures { [#"../red_black_tree.rs" 556 14 556 44] internal_invariant1 ( * result) }
-    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( ^ result) k v -> has_mapping1 ( * result) k v) -> internal_invariant1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 560 4 560 97] height1 ( * result) = height1 ( ^ result) -> height1 ( * self) = height1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 ( ^ result) k v  -> has_mapping1 ( * result) k v)  -> internal_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 560 4 560 97] height1 ( * result) = height1 ( ^ result)
+     -> height1 ( * self) = height1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 561 14 561 42] RedBlackTree_Node_Type.node_key ( * result) = RedBlackTree_Node_Type.node_key ( * self) }
-    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( * result) k v -> has_mapping1 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( * self) k v /\ le_log0 (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) k -> has_mapping1 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 ( * result) k v  -> has_mapping1 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping1 ( * self) k v /\ le_log0 (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) k
+     -> has_mapping1 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 567 14 568 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 571 36 571 45] inv4 result }
     
   predicate resolve5 (self : RedBlackTree_Node_Type.t_node k v)
@@ -6082,7 +6667,8 @@ module RedBlackTree_Impl15_DeleteMaxRec
     
   val as_ref0 (self : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)) : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)
     requires {inv14 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 59 16 61 18] self = Core_Option_Option_Type.C_None \/ (exists r : RedBlackTree_Node_Type.t_node k v . inv7 r /\ result = Core_Option_Option_Type.C_Some r /\ self = Core_Option_Option_Type.C_Some r) }
     ensures { inv15 result }
     
@@ -6162,7 +6748,8 @@ module RedBlackTree_Impl15_DeleteMaxRec
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv5 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv12 result }
     
@@ -6173,10 +6760,14 @@ module RedBlackTree_Impl15_DeleteMaxRec
     ensures { [#"../red_black_tree.rs" 635 14 635 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 636 14 636 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 637 14 637 66] has_mapping0 ( * self) (deep_model0 (let (a, _) = result in a)) (let (_, a) = result in a) }
-    ensures { [#"../red_black_tree.rs" 638 4 638 104] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 ( * self) k v -> le_log0 k (deep_model0 (let (a, _) = result in a)) }
-    ensures { [#"../red_black_tree.rs" 639 4 640 73] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 638 4 638 104] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping0 ( * self) k v  -> le_log0 k (deep_model0 (let (a, _) = result in a)) }
+    ensures { [#"../red_black_tree.rs" 639 4 640 73] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 641 14 641 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 642 4 642 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 642 4 642 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 643 36 643 42] inv11 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -6478,7 +7069,9 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -6486,7 +7079,10 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -6494,7 +7090,10 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -6505,13 +7104,19 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -6522,7 +7127,9 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -6533,7 +7140,9 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -6544,7 +7153,9 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -6555,7 +7166,9 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant8 (self : deep_model_ty0)
   val invariant8 (self : deep_model_ty0) : bool
     ensures { result = invariant8 self }
@@ -6694,7 +7307,8 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv5 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv5 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv5 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -6719,7 +7333,13 @@ module RedBlackTree_Impl15_DeleteMax
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv7 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v -> inv7 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv7 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv7 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -6759,7 +7379,10 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv7 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv5 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv13 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv7 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv10 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv5 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv13 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv7 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv10 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -6774,7 +7397,12 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv7 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv5 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv13 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv7 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv10 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv5 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv13 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv7 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv10 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -6785,7 +7413,11 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv7 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv5 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv7 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv10 v -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv5 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv7 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv10 v
+   -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
   val unwrap0 (self : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))) : borrowed (RedBlackTree_Node_Type.t_node k v)
     requires {[#"../../../../creusot-contracts/src/std/option.rs" 29 0 126 1] self <> Core_Option_Option_Type.C_None}
     requires {inv12 self}
@@ -6794,7 +7426,8 @@ module RedBlackTree_Impl15_DeleteMax
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv4 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv3 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv12 result }
     
@@ -6828,16 +7461,21 @@ module RedBlackTree_Impl15_DeleteMax
     ensures { [#"../red_black_tree.rs" 635 14 635 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 636 14 636 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 637 14 637 66] has_mapping0 ( * self) (deep_model0 (let (a, _) = result in a)) (let (_, a) = result in a) }
-    ensures { [#"../red_black_tree.rs" 638 4 638 104] forall v : v . forall k : deep_model_ty0 . inv10 v -> inv7 k -> has_mapping0 ( * self) k v -> le_log0 k (deep_model0 (let (a, _) = result in a)) }
-    ensures { [#"../red_black_tree.rs" 639 4 640 73] forall v : v . forall k : deep_model_ty0 . inv10 v -> inv7 k -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 638 4 638 104] forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv7 k  -> has_mapping0 ( * self) k v  -> le_log0 k (deep_model0 (let (a, _) = result in a)) }
+    ensures { [#"../red_black_tree.rs" 639 4 640 73] forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv7 k
+     -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 641 14 641 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 642 4 642 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 642 4 642 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 643 36 643 42] inv11 result }
     
   predicate same_mappings0 [#"../red_black_tree.rs" 42 4 42 43] (self : RedBlackTree_Tree_Type.t_tree k v) (o : RedBlackTree_Tree_Type.t_tree k v)
     
    =
-    [#"../red_black_tree.rs" 43 8 45 9] forall v : v . forall k : deep_model_ty0 . inv10 v -> inv7 k -> has_mapping0 self k v = has_mapping0 o k v
+    [#"../red_black_tree.rs" 43 8 45 9] forall v : v . forall k : deep_model_ty0 . inv10 v
+     -> inv7 k  -> has_mapping0 self k v = has_mapping0 o k v
   val same_mappings0 [#"../red_black_tree.rs" 42 4 42 43] (self : RedBlackTree_Tree_Type.t_tree k v) (o : RedBlackTree_Tree_Type.t_tree k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -6866,7 +7504,8 @@ module RedBlackTree_Impl15_DeleteMax
     requires {[#"../red_black_tree.rs" 667 27 667 31] inv6 self}
     ensures { [#"../red_black_tree.rs" 661 14 661 33] invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 662 14 666 65] match result with
-      | Core_Option_Option_Type.C_Some (k, v) -> Map.get (shallow_model0 self) (deep_model0 k) = Core_Option_Option_Type.C_Some v /\ (forall k2 : deep_model_ty0 . inv7 k2 -> Map.get (shallow_model0 self) k2 = Core_Option_Option_Type.C_None \/ le_log0 k2 (deep_model0 k)) /\ shallow_model1 ( ^ self) = Map.set (shallow_model0 self) (deep_model0 k) (Core_Option_Option_Type.C_None)
+      | Core_Option_Option_Type.C_Some (k, v) -> Map.get (shallow_model0 self) (deep_model0 k) = Core_Option_Option_Type.C_Some v /\ (forall k2 : deep_model_ty0 . inv7 k2
+       -> Map.get (shallow_model0 self) k2 = Core_Option_Option_Type.C_None \/ le_log0 k2 (deep_model0 k)) /\ shallow_model1 ( ^ self) = Map.set (shallow_model0 self) (deep_model0 k) (Core_Option_Option_Type.C_None)
       | Core_Option_Option_Type.C_None -> shallow_model1 ( ^ self) = shallow_model0 self /\ shallow_model0 self = Const.const (Core_Option_Option_Type.C_None)
       end }
     ensures { [#"../red_black_tree.rs" 667 36 667 50] inv8 result }
@@ -7088,7 +7727,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -7096,7 +7737,10 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -7104,7 +7748,10 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -7115,13 +7762,19 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -7132,7 +7785,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -7143,7 +7798,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -7154,7 +7811,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -7165,7 +7824,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant10 (self : deep_model_ty0)
   val invariant10 (self : deep_model_ty0) : bool
     ensures { result = invariant10 self }
@@ -7313,7 +7974,8 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv8 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv8 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv8 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   use RedBlackTree_Cp_Type as RedBlackTree_Cp_Type
   function cpn0 [#"../red_black_tree.rs" 226 0 226 36] (c : RedBlackTree_Color_Type.t_color) (l : RedBlackTree_Cp_Type.t_cp) (r : RedBlackTree_Cp_Type.t_cp) : RedBlackTree_Cp_Type.t_cp
     
@@ -7346,7 +8008,13 @@ module RedBlackTree_Impl15_DeleteMinRec
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -7387,7 +8055,9 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv7 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv7 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv7 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node  -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   predicate has_mapping1 [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
    =
@@ -7398,11 +8068,17 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv9 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv7 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv9 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv7 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv10 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv9 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -7423,18 +8099,26 @@ module RedBlackTree_Impl15_DeleteMinRec
     
   val balance0 [#"../red_black_tree.rs" 510 4 510 25] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 491 15 491 43] internal_invariant1 ( * self)}
-    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
-    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
-    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> false}
+    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
+    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
+    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> false}
     requires {[#"../red_black_tree.rs" 510 20 510 24] inv3 self}
     ensures { [#"../red_black_tree.rs" 497 14 497 42] same_mappings0 ( * self) ( ^ self) }
     ensures { [#"../red_black_tree.rs" 498 14 498 42] internal_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 499 14 499 50] height1 ( * self) = height1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black ->  * self =  ^ self }
-    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black
+     ->  * self =  ^ self }
+    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
     
   val move_red_left0 [#"../red_black_tree.rs" 542 4 542 44] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : borrowed (RedBlackTree_Node_Type.t_node k v)
     requires {[#"../red_black_tree.rs" 524 15 524 41] RedBlackTree_Tree_Type.tree_node (RedBlackTree_Node_Type.node_right ( * self)) <> Core_Option_Option_Type.C_None}
@@ -7442,14 +8126,24 @@ module RedBlackTree_Impl15_DeleteMinRec
     requires {[#"../red_black_tree.rs" 526 15 526 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)}
     requires {[#"../red_black_tree.rs" 542 26 542 30] inv3 self}
     ensures { [#"../red_black_tree.rs" 527 14 527 44] internal_invariant1 ( * result) }
-    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( ^ result) k v -> has_mapping1 ( * result) k v) -> internal_invariant1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 531 4 531 97] height1 ( * result) = height1 ( ^ result) -> height1 ( * self) = height1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 ( ^ result) k v  -> has_mapping1 ( * result) k v)  -> internal_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 531 4 531 97] height1 ( * result) = height1 ( ^ result)
+     -> height1 ( * self) = height1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 532 14 532 42] RedBlackTree_Node_Type.node_key ( * self) = RedBlackTree_Node_Type.node_key ( * result) }
-    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( * result) k v -> has_mapping1 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( * self) k v /\ le_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) -> has_mapping1 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping1 ( * result) k v  -> has_mapping1 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping1 ( * self) k v /\ le_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key ( * self)))
+     -> has_mapping1 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 538 14 539 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 542 35 542 44] inv3 result }
     
   predicate resolve5 (self : RedBlackTree_Node_Type.t_node k v)
@@ -7464,7 +8158,8 @@ module RedBlackTree_Impl15_DeleteMinRec
     
   val as_ref0 (self : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)) : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)
     requires {inv14 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 59 16 61 18] self = Core_Option_Option_Type.C_None \/ (exists r : RedBlackTree_Node_Type.t_node k v . inv6 r /\ result = Core_Option_Option_Type.C_Some r /\ self = Core_Option_Option_Type.C_Some r) }
     ensures { inv15 result }
     
@@ -7532,7 +8227,8 @@ module RedBlackTree_Impl15_DeleteMinRec
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv4 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv12 result }
     
@@ -7543,10 +8239,14 @@ module RedBlackTree_Impl15_DeleteMinRec
     ensures { [#"../red_black_tree.rs" 688 14 688 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 689 14 689 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 690 14 690 66] has_mapping0 ( * self) (deep_model0 (let (a, _) = result in a)) (let (_, a) = result in a) }
-    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 ( * self) k v -> le_log0 (deep_model0 (let (a, _) = result in a)) k }
-    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv10 k -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k  -> has_mapping0 ( * self) k v  -> le_log0 (deep_model0 (let (a, _) = result in a)) k }
+    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv10 k
+     -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 694 14 694 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 696 36 696 42] inv11 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -7820,7 +8520,9 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -7828,7 +8530,10 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -7836,7 +8541,10 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -7847,13 +8555,19 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv6 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -7864,7 +8578,9 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -7875,7 +8591,9 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -7886,7 +8604,9 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -7897,7 +8617,9 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv6 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv6 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv6 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant7 (self : deep_model_ty0)
   val invariant7 (self : deep_model_ty0) : bool
     ensures { result = invariant7 self }
@@ -8026,7 +8748,8 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv4 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv4 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv4 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -8051,7 +8774,13 @@ module RedBlackTree_Impl15_DeleteMin
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv8 v -> inv6 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv8 v -> inv6 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv6 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv6 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -8082,7 +8811,8 @@ module RedBlackTree_Impl15_DeleteMin
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv3 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv11 result }
     
@@ -8116,10 +8846,14 @@ module RedBlackTree_Impl15_DeleteMin
     ensures { [#"../red_black_tree.rs" 688 14 688 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 689 14 689 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 690 14 690 66] has_mapping0 ( * self) (deep_model0 (let (a, _) = result in a)) (let (_, a) = result in a) }
-    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv8 v -> inv6 k -> has_mapping0 ( * self) k v -> le_log0 (deep_model0 (let (a, _) = result in a)) k }
-    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv8 v -> inv6 k -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv6 k  -> has_mapping0 ( * self) k v  -> le_log0 (deep_model0 (let (a, _) = result in a)) k }
+    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv8 v
+     -> inv6 k
+     -> has_mapping0 ( ^ self) k v = (deep_model0 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 694 14 694 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 696 36 696 42] inv10 result }
     
   predicate resolve2 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) =
@@ -8154,7 +8888,10 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv6 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv4 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv6 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv8 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv4 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv6 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv8 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -8169,7 +8906,12 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv6 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv4 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv6 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv8 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv4 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv6 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv8 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -8180,13 +8922,18 @@ module RedBlackTree_Impl15_DeleteMin
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv6 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv4 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv6 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv8 v -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv4 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv6 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv8 v
+   -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
   let rec cfg delete_min [#"../red_black_tree.rs" 719 4 719 50] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) : Core_Option_Option_Type.t_option (k, v)
     requires {[#"../red_black_tree.rs" 710 15 710 34] invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 719 27 719 31] inv5 self}
     ensures { [#"../red_black_tree.rs" 711 14 711 33] invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 712 14 718 5] match result with
-      | Core_Option_Option_Type.C_Some (k, v) -> Map.get (shallow_model0 self) (deep_model0 k) = Core_Option_Option_Type.C_Some v /\ (forall k2 : deep_model_ty0 . inv6 k2 -> Map.get (shallow_model0 self) k2 = Core_Option_Option_Type.C_None \/ le_log0 (deep_model0 k) k2) /\ shallow_model1 ( ^ self) = Map.set (shallow_model0 self) (deep_model0 k) (Core_Option_Option_Type.C_None)
+      | Core_Option_Option_Type.C_Some (k, v) -> Map.get (shallow_model0 self) (deep_model0 k) = Core_Option_Option_Type.C_Some v /\ (forall k2 : deep_model_ty0 . inv6 k2
+       -> Map.get (shallow_model0 self) k2 = Core_Option_Option_Type.C_None \/ le_log0 (deep_model0 k) k2) /\ shallow_model1 ( ^ self) = Map.set (shallow_model0 self) (deep_model0 k) (Core_Option_Option_Type.C_None)
       | Core_Option_Option_Type.C_None -> shallow_model1 ( ^ self) = shallow_model0 self /\ shallow_model0 self = Const.const (Core_Option_Option_Type.C_None)
       end }
     ensures { [#"../red_black_tree.rs" 719 36 719 50] inv7 result }
@@ -8400,7 +9147,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -8408,7 +9157,10 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -8416,7 +9168,10 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -8427,13 +9182,19 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -8444,7 +9205,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -8455,7 +9218,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -8466,7 +9231,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -8477,7 +9244,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use prelude.Borrow
   predicate invariant16 (self : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v)))
   val invariant16 (self : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))) : bool
@@ -8685,7 +9454,8 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv7 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv7 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv7 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   use RedBlackTree_Cp_Type as RedBlackTree_Cp_Type
   function cpn0 [#"../red_black_tree.rs" 226 0 226 36] (c : RedBlackTree_Color_Type.t_color) (l : RedBlackTree_Cp_Type.t_cp) (r : RedBlackTree_Cp_Type.t_cp) : RedBlackTree_Cp_Type.t_cp
     
@@ -8718,7 +9488,13 @@ module RedBlackTree_Impl15_DeleteRec
     ensures { result = height_invariant0 self }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -8760,7 +9536,9 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 328 14 328 18] inv5 self}
     ensures { result = height1 self }
     
-  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self) -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
+  axiom height1_spec : forall self : RedBlackTree_Node_Type.t_node k v . ([#"../red_black_tree.rs" 328 14 328 18] inv5 self)
+   -> ([#"../red_black_tree.rs" 326 4 327 77] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node  -> height1 self = height0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)))
   predicate has_mapping1 [#"../red_black_tree.rs" 140 4 140 57] (self : RedBlackTree_Node_Type.t_node k v) (k : deep_model_ty0) (v : v)
     
    =
@@ -8771,11 +9549,17 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 140 44 140 45] inv11 v}
     ensures { result = has_mapping1 self k v }
     
-  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self) -> ([#"../red_black_tree.rs" 140 25 140 26] inv14 k) -> ([#"../red_black_tree.rs" 140 44 140 45] inv11 v) -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node -> self = node -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
+  axiom has_mapping1_spec : forall self : RedBlackTree_Node_Type.t_node k v, k : deep_model_ty0, v : v . ([#"../red_black_tree.rs" 140 19 140 23] inv5 self)
+   -> ([#"../red_black_tree.rs" 140 25 140 26] inv14 k)
+   -> ([#"../red_black_tree.rs" 140 44 140 45] inv11 v)
+   -> ([#"../red_black_tree.rs" 138 4 139 86] forall node : RedBlackTree_Node_Type.t_node k v . inv1 node
+   -> self = node
+   -> has_mapping1 self k v = has_mapping0 (RedBlackTree_Tree_Type.C_Tree (Core_Option_Option_Type.C_Some node)) k v)
   predicate same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v)
     
    =
-    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 self k v = has_mapping1 o k v
+    [#"../red_black_tree.rs" 149 8 151 9] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping1 self k v = has_mapping1 o k v
   val same_mappings0 [#"../red_black_tree.rs" 148 4 148 43] (self : RedBlackTree_Node_Type.t_node k v) (o : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = same_mappings0 self o }
     
@@ -8796,18 +9580,26 @@ module RedBlackTree_Impl15_DeleteRec
     
   val balance0 [#"../red_black_tree.rs" 510 4 510 25] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 491 15 491 43] internal_invariant1 ( * self)}
-    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
-    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
-    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red -> false}
+    requires {[#"../red_black_tree.rs" 492 4 493 47] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_left ( * self))}
+    requires {[#"../red_black_tree.rs" 494 4 495 48] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> color_invariant0 (RedBlackTree_Node_Type.node_right ( * self))}
+    requires {[#"../red_black_tree.rs" 496 4 496 110] RedBlackTree_Node_Type.node_color ( * self) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Red /\ color0 (RedBlackTree_Node_Type.node_left ( * self)) = RedBlackTree_Color_Type.C_Red
+     -> false}
     requires {[#"../red_black_tree.rs" 510 20 510 24] inv6 self}
     ensures { [#"../red_black_tree.rs" 497 14 497 42] same_mappings0 ( * self) ( ^ self) }
     ensures { [#"../red_black_tree.rs" 498 14 498 42] internal_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 499 14 499 50] height1 ( * self) = height1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black ->  * self =  ^ self }
-    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self) -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 500 4 501 34] color_invariant0 (RedBlackTree_Node_Type.node_left ( * self)) /\ color0 (RedBlackTree_Node_Type.node_right ( * self)) = RedBlackTree_Color_Type.C_Black
+     ->  * self =  ^ self }
+    ensures { [#"../red_black_tree.rs" 502 4 503 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 504 4 505 63] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 506 4 507 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 508 4 509 39] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * self)
+     -> match_n0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( ^ self) }
     
   val rotate_right0 [#"../red_black_tree.rs" 412 4 412 30] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : ()
     requires {[#"../red_black_tree.rs" 400 15 400 43] internal_invariant1 ( * self)}
@@ -8912,7 +9704,10 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv14 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv7 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv21 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv14 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv11 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv7 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv21 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv14 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv11 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -8927,7 +9722,12 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv14 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv7 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv21 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv14 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv11 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv7 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv21 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv14 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv11 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -8938,7 +9738,11 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv14 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv7 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv14 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv11 v -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv7 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv14 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv11 v
+   -> has_mapping0 self k v = (Map.get (shallow_model0 self) k = Core_Option_Option_Type.C_Some v))
   function has_mapping_inj0 [#"../red_black_tree.rs" 125 4 127 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) (v1 : v) (v2 : v) : ()
     
    =
@@ -8956,7 +9760,13 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 125 55 125 57] inv11 v2}
     ensures { result = has_mapping_inj0 self k v1 v2 }
     
-  axiom has_mapping_inj0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0, v1 : v, v2 : v . ([#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1) -> ([#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2) -> ([#"../red_black_tree.rs" 125 23 125 27] inv7 self) -> ([#"../red_black_tree.rs" 125 29 125 30] inv14 k) -> ([#"../red_black_tree.rs" 125 48 125 50] inv11 v1) -> ([#"../red_black_tree.rs" 125 55 125 57] inv11 v2) -> ([#"../red_black_tree.rs" 124 14 124 22] v1 = v2)
+  axiom has_mapping_inj0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0, v1 : v, v2 : v . ([#"../red_black_tree.rs" 121 15 121 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 122 15 122 38] has_mapping0 self k v1)
+   -> ([#"../red_black_tree.rs" 123 15 123 38] has_mapping0 self k v2)
+   -> ([#"../red_black_tree.rs" 125 23 125 27] inv7 self)
+   -> ([#"../red_black_tree.rs" 125 29 125 30] inv14 k)
+   -> ([#"../red_black_tree.rs" 125 48 125 50] inv11 v1)
+   -> ([#"../red_black_tree.rs" 125 55 125 57] inv11 v2)  -> ([#"../red_black_tree.rs" 124 14 124 22] v1 = v2)
   val delete_min_rec0 [#"../red_black_tree.rs" 696 4 696 42] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) : (k, v)
     requires {[#"../red_black_tree.rs" 685 15 685 43] internal_invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 686 15 687 62] match_t0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) ( * self) \/ match_t0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)}
@@ -8964,10 +9774,14 @@ module RedBlackTree_Impl15_DeleteRec
     ensures { [#"../red_black_tree.rs" 688 14 688 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 689 14 689 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 690 14 690 66] has_mapping0 ( * self) (deep_model1 (let (a, _) = result in a)) (let (_, a) = result in a) }
-    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping0 ( * self) k v -> le_log0 (deep_model1 (let (a, _) = result in a)) k }
-    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping0 ( ^ self) k v = (deep_model1 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 691 4 691 104] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping0 ( * self) k v  -> le_log0 (deep_model1 (let (a, _) = result in a)) k }
+    ensures { [#"../red_black_tree.rs" 692 4 693 73] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping0 ( ^ self) k v = (deep_model1 (let (a, _) = result in a) <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 694 14 694 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 695 4 695 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 696 36 696 42] inv20 result }
     
   val move_red_right0 [#"../red_black_tree.rs" 571 4 571 45] (self : borrowed (RedBlackTree_Node_Type.t_node k v)) : borrowed (RedBlackTree_Node_Type.t_node k v)
@@ -8976,14 +9790,24 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 555 15 555 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)))) ( * self)}
     requires {[#"../red_black_tree.rs" 571 27 571 31] inv6 self}
     ensures { [#"../red_black_tree.rs" 556 14 556 44] internal_invariant1 ( * result) }
-    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( ^ result) k v -> has_mapping1 ( * result) k v) -> internal_invariant1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 560 4 560 97] height1 ( * result) = height1 ( ^ result) -> height1 ( * self) = height1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 557 4 559 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping1 ( ^ result) k v  -> has_mapping1 ( * result) k v)  -> internal_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 560 4 560 97] height1 ( * result) = height1 ( ^ result)
+     -> height1 ( * self) = height1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 561 14 561 42] RedBlackTree_Node_Type.node_key ( * result) = RedBlackTree_Node_Type.node_key ( * self) }
-    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( * result) k v -> has_mapping1 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( * self) k v /\ le_log0 (deep_model1 (RedBlackTree_Node_Type.node_key ( * self))) k -> has_mapping1 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 562 4 562 105] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping1 ( * result) k v  -> has_mapping1 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 563 4 564 47] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping1 ( * self) k v /\ le_log0 (deep_model1 (RedBlackTree_Node_Type.node_key ( * self))) k
+     -> has_mapping1 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 565 4 566 108] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 567 14 568 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 569 4 570 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_left ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 571 36 571 45] inv6 result }
     
   predicate resolve4 (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) =
@@ -9002,14 +9826,24 @@ module RedBlackTree_Impl15_DeleteRec
     requires {[#"../red_black_tree.rs" 526 15 526 86] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Red) (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * self)}
     requires {[#"../red_black_tree.rs" 542 26 542 30] inv6 self}
     ensures { [#"../red_black_tree.rs" 527 14 527 44] internal_invariant1 ( * result) }
-    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( ^ result) k v -> has_mapping1 ( * result) k v) -> internal_invariant1 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 531 4 531 97] height1 ( * result) = height1 ( ^ result) -> height1 ( * self) = height1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 528 4 530 48] internal_invariant1 ( ^ result) /\ height1 ( * result) = height1 ( ^ result) /\ (forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping1 ( ^ result) k v  -> has_mapping1 ( * result) k v)  -> internal_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 531 4 531 97] height1 ( * result) = height1 ( ^ result)
+     -> height1 ( * self) = height1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 532 14 532 42] RedBlackTree_Node_Type.node_key ( * self) = RedBlackTree_Node_Type.node_key ( * result) }
-    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( * result) k v -> has_mapping1 ( * self) k v }
-    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( * self) k v /\ le_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key ( * self))) -> has_mapping1 ( * result) k v }
-    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
+    ensures { [#"../red_black_tree.rs" 533 4 533 105] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping1 ( * result) k v  -> has_mapping1 ( * self) k v }
+    ensures { [#"../red_black_tree.rs" 534 4 535 47] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping1 ( * self) k v /\ le_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key ( * self)))
+     -> has_mapping1 ( * result) k v }
+    ensures { [#"../red_black_tree.rs" 536 4 537 108] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k
+     -> has_mapping1 ( ^ self) k v = (has_mapping1 ( ^ result) k v \/ has_mapping1 ( * self) k v /\ not has_mapping1 ( * result) k v) }
     ensures { [#"../red_black_tree.rs" 538 14 539 61] match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black))) ( * result) \/ match_n0 (cpn0 (RedBlackTree_Color_Type.C_Black) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red)) (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Red))) ( * result) }
-    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black) -> color_invariant1 ( ^ self) }
+    ensures { [#"../red_black_tree.rs" 540 4 541 45] color_invariant1 ( ^ result) /\ (color0 (RedBlackTree_Node_Type.node_right ( * result)) = RedBlackTree_Color_Type.C_Black
+     -> RedBlackTree_Node_Type.node_color ( ^ result) = RedBlackTree_Color_Type.C_Black)
+     -> color_invariant1 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 542 35 542 44] inv6 result }
     
   predicate resolve2 (self : RedBlackTree_Node_Type.t_node k v)
@@ -9024,7 +9858,8 @@ module RedBlackTree_Impl15_DeleteRec
     
   val as_ref0 (self : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)) : Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v)
     requires {inv17 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 58 16 58 60] self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 59 16 61 18] self = Core_Option_Option_Type.C_None \/ (exists r : RedBlackTree_Node_Type.t_node k v . inv4 r /\ result = Core_Option_Option_Type.C_Some r /\ self = Core_Option_Option_Type.C_Some r) }
     ensures { inv19 result }
     
@@ -9064,7 +9899,8 @@ module RedBlackTree_Impl15_DeleteRec
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv13 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv16 result }
     
@@ -9076,12 +9912,14 @@ module RedBlackTree_Impl15_DeleteRec
     ensures { [#"../red_black_tree.rs" 739 14 739 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 740 14 740 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 741 14 744 5] match result with
-      | Core_Option_Option_Type.C_None -> forall v : v . inv11 v -> not has_mapping0 ( * self) (deep_model0 key) v
+      | Core_Option_Option_Type.C_None -> forall v : v . inv11 v  -> not has_mapping0 ( * self) (deep_model0 key) v
       | Core_Option_Option_Type.C_Some (k, v) -> deep_model0 key = deep_model1 k /\ has_mapping0 ( * self) (deep_model1 k) v
       end }
-    ensures { [#"../red_black_tree.rs" 745 4 745 129] forall v : v . forall k : deep_model_ty0 . inv11 v -> inv14 k -> has_mapping0 ( ^ self) k v = (deep_model0 key <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 745 4 745 129] forall v : v . forall k : deep_model_ty0 . inv11 v
+     -> inv14 k  -> has_mapping0 ( ^ self) k v = (deep_model0 key <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 746 14 746 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 747 4 747 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 747 4 747 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 748 41 748 55] inv15 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -9615,7 +10453,9 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -9623,7 +10463,10 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -9631,7 +10474,10 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -9642,13 +10488,19 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -9659,7 +10511,9 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -9670,7 +10524,9 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -9681,7 +10537,9 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -9692,7 +10550,9 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use Core_Option_Option_Type as Core_Option_Option_Type
   use map.Map
   predicate invariant13 (self : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v))
@@ -9885,7 +10745,8 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv4 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv4 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv4 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -9910,7 +10771,13 @@ module RedBlackTree_Impl15_Delete
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv8 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v -> inv8 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv8 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model0 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv8 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model0 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -9941,7 +10808,8 @@ module RedBlackTree_Impl15_Delete
     
   val as_mut0 (self : borrowed (Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v))) : Core_Option_Option_Type.t_option (borrowed (RedBlackTree_Node_Type.t_node k v))
     requires {inv3 self}
-    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../creusot-contracts/src/std/option.rs" 51 16 51 77]  * self = Core_Option_Option_Type.C_None
+     -> result = Core_Option_Option_Type.C_None /\  ^ self = Core_Option_Option_Type.C_None }
     ensures { [#"../../../../creusot-contracts/src/std/option.rs" 52 16 55 18]  * self = Core_Option_Option_Type.C_None \/ (exists r : borrowed (RedBlackTree_Node_Type.t_node k v) . inv2 r /\ result = Core_Option_Option_Type.C_Some r /\  * self = Core_Option_Option_Type.C_Some ( * r) /\  ^ self = Core_Option_Option_Type.C_Some ( ^ r)) }
     ensures { inv11 result }
     
@@ -9976,12 +10844,14 @@ module RedBlackTree_Impl15_Delete
     ensures { [#"../red_black_tree.rs" 739 14 739 42] internal_invariant0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 740 14 740 50] height0 ( * self) = height0 ( ^ self) }
     ensures { [#"../red_black_tree.rs" 741 14 744 5] match result with
-      | Core_Option_Option_Type.C_None -> forall v : v . inv9 v -> not has_mapping0 ( * self) (deep_model1 key) v
+      | Core_Option_Option_Type.C_None -> forall v : v . inv9 v  -> not has_mapping0 ( * self) (deep_model1 key) v
       | Core_Option_Option_Type.C_Some (k, v) -> deep_model1 key = deep_model0 k /\ has_mapping0 ( * self) (deep_model0 k) v
       end }
-    ensures { [#"../red_black_tree.rs" 745 4 745 129] forall v : v . forall k : deep_model_ty0 . inv9 v -> inv8 k -> has_mapping0 ( ^ self) k v = (deep_model1 key <> k /\ has_mapping0 ( * self) k v) }
+    ensures { [#"../red_black_tree.rs" 745 4 745 129] forall v : v . forall k : deep_model_ty0 . inv9 v
+     -> inv8 k  -> has_mapping0 ( ^ self) k v = (deep_model1 key <> k /\ has_mapping0 ( * self) k v) }
     ensures { [#"../red_black_tree.rs" 746 14 746 39] color_invariant0 ( ^ self) }
-    ensures { [#"../red_black_tree.rs" 747 4 747 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
+    ensures { [#"../red_black_tree.rs" 747 4 747 69] color0 ( * self) = RedBlackTree_Color_Type.C_Black
+     -> color0 ( ^ self) = RedBlackTree_Color_Type.C_Black }
     ensures { [#"../red_black_tree.rs" 748 41 748 55] inv7 result }
     
   predicate resolve3 (self : k)
@@ -10020,7 +10890,10 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv8 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv4 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv8 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv9 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv4 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv8 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv9 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -10035,7 +10908,12 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv8 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv4 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv8 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv9 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv4 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv8 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv9 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -10046,7 +10924,11 @@ module RedBlackTree_Impl15_Delete
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv8 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv4 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv8 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv9 v -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv4 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv8 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv9 v
+   -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
   let rec cfg delete [#"../red_black_tree.rs" 800 4 800 55] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) (key : k) : Core_Option_Option_Type.t_option (k, v)
     requires {[#"../red_black_tree.rs" 792 15 792 34] invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 800 23 800 27] inv6 self}
@@ -10232,7 +11114,9 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -10240,7 +11124,10 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -10248,7 +11135,10 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -10259,13 +11149,19 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv8 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -10276,7 +11172,9 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -10287,7 +11185,9 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -10298,7 +11198,9 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -10309,7 +11211,9 @@ module RedBlackTree_Impl15_Get
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv8 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv8 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   predicate invariant9 (self : deep_model_ty0)
   val invariant9 (self : deep_model_ty0) : bool
     ensures { result = invariant9 self }
@@ -10458,7 +11362,8 @@ module RedBlackTree_Impl15_Get
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv7 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv7 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv7 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -10483,7 +11388,13 @@ module RedBlackTree_Impl15_Get
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv8 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv8 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv8 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv8 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -10554,7 +11465,10 @@ module RedBlackTree_Impl15_Get
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv8 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv7 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv9 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv8 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv1 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv7 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv9 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv8 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv1 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -10569,7 +11483,12 @@ module RedBlackTree_Impl15_Get
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv8 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv7 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv9 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv8 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv1 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv7 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv9 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv8 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv1 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -10580,7 +11499,11 @@ module RedBlackTree_Impl15_Get
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv8 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv7 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv8 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv1 v -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv7 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv8 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv1 v
+   -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
   let rec cfg get [#"../red_black_tree.rs" 822 4 822 44] [@cfg:stackify] [@cfg:subregion_analysis] (self : RedBlackTree_Tree_Type.t_tree k v) (key : k) : Core_Option_Option_Type.t_option v
     requires {[#"../red_black_tree.rs" 817 15 817 34] invariant0 self}
     requires {[#"../red_black_tree.rs" 822 16 822 20] inv0 self}
@@ -10621,7 +11544,8 @@ module RedBlackTree_Impl15_Get
   }
   BB2 {
     invariant { [#"../red_black_tree.rs" 826 20 826 43] bst_invariant0 tree };
-    invariant { [#"../red_black_tree.rs" 826 8 826 45] forall v : v . inv1 v -> has_mapping0 self (deep_model0 key) v = has_mapping0 tree (deep_model0 key) v };
+    invariant { [#"../red_black_tree.rs" 826 8 826 45] forall v : v . inv1 v
+     -> has_mapping0 self (deep_model0 key) v = has_mapping0 tree (deep_model0 key) v };
     goto BB3
   }
   BB3 {
@@ -10744,7 +11668,9 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -10752,7 +11678,10 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -10760,7 +11689,10 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -10771,13 +11703,19 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv2 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -10788,7 +11726,9 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -10799,7 +11739,9 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -10810,7 +11752,9 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -10821,7 +11765,9 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv2 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv2 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use prelude.Borrow
   predicate invariant12 (self : Core_Option_Option_Type.t_option (borrowed v))
   val invariant12 (self : Core_Option_Option_Type.t_option (borrowed v)) : bool
@@ -10999,7 +11945,8 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../red_black_tree.rs" 296 14 296 18] inv6 self}
     ensures { result = height0 self }
     
-  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv6 self) -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
+  axiom height0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v . ([#"../red_black_tree.rs" 296 14 296 18] inv6 self)
+   -> ([#"../red_black_tree.rs" 295 14 295 25] height0 self >= 0)
   predicate height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) =
     [#"../red_black_tree.rs" 339 20 339 61] height0 (RedBlackTree_Node_Type.node_left self) = height0 (RedBlackTree_Node_Type.node_right self)
   val height_invariant_here0 [#"../red_black_tree.rs" 338 4 338 42] (self : RedBlackTree_Node_Type.t_node k v) : bool
@@ -11024,7 +11971,13 @@ module RedBlackTree_Impl15_GetMut
     ensures { result = has_mapping0 self k v }
     
   predicate bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) =
-    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
+    [#"../red_black_tree.rs" 186 12 187 104] (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_left self) k v
+     -> lt_log0 k (deep_model1 (RedBlackTree_Node_Type.node_key self))) /\ (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k
+     -> has_mapping0 (RedBlackTree_Node_Type.node_right self) k v
+     -> lt_log0 (deep_model1 (RedBlackTree_Node_Type.node_key self)) k)
   val bst_invariant_here0 [#"../red_black_tree.rs" 184 4 184 39] (self : RedBlackTree_Node_Type.t_node k v) : bool
     ensures { result = bst_invariant_here0 self }
     
@@ -11115,7 +12068,10 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../red_black_tree.rs" 71 8 71 9] inv2 k}
     ensures { result = model_acc_has_mapping0 self accu k }
     
-  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv6 self) -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu) -> ([#"../red_black_tree.rs" 71 8 71 9] inv2 k) -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv1 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
+  axiom model_acc_has_mapping0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 69 8 69 12] inv6 self)
+   -> ([#"../red_black_tree.rs" 70 8 70 12] inv12 accu)
+   -> ([#"../red_black_tree.rs" 71 8 71 9] inv2 k)
+   -> ([#"../red_black_tree.rs" 66 4 67 93] Map.get (model_acc0 self accu) k = Map.get accu k \/ (exists v : v . inv1 v /\ Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v /\ has_mapping0 self k v))
   function has_mapping_model_acc0 [#"../red_black_tree.rs" 89 4 91 33] (self : RedBlackTree_Tree_Type.t_tree k v) (accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v)) (k : deep_model_ty0) : ()
     
    =
@@ -11130,7 +12086,12 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../red_black_tree.rs" 89 81 89 82] inv2 k}
     ensures { result = has_mapping_model_acc0 self accu k }
     
-  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 89 29 89 33] inv6 self) -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu) -> ([#"../red_black_tree.rs" 89 81 89 82] inv2 k) -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv1 v -> has_mapping0 self k v -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
+  axiom has_mapping_model_acc0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, accu : Map.map deep_model_ty0 (Core_Option_Option_Type.t_option v), k : deep_model_ty0 . ([#"../red_black_tree.rs" 87 15 87 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 89 29 89 33] inv6 self)
+   -> ([#"../red_black_tree.rs" 89 35 89 39] inv12 accu)
+   -> ([#"../red_black_tree.rs" 89 81 89 82] inv2 k)
+   -> ([#"../red_black_tree.rs" 88 4 88 94] forall v : v . inv1 v
+   -> has_mapping0 self k v  -> Map.get (model_acc0 self accu) k = Core_Option_Option_Type.C_Some v)
   function has_mapping_model0 [#"../red_black_tree.rs" 110 4 112 33] (self : RedBlackTree_Tree_Type.t_tree k v) (k : deep_model_ty0) : ()
     
    =
@@ -11141,7 +12102,11 @@ module RedBlackTree_Impl15_GetMut
     requires {[#"../red_black_tree.rs" 110 31 110 32] inv2 k}
     ensures { result = has_mapping_model0 self k }
     
-  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self) -> ([#"../red_black_tree.rs" 110 25 110 29] inv6 self) -> ([#"../red_black_tree.rs" 110 31 110 32] inv2 k) -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv1 v -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
+  axiom has_mapping_model0_spec : forall self : RedBlackTree_Tree_Type.t_tree k v, k : deep_model_ty0 . ([#"../red_black_tree.rs" 108 15 108 35] bst_invariant0 self)
+   -> ([#"../red_black_tree.rs" 110 25 110 29] inv6 self)
+   -> ([#"../red_black_tree.rs" 110 31 110 32] inv2 k)
+   -> ([#"../red_black_tree.rs" 109 4 109 80] forall v : v . inv1 v
+   -> has_mapping0 self k v = (Map.get (shallow_model1 self) k = Core_Option_Option_Type.C_Some v))
   let rec cfg get_mut [#"../red_black_tree.rs" 844 4 844 56] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (RedBlackTree_Tree_Type.t_tree k v)) (key : k) : Core_Option_Option_Type.t_option (borrowed v)
     requires {[#"../red_black_tree.rs" 838 15 838 34] invariant0 ( * self)}
     requires {[#"../red_black_tree.rs" 844 24 844 28] inv7 self}
@@ -11194,12 +12159,21 @@ module RedBlackTree_Impl15_GetMut
     invariant { [#"../red_black_tree.rs" 850 20 850 43] bst_invariant0 ( * tree) };
     invariant { [#"../red_black_tree.rs" 851 20 851 46] height_invariant0 ( * tree) };
     invariant { [#"../red_black_tree.rs" 852 20 852 45] color_invariant0 ( * tree) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( ^ tree) (deep_model0 key) v = has_mapping0 ( ^ Snapshot.inner old_self) (deep_model0 key) v };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v -> has_mapping0 ( * tree) (deep_model0 key) v = has_mapping0 ( * Snapshot.inner old_self) (deep_model0 key) v };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] (forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> k = deep_model0 key \/ has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v) -> bst_invariant0 ( ^ tree) -> bst_invariant0 ( ^ Snapshot.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] height0 ( * tree) = height0 ( ^ tree) /\ height_invariant0 ( ^ tree) -> height_invariant0 ( ^ Snapshot.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] match_t0 (RedBlackTree_Cp_Type.C_CPL (color0 ( * tree))) ( ^ tree) -> match_t0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) ( ^ Snapshot.inner old_self) };
-    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . forall k : deep_model_ty0 . inv1 v -> inv2 k -> has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v -> has_mapping0 ( * Snapshot.inner old_self) k v = has_mapping0 ( ^ Snapshot.inner old_self) k v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v
+     -> has_mapping0 ( ^ tree) (deep_model0 key) v = has_mapping0 ( ^ Snapshot.inner old_self) (deep_model0 key) v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . inv1 v
+     -> has_mapping0 ( * tree) (deep_model0 key) v = has_mapping0 ( * Snapshot.inner old_self) (deep_model0 key) v };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] (forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k  -> k = deep_model0 key \/ has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v)
+     -> bst_invariant0 ( ^ tree)  -> bst_invariant0 ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] height0 ( * tree) = height0 ( ^ tree) /\ height_invariant0 ( ^ tree)
+     -> height_invariant0 ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] match_t0 (RedBlackTree_Cp_Type.C_CPL (color0 ( * tree))) ( ^ tree)
+     -> match_t0 (RedBlackTree_Cp_Type.C_CPL (RedBlackTree_Color_Type.C_Black)) ( ^ Snapshot.inner old_self) };
+    invariant { [#"../red_black_tree.rs" 850 8 850 45] forall v : v . forall k : deep_model_ty0 . inv1 v
+     -> inv2 k
+     -> has_mapping0 ( * tree) k v = has_mapping0 ( ^ tree) k v
+     -> has_mapping0 ( * Snapshot.inner old_self) k v = has_mapping0 ( ^ Snapshot.inner old_self) k v };
     goto BB4
   }
   BB4 {
@@ -11345,7 +12319,8 @@ module RedBlackTree_Impl16
     
   axiom inv0 : forall x : RedBlackTree_Color_Type.t_color . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../red_black_tree.rs" 8 9 8 14] forall self : RedBlackTree_Color_Type.t_color . inv0 self -> (forall result : RedBlackTree_Color_Type.t_color . result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../red_black_tree.rs" 8 9 8 14] forall self : RedBlackTree_Color_Type.t_color . inv0 self
+   -> (forall result : RedBlackTree_Color_Type.t_color . result = self  -> inv1 result /\ result = self)
 end
 module RedBlackTree_Impl17
   
diff --git a/creusot/tests/should_succeed/result/own.mlcfg b/creusot/tests/should_succeed/result/own.mlcfg
index 27ee1f4709..c969ca5575 100644
--- a/creusot/tests/should_succeed/result/own.mlcfg
+++ b/creusot/tests/should_succeed/result/own.mlcfg
@@ -210,8 +210,10 @@ module Own_Impl0_Ok
     
   let rec cfg ok [#"../own.rs" 36 4 36 32] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : Core_Option_Option_Type.t_option t
     requires {[#"../own.rs" 36 14 36 18] inv0 self}
-    ensures { [#"../own.rs" 34 4 34 75] forall t : t . inv2 t -> self = Own_OwnResult_Type.C_Ok t -> result = Core_Option_Option_Type.C_Some t }
-    ensures { [#"../own.rs" 35 4 35 75] (exists e : e . inv1 e /\ self = Own_OwnResult_Type.C_Err e) -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../own.rs" 34 4 34 75] forall t : t . inv2 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Core_Option_Option_Type.C_Some t }
+    ensures { [#"../own.rs" 35 4 35 75] (exists e : e . inv1 e /\ self = Own_OwnResult_Type.C_Err e)
+     -> result = Core_Option_Option_Type.C_None }
     ensures { [#"../own.rs" 36 23 36 32] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -338,8 +340,10 @@ module Own_Impl0_Err
     
   let rec cfg err [#"../own.rs" 46 4 46 33] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : Core_Option_Option_Type.t_option e
     requires {[#"../own.rs" 46 15 46 19] inv1 self}
-    ensures { [#"../own.rs" 44 4 44 74] (exists t : t . inv0 t /\ self = Own_OwnResult_Type.C_Ok t) -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../own.rs" 45 4 45 76] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Core_Option_Option_Type.C_Some e }
+    ensures { [#"../own.rs" 44 4 44 74] (exists t : t . inv0 t /\ self = Own_OwnResult_Type.C_Ok t)
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../own.rs" 45 4 45 76] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Core_Option_Option_Type.C_Some e }
     ensures { [#"../own.rs" 46 24 46 33] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -462,8 +466,10 @@ module Own_Impl0_AsRef
     
   let rec cfg as_ref [#"../own.rs" 56 4 56 45] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : Own_OwnResult_Type.t_ownresult t e
     requires {[#"../own.rs" 56 19 56 23] inv0 self}
-    ensures { [#"../own.rs" 54 4 54 87] forall t : t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok t }
-    ensures { [#"../own.rs" 55 4 55 89] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 54 4 54 87] forall t : t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok t }
+    ensures { [#"../own.rs" 55 4 55 89] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 56 28 56 45] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1027,8 +1033,9 @@ module Own_Impl0_UnwrapOr
   let rec cfg unwrap_or [#"../own.rs" 116 4 116 43] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) (default : t) : t
     requires {[#"../own.rs" 116 21 116 25] inv1 self}
     requires {[#"../own.rs" 116 27 116 34] inv0 default}
-    ensures { [#"../own.rs" 114 4 114 69] forall t : t . inv0 t -> self = Own_OwnResult_Type.C_Ok t -> result = t }
-    ensures { [#"../own.rs" 115 4 115 78] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e) -> result = default }
+    ensures { [#"../own.rs" 114 4 114 69] forall t : t . inv0 t  -> self = Own_OwnResult_Type.C_Ok t  -> result = t }
+    ensures { [#"../own.rs" 115 4 115 78] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e)
+     -> result = default }
     ensures { [#"../own.rs" 116 42 116 43] inv0 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1159,8 +1166,9 @@ module Own_Impl0_UnwrapOrDefault
     
   let rec cfg unwrap_or_default [#"../own.rs" 126 4 128 19] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : t
     requires {[#"../own.rs" 126 29 126 33] inv0 self}
-    ensures { [#"../own.rs" 124 4 124 69] forall t : t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = t }
-    ensures { [#"../own.rs" 125 4 125 80] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e) -> is_default0 result }
+    ensures { [#"../own.rs" 124 4 124 69] forall t : t . inv1 t  -> self = Own_OwnResult_Type.C_Ok t  -> result = t }
+    ensures { [#"../own.rs" 125 4 125 80] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e)
+     -> is_default0 result }
     ensures { [#"../own.rs" 126 38 126 39] inv1 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1289,8 +1297,9 @@ module Own_Impl0_And
   let rec cfg and [#"../own.rs" 138 4 138 64] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) (res : Own_OwnResult_Type.t_ownresult u e) : Own_OwnResult_Type.t_ownresult u e
     requires {[#"../own.rs" 138 18 138 22] inv1 self}
     requires {[#"../own.rs" 138 24 138 27] inv2 res}
-    ensures { [#"../own.rs" 136 4 136 73] (exists t : t . inv0 t /\ self = Own_OwnResult_Type.C_Ok t) -> result = res }
-    ensures { [#"../own.rs" 137 4 137 86] forall e : e . inv3 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 136 4 136 73] (exists t : t . inv0 t /\ self = Own_OwnResult_Type.C_Ok t)  -> result = res }
+    ensures { [#"../own.rs" 137 4 137 86] forall e : e . inv3 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 138 49 138 64] inv2 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1439,8 +1448,10 @@ module Own_Impl0_Or
   let rec cfg or [#"../own.rs" 148 4 148 63] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) (res : Own_OwnResult_Type.t_ownresult t f) : Own_OwnResult_Type.t_ownresult t f
     requires {[#"../own.rs" 148 17 148 21] inv1 self}
     requires {[#"../own.rs" 148 23 148 26] inv0 res}
-    ensures { [#"../own.rs" 146 4 146 84] forall t : t . inv3 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok t }
-    ensures { [#"../own.rs" 147 4 147 74] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e) -> result = res }
+    ensures { [#"../own.rs" 146 4 146 84] forall t : t . inv3 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok t }
+    ensures { [#"../own.rs" 147 4 147 74] (exists e : e . inv2 e /\ self = Own_OwnResult_Type.C_Err e)
+     -> result = res }
     ensures { [#"../own.rs" 148 48 148 63] inv0 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1576,8 +1587,10 @@ module Own_Impl1_Copied
     
   let rec cfg copied [#"../own.rs" 160 4 162 16] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : Own_OwnResult_Type.t_ownresult t e
     requires {[#"../own.rs" 160 18 160 22] inv0 self}
-    ensures { [#"../own.rs" 158 4 158 86] forall t : t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok t }
-    ensures { [#"../own.rs" 159 4 159 86] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 158 4 158 86] forall t : t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok t }
+    ensures { [#"../own.rs" 159 4 159 86] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 160 27 160 42] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1714,8 +1727,10 @@ module Own_Impl1_Cloned
     
   let rec cfg cloned [#"../own.rs" 173 4 175 17] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult t e) : Own_OwnResult_Type.t_ownresult t e
     requires {[#"../own.rs" 173 18 173 22] inv0 self}
-    ensures { [#"../own.rs" 171 4 171 86] forall t : t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok t }
-    ensures { [#"../own.rs" 172 4 172 86] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 171 4 171 86] forall t : t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok t }
+    ensures { [#"../own.rs" 172 4 172 86] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 173 27 173 42] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1848,8 +1863,10 @@ module Own_Impl2_Copied
     
   let rec cfg copied [#"../own.rs" 188 4 190 16] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult (borrowed t) e) : Own_OwnResult_Type.t_ownresult t e
     requires {[#"../own.rs" 188 18 188 22] inv0 self}
-    ensures { [#"../own.rs" 186 4 186 105] forall t : borrowed t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok ( * t) /\ resolve1 t }
-    ensures { [#"../own.rs" 187 4 187 86] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 186 4 186 105] forall t : borrowed t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok ( * t) /\ resolve1 t }
+    ensures { [#"../own.rs" 187 4 187 86] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 188 27 188 42] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1997,8 +2014,10 @@ module Own_Impl2_Cloned
     
   let rec cfg cloned [#"../own.rs" 201 4 203 17] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult (borrowed t) e) : Own_OwnResult_Type.t_ownresult t e
     requires {[#"../own.rs" 201 18 201 22] inv0 self}
-    ensures { [#"../own.rs" 199 4 199 105] forall t : borrowed t . inv1 t -> self = Own_OwnResult_Type.C_Ok t -> result = Own_OwnResult_Type.C_Ok ( * t) /\ resolve1 t }
-    ensures { [#"../own.rs" 200 4 200 86] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Own_OwnResult_Type.C_Err e }
+    ensures { [#"../own.rs" 199 4 199 105] forall t : borrowed t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok t  -> result = Own_OwnResult_Type.C_Ok ( * t) /\ resolve1 t }
+    ensures { [#"../own.rs" 200 4 200 86] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Own_OwnResult_Type.C_Err e }
     ensures { [#"../own.rs" 201 27 201 42] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -2133,9 +2152,13 @@ module Own_Impl3_Transpose
     
   let rec cfg transpose [#"../own.rs" 217 4 217 53] [@cfg:stackify] [@cfg:subregion_analysis] (self : Own_OwnResult_Type.t_ownresult (Core_Option_Option_Type.t_option t) e) : Core_Option_Option_Type.t_option (Own_OwnResult_Type.t_ownresult t e)
     requires {[#"../own.rs" 217 21 217 25] inv0 self}
-    ensures { [#"../own.rs" 214 4 214 62] self = Own_OwnResult_Type.C_Ok (Core_Option_Option_Type.C_None) -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../own.rs" 215 4 215 96] forall t : t . inv1 t -> self = Own_OwnResult_Type.C_Ok (Core_Option_Option_Type.C_Some t) -> result = Core_Option_Option_Type.C_Some (Own_OwnResult_Type.C_Ok t) }
-    ensures { [#"../own.rs" 216 4 216 92] forall e : e . inv2 e -> self = Own_OwnResult_Type.C_Err e -> result = Core_Option_Option_Type.C_Some (Own_OwnResult_Type.C_Err e) }
+    ensures { [#"../own.rs" 214 4 214 62] self = Own_OwnResult_Type.C_Ok (Core_Option_Option_Type.C_None)
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../own.rs" 215 4 215 96] forall t : t . inv1 t
+     -> self = Own_OwnResult_Type.C_Ok (Core_Option_Option_Type.C_Some t)
+     -> result = Core_Option_Option_Type.C_Some (Own_OwnResult_Type.C_Ok t) }
+    ensures { [#"../own.rs" 216 4 216 92] forall e : e . inv2 e
+     -> self = Own_OwnResult_Type.C_Err e  -> result = Core_Option_Option_Type.C_Some (Own_OwnResult_Type.C_Err e) }
     ensures { [#"../own.rs" 217 30 217 53] inv3 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
diff --git a/creusot/tests/should_succeed/result/result.mlcfg b/creusot/tests/should_succeed/result/result.mlcfg
index dd1d9edbac..c8a974761b 100644
--- a/creusot/tests/should_succeed/result/result.mlcfg
+++ b/creusot/tests/should_succeed/result/result.mlcfg
@@ -178,9 +178,14 @@ module Result_TestResult
     
   val transpose0 (self : Core_Result_Result_Type.t_result (Core_Option_Option_Type.t_option int32) int32) : Core_Option_Option_Type.t_option (Core_Result_Result_Type.t_result int32 int32)
     requires {inv12 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 112 16 112 63] self = Core_Result_Result_Type.C_Ok (Core_Option_Option_Type.C_None) -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 113 16 113 86] forall t : int32 . inv1 t -> self = Core_Result_Result_Type.C_Ok (Core_Option_Option_Type.C_Some t) -> result = Core_Option_Option_Type.C_Some (Core_Result_Result_Type.C_Ok t) }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 114 16 114 82] forall e : int32 . inv1 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Option_Option_Type.C_Some (Core_Result_Result_Type.C_Err e) }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 112 16 112 63] self = Core_Result_Result_Type.C_Ok (Core_Option_Option_Type.C_None)
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 113 16 113 86] forall t : int32 . inv1 t
+     -> self = Core_Result_Result_Type.C_Ok (Core_Option_Option_Type.C_Some t)
+     -> result = Core_Option_Option_Type.C_Some (Core_Result_Result_Type.C_Ok t) }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 114 16 114 82] forall e : int32 . inv1 e
+     -> self = Core_Result_Result_Type.C_Err e
+     -> result = Core_Option_Option_Type.C_Some (Core_Result_Result_Type.C_Err e) }
     ensures { inv13 result }
     
   predicate resolve0 (self : borrowed int32) =
@@ -190,14 +195,18 @@ module Result_TestResult
     
   val cloned1 (self : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32)) : Core_Result_Result_Type.t_result int32 (borrowed int32)
     requires {inv9 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 104 16 104 95] forall t : borrowed int32 . inv8 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok ( * t) /\ resolve0 t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 105 16 105 76] forall e : borrowed int32 . inv8 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 104 16 104 95] forall t : borrowed int32 . inv8 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok ( * t) /\ resolve0 t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 105 16 105 76] forall e : borrowed int32 . inv8 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv11 result }
     
   val cloned0 (self : Core_Result_Result_Type.t_result int32 int32) : Core_Result_Result_Type.t_result int32 int32
     requires {inv6 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 90 16 90 76] forall t : int32 . inv5 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 91 16 91 76] forall e : int32 . inv5 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 90 16 90 76] forall t : int32 . inv5 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 91 16 91 76] forall e : int32 . inv5 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv10 result }
     
   val unwrap_err4 (self : Core_Result_Result_Type.t_result int32 (borrowed int32)) : borrowed int32
@@ -214,8 +223,10 @@ module Result_TestResult
     
   val copied1 (self : Core_Result_Result_Type.t_result (borrowed int32) (borrowed int32)) : Core_Result_Result_Type.t_result int32 (borrowed int32)
     requires {inv9 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 98 16 98 95] forall t : borrowed int32 . inv8 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok ( * t) /\ resolve0 t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 99 16 99 76] forall e : borrowed int32 . inv8 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 98 16 98 95] forall t : borrowed int32 . inv8 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok ( * t) /\ resolve0 t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 99 16 99 76] forall e : borrowed int32 . inv8 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv11 result }
     
   val unwrap_err3 (self : Core_Result_Result_Type.t_result int32 int32) : int32
@@ -232,22 +243,28 @@ module Result_TestResult
     
   val copied0 (self : Core_Result_Result_Type.t_result int32 int32) : Core_Result_Result_Type.t_result int32 int32
     requires {inv6 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 84 16 84 76] forall t : int32 . inv5 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 85 16 85 76] forall e : int32 . inv5 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 84 16 84 76] forall t : int32 . inv5 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 85 16 85 76] forall e : int32 . inv5 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv10 result }
     
   val or0 (self : Core_Result_Result_Type.t_result int32 int32) (res : Core_Result_Result_Type.t_result int32 int32) : Core_Result_Result_Type.t_result int32 int32
     requires {inv2 self}
     requires {inv2 res}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 78 16 78 74] forall t : int32 . inv1 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 79 16 79 75] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e) -> result = res }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 78 16 78 74] forall t : int32 . inv1 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 79 16 79 75] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e)
+     -> result = res }
     ensures { inv2 result }
     
   val and0 (self : Core_Result_Result_Type.t_result int32 int32) (res : Core_Result_Result_Type.t_result int32 int32) : Core_Result_Result_Type.t_result int32 int32
     requires {inv2 self}
     requires {inv2 res}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 74 16 74 74] (exists t : int32 . inv1 t /\ self = Core_Result_Result_Type.C_Ok t) -> result = res }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 75 16 75 76] forall e : int32 . inv1 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 74 16 74 74] (exists t : int32 . inv1 t /\ self = Core_Result_Result_Type.C_Ok t)
+     -> result = res }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 75 16 75 76] forall e : int32 . inv1 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv2 result }
     
   use prelude.Int
@@ -258,15 +275,19 @@ module Result_TestResult
     
   val unwrap_or_default0 (self : Core_Result_Result_Type.t_result int32 int32) : int32
     requires {inv2 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 68 16 68 70] forall t : int32 . inv1 t -> self = Core_Result_Result_Type.C_Ok t -> result = t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 69 16 69 81] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e) -> is_default0 result }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 68 16 68 70] forall t : int32 . inv1 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 69 16 69 81] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e)
+     -> is_default0 result }
     ensures { inv1 result }
     
   val unwrap_or0 (self : Core_Result_Result_Type.t_result int32 int32) (default : int32) : int32
     requires {inv2 self}
     requires {inv1 default}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 64 16 64 70] forall t : int32 . inv1 t -> self = Core_Result_Result_Type.C_Ok t -> result = t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 65 16 65 79] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e) -> result = default }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 64 16 64 70] forall t : int32 . inv1 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 65 16 65 79] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e)
+     -> result = default }
     ensures { inv1 result }
     
   val unwrap_err2 (self : Core_Result_Result_Type.t_result int32 int32) : int32
@@ -312,14 +333,18 @@ module Result_TestResult
     
   val as_ref0 (self : Core_Result_Result_Type.t_result int32 int32) : Core_Result_Result_Type.t_result int32 int32
     requires {inv0 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 36 16 36 77] forall t : int32 . inv5 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Result_Result_Type.C_Ok t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 37 16 37 79] forall e : int32 . inv5 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Result_Result_Type.C_Err e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 36 16 36 77] forall t : int32 . inv5 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Result_Result_Type.C_Ok t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 37 16 37 79] forall e : int32 . inv5 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Result_Result_Type.C_Err e }
     ensures { inv6 result }
     
   val err0 (self : Core_Result_Result_Type.t_result int32 int32) : Core_Option_Option_Type.t_option int32
     requires {inv2 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 32 16 32 75] (exists t : int32 . inv1 t /\ self = Core_Result_Result_Type.C_Ok t) -> result = Core_Option_Option_Type.C_None }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 33 16 33 77] forall e : int32 . inv1 e -> self = Core_Result_Result_Type.C_Err e -> result = Core_Option_Option_Type.C_Some e }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 32 16 32 75] (exists t : int32 . inv1 t /\ self = Core_Result_Result_Type.C_Ok t)
+     -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 33 16 33 77] forall e : int32 . inv1 e
+     -> self = Core_Result_Result_Type.C_Err e  -> result = Core_Option_Option_Type.C_Some e }
     ensures { inv3 result }
     
   val is_none0 (self : Core_Option_Option_Type.t_option int32) : bool
@@ -334,8 +359,10 @@ module Result_TestResult
     
   val ok0 (self : Core_Result_Result_Type.t_result int32 int32) : Core_Option_Option_Type.t_option int32
     requires {inv2 self}
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 28 16 28 76] forall t : int32 . inv1 t -> self = Core_Result_Result_Type.C_Ok t -> result = Core_Option_Option_Type.C_Some t }
-    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 29 16 29 76] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e) -> result = Core_Option_Option_Type.C_None }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 28 16 28 76] forall t : int32 . inv1 t
+     -> self = Core_Result_Result_Type.C_Ok t  -> result = Core_Option_Option_Type.C_Some t }
+    ensures { [#"../../../../../creusot-contracts/src/std/result.rs" 29 16 29 76] (exists e : int32 . inv1 e /\ self = Core_Result_Result_Type.C_Err e)
+     -> result = Core_Option_Option_Type.C_None }
     ensures { inv3 result }
     
   val is_err0 (self : Core_Result_Result_Type.t_result int32 int32) : bool
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
index bf6bde749b..e86d370e18 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
@@ -139,7 +139,9 @@ module IncMaxRepeat_IncMaxRepeat
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_Range_Type.t_range uint32)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_Range_Type.t_range uint32) : bool
     ensures { result = produces0 self visited o }
     
@@ -155,14 +157,22 @@ module IncMaxRepeat_IncMaxRepeat
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range uint32, ab : Seq.seq uint32, b : Core_Ops_Range_Range_Type.t_range uint32, bc : Seq.seq uint32, c : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range uint32, ab : Seq.seq uint32, b : Core_Ops_Range_Range_Type.t_range uint32, bc : Seq.seq uint32, c : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range uint32) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range uint32) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range uint32) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range uint32) : bool
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index 73942e7127..273ac399dc 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -33,7 +33,8 @@ module IncSome2List_Impl0_LemmaSumNonneg_Impl
   constant self  : IncSome2List_List_Type.t_list
   function lemma_sum_nonneg [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : ()
   goal vc_lemma_sum_nonneg : match self with
-    | IncSome2List_List_Type.C_Cons _ l -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 l >= 0) -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0)
+    | IncSome2List_List_Type.C_Cons _ l -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 l >= 0)
+     -> ([#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0)
     | IncSome2List_List_Type.C_Nil -> [#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0
     end
 end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
index 6b17078dfb..029d3943a1 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
@@ -38,7 +38,9 @@ module IncSome2Tree_Impl0_LemmaSumNonneg_Impl
   constant self  : IncSome2Tree_Tree_Type.t_tree
   function lemma_sum_nonneg [#"../inc_some_2_tree.rs" 33 4 33 30] (self : IncSome2Tree_Tree_Type.t_tree) : ()
   goal vc_lemma_sum_nonneg : match self with
-    | IncSome2Tree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tl >= 0) -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tr >= 0) -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0))
+    | IncSome2Tree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tl >= 0)
+     -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_2_tree.rs" 32 14 32 29] sum0 tr >= 0)
+     -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0))
     | IncSome2Tree_Tree_Type.C_Leaf -> [#"../inc_some_2_tree.rs" 32 14 32 29] sum0 self >= 0
     end
 end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index 34b6255ef6..71fbe503c1 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -33,7 +33,8 @@ module IncSomeList_Impl0_LemmaSumNonneg_Impl
   constant self  : IncSomeList_List_Type.t_list
   function lemma_sum_nonneg [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : ()
   goal vc_lemma_sum_nonneg : match self with
-    | IncSomeList_List_Type.C_Cons _ l -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 l >= 0) -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0)
+    | IncSomeList_List_Type.C_Cons _ l -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 l >= 0)
+     -> ([#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0)
     | IncSomeList_List_Type.C_Nil -> [#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0
     end
 end
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
index 7a5ba7246a..8b17f81846 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
@@ -38,7 +38,9 @@ module IncSomeTree_Impl0_LemmaSumNonneg_Impl
   constant self  : IncSomeTree_Tree_Type.t_tree
   function lemma_sum_nonneg [#"../inc_some_tree.rs" 33 4 33 30] (self : IncSomeTree_Tree_Type.t_tree) : ()
   goal vc_lemma_sum_nonneg : match self with
-    | IncSomeTree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tl >= 0) -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tr >= 0) -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0))
+    | IncSomeTree_Tree_Type.C_Node tl _ tr -> ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tl >= 0)
+     -> (let _ = lemma_sum_nonneg tl in ([#"../inc_some_tree.rs" 32 14 32 29] sum0 tr >= 0)
+     -> (let _ = lemma_sum_nonneg tr in [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0))
     | IncSomeTree_Tree_Type.C_Leaf -> [#"../inc_some_tree.rs" 32 14 32 29] sum0 self >= 0
     end
 end
diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index 1b8ba9f36f..eed53ff567 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -197,7 +197,8 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv12 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv12 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv12 (shallow_model3 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -224,7 +225,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -232,7 +235,10 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -240,7 +246,10 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -251,13 +260,19 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv14 z)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -268,7 +283,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -279,7 +296,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -290,7 +309,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -301,7 +322,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv14 x) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y) -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv14 x)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv14 y)
+   -> ([#"../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use seq.Seq
   predicate inv1 (_x : Core_Ops_Range_Range_Type.t_range usize)
   val inv1 (_x : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -318,7 +341,9 @@ module SelectionSortGeneric_SelectionSort
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model2 (Core_Ops_Range_Range_Type.range_start self) <= deep_model2 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model2 (Core_Ops_Range_Range_Type.range_start o) <= deep_model2 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model2 (Core_Ops_Range_Range_Type.range_start o) - deep_model2 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model2 (Seq.get visited i) = deep_model2 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model2 (Core_Ops_Range_Range_Type.range_start self) <= deep_model2 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model2 (Core_Ops_Range_Range_Type.range_start o) <= deep_model2 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model2 (Core_Ops_Range_Range_Type.range_start o) - deep_model2 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model2 (Seq.get visited i) = deep_model2 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -334,14 +359,22 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv13 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv13 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv13 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv13 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -362,7 +395,8 @@ module SelectionSortGeneric_SelectionSort
   use seq.Seq
   predicate sorted_range0 [#"../selection_sort_generic.rs" 10 0 10 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int)
    =
-    [#"../selection_sort_generic.rs" 11 4 13 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
+    [#"../selection_sort_generic.rs" 11 4 13 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u
+     -> le_log0 (Seq.get s i) (Seq.get s j)
   val sorted_range0 [#"../selection_sort_generic.rs" 10 0 10 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) : bool
     ensures { result = sorted_range0 s l u }
     
@@ -389,7 +423,9 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self}
     ensures { result = deep_model1 self }
     
-  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv11 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> Seq.get (deep_model1 self) i = deep_model4 (index_logic2 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
+  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv11 (deep_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+   -> Seq.get (deep_model1 self) i = deep_model4 (index_logic2 self i)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
   predicate resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -407,7 +443,8 @@ module SelectionSortGeneric_SelectionSort
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv12 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv12 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   function shallow_model6 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model7 ( * self)
   val shallow_model6 (self : borrowed (slice t)) : Seq.seq t
@@ -487,7 +524,8 @@ module SelectionSortGeneric_SelectionSort
     ensures { inv9 result }
     
   predicate partition0 [#"../selection_sort_generic.rs" 24 0 24 52] (v : Seq.seq deep_model_ty0) (i : int) =
-    [#"../selection_sort_generic.rs" 25 4 25 106] forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length v -> le_log0 (Seq.get v k1) (Seq.get v k2)
+    [#"../selection_sort_generic.rs" 25 4 25 106] forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length v
+     -> le_log0 (Seq.get v k1) (Seq.get v k2)
   val partition0 [#"../selection_sort_generic.rs" 24 0 24 52] (v : Seq.seq deep_model_ty0) (i : int) : bool
     ensures { result = partition0 v i }
     
@@ -696,7 +734,8 @@ module SelectionSortGeneric_SelectionSort
   BB18 {
     invariant { [#"../selection_sort_generic.rs" 41 8 41 121] inv1 iter1 };
     invariant { [#"../selection_sort_generic.rs" 41 8 41 121] produces0 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
-    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] forall k : int . UIntSize.to_int i <= k /\ k < Seq.length (Snapshot.inner produced1) + UIntSize.to_int i + 1 -> le_log0 (Seq.get (deep_model0 v) (UIntSize.to_int min)) (Seq.get (deep_model0 v) k) };
+    invariant { [#"../selection_sort_generic.rs" 41 8 41 121] forall k : int . UIntSize.to_int i <= k /\ k < Seq.length (Snapshot.inner produced1) + UIntSize.to_int i + 1
+     -> le_log0 (Seq.get (deep_model0 v) (UIntSize.to_int min)) (Seq.get (deep_model0 v) k) };
     invariant { [#"../selection_sort_generic.rs" 42 20 42 64] UIntSize.to_int i <= UIntSize.to_int min /\ UIntSize.to_int min < Seq.length (Snapshot.inner produced1) + UIntSize.to_int i + 1 };
     goto BB19
   }
@@ -780,7 +819,8 @@ module SelectionSortGeneric_SelectionSort
   BB32 {
     assert { [@expl:type invariant] inv5 _65 };
     assume { resolve3 _65 };
-    assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v) -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
+    assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v)
+     -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
     [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] [#"../selection_sort_generic.rs" 38 24 51 5] ());
     goto BB6
   }
diff --git a/creusot/tests/should_succeed/slices/01.mlcfg b/creusot/tests/should_succeed/slices/01.mlcfg
index e26f82686c..0f5016e73f 100644
--- a/creusot/tests/should_succeed/slices/01.mlcfg
+++ b/creusot/tests/should_succeed/slices/01.mlcfg
@@ -35,7 +35,8 @@ module C01_IndexSlice
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   use prelude.Borrow
   function shallow_model0 (self : slice uint32) : Seq.seq uint32 =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model1 self
@@ -105,7 +106,8 @@ module C01_IndexMutSlice
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   function index_logic0 [@inline:trivial] (self : slice uint32) (ix : int) : uint32 =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model2 self) ix
   val index_logic0 [@inline:trivial] (self : slice uint32) (ix : int) : uint32
@@ -218,7 +220,8 @@ module C01_SliceFirst
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model2 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   use prelude.Borrow
   function shallow_model0 (self : slice t) : Seq.seq t =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model2 self
diff --git a/creusot/tests/should_succeed/slices/02_std.mlcfg b/creusot/tests/should_succeed/slices/02_std.mlcfg
index 382bc7d713..44aa1c6d0e 100644
--- a/creusot/tests/should_succeed/slices/02_std.mlcfg
+++ b/creusot/tests/should_succeed/slices/02_std.mlcfg
@@ -102,7 +102,8 @@ module C02Std_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   function index_logic0 [@inline:trivial] (self : slice uint32) (ix : int) : uint32 =
     [#"../../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model3 self) ix
   val index_logic0 [@inline:trivial] (self : slice uint32) (ix : int) : uint32
@@ -138,10 +139,13 @@ module C02Std_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv4 self}
     ensures { result = deep_model1 self }
     
-  axiom deep_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 32 4 32 44] inv5 (deep_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 31 4 31 98] forall i : int . 0 <= i /\ i < Seq.length (deep_model1 self) -> Seq.get (deep_model1 self) i = deep_model3 (index_logic0 self i)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 30 14 30 44] Seq.length (shallow_model1 self) = Seq.length (deep_model1 self))
+  axiom deep_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 32 18 32 22] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 32 4 32 44] inv5 (deep_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 31 4 31 98] forall i : int . 0 <= i /\ i < Seq.length (deep_model1 self)
+   -> Seq.get (deep_model1 self) i = deep_model3 (index_logic0 self i)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 30 14 30 44] Seq.length (shallow_model1 self) = Seq.length (deep_model1 self))
   use int.Int
   predicate sorted_range0 (self : Seq.seq int) (l : int) (u : int) =
-    [#"../../../../../creusot-contracts/src/logic/seq.rs" 138 8 140 9] forall j : int . forall i : int . l <= i /\ i <= j /\ j < u -> Seq.get self i <= Seq.get self j
+    [#"../../../../../creusot-contracts/src/logic/seq.rs" 138 8 140 9] forall j : int . forall i : int . l <= i /\ i <= j /\ j < u
+     -> Seq.get self i <= Seq.get self j
   val sorted_range0 (self : Seq.seq int) (l : int) (u : int) : bool
     ensures { result = sorted_range0 self l u }
     
@@ -159,15 +163,22 @@ module C02Std_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 238 0 334 1] sorted0 (deep_model0 self)}
     requires {inv0 self}
     requires {inv1 x}
-    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 304 8 304 118] forall i : usize . result = Core_Result_Result_Type.C_Ok i -> UIntSize.to_int i < Seq.length (shallow_model1 self) /\ Seq.get (deep_model1 self) (UIntSize.to_int i) = deep_model2 x }
-    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 305 8 306 96] forall i : usize . result = Core_Result_Result_Type.C_Err i -> UIntSize.to_int i <= Seq.length (shallow_model1 self) /\ (forall j : int . 0 <= j /\ j < Seq.length (shallow_model1 self) -> Seq.get (deep_model0 self) j <> deep_model2 x) }
-    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 307 8 308 78] forall i : usize . result = Core_Result_Result_Type.C_Err i -> (forall j : usize . j < i -> Seq.get (deep_model0 self) (UIntSize.to_int j) < deep_model2 x) }
-    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 309 8 310 99] forall i : usize . result = Core_Result_Result_Type.C_Err i -> (forall j : usize . i <= j /\ UIntSize.to_int j < Seq.length (shallow_model1 self) -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) }
+    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 304 8 304 118] forall i : usize . result = Core_Result_Result_Type.C_Ok i
+     -> UIntSize.to_int i < Seq.length (shallow_model1 self) /\ Seq.get (deep_model1 self) (UIntSize.to_int i) = deep_model2 x }
+    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 305 8 306 96] forall i : usize . result = Core_Result_Result_Type.C_Err i
+     -> UIntSize.to_int i <= Seq.length (shallow_model1 self) /\ (forall j : int . 0 <= j /\ j < Seq.length (shallow_model1 self)
+     -> Seq.get (deep_model0 self) j <> deep_model2 x) }
+    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 307 8 308 78] forall i : usize . result = Core_Result_Result_Type.C_Err i
+     -> (forall j : usize . j < i  -> Seq.get (deep_model0 self) (UIntSize.to_int j) < deep_model2 x) }
+    ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 309 8 310 99] forall i : usize . result = Core_Result_Result_Type.C_Err i
+     -> (forall j : usize . i <= j /\ UIntSize.to_int j < Seq.length (shallow_model1 self)
+     -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) }
     
   let constant promoted0 [#"../02_std.rs" 8 0 8 40]  : uint32 = [@vc:do_not_keep_trace] [@vc:sp]
     let _1 = [#"../02_std.rs" 9 30 9 31] [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
   let rec cfg binary_search [#"../02_std.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (s : slice uint32) : usize
-    requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s) -> UInt32.to_int (index_logic0 s i) = i}
+    requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s)
+     -> UInt32.to_int (index_logic0 s i) = i}
     requires {[#"../02_std.rs" 7 11 7 24] Seq.length (shallow_model1 s) = 5}
     
    = [@vc:do_not_keep_trace] [@vc:sp]
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 790a3ed723..b83ae2cad9 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -105,7 +105,8 @@ module SparseArray_Impl2_Get
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv10 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv10 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv10 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   predicate invariant10 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv11 (shallow_model6 self)
   val invariant10 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -132,7 +133,8 @@ module SparseArray_Impl2_Get
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
+  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv8 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model5 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
   predicate invariant8 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv9 (shallow_model5 self)
   val invariant8 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -178,7 +180,8 @@ module SparseArray_Impl2_Get
     ensures { result = shallow_model4 self }
     
   predicate invariant7 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) =
-    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model4 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model6 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model5 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model5 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) -> match index_logic4 (SparseArray_Sparse_Type.sparse_back self) i with
+    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model4 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model6 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model5 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model5 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self)
+     -> match index_logic4 (SparseArray_Sparse_Type.sparse_back self) i with
       | j -> 0 <= UIntSize.to_int j /\ UIntSize.to_int j < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ UIntSize.to_int (index_logic4 (SparseArray_Sparse_Type.sparse_idx self) (UIntSize.to_int j)) = i
       end)
   val invariant7 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) : bool
@@ -439,7 +442,8 @@ module SparseArray_Impl2_LemmaPermutation_Impl
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model1 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model1 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -456,7 +460,8 @@ module SparseArray_Impl2_LemmaPermutation_Impl
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant1 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model3 self)
   val invariant1 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -502,7 +507,8 @@ module SparseArray_Impl2_LemmaPermutation_Impl
     ensures { result = shallow_model2 self }
     
   predicate invariant0 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) =
-    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) -> match index_logic0 (SparseArray_Sparse_Type.sparse_back self) i with
+    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self)
+     -> match index_logic0 (SparseArray_Sparse_Type.sparse_back self) i with
       | j -> 0 <= UIntSize.to_int j /\ UIntSize.to_int j < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ UIntSize.to_int (index_logic0 (SparseArray_Sparse_Type.sparse_idx self) (UIntSize.to_int j)) = i
       end)
   val invariant0 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) : bool
@@ -519,7 +525,10 @@ module SparseArray_Impl2_LemmaPermutation_Impl
   constant i  : int
   function lemma_permutation [#"../sparse_array.rs" 104 4 104 38] (self : SparseArray_Sparse_Type.t_sparse t) (i : int) : ()
     
-  goal vc_lemma_permutation : ([#"../sparse_array.rs" 104 25 104 29] inv0 self) -> ([#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self)) -> ([#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self) -> ([#"../sparse_array.rs" 103 14 103 28] is_elt0 self i)
+  goal vc_lemma_permutation : ([#"../sparse_array.rs" 104 25 104 29] inv0 self)
+   -> ([#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self))
+   -> ([#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self)
+   -> ([#"../sparse_array.rs" 103 14 103 28] is_elt0 self i)
 end
 module SparseArray_Impl2_Set
   type t
@@ -551,7 +560,8 @@ module SparseArray_Impl2_Set
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv13 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv13 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   predicate invariant12 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv13 (shallow_model7 self)
   val invariant12 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -607,7 +617,8 @@ module SparseArray_Impl2_Set
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   use seq.Seq
   use seq.Seq
   use prelude.Mapping
@@ -637,7 +648,8 @@ module SparseArray_Impl2_Set
     ensures { result = shallow_model2 self }
     
   predicate invariant8 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) =
-    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model4 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) -> match index_logic4 (SparseArray_Sparse_Type.sparse_back self) i with
+    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model4 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self)
+     -> match index_logic4 (SparseArray_Sparse_Type.sparse_back self) i with
       | j -> 0 <= UIntSize.to_int j /\ UIntSize.to_int j < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ UIntSize.to_int (index_logic4 (SparseArray_Sparse_Type.sparse_idx self) (UIntSize.to_int j)) = i
       end)
   val invariant8 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) : bool
@@ -743,7 +755,8 @@ module SparseArray_Impl2_Set
     
   use prelude.Slice
   predicate resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) : bool
     ensures { result = resolve_elswhere1 self old' fin }
     
@@ -789,7 +802,9 @@ module SparseArray_Impl2_Set
     requires {[#"../sparse_array.rs" 104 25 104 29] inv8 self}
     ensures { result = lemma_permutation0 self i }
     
-  axiom lemma_permutation0_spec : forall self : SparseArray_Sparse_Type.t_sparse t, i : int . ([#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self) -> ([#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self)) -> ([#"../sparse_array.rs" 104 25 104 29] inv8 self) -> ([#"../sparse_array.rs" 103 14 103 28] is_elt0 self i)
+  axiom lemma_permutation0_spec : forall self : SparseArray_Sparse_Type.t_sparse t, i : int . ([#"../sparse_array.rs" 101 15 101 34] SparseArray_Sparse_Type.sparse_n self = SparseArray_Sparse_Type.sparse_size self)
+   -> ([#"../sparse_array.rs" 102 15 102 39] 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self))
+   -> ([#"../sparse_array.rs" 104 25 104 29] inv8 self)  -> ([#"../sparse_array.rs" 103 14 103 28] is_elt0 self i)
   function shallow_model5 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : Seq.seq usize =
     [#"../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model7 self
   val shallow_model5 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : Seq.seq usize
@@ -812,7 +827,8 @@ module SparseArray_Impl2_Set
     ensures { result = resolve0 self }
     
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq t) (fin : Seq.seq t) =
-    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq t) (fin : Seq.seq t) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -847,7 +863,8 @@ module SparseArray_Impl2_Set
     requires {[#"../sparse_array.rs" 112 20 112 24] inv3 self}
     requires {[#"../sparse_array.rs" 112 36 112 37] inv1 v}
     ensures { [#"../sparse_array.rs" 109 14 109 43] Seq.length (shallow_model2 ( ^ self)) = Seq.length (shallow_model1 self) }
-    ensures { [#"../sparse_array.rs" 110 4 110 95] forall j : int . 0 <= j /\ j < Seq.length (shallow_model1 self) /\ j <> UIntSize.to_int i -> Seq.get (shallow_model2 ( ^ self)) j = Seq.get (shallow_model1 self) j }
+    ensures { [#"../sparse_array.rs" 110 4 110 95] forall j : int . 0 <= j /\ j < Seq.length (shallow_model1 self) /\ j <> UIntSize.to_int i
+     -> Seq.get (shallow_model2 ( ^ self)) j = Seq.get (shallow_model1 self) j }
     ensures { [#"../sparse_array.rs" 111 14 111 37] Seq.get (shallow_model2 ( ^ self)) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1006,7 +1023,8 @@ module SparseArray_Create
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model3 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv6 (shallow_model3 self)
   val invariant4 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1033,7 +1051,8 @@ module SparseArray_Create
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model2 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model2 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model2 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1079,7 +1098,8 @@ module SparseArray_Create
     ensures { result = shallow_model1 self }
     
   predicate invariant1 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) =
-    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) -> match index_logic2 (SparseArray_Sparse_Type.sparse_back self) i with
+    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model1 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model3 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self)
+     -> match index_logic2 (SparseArray_Sparse_Type.sparse_back self) i with
       | j -> 0 <= UIntSize.to_int j /\ UIntSize.to_int j < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ UIntSize.to_int (index_logic2 (SparseArray_Sparse_Type.sparse_idx self) (UIntSize.to_int j)) = i
       end)
   val invariant1 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse t) : bool
@@ -1105,13 +1125,15 @@ module SparseArray_Create
   val from_elem1 (elem : usize) (n : usize) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     requires {inv3 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model3 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic2 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic2 result i = elem }
     ensures { inv4 result }
     
   val from_elem0 (elem : t) (n : usize) : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)
     requires {inv0 elem}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model2 result) = UIntSize.to_int n }
-    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic1 result i = elem }
+    ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic1 result i = elem }
     ensures { inv2 result }
     
   predicate resolve0 (self : t)
@@ -1121,7 +1143,8 @@ module SparseArray_Create
   let rec cfg create [#"../sparse_array.rs" 134 0 134 64] [@cfg:stackify] [@cfg:subregion_analysis] (sz : usize) (dummy : t) : SparseArray_Sparse_Type.t_sparse t
     requires {[#"../sparse_array.rs" 134 42 134 47] inv0 dummy}
     ensures { [#"../sparse_array.rs" 132 10 132 27] SparseArray_Sparse_Type.sparse_size result = sz }
-    ensures { [#"../sparse_array.rs" 133 0 133 67] forall i : int . 0 <= i /\ i < UIntSize.to_int sz -> Seq.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
+    ensures { [#"../sparse_array.rs" 133 0 133 67] forall i : int . 0 <= i /\ i < UIntSize.to_int sz
+     -> Seq.get (shallow_model1 result) i = Core_Option_Option_Type.C_None }
     ensures { [#"../sparse_array.rs" 134 55 134 64] inv1 result }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -1195,7 +1218,8 @@ module SparseArray_F
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model7 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model7 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1223,7 +1247,8 @@ module SparseArray_F
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model6 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv6 (shallow_model6 self)
   val invariant5 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1313,7 +1338,8 @@ module SparseArray_F
     ensures { result = shallow_model2 self }
     
   predicate invariant0 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse int32) =
-    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model6 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) -> match index_logic2 (SparseArray_Sparse_Type.sparse_back self) i with
+    [#"../sparse_array.rs" 50 8 61 9] UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self) <= UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model2 self) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model6 (SparseArray_Sparse_Type.sparse_values self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_idx self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ Seq.length (shallow_model7 (SparseArray_Sparse_Type.sparse_back self)) = UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (SparseArray_Sparse_Type.sparse_n self)
+     -> match index_logic2 (SparseArray_Sparse_Type.sparse_back self) i with
       | j -> 0 <= UIntSize.to_int j /\ UIntSize.to_int j < UIntSize.to_int (SparseArray_Sparse_Type.sparse_size self) /\ UIntSize.to_int (index_logic2 (SparseArray_Sparse_Type.sparse_idx self) (UIntSize.to_int j)) = i
       end)
   val invariant0 [#"../sparse_array.rs" 49 4 49 30] (self : SparseArray_Sparse_Type.t_sparse int32) : bool
@@ -1342,7 +1368,8 @@ module SparseArray_F
     requires {[#"../sparse_array.rs" 112 20 112 24] inv4 self}
     requires {[#"../sparse_array.rs" 112 36 112 37] inv1 v}
     ensures { [#"../sparse_array.rs" 109 14 109 43] Seq.length (shallow_model2 ( ^ self)) = Seq.length (shallow_model4 self) }
-    ensures { [#"../sparse_array.rs" 110 4 110 95] forall j : int . 0 <= j /\ j < Seq.length (shallow_model4 self) /\ j <> UIntSize.to_int i -> Seq.get (shallow_model2 ( ^ self)) j = Seq.get (shallow_model4 self) j }
+    ensures { [#"../sparse_array.rs" 110 4 110 95] forall j : int . 0 <= j /\ j < Seq.length (shallow_model4 self) /\ j <> UIntSize.to_int i
+     -> Seq.get (shallow_model2 ( ^ self)) j = Seq.get (shallow_model4 self) j }
     ensures { [#"../sparse_array.rs" 111 14 111 37] Seq.get (shallow_model2 ( ^ self)) (UIntSize.to_int i) = Core_Option_Option_Type.C_Some v }
     
   function shallow_model3 (self : SparseArray_Sparse_Type.t_sparse int32) : Seq.seq (Core_Option_Option_Type.t_option int32)
@@ -1368,7 +1395,8 @@ module SparseArray_F
   val create0 [#"../sparse_array.rs" 134 0 134 64] (sz : usize) (dummy : int32) : SparseArray_Sparse_Type.t_sparse int32
     requires {[#"../sparse_array.rs" 134 42 134 47] inv1 dummy}
     ensures { [#"../sparse_array.rs" 132 10 132 27] SparseArray_Sparse_Type.sparse_size result = sz }
-    ensures { [#"../sparse_array.rs" 133 0 133 67] forall i : int . 0 <= i /\ i < UIntSize.to_int sz -> Seq.get (shallow_model2 result) i = Core_Option_Option_Type.C_None }
+    ensures { [#"../sparse_array.rs" 133 0 133 67] forall i : int . 0 <= i /\ i < UIntSize.to_int sz
+     -> Seq.get (shallow_model2 result) i = Core_Option_Option_Type.C_None }
     ensures { [#"../sparse_array.rs" 134 55 134 64] inv0 result }
     
   let rec cfg f [#"../sparse_array.rs" 140 0 140 10] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg
index 0409a7db0a..11977f77cf 100644
--- a/creusot/tests/should_succeed/sum.mlcfg
+++ b/creusot/tests/should_succeed/sum.mlcfg
@@ -96,7 +96,9 @@ module Sum_SumFirstN
     requires {[#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self}
     ensures { result = is_empty_log0 self }
     
-  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self) -> ([#"../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
+  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self
+   -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
   function range_inclusive_len0 (r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) : int =
     [#"../../../../creusot-contracts/src/std/iter/range.rs" 47 4 50 5] if is_empty_log0 r then
       0
@@ -107,12 +109,15 @@ module Sum_SumFirstN
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r}
     ensures { result = range_inclusive_len0 r }
     
-  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
+  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
   use seq.Seq
   predicate produces0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self
+     -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
   val produces0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) : bool
     ensures { result = produces0 self visited o }
     
@@ -130,7 +135,14 @@ module Sum_SumFirstN
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32, ab : Seq.seq uint32, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32, bc : Seq.seq uint32, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv0 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv4 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv0 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv4 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32, ab : Seq.seq uint32, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32, bc : Seq.seq uint32, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv0 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv4 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv0 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv4 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) : () =
     [#"../../../../creusot-contracts/src/std/iter/range.rs" 74 4 74 10] ()
@@ -138,7 +150,8 @@ module Sum_SumFirstN
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive uint32) : bool
@@ -193,7 +206,8 @@ module Sum_SumFirstN
     requires {inv1 end'}
     ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 220 26 220 53] start_log0 result = start }
     ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 221 26 221 49] end_log0 result = end' }
-    ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end' -> not is_empty_log0 result }
+    ensures { [#"../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end'
+     -> not is_empty_log0 result }
     ensures { inv0 result }
     
   let rec cfg sum_first_n [#"../sum.rs" 6 0 6 33] [@cfg:stackify] [@cfg:subregion_analysis] (n : uint32) : uint32
diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index 9fcc2559c0..1f31f3448e 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -26,8 +26,10 @@ module SumOfOdds_SumOfOddIsSqr_Impl
     
   constant x  : int
   function sum_of_odd_is_sqr [#"../sum_of_odds.rs" 30 0 30 28] (x : int) : ()
-  goal vc_sum_of_odd_is_sqr : ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0) -> match x > 0 with
-    | True -> (([#"../sum_of_odds.rs" 27 11 27 17] x - 1 >= 0) /\ 0 <= ([#"../sum_of_odds.rs" 29 10 29 11] x) /\ ([#"../sum_of_odds.rs" 29 10 29 11] x - 1) < ([#"../sum_of_odds.rs" 29 10 29 11] x)) /\ (([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 (x - 1) = sqr0 (x - 1)) -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x))
+  goal vc_sum_of_odd_is_sqr : ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0)
+   -> match x > 0 with
+    | True -> (([#"../sum_of_odds.rs" 27 11 27 17] x - 1 >= 0) /\ 0 <= ([#"../sum_of_odds.rs" 29 10 29 11] x) /\ ([#"../sum_of_odds.rs" 29 10 29 11] x - 1) < ([#"../sum_of_odds.rs" 29 10 29 11] x)) /\ (([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 (x - 1) = sqr0 (x - 1))
+     -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x))
     | False -> [#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x
     end
 end
@@ -109,7 +111,9 @@ module SumOfOdds_ComputeSumOfOdd
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_Range_Type.t_range uint32)
     
    =
-    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range uint32) (visited : Seq.seq uint32) (o : Core_Ops_Range_Range_Type.t_range uint32) : bool
     ensures { result = produces0 self visited o }
     
@@ -125,14 +129,22 @@ module SumOfOdds_ComputeSumOfOdd
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range uint32, ab : Seq.seq uint32, b : Core_Ops_Range_Range_Type.t_range uint32, bc : Seq.seq uint32, c : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range uint32, ab : Seq.seq uint32, b : Core_Ops_Range_Range_Type.t_range uint32, bc : Seq.seq uint32, c : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv3 ab)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv3 bc)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range uint32) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range uint32) : ()
     requires {[#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range uint32 . ([#"../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range uint32) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range uint32) : bool
@@ -164,7 +176,8 @@ module SumOfOdds_ComputeSumOfOdd
     requires {[#"../sum_of_odds.rs" 27 11 27 17] x >= 0}
     ensures { result = sum_of_odd_is_sqr0 x }
     
-  axiom sum_of_odd_is_sqr0_spec : forall x : int . ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0) -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x)
+  axiom sum_of_odd_is_sqr0_spec : forall x : int . ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0)
+   -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x)
   use seq.Seq
   predicate resolve0 (self : borrowed (Core_Ops_Range_Range_Type.t_range uint32)) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -332,7 +345,8 @@ module SumOfOdds_Test
     requires {[#"../sum_of_odds.rs" 27 11 27 17] x >= 0}
     ensures { result = sum_of_odd_is_sqr0 x }
     
-  axiom sum_of_odd_is_sqr0_spec : forall x : int . ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0) -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x)
+  axiom sum_of_odd_is_sqr0_spec : forall x : int . ([#"../sum_of_odds.rs" 27 11 27 17] x >= 0)
+   -> ([#"../sum_of_odds.rs" 28 10 28 33] sum_of_odd0 x = sqr0 x)
   use prelude.UInt32
   val compute_sum_of_odd0 [#"../sum_of_odds.rs" 36 0 36 36] (x : uint32) : uint32
     requires {[#"../sum_of_odds.rs" 34 11 34 23] UInt32.to_int x < 65536}
diff --git a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
index 85e0d61601..a8d7f742d2 100644
--- a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
@@ -13,7 +13,7 @@ module C04AssocPrec_RespectPrec
     ensures { result = resolve0 self }
     
   let rec cfg respect_prec [#"../04_assoc_prec.rs" 10 0 10 34] [@cfg:stackify] [@cfg:subregion_analysis] (x : (uint32, uint32)) : ()
-    ensures { [#"../04_assoc_prec.rs" 7 0 7 33] 5 = 3 -> 2 + 1 = 3 }
+    ensures { [#"../04_assoc_prec.rs" 7 0 7 33] 5 = 3  -> 2 + 1 = 3 }
     ensures { [#"../04_assoc_prec.rs" 8 10 8 35] div (5 * 3) 2 <> 4 * (40 + 1) }
     ensures { [#"../04_assoc_prec.rs" 9 10 9 20] (let (a, _) = x in a) = (let (_, a) = x in a) }
     
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index 7863fc9bdb..49296ded96 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -36,7 +36,8 @@ module C05Pearlite_HasLen3_Impl
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : slice uint32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model1 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   function shallow_model0 (self : slice uint32) : Seq.seq uint32 =
     [#"../../../../../creusot-contracts/src/model.rs" 83 8 83 31] shallow_model1 self
   val shallow_model0 (self : slice uint32) : Seq.seq uint32
diff --git a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
index 85a717d886..43065ad5d2 100644
--- a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
@@ -88,8 +88,10 @@ module C10MutualRecTypes_Impl0_Height
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 53 26 53 66] deep_model0 result >= deep_model0 self }
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 54 26 54 63] deep_model0 result >= deep_model0 other }
     ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 7 0 62 1] result = self \/ result = other }
-    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 56 16 56 79] deep_model0 self <= deep_model0 other -> result = other }
-    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 57 16 57 81] deep_model0 other < deep_model0 self -> result = self }
+    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 56 16 56 79] deep_model0 self <= deep_model0 other
+     -> result = other }
+    ensures { [#"../../../../../creusot-contracts/src/std/cmp.rs" 57 16 57 81] deep_model0 other < deep_model0 self
+     -> result = self }
     ensures { inv0 result }
     
   use C10MutualRecTypes_Node_Type as C10MutualRecTypes_Node_Type
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index 06dfc294fa..884cabb418 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -93,7 +93,8 @@ module C12GhostCode_GhostVec
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -116,7 +117,8 @@ module C12GhostCode_GhostVec
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve1 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve1 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
@@ -285,7 +287,8 @@ module C12GhostCode_GhostCheck
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -307,7 +310,8 @@ module C12GhostCode_GhostCheck
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve1 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve1 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index afcdb43d79..64ea1e72d9 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -95,7 +95,8 @@ module C13VecMacro_X
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model1 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -133,7 +134,8 @@ module C13VecMacro_X
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv1 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -146,7 +148,8 @@ module C13VecMacro_X
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : slice int32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : slice int32 . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv4 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model4 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   function shallow_model3 (self : slice int32) : Seq.seq int32 =
     [#"../../../../../creusot-contracts/src/std/boxed.rs" 20 8 20 31] shallow_model4 self
   val shallow_model3 (self : slice int32) : Seq.seq int32
@@ -171,14 +174,16 @@ module C13VecMacro_X
     ensures { result = index_logic1 self ix }
     
   predicate resolve1 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve3 (index_logic1 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve3 (index_logic1 self i)
   val resolve1 (self : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve1 self }
     
   val from_elem0 (elem : int32) (n : usize) : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)
     requires {inv2 elem}
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model1 result) = UIntSize.to_int n }
-    ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic1 result i = elem }
+    ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic1 result i = elem }
     ensures { inv3 result }
     
   predicate resolve2 (self : uint32) =
@@ -195,7 +200,8 @@ module C13VecMacro_X
     ensures { result = index_logic0 self ix }
     
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve2 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve2 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
index 40dec9e9c2..6719efb634 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
+++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
@@ -839,7 +839,9 @@ module DeriveMacros_Impl2
     
   axiom inv0 : forall x : DeriveMacros_Product_Type.t_product a b . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../derive_macros.rs" 8 9 8 14] forall self : DeriveMacros_Product_Type.t_product a b . inv0 self -> inv0 self /\ (forall result : DeriveMacros_Product_Type.t_product a b . inv1 result /\ result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../derive_macros.rs" 8 9 8 14] forall self : DeriveMacros_Product_Type.t_product a b . inv0 self
+   -> inv0 self /\ (forall result : DeriveMacros_Product_Type.t_product a b . inv1 result /\ result = self
+   -> inv1 result /\ result = self)
 end
 module DeriveMacros_Impl4
   type a
@@ -864,7 +866,9 @@ module DeriveMacros_Impl4
     
   axiom inv0 : forall x : DeriveMacros_Sum_Type.t_sum a b . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../derive_macros.rs" 28 9 28 14] forall self : DeriveMacros_Sum_Type.t_sum a b . inv0 self -> inv0 self /\ (forall result : DeriveMacros_Sum_Type.t_sum a b . inv1 result /\ result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../derive_macros.rs" 28 9 28 14] forall self : DeriveMacros_Sum_Type.t_sum a b . inv0 self
+   -> inv0 self /\ (forall result : DeriveMacros_Sum_Type.t_sum a b . inv1 result /\ result = self
+   -> inv1 result /\ result = self)
 end
 module DeriveMacros_Impl3
   type a
@@ -904,7 +908,9 @@ module DeriveMacros_Impl3
   val deep_model0 (self : DeriveMacros_Product_Type.t_product a b) : DeriveMacros_Product_Type.t_product deep_model_ty0 deep_model_ty1
     ensures { result = deep_model0 self }
     
-  goal eq_refn : [#"../derive_macros.rs" 8 16 8 25] forall self : DeriveMacros_Product_Type.t_product a b . forall other : DeriveMacros_Product_Type.t_product a b . inv0 other /\ inv0 self -> inv0 other /\ inv0 self /\ (forall result : bool . result = (deep_model0 self = deep_model0 other) -> result = (deep_model0 self = deep_model0 other))
+  goal eq_refn : [#"../derive_macros.rs" 8 16 8 25] forall self : DeriveMacros_Product_Type.t_product a b . forall other : DeriveMacros_Product_Type.t_product a b . inv0 other /\ inv0 self
+   -> inv0 other /\ inv0 self /\ (forall result : bool . result = (deep_model0 self = deep_model0 other)
+   -> result = (deep_model0 self = deep_model0 other))
 end
 module DeriveMacros_Impl5
   type a
@@ -947,7 +953,9 @@ module DeriveMacros_Impl5
   val deep_model0 (self : DeriveMacros_Sum_Type.t_sum a b) : DeriveMacros_Sum_Type.t_sum deep_model_ty0 deep_model_ty1
     ensures { result = deep_model0 self }
     
-  goal eq_refn : [#"../derive_macros.rs" 28 16 28 25] forall self : DeriveMacros_Sum_Type.t_sum a b . forall other : DeriveMacros_Sum_Type.t_sum a b . inv0 other /\ inv0 self -> inv0 other /\ inv0 self /\ (forall result : bool . result = (deep_model0 self = deep_model0 other) -> result = (deep_model0 self = deep_model0 other))
+  goal eq_refn : [#"../derive_macros.rs" 28 16 28 25] forall self : DeriveMacros_Sum_Type.t_sum a b . forall other : DeriveMacros_Sum_Type.t_sum a b . inv0 other /\ inv0 self
+   -> inv0 other /\ inv0 self /\ (forall result : bool . result = (deep_model0 self = deep_model0 other)
+   -> result = (deep_model0 self = deep_model0 other))
 end
 module DeriveMacros_Impl0
   type a
diff --git a/creusot/tests/should_succeed/take_first_mut.mlcfg b/creusot/tests/should_succeed/take_first_mut.mlcfg
index 8c80823cf2..9fbf1b24c7 100644
--- a/creusot/tests/should_succeed/take_first_mut.mlcfg
+++ b/creusot/tests/should_succeed/take_first_mut.mlcfg
@@ -107,7 +107,8 @@ module TakeFirstMut_TakeFirstMut
     requires {[#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self) -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv7 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : slice t . ([#"../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv7 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model0 self = Slice.id self) && ([#"../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   use seq.Seq
   function index_logic0 [@inline:trivial] (self : slice t) (ix : int) : t =
     [#"../../../../creusot-contracts/src/logic/ops.rs" 43 8 43 31] Seq.get (shallow_model0 self) ix
diff --git a/creusot/tests/should_succeed/trait_impl.mlcfg b/creusot/tests/should_succeed/trait_impl.mlcfg
index 47804abcfa..6da53136a4 100644
--- a/creusot/tests/should_succeed/trait_impl.mlcfg
+++ b/creusot/tests/should_succeed/trait_impl.mlcfg
@@ -74,7 +74,7 @@ module TraitImpl_Impl0
     ensures { result = inv0 _x }
     
   axiom inv0 : forall x : (t1, t2) . inv0 x = true
-  goal x_refn : [#"../trait_impl.rs" 25 4 25 14] forall self : (t1, t2) . inv0 self -> inv0 self
+  goal x_refn : [#"../trait_impl.rs" 25 4 25 14] forall self : (t1, t2) . inv0 self  -> inv0 self
 end
 module TraitImpl_Impl1
   type b
diff --git a/creusot/tests/should_succeed/traits/03.mlcfg b/creusot/tests/should_succeed/traits/03.mlcfg
index fecedca641..427b3d0584 100644
--- a/creusot/tests/should_succeed/traits/03.mlcfg
+++ b/creusot/tests/should_succeed/traits/03.mlcfg
@@ -89,7 +89,7 @@ module C03_Impl0
   axiom inv0 : forall x : int32 . inv0 x = true
   use prelude.Int
   use prelude.Borrow
-  goal f_refn : [#"../03.rs" 9 4 9 23] forall self : int32 . inv0 self -> (forall result : int32 . inv1 result)
+  goal f_refn : [#"../03.rs" 9 4 9 23] forall self : int32 . inv0 self  -> (forall result : int32 . inv1 result)
 end
 module C03_Impl1
   use prelude.UInt32
@@ -115,7 +115,8 @@ module C03_Impl1
   axiom inv0 : forall x : uint32 . inv0 x = true
   use prelude.Int
   use prelude.Borrow
-  goal g_refn : [#"../03.rs" 20 4 20 23] forall self : uint32 . inv0 self -> (forall result : uint32 . inv1 result /\ result = result)
+  goal g_refn : [#"../03.rs" 20 4 20 23] forall self : uint32 . inv0 self
+   -> (forall result : uint32 . inv1 result /\ result = result)
 end
 module C03_Impl2
   type g
@@ -129,5 +130,6 @@ module C03_Impl2
     
   axiom inv0 : forall x : g . inv0 x = true
   use prelude.Borrow
-  goal h_refn : [#"../03.rs" 30 4 30 24] forall x : g . inv0 x -> inv0 x /\ (forall result : g . inv0 result -> inv0 result)
+  goal h_refn : [#"../03.rs" 30 4 30 24] forall x : g . inv0 x
+   -> inv0 x /\ (forall result : g . inv0 result  -> inv0 result)
 end
diff --git a/creusot/tests/should_succeed/traits/07.mlcfg b/creusot/tests/should_succeed/traits/07.mlcfg
index 1720013163..000a84b85f 100644
--- a/creusot/tests/should_succeed/traits/07.mlcfg
+++ b/creusot/tests/should_succeed/traits/07.mlcfg
@@ -79,5 +79,5 @@ module C07_Impl0
   axiom inv0 : forall x : int32 . inv0 x = true
   use prelude.Int
   use prelude.Borrow
-  goal ix_refn : [#"../07.rs" 11 4 11 36] forall self : int32 . inv0 self -> (forall result : () . inv1 result)
+  goal ix_refn : [#"../07.rs" 11 4 11 36] forall self : int32 . inv0 self  -> (forall result : () . inv1 result)
 end
diff --git a/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg b/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
index 93b5b4cce1..cf4ce49501 100644
--- a/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
+++ b/creusot/tests/should_succeed/traits/13_assoc_types.mlcfg
@@ -68,5 +68,6 @@ module C13AssocTypes_Impl0
     
   axiom inv0 : forall x : t . inv0 x = true
   use prelude.Borrow
-  goal model_refn : [#"../13_assoc_types.rs" 13 4 13 35] forall self : t . inv0 self -> inv0 self /\ (forall result : model_ty0 . inv1 result -> inv1 result)
+  goal model_refn : [#"../13_assoc_types.rs" 13 4 13 35] forall self : t . inv0 self
+   -> inv0 self /\ (forall result : model_ty0 . inv1 result  -> inv1 result)
 end
diff --git a/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg b/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
index 91d0278ed4..34e8b7e21e 100644
--- a/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
+++ b/creusot/tests/should_succeed/traits/18_trait_laws.mlcfg
@@ -15,7 +15,8 @@ module C18TraitLaws_UsesOp_Impl
     requires {[#"../18_trait_laws.rs" 10 26 10 27] inv0 b}
     ensures { result = reflexive0 a b }
     
-  axiom reflexive0_spec : forall a : t, b : t . ([#"../18_trait_laws.rs" 10 17 10 18] inv0 a) -> ([#"../18_trait_laws.rs" 10 26 10 27] inv0 b) -> ([#"../18_trait_laws.rs" 9 14 9 32] op0 a b = op0 b a)
+  axiom reflexive0_spec : forall a : t, b : t . ([#"../18_trait_laws.rs" 10 17 10 18] inv0 a)
+   -> ([#"../18_trait_laws.rs" 10 26 10 27] inv0 b)  -> ([#"../18_trait_laws.rs" 9 14 9 32] op0 a b = op0 b a)
   predicate invariant0 (self : t)
   val invariant0 (self : t) : bool
     ensures { result = invariant0 self }
@@ -24,7 +25,9 @@ module C18TraitLaws_UsesOp_Impl
   constant x  : t
   constant y  : t
   function uses_op [#"../18_trait_laws.rs" 16 0 16 48] (x : t) (y : t) : bool
-  goal vc_uses_op : ([#"../18_trait_laws.rs" 16 35 16 36] inv0 y) -> ([#"../18_trait_laws.rs" 16 29 16 30] inv0 x) -> ([#"../18_trait_laws.rs" 15 10 15 24] (op0 x y = op0 y x) = true)
+  goal vc_uses_op : ([#"../18_trait_laws.rs" 16 35 16 36] inv0 y)
+   -> ([#"../18_trait_laws.rs" 16 29 16 30] inv0 x)
+   -> ([#"../18_trait_laws.rs" 15 10 15 24] (op0 x y = op0 y x) = true)
 end
 module C18TraitLaws_Impl0_Reflexive_Impl
   function op0 [#"../18_trait_laws.rs" 23 4 23 32] (self : ()) (_2 : ()) : () =
@@ -69,5 +72,6 @@ module C18TraitLaws_Impl0
   val op0 [#"../18_trait_laws.rs" 23 4 23 32] (self : ()) (_2 : ()) : ()
     ensures { result = op0 self _2 }
     
-  goal reflexive_refn : [#"../18_trait_laws.rs" 30 4 30 34] forall a : () . forall b : () . inv0 b /\ inv0 a -> (forall result : () . op0 a b = op0 b a -> op0 a b = op0 b a)
+  goal reflexive_refn : [#"../18_trait_laws.rs" 30 4 30 34] forall a : () . forall b : () . inv0 b /\ inv0 a
+   -> (forall result : () . op0 a b = op0 b a  -> op0 a b = op0 b a)
 end
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
index bfb1259191..85f7281307 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
@@ -112,7 +112,11 @@ module NonZero_Impl1_SubPreTrans_Impl
   constant c  : NonZero_NonZeroU32_Type.t_nonzerou32
   function sub_pre_trans [#"../non_zero.rs" 36 4 36 51] (a : NonZero_NonZeroU32_Type.t_nonzerou32) (b : NonZero_NonZeroU32_Type.t_nonzerou32) (c : NonZero_NonZeroU32_Type.t_nonzerou32) : ()
     
-  goal vc_sub_pre_trans : ([#"../non_zero.rs" 36 43 36 44] inv0 c) -> ([#"../non_zero.rs" 36 34 36 35] inv0 b) -> ([#"../non_zero.rs" 36 25 36 26] inv0 a) -> ([#"../non_zero.rs" 34 15 34 27] sub_pre0 b c) -> ([#"../non_zero.rs" 33 15 33 27] sub_pre0 a b) -> ([#"../non_zero.rs" 35 14 35 26] sub_pre0 a c)
+  goal vc_sub_pre_trans : ([#"../non_zero.rs" 36 43 36 44] inv0 c)
+   -> ([#"../non_zero.rs" 36 34 36 35] inv0 b)
+   -> ([#"../non_zero.rs" 36 25 36 26] inv0 a)
+   -> ([#"../non_zero.rs" 34 15 34 27] sub_pre0 b c)
+   -> ([#"../non_zero.rs" 33 15 33 27] sub_pre0 a b)  -> ([#"../non_zero.rs" 35 14 35 26] sub_pre0 a c)
 end
 module NonZero_Impl1_Sub
   use prelude.Int
diff --git a/creusot/tests/should_succeed/type_invariants/quant.mlcfg b/creusot/tests/should_succeed/type_invariants/quant.mlcfg
index faae2505c8..6ca7198898 100644
--- a/creusot/tests/should_succeed/type_invariants/quant.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/quant.mlcfg
@@ -20,7 +20,8 @@ module Quant_Forall_Impl
     end)
   constant _1  : ()
   function forall' [#"../quant.rs" 17 0 17 15] (_1 : ()) : ()
-  goal vc_forall' : [#"../quant.rs" 16 0 16 50] forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x -> invariant0 x
+  goal vc_forall' : [#"../quant.rs" 16 0 16 50] forall x : Quant_WithInvariant_Type.t_withinvariant . inv0 x
+   -> invariant0 x
 end
 module Quant_Exists_Impl
   use Quant_WithInvariant_Type as Quant_WithInvariant_Type
diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
index 9705591c4b..21135df73a 100644
--- a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
@@ -108,7 +108,8 @@ module VecInv_Vec
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : slice (borrowed (VecInv_SumTo10_Type.t_sumto10)) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : slice (borrowed (VecInv_SumTo10_Type.t_sumto10)) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv1 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model3 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   function index_logic2 [@inline:trivial] (self : slice (borrowed (VecInv_SumTo10_Type.t_sumto10))) (ix : int) : borrowed (VecInv_SumTo10_Type.t_sumto10)
     
    =
@@ -122,7 +123,8 @@ module VecInv_Vec
     ensures { result = slice_len0 x }
     
   use prelude.UInt64
-  axiom inv3 : forall x : slice (borrowed (VecInv_SumTo10_Type.t_sumto10)) . inv3 x = (forall i : uint64 . 0 <= i -> i < slice_len0 x -> inv4 (index_logic2 x i))
+  axiom inv3 : forall x : slice (borrowed (VecInv_SumTo10_Type.t_sumto10)) . inv3 x = (forall i : uint64 . 0 <= i
+   -> i < slice_len0 x  -> inv4 (index_logic2 x i))
   use Alloc_Alloc_Global_Type as Alloc_Alloc_Global_Type
   use Alloc_RawVec_RawVec_Type as Alloc_RawVec_RawVec_Type
   predicate invariant2 (self : Alloc_RawVec_RawVec_Type.t_rawvec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global))
@@ -138,7 +140,8 @@ module VecInv_Vec
     ensures { result = inv2 _x }
     
   axiom inv2 : forall x : Alloc_RawVec_RawVec_Type.t_rawvec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global) . inv2 x = true
-  axiom inv1 : forall x : Seq.seq (borrowed (VecInv_SumTo10_Type.t_sumto10)) . inv1 x = (forall i : int . 0 <= i -> i < Seq.length x -> inv4 (Seq.get x i))
+  axiom inv1 : forall x : Seq.seq (borrowed (VecInv_SumTo10_Type.t_sumto10)) . inv1 x = (forall i : int . 0 <= i
+   -> i < Seq.length x  -> inv4 (Seq.get x i))
   use Alloc_Vec_Vec_Type as Alloc_Vec_Vec_Type
   predicate inv0 (_x : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global))
     
@@ -151,7 +154,8 @@ module VecInv_Vec
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv1 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -177,7 +181,8 @@ module VecInv_Vec
   predicate resolve0 (self : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self) -> resolve1 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve1 (index_logic0 self i)
   val resolve0 (self : Alloc_Vec_Vec_Type.t_vec (borrowed (VecInv_SumTo10_Type.t_sumto10)) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve0 self }
     
diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg
index fa696eee6a..8885afa9d3 100644
--- a/creusot/tests/should_succeed/vecdeque.mlcfg
+++ b/creusot/tests/should_succeed/vecdeque.mlcfg
@@ -140,7 +140,8 @@ module Vecdeque_TestDeque
     requires {[#"../../../../creusot-contracts/src/std/deque.rs" 12 21 12 25] inv5 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/deque.rs" 12 21 12 25] inv5 self) -> ([#"../../../../creusot-contracts/src/std/deque.rs" 12 4 12 36] inv6 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/deque.rs" 11 14 11 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/deque.rs" 12 21 12 25] inv5 self)
+   -> ([#"../../../../creusot-contracts/src/std/deque.rs" 12 4 12 36] inv6 (shallow_model0 self)) && ([#"../../../../creusot-contracts/src/std/deque.rs" 11 14 11 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   val clear0 (self : borrowed (Alloc_Collections_VecDeque_VecDeque_Type.t_vecdeque uint32 (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {inv1 self}
     ensures { [#"../../../../creusot-contracts/src/std/deque.rs" 71 26 71 45] Seq.length (shallow_model0 ( ^ self)) = 0 }
diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index eeaecbe0f6..ff4cafa265 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -102,7 +102,8 @@ module C01_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model2 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -188,7 +189,9 @@ module C01_AllZero
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -204,14 +207,22 @@ module C01_AllZero
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv9 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv9 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv9 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv9 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -232,7 +243,8 @@ module C01_AllZero
   use prelude.Slice
   use seq.Seq
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq uint32) (fin : Seq.seq uint32) =
-    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq uint32) (fin : Seq.seq uint32) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -338,7 +350,8 @@ module C01_AllZero
     
   use prelude.Snapshot
   let rec cfg all_zero [#"../01.rs" 7 0 7 33] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global))) : ()
-    ensures { [#"../01.rs" 5 0 5 73] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 ( ^ v)) -> index_logic0 ( ^ v) i = (0 : uint32) }
+    ensures { [#"../01.rs" 5 0 5 73] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 ( ^ v))
+     -> index_logic0 ( ^ v) i = (0 : uint32) }
     ensures { [#"../01.rs" 6 10 6 33] Seq.length (shallow_model0 v) = Seq.length (shallow_model2 ( ^ v)) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -391,7 +404,8 @@ module C01_AllZero
     invariant { [#"../01.rs" 9 4 9 42] inv0 iter };
     invariant { [#"../01.rs" 9 4 9 42] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
     invariant { [#"../01.rs" 9 16 9 40] Seq.length (shallow_model0 v) = Seq.length (shallow_model1 old_v) };
-    invariant { [#"../01.rs" 9 4 9 42] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced) -> index_logic0 ( * v) j = (0 : uint32) };
+    invariant { [#"../01.rs" 9 4 9 42] forall j : int . 0 <= j /\ j < Seq.length (Snapshot.inner produced)
+     -> index_logic0 ( * v) j = (0 : uint32) };
     goto BB7
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index 55c65859a7..d8a3aa84c7 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -109,7 +109,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -117,7 +119,10 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -125,7 +130,10 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -136,13 +144,19 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv10 z)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -153,7 +167,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -164,7 +180,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -175,7 +193,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -186,7 +206,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv10 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv10 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use prelude.Slice
   use prelude.Borrow
   predicate invariant5 (self : borrowed (slice t))
@@ -221,7 +243,8 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv9 (shallow_model3 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -259,7 +282,8 @@ module C02Gnome_GnomeSort
   axiom inv0 : forall x : Snapshot.snap_ty (borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../02_gnome.rs" 9 0 9 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) =
-    [#"../02_gnome.rs" 10 4 12 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
+    [#"../02_gnome.rs" 10 4 12 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u
+     -> le_log0 (Seq.get s i) (Seq.get s j)
   val sorted_range0 [#"../02_gnome.rs" 9 0 9 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) : bool
     ensures { result = sorted_range0 s l u }
     
@@ -286,7 +310,9 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self}
     ensures { result = deep_model1 self }
     
-  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv8 (deep_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> Seq.get (deep_model1 self) i = deep_model3 (index_logic1 self i)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
+  axiom deep_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv8 (deep_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+   -> Seq.get (deep_model1 self) i = deep_model3 (index_logic1 self i)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model3 self) = Seq.length (deep_model1 self))
   predicate resolve3 (self : borrowed (slice t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve3 (self : borrowed (slice t)) : bool
@@ -299,7 +325,8 @@ module C02Gnome_GnomeSort
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model7 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model7 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   function shallow_model6 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model7 ( * self)
   val shallow_model6 (self : borrowed (slice t)) : Seq.seq t
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index e2d9656bc9..1d32b64cb4 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -161,7 +161,8 @@ module C03KnuthShuffle_KnuthShuffle
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv2 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv9 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv9 (shallow_model2 self)
   val invariant2 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -184,7 +185,9 @@ module C03KnuthShuffle_KnuthShuffle
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -200,14 +203,22 @@ module C03KnuthShuffle_KnuthShuffle
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv10 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv10 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -242,7 +253,8 @@ module C03KnuthShuffle_KnuthShuffle
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model7 self }
     
-  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model7 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
+  axiom shallow_model7_spec : forall self : slice t . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv9 (shallow_model7 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model7 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model7 self) <= UIntSize.to_int max0)
   function shallow_model6 (self : borrowed (slice t)) : Seq.seq t =
     [#"../../../../../creusot-contracts/src/model.rs" 101 8 101 31] shallow_model7 ( * self)
   val shallow_model6 (self : borrowed (slice t)) : Seq.seq t
diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
index 2336e6828a..0a48f487c3 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
+++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
@@ -74,7 +74,8 @@ module C04BinarySearch_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model2 self)
   val invariant3 (self : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -113,7 +114,8 @@ module C04BinarySearch_BinarySearch
   axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global) . inv0 x = true
   use seq.Seq
   predicate sorted_range0 [#"../04_binary_search.rs" 8 0 8 52] (s : Seq.seq uint32) (l : int) (u : int) =
-    [#"../04_binary_search.rs" 9 4 11 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u -> Seq.get s i <= Seq.get s j
+    [#"../04_binary_search.rs" 9 4 11 5] forall j : int . forall i : int . l <= i /\ i < j /\ j < u
+     -> Seq.get s i <= Seq.get s j
   val sorted_range0 [#"../04_binary_search.rs" 8 0 8 52] (s : Seq.seq uint32) (l : int) (u : int) : bool
     ensures { result = sorted_range0 s l u }
     
@@ -161,9 +163,13 @@ module C04BinarySearch_BinarySearch
   let rec cfg binary_search [#"../04_binary_search.rs" 26 0 26 71] [@cfg:stackify] [@cfg:subregion_analysis] (arr : Alloc_Vec_Vec_Type.t_vec uint32 (Alloc_Alloc_Global_Type.t_global)) (elem : uint32) : Core_Result_Result_Type.t_result usize usize
     requires {[#"../04_binary_search.rs" 19 11 19 36] Seq.length (shallow_model1 arr) <= UIntSize.to_int max0}
     requires {[#"../04_binary_search.rs" 20 11 20 23] sorted0 (shallow_model1 arr)}
-    ensures { [#"../04_binary_search.rs" 21 0 21 63] forall x : usize . result = Core_Result_Result_Type.C_Ok x -> index_logic0 arr (UIntSize.to_int x) = elem }
-    ensures { [#"../04_binary_search.rs" 22 0 23 48] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . i < x -> index_logic0 arr (UIntSize.to_int i) <= elem) }
-    ensures { [#"../04_binary_search.rs" 24 0 25 65] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . x < i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr) -> elem < index_logic0 arr (UIntSize.to_int i)) }
+    ensures { [#"../04_binary_search.rs" 21 0 21 63] forall x : usize . result = Core_Result_Result_Type.C_Ok x
+     -> index_logic0 arr (UIntSize.to_int x) = elem }
+    ensures { [#"../04_binary_search.rs" 22 0 23 48] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . i < x  -> index_logic0 arr (UIntSize.to_int i) <= elem) }
+    ensures { [#"../04_binary_search.rs" 24 0 25 65] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . x < i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr)
+     -> elem < index_logic0 arr (UIntSize.to_int i)) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Result_Result_Type.t_result usize usize;
@@ -214,8 +220,10 @@ module C04BinarySearch_BinarySearch
   }
   BB5 {
     invariant { [#"../04_binary_search.rs" 33 16 33 56] 0 < UIntSize.to_int size /\ UIntSize.to_int size + UIntSize.to_int base <= Seq.length (shallow_model1 arr) };
-    invariant { [#"../04_binary_search.rs" 33 4 33 58] forall i : usize . i < base -> index_logic0 arr (UIntSize.to_int i) <= elem };
-    invariant { [#"../04_binary_search.rs" 33 4 33 58] forall i : usize . UIntSize.to_int base + UIntSize.to_int size < UIntSize.to_int i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr) -> elem < index_logic0 arr (UIntSize.to_int i) };
+    invariant { [#"../04_binary_search.rs" 33 4 33 58] forall i : usize . i < base
+     -> index_logic0 arr (UIntSize.to_int i) <= elem };
+    invariant { [#"../04_binary_search.rs" 33 4 33 58] forall i : usize . UIntSize.to_int base + UIntSize.to_int size < UIntSize.to_int i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr)
+     -> elem < index_logic0 arr (UIntSize.to_int i) };
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
index 32fa1beb29..6ed7c06b37 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
@@ -99,7 +99,8 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv5 (shallow_model2 self)
   val invariant4 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -154,7 +155,9 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y}
     ensures { result = eq_cmp0 x y }
     
-  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
+  axiom eq_cmp0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 14 70 15] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 70 23 70 24] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 69 14 69 59] (x = y) = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Equal))
   function antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym20 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater}
@@ -162,7 +165,10 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y}
     ensures { result = antisym20 x y }
     
-  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
+  axiom antisym20_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 64 15 64 48] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 16 66 17] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 66 25 66 26] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 65 14 65 44] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Less)
   function antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
   val antisym10 (x : deep_model_ty0) (y : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less}
@@ -170,7 +176,10 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y}
     ensures { result = antisym10 x y }
     
-  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
+  axiom antisym10_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 59 15 59 45] cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 16 61 17] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 61 25 61 26] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 60 14 60 47] cmp_log0 y x = Core_Cmp_Ordering_Type.C_Greater)
   function trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
     
   val trans0 (x : deep_model_ty0) (y : deep_model_ty0) (z : deep_model_ty0) (o : Core_Cmp_Ordering_Type.t_ordering) : ()
@@ -181,13 +190,19 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z}
     ensures { result = trans0 x y z o }
     
-  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
+  axiom trans0_spec : forall x : deep_model_ty0, y : deep_model_ty0, z : deep_model_ty0, o : Core_Cmp_Ordering_Type.t_ordering . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 53 15 53 32] cmp_log0 x y = o)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 54 15 54 32] cmp_log0 y z = o)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 13 56 14] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 22 56 23] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 56 31 56 32] inv7 z)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 55 14 55 31] cmp_log0 x z = o)
   function refl0 (x : deep_model_ty0) : ()
   val refl0 (x : deep_model_ty0) : ()
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x}
     ensures { result = refl0 x }
     
-  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
+  axiom refl0_spec : forall x : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 50 12 50 13] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 49 14 49 45] cmp_log0 x x = Core_Cmp_Ordering_Type.C_Equal)
   function gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val gt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = gt_log0 self o }
@@ -198,7 +213,9 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y}
     ensures { result = cmp_gt_log0 x y }
     
-  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_gt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 18 46 19] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 46 27 46 28] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 45 14 45 64] gt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Greater))
   function ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val ge_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = ge_log0 self o }
@@ -209,7 +226,9 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y}
     ensures { result = cmp_ge_log0 x y }
     
-  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_ge_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 18 36 19] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 36 27 36 28] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 35 14 35 61] ge_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Less))
   function lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val lt_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = lt_log0 self o }
@@ -220,7 +239,9 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y}
     ensures { result = cmp_lt_log0 x y }
     
-  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
+  axiom cmp_lt_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 18 26 19] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 26 27 26 28] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 25 14 25 61] lt_log0 x y = (cmp_log0 x y = Core_Cmp_Ordering_Type.C_Less))
   function le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
   val le_log0 (self : deep_model_ty0) (o : deep_model_ty0) : bool
     ensures { result = le_log0 self o }
@@ -231,11 +252,14 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y}
     ensures { result = cmp_le_log0 x y }
     
-  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y) -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
+  axiom cmp_le_log0_spec : forall x : deep_model_ty0, y : deep_model_ty0 . ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 18 16 19] inv7 x)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 16 27 16 28] inv7 y)
+   -> ([#"../../../../../creusot-contracts/src/logic/ord.rs" 15 14 15 64] le_log0 x y = (cmp_log0 x y <> Core_Cmp_Ordering_Type.C_Greater))
   use seq.Seq
   predicate sorted_range0 [#"../05_binary_search_generic.rs" 9 0 9 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int)
    =
-    [#"../05_binary_search_generic.rs" 10 4 12 5] forall j : int . forall i : int . l <= i /\ i <= j /\ j < u -> le_log0 (Seq.get s i) (Seq.get s j)
+    [#"../05_binary_search_generic.rs" 10 4 12 5] forall j : int . forall i : int . l <= i /\ i <= j /\ j < u
+     -> le_log0 (Seq.get s i) (Seq.get s j)
   val sorted_range0 [#"../05_binary_search_generic.rs" 9 0 9 63] (s : Seq.seq deep_model_ty0) (l : int) (u : int) : bool
     ensures { result = sorted_range0 s l u }
     
@@ -314,7 +338,9 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv4 self}
     ensures { result = deep_model2 self }
     
-  axiom deep_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 self) -> Seq.get (deep_model2 self) i = deep_model1 (index_logic1 self i)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model2 self) = Seq.length (deep_model2 self))
+  axiom deep_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 18 33 22] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 33 4 33 44] inv6 (deep_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 31 4 32 53] forall i : int . 0 <= i /\ i < Seq.length (shallow_model2 self)
+   -> Seq.get (deep_model2 self) i = deep_model1 (index_logic1 self i)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 30 14 30 56] Seq.length (shallow_model2 self) = Seq.length (deep_model2 self))
   function deep_model0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : Seq.seq deep_model_ty0 =
     [#"../../../../../creusot-contracts/src/model.rs" 74 8 74 28] deep_model2 self
   val deep_model0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : Seq.seq deep_model_ty0
@@ -329,9 +355,13 @@ module C05BinarySearchGeneric_BinarySearch
     requires {[#"../05_binary_search_generic.rs" 21 11 21 35] sorted0 (deep_model0 arr)}
     requires {[#"../05_binary_search_generic.rs" 27 41 27 44] inv0 arr}
     requires {[#"../05_binary_search_generic.rs" 27 55 27 59] inv2 elem}
-    ensures { [#"../05_binary_search_generic.rs" 22 0 22 89] forall x : usize . result = Core_Result_Result_Type.C_Ok x -> Seq.get (deep_model0 arr) (UIntSize.to_int x) = deep_model1 elem }
-    ensures { [#"../05_binary_search_generic.rs" 23 0 24 74] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . i < x -> le_log0 (Seq.get (deep_model0 arr) (UIntSize.to_int i)) (deep_model1 elem)) }
-    ensures { [#"../05_binary_search_generic.rs" 25 0 26 92] forall x : usize . result = Core_Result_Result_Type.C_Err x -> (forall i : usize . x <= i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr) -> lt_log0 (deep_model1 elem) (Seq.get (deep_model0 arr) (UIntSize.to_int i))) }
+    ensures { [#"../05_binary_search_generic.rs" 22 0 22 89] forall x : usize . result = Core_Result_Result_Type.C_Ok x
+     -> Seq.get (deep_model0 arr) (UIntSize.to_int x) = deep_model1 elem }
+    ensures { [#"../05_binary_search_generic.rs" 23 0 24 74] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . i < x  -> le_log0 (Seq.get (deep_model0 arr) (UIntSize.to_int i)) (deep_model1 elem)) }
+    ensures { [#"../05_binary_search_generic.rs" 25 0 26 92] forall x : usize . result = Core_Result_Result_Type.C_Err x
+     -> (forall i : usize . x <= i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr)
+     -> lt_log0 (deep_model1 elem) (Seq.get (deep_model0 arr) (UIntSize.to_int i))) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Result_Result_Type.t_result usize usize;
@@ -405,8 +435,10 @@ module C05BinarySearchGeneric_BinarySearch
   }
   BB11 {
     invariant { [#"../05_binary_search_generic.rs" 37 16 37 56] 0 < UIntSize.to_int size /\ UIntSize.to_int size + UIntSize.to_int base <= Seq.length (shallow_model1 arr) };
-    invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . i < base -> le_log0 (Seq.get (deep_model0 arr) (UIntSize.to_int i)) (deep_model1 elem) };
-    invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . UIntSize.to_int base + UIntSize.to_int size <= UIntSize.to_int i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr) -> lt_log0 (deep_model1 elem) (Seq.get (deep_model0 arr) (UIntSize.to_int i)) };
+    invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . i < base
+     -> le_log0 (Seq.get (deep_model0 arr) (UIntSize.to_int i)) (deep_model1 elem) };
+    invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . UIntSize.to_int base + UIntSize.to_int size <= UIntSize.to_int i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr)
+     -> lt_log0 (deep_model1 elem) (Seq.get (deep_model0 arr) (UIntSize.to_int i)) };
     goto BB12
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index 875bcbc684..c4bca34a66 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -199,7 +199,8 @@ module C06KnightsTour_Impl1_New_Closure3
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant1 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv2 (shallow_model0 self)
   val invariant1 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -242,7 +243,8 @@ module C06KnightsTour_Impl1_New_Closure3
   val from_elem0 (elem : usize) (n : usize) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     requires {inv0 elem}
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 157 22 157 41] Seq.length (shallow_model0 result) = UIntSize.to_int n }
-    ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n -> index_logic0 result i = elem }
+    ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 158 12 158 78] forall i : int . 0 <= i /\ i < UIntSize.to_int n
+     -> index_logic0 result i = elem }
     ensures { inv1 result }
     
   predicate resolve0 (self : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) =
@@ -357,7 +359,8 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv7 (shallow_model2 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -397,7 +400,8 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant6 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -450,18 +454,22 @@ module C06KnightsTour_Impl1_New
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
   predicate produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (visited : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq usize . inv7 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) . inv11 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 37 8 49 9] unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ) /\ (exists s : Seq.seq usize . inv7 s /\ Seq.length s = Seq.length visited /\ produces0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter self) s (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_iter succ) /\ Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced succ) = Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) s /\ (exists fs : Seq.seq (borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) . inv11 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+     ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
     else
        * Seq.get fs 0 = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self /\  ^ Seq.get fs (Seq.length visited - 1) = CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func succ
-    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
+    ) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> unnest0 (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_func self) ( * Seq.get fs i) /\ precondition0 ( * Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) /\ postcondition_mut0 (Seq.get fs i) (Seq.get s i, Snapshot.new (Seq.(++) (Snapshot.inner (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.mapinv_produced self)) (SeqExt.subsequence s 0 i))) (Seq.get visited i))))
   val produces1 [@inline:trivial] (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (visited : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (succ : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = produces1 self visited succ }
     
@@ -477,7 +485,14 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv3 c}
     ensures { result = produces_trans2 a ab b bc c }
     
-  axiom produces_trans2_spec : forall a : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, ab : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)), b : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, bc : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)), c : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 28 15 28 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 29 15 29 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 22 31 23] inv3 a) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 31 31 33] inv4 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 52 31 53] inv3 b) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 61 31 63] inv4 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv3 c) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 30 14 30 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans2_spec : forall a : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, ab : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)), b : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, bc : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)), c : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 28 15 28 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 29 15 29 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 22 31 23] inv3 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 31 31 33] inv4 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 52 31 53] inv3 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 61 31 63] inv4 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 31 82 31 83] inv3 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 30 14 30 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl2 (self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : ()
     
@@ -485,7 +500,8 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv3 self}
     ensures { result = produces_refl2 self }
     
-  axiom produces_refl2_spec : forall self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv3 self) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 23 14 23 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl2_spec : forall self : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 24 21 24 25] inv3 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 23 14 23 45] produces1 self (Seq.empty ) self)
   predicate invariant5 (self : borrowed (CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3))
     
    =
@@ -517,7 +533,8 @@ module C06KnightsTour_Impl1_New
   predicate next_precondition0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (produced : Seq.seq usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i -> inv1 e -> produces0 iter (Seq.singleton e) i -> precondition0 func (e, Snapshot.new produced)
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 112 8 116 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i
+     -> inv1 e  -> produces0 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) (produced : Seq.seq usize) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -525,7 +542,16 @@ module C06KnightsTour_Impl1_New
   predicate preservation0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall b : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . forall f : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall e2 : usize . forall e1 : usize . forall s : Seq.seq usize . inv0 i -> inv9 b -> inv10 f -> inv1 e2 -> inv1 e1 -> inv7 s -> unnest0 func ( * f) -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i -> precondition0 ( * f) (e1, Snapshot.new s) -> postcondition_mut0 f (e1, Snapshot.new s) b -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 135 8 142 9] forall i : Core_Ops_Range_Range_Type.t_range usize . forall b : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . forall f : borrowed C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall e2 : usize . forall e1 : usize . forall s : Seq.seq usize . inv0 i
+     -> inv9 b
+     -> inv10 f
+     -> inv1 e2
+     -> inv1 e1
+     -> inv7 s
+     -> unnest0 func ( * f)
+     -> produces0 iter (Seq.snoc (Seq.snoc s e1) e2) i
+     -> precondition0 ( * f) (e1, Snapshot.new s)
+     -> postcondition_mut0 f (e1, Snapshot.new s) b  -> precondition0 ( ^ f) (e2, Snapshot.new (Seq.snoc s e1))
   val preservation0 (iter : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : bool
     ensures { result = preservation0 iter func }
     
@@ -542,7 +568,11 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv7 produced}
     ensures { result = preservation_inv0 iter func produced }
     
-  axiom preservation_inv0_spec : forall iter : Core_Ops_Range_Range_Type.t_range usize, func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, produced : Seq.seq usize . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 24 121 28] inv0 iter) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 33 121 37] inv2 func) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv7 produced) -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 120 4 120 83] produced = Seq.empty  -> preservation_inv0 iter func produced = preservation0 iter func)
+  axiom preservation_inv0_spec : forall iter : Core_Ops_Range_Range_Type.t_range usize, func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3, produced : Seq.seq usize . ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 24 121 28] inv0 iter)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 33 121 37] inv2 func)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 121 42 121 50] inv7 produced)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 120 4 120 83] produced = Seq.empty 
+   -> preservation_inv0 iter func produced = preservation0 iter func)
   predicate resolve3 (self : borrowed (Core_Ops_Range_Range_Type.t_range usize)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve3 (self : borrowed (Core_Ops_Range_Range_Type.t_range usize)) : bool
@@ -554,7 +584,8 @@ module C06KnightsTour_Impl1_New
     ensures { result = completed1 self }
     
   predicate reinitialize0 (_1 : ()) =
-    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 148 8 153 9] forall func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall iter : borrowed (Core_Ops_Range_Range_Type.t_range usize) . inv2 func -> inv8 iter -> completed1 iter -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
+    [#"../../../../../creusot-contracts/src/std/iter/map_inv.rs" 148 8 153 9] forall func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3 . forall iter : borrowed (Core_Ops_Range_Range_Type.t_range usize) . inv2 func
+     -> inv8 iter  -> completed1 iter  -> next_precondition0 ( ^ iter) func (Seq.empty ) /\ preservation0 ( ^ iter) func
   val reinitialize0 (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
@@ -584,13 +615,21 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv7 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv7 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv7 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv7 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant1 (self : usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : usize) : bool
@@ -615,13 +654,21 @@ module C06KnightsTour_Impl1_New
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv7 ab) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv7 bc) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter.rs" 38 15 38 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 39 15 39 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 22 41 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 31 41 33] inv7 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 52 41 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 61 41 63] inv7 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 41 82 41 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 40 14 40 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter.rs" 35 21 35 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter.rs" 34 14 34 45] produces0 self (Seq.empty ) self)
   function index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
     
    =
@@ -631,7 +678,8 @@ module C06KnightsTour_Impl1_New
     
   use C06KnightsTour_Board_Type as C06KnightsTour_Board_Type
   predicate wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) =
-    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model1 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) -> Seq.length (shallow_model2 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model1 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self)
+     -> Seq.length (shallow_model2 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
@@ -671,7 +719,8 @@ module C06KnightsTour_Impl1_New
     ensures { inv6 result }
     
   val map_inv0 (self : Core_Ops_Range_Range_Type.t_range usize) (func : C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3) : CreusotContracts_Std1_Iter_MapInv_MapInv_Type.t_mapinv (Core_Ops_Range_Range_Type.t_range usize) usize C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3
-    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i2 -> inv1 e -> produces0 self (Seq.singleton e) i2 -> precondition0 func (e, Snapshot.new (Seq.empty ))}
+    requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 43 4 43 141] forall i2 : Core_Ops_Range_Range_Type.t_range usize . forall e : usize . inv0 i2
+     -> inv1 e  -> produces0 self (Seq.singleton e) i2  -> precondition0 func (e, Snapshot.new (Seq.empty ))}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 44 15 44 51] reinitialize0 ()}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 45 15 45 70] preservation0 self func}
     requires {[#"../../../../../creusot-contracts/src/std/iter.rs" 47 21 47 25] inv0 self}
@@ -749,7 +798,8 @@ module C06KnightsTour_Impl1_Available
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   predicate invariant6 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv7 (shallow_model4 self)
   val invariant6 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -778,7 +828,8 @@ module C06KnightsTour_Impl1_Available
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -849,7 +900,8 @@ module C06KnightsTour_Impl1_Available
     ensures { result = index_logic0 self ix }
     
   predicate wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) =
-    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model3 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) -> Seq.length (shallow_model4 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model3 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self)
+     -> Seq.length (shallow_model4 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
@@ -909,7 +961,7 @@ module C06KnightsTour_Impl1_Available
   use prelude.IntSize
   let rec cfg available [#"../06_knights_tour.rs" 52 4 52 41] [@cfg:stackify] [@cfg:subregion_analysis] (self : C06KnightsTour_Board_Type.t_board) (p : C06KnightsTour_Point_Type.t_point) : bool
     requires {[#"../06_knights_tour.rs" 50 15 50 24] wf0 self}
-    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result -> in_bounds0 self p }
+    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result  -> in_bounds0 self p }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : bool;
@@ -1053,7 +1105,8 @@ module C06KnightsTour_Impl1_CountDegree
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
+  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv8 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
   predicate invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv8 (shallow_model5 self)
   val invariant7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1082,7 +1135,8 @@ module C06KnightsTour_Impl1_CountDegree
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model4 self }
     
-  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
+  axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model4 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max0)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1139,7 +1193,8 @@ module C06KnightsTour_Impl1_CountDegree
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant1 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model1 self)
   val invariant1 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1177,7 +1232,14 @@ module C06KnightsTour_Impl1_CountDegree
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq (isize, isize), b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq (isize, isize), c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv4 ab) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv4 bc) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq (isize, isize), b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq (isize, isize), c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv4 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv4 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : ()
     
@@ -1187,7 +1249,8 @@ module C06KnightsTour_Impl1_CountDegree
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1215,7 +1278,8 @@ module C06KnightsTour_Impl1_CountDegree
     ensures { result = index_logic2 self ix }
     
   predicate wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) =
-    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model4 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) -> Seq.length (shallow_model5 (index_logic2 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model4 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self)
+     -> Seq.length (shallow_model5 (index_logic2 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
@@ -1234,13 +1298,14 @@ module C06KnightsTour_Impl1_CountDegree
   predicate resolve2 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 222 8 222 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self) -> resolve1 (Seq.get (shallow_model3 self) i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 222 8 222 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+     -> resolve1 (Seq.get (shallow_model3 self) i)
   val resolve2 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve2 self }
     
   val available0 [#"../06_knights_tour.rs" 52 4 52 41] (self : C06KnightsTour_Board_Type.t_board) (p : C06KnightsTour_Point_Type.t_point) : bool
     requires {[#"../06_knights_tour.rs" 50 15 50 24] wf0 self}
-    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result -> in_bounds0 self p }
+    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result  -> in_bounds0 self p }
     
   val mov0 [#"../06_knights_tour.rs" 18 4 18 45] (self : C06KnightsTour_Point_Type.t_point) (p : (isize, isize)) : C06KnightsTour_Point_Type.t_point
     requires {[#"../06_knights_tour.rs" 12 15 12 52] - 10000 <= IntSize.to_int (C06KnightsTour_Point_Type.point_x self) /\ IntSize.to_int (C06KnightsTour_Point_Type.point_x self) <= 10000}
@@ -1312,7 +1377,8 @@ module C06KnightsTour_Impl1_CountDegree
     
   val moves0 [#"../06_knights_tour.rs" 95 0 95 33] (_1 : ()) : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)
     ensures { [#"../06_knights_tour.rs" 93 10 93 28] Seq.length (shallow_model1 result) = 8 }
-    ensures { [#"../06_knights_tour.rs" 94 0 94 130] forall i : int . 0 <= i /\ i < 8 -> - 2 <= IntSize.to_int (let (a, _) = index_logic0 result i in a) /\ IntSize.to_int (let (a, _) = index_logic0 result i in a) <= 2 /\ - 2 <= IntSize.to_int (let (_, a) = index_logic0 result i in a) /\ IntSize.to_int (let (_, a) = index_logic0 result i in a) <= 2 }
+    ensures { [#"../06_knights_tour.rs" 94 0 94 130] forall i : int . 0 <= i /\ i < 8
+     -> - 2 <= IntSize.to_int (let (a, _) = index_logic0 result i in a) /\ IntSize.to_int (let (a, _) = index_logic0 result i in a) <= 2 /\ - 2 <= IntSize.to_int (let (_, a) = index_logic0 result i in a) /\ IntSize.to_int (let (_, a) = index_logic0 result i in a) <= 2 }
     
   let rec cfg count_degree [#"../06_knights_tour.rs" 70 4 70 45] [@cfg:stackify] [@cfg:subregion_analysis] (self : C06KnightsTour_Board_Type.t_board) (p : C06KnightsTour_Point_Type.t_point) : usize
     requires {[#"../06_knights_tour.rs" 68 15 68 24] wf0 self}
@@ -1473,7 +1539,8 @@ module C06KnightsTour_Impl1_Set
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv6 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant6 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv7 (shallow_model3 self)
   val invariant6 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -1502,7 +1569,8 @@ module C06KnightsTour_Impl1_Set
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model1 self }
     
-  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
+  axiom shallow_model1_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv5 (shallow_model1 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model1 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1574,7 +1642,8 @@ module C06KnightsTour_Impl1_Set
     ensures { result = index_logic0 self ix }
     
   predicate wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) =
-    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model1 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) -> Seq.length (shallow_model3 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model1 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self)
+     -> Seq.length (shallow_model3 (index_logic0 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
@@ -1596,7 +1665,8 @@ module C06KnightsTour_Impl1_Set
   use prelude.Slice
   use seq.Seq
   predicate resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) =
-    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere1 [@inline:trivial] (self : usize) (old' : Seq.seq usize) (fin : Seq.seq usize) : bool
     ensures { result = resolve_elswhere1 self old' fin }
     
@@ -1630,7 +1700,8 @@ module C06KnightsTour_Impl1_Set
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)))
     
    =
-    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) (fin : Seq.seq (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
@@ -1766,7 +1837,8 @@ module C06KnightsTour_Min
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -1830,7 +1902,8 @@ module C06KnightsTour_Min
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self}
     ensures { result = shallow_model6 self }
     
-  axiom shallow_model6_spec : forall self : slice (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
+  axiom shallow_model6_spec : forall self : slice (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 21 19 25] inv7 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 19 4 19 50] inv6 (shallow_model6 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 18 14 18 42] shallow_model6 self = Slice.id self) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 17 14 17 41] Seq.length (shallow_model6 self) <= UIntSize.to_int max0)
   function index_logic3 [@inline:trivial] (self : slice (usize, C06KnightsTour_Point_Type.t_point)) (ix : int) : (usize, C06KnightsTour_Point_Type.t_point)
     
    =
@@ -1853,7 +1926,9 @@ module C06KnightsTour_Min
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv4 self}
     ensures { result = to_ref_seq0 self }
     
-  axiom to_ref_seq0_spec : forall self : slice (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv3 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self) -> Seq.get (to_ref_seq0 self) i = index_logic3 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model3 self))
+  axiom to_ref_seq0_spec : forall self : slice (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 19 91 23] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 91 4 91 35] inv3 (to_ref_seq0 self)) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 90 4 90 82] forall i : int . 0 <= i /\ i < Seq.length (to_ref_seq0 self)
+   -> Seq.get (to_ref_seq0 self) i = index_logic3 self i) && ([#"../../../../../creusot-contracts/src/std/slice.rs" 89 14 89 41] Seq.length (to_ref_seq0 self) = Seq.length (shallow_model3 self))
   function shallow_model1 (self : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point)) : slice (usize, C06KnightsTour_Point_Type.t_point)
     
   val shallow_model1 (self : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point)) : slice (usize, C06KnightsTour_Point_Type.t_point)
@@ -1877,7 +1952,11 @@ module C06KnightsTour_Min
     requires {[#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv3 bc}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point), ab : Seq.seq (usize, C06KnightsTour_Point_Type.t_point), b : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point), bc : Seq.seq (usize, C06KnightsTour_Point_Type.t_point), c : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv3 ab) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv3 bc) -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point), ab : Seq.seq (usize, C06KnightsTour_Point_Type.t_point), b : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point), bc : Seq.seq (usize, C06KnightsTour_Point_Type.t_point), c : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point) . ([#"../../../../../creusot-contracts/src/std/slice.rs" 397 15 397 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 398 15 398 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 31 400 33] inv3 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 400 61 400 63] inv3 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/slice.rs" 399 14 399 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Slice_Iter_Iter_Type.t_iter (usize, C06KnightsTour_Point_Type.t_point)) : () =
     [#"../../../../../creusot-contracts/src/std/slice.rs" 390 4 390 10] ()
@@ -1960,7 +2039,8 @@ module C06KnightsTour_Min
     ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 89 0 166 1] into_iter_post0 self result }
     
   let rec cfg min [#"../06_knights_tour.rs" 111 0 111 58] [@cfg:stackify] [@cfg:subregion_analysis] (v : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)) : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point)
-    ensures { [#"../06_knights_tour.rs" 109 0 110 62] forall r : (usize, C06KnightsTour_Point_Type.t_point) . result = Core_Option_Option_Type.C_Some r -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) /\ index_logic0 v i = r) }
+    ensures { [#"../06_knights_tour.rs" 109 0 110 62] forall r : (usize, C06KnightsTour_Point_Type.t_point) . result = Core_Option_Option_Type.C_Some r
+     -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) /\ index_logic0 v i = r) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
@@ -2002,7 +2082,8 @@ module C06KnightsTour_Min
   BB4 {
     invariant { [#"../06_knights_tour.rs" 113 4 114 74] inv0 iter };
     invariant { [#"../06_knights_tour.rs" 113 4 114 74] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
-    invariant { [#"../06_knights_tour.rs" 113 4 114 74] forall r : (usize, C06KnightsTour_Point_Type.t_point) . min = Core_Option_Option_Type.C_Some r -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) /\ index_logic0 v i = r) };
+    invariant { [#"../06_knights_tour.rs" 113 4 114 74] forall r : (usize, C06KnightsTour_Point_Type.t_point) . min = Core_Option_Option_Type.C_Some r
+     -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model0 v) /\ index_logic0 v i = r) };
     goto BB5
   }
   BB5 {
@@ -2095,7 +2176,8 @@ module C06KnightsTour_DumbNonlinearArith_Impl
   use prelude.UIntSize
   constant a  : usize
   function dumb_nonlinear_arith [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : ()
-  goal vc_dumb_nonlinear_arith : ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000) -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000)
+  goal vc_dumb_nonlinear_arith : ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000)
+   -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000)
 end
 module C06KnightsTour_KnightsTour
   use prelude.IntSize
@@ -2131,7 +2213,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv14 self}
     ensures { result = shallow_model3 self }
     
-  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv14 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
+  axiom shallow_model3_spec : forall self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv14 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv11 (shallow_model3 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model3 self) <= UIntSize.to_int max0)
   predicate invariant14 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv11 (shallow_model3 self)
   val invariant14 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -2160,7 +2243,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv13 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv12 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv13 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant12 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -2246,7 +2330,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self}
     ensures { result = shallow_model5 self }
     
-  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv15 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
+  axiom shallow_model5_spec : forall self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv15 (shallow_model5 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model5 self) <= UIntSize.to_int max0)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv15 (shallow_model5 self)
   val invariant5 (self : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -2265,7 +2350,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv4 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv6 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -2326,7 +2412,14 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv1 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq (isize, isize), b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq (isize, isize), c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv1 a) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv15 ab) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv15 bc) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), ab : Seq.seq (isize, isize), b : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global), bc : Seq.seq (isize, isize), c : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 248 15 248 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 249 15 249 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 22 251 23] inv1 a)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 31 251 33] inv15 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 43 251 44] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 52 251 54] inv15 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 251 64 251 65] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 250 14 250 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : ()
     
@@ -2336,7 +2429,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv1 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 244 21 244 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 243 14 243 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
@@ -2360,7 +2454,9 @@ module C06KnightsTour_KnightsTour
   predicate produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces0 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -2376,14 +2472,22 @@ module C06KnightsTour_KnightsTour
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv11 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv11 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv11 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv11 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces0 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl0 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -2418,7 +2522,8 @@ module C06KnightsTour_KnightsTour
   predicate resolve4 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self) -> resolve6 (index_logic0 self i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 self)
+     -> resolve6 (index_logic0 self i)
   val resolve4 (self : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve4 self }
     
@@ -2430,7 +2535,8 @@ module C06KnightsTour_KnightsTour
     ensures { result = shallow_model8 self }
     
   val min0 [#"../06_knights_tour.rs" 111 0 111 58] (v : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)) : Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point)
-    ensures { [#"../06_knights_tour.rs" 109 0 110 62] forall r : (usize, C06KnightsTour_Point_Type.t_point) . result = Core_Option_Option_Type.C_Some r -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model8 v) /\ index_logic0 v i = r) }
+    ensures { [#"../06_knights_tour.rs" 109 0 110 62] forall r : (usize, C06KnightsTour_Point_Type.t_point) . result = Core_Option_Option_Type.C_Some r
+     -> (exists i : int . 0 <= i /\ i < Seq.length (shallow_model8 v) /\ index_logic0 v i = r) }
     
   predicate resolve5 (self : isize) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
@@ -2446,7 +2552,8 @@ module C06KnightsTour_KnightsTour
   predicate resolve3 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../../creusot-contracts/src/std/vec.rs" 222 8 222 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model6 self) -> resolve2 (Seq.get (shallow_model6 self) i)
+    [#"../../../../../creusot-contracts/src/std/vec.rs" 222 8 222 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model6 self)
+     -> resolve2 (Seq.get (shallow_model6 self) i)
   val resolve3 (self : Alloc_Vec_IntoIter_IntoIter_Type.t_intoiter (isize, isize) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = resolve3 self }
     
@@ -2480,7 +2587,8 @@ module C06KnightsTour_KnightsTour
     ensures { result = index_logic2 self ix }
     
   predicate wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) =
-    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model2 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) -> Seq.length (shallow_model3 (index_logic2 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
+    [#"../06_knights_tour.rs" 31 8 35 9] UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) <= 1000 /\ Seq.length (shallow_model2 (C06KnightsTour_Board_Type.board_field self)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int (C06KnightsTour_Board_Type.board_size self)
+     -> Seq.length (shallow_model3 (index_logic2 (C06KnightsTour_Board_Type.board_field self) i)) = UIntSize.to_int (C06KnightsTour_Board_Type.board_size self))
   val wf0 [#"../06_knights_tour.rs" 30 4 30 23] (self : C06KnightsTour_Board_Type.t_board) : bool
     ensures { result = wf0 self }
     
@@ -2490,7 +2598,7 @@ module C06KnightsTour_KnightsTour
     
   val available0 [#"../06_knights_tour.rs" 52 4 52 41] (self : C06KnightsTour_Board_Type.t_board) (p : C06KnightsTour_Point_Type.t_point) : bool
     requires {[#"../06_knights_tour.rs" 50 15 50 24] wf0 self}
-    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result -> in_bounds0 self p }
+    ensures { [#"../06_knights_tour.rs" 51 4 51 44] result  -> in_bounds0 self p }
     
   val mov0 [#"../06_knights_tour.rs" 18 4 18 45] (self : C06KnightsTour_Point_Type.t_point) (p : (isize, isize)) : C06KnightsTour_Point_Type.t_point
     requires {[#"../06_knights_tour.rs" 12 15 12 52] - 10000 <= IntSize.to_int (C06KnightsTour_Point_Type.point_x self) /\ IntSize.to_int (C06KnightsTour_Point_Type.point_x self) <= 10000}
@@ -2561,7 +2669,8 @@ module C06KnightsTour_KnightsTour
     
   val moves0 [#"../06_knights_tour.rs" 95 0 95 33] (_1 : ()) : Alloc_Vec_Vec_Type.t_vec (isize, isize) (Alloc_Alloc_Global_Type.t_global)
     ensures { [#"../06_knights_tour.rs" 93 10 93 28] Seq.length (shallow_model5 result) = 8 }
-    ensures { [#"../06_knights_tour.rs" 94 0 94 130] forall i : int . 0 <= i /\ i < 8 -> - 2 <= IntSize.to_int (let (a, _) = index_logic3 result i in a) /\ IntSize.to_int (let (a, _) = index_logic3 result i in a) <= 2 /\ - 2 <= IntSize.to_int (let (_, a) = index_logic3 result i in a) /\ IntSize.to_int (let (_, a) = index_logic3 result i in a) <= 2 }
+    ensures { [#"../06_knights_tour.rs" 94 0 94 130] forall i : int . 0 <= i /\ i < 8
+     -> - 2 <= IntSize.to_int (let (a, _) = index_logic3 result i in a) /\ IntSize.to_int (let (a, _) = index_logic3 result i in a) <= 2 /\ - 2 <= IntSize.to_int (let (_, a) = index_logic3 result i in a) /\ IntSize.to_int (let (_, a) = index_logic3 result i in a) <= 2 }
     
   val new4 (_1 : ()) : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)
     ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 68 26 68 44] Seq.length (shallow_model0 result) = 0 }
@@ -2615,7 +2724,8 @@ module C06KnightsTour_KnightsTour
     requires {[#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000}
     ensures { result = dumb_nonlinear_arith0 a }
     
-  axiom dumb_nonlinear_arith0_spec : forall a : usize . ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000) -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000)
+  axiom dumb_nonlinear_arith0_spec : forall a : usize . ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000)
+   -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000)
   val set0 [#"../06_knights_tour.rs" 87 4 87 41] (self : borrowed (C06KnightsTour_Board_Type.t_board)) (p : C06KnightsTour_Point_Type.t_point) (v : usize) : ()
     requires {[#"../06_knights_tour.rs" 83 15 83 24] wf0 ( * self)}
     requires {[#"../06_knights_tour.rs" 84 15 84 32] in_bounds0 ( * self) p}
@@ -2807,7 +2917,8 @@ module C06KnightsTour_KnightsTour
   BB25 {
     invariant { [#"../06_knights_tour.rs" 148 8 149 54] inv1 iter1 };
     invariant { [#"../06_knights_tour.rs" 148 8 149 54] produces1 (Snapshot.inner iter_old1) (Snapshot.inner produced1) iter1 };
-    invariant { [#"../06_knights_tour.rs" 148 8 149 54] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 candidates) -> in_bounds0 board (let (_, a) = index_logic0 candidates i in a) };
+    invariant { [#"../06_knights_tour.rs" 148 8 149 54] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 candidates)
+     -> in_bounds0 board (let (_, a) = index_logic0 candidates i in a) };
     goto BB26
   }
   BB26 {
@@ -2973,5 +3084,6 @@ module C06KnightsTour_Impl3
     
   axiom inv0 : forall x : C06KnightsTour_Point_Type.t_point . inv0 x = true
   use prelude.Borrow
-  goal clone'_refn : [#"../06_knights_tour.rs" 4 15 4 20] forall self : C06KnightsTour_Point_Type.t_point . inv0 self -> (forall result : C06KnightsTour_Point_Type.t_point . result = self -> inv1 result /\ result = self)
+  goal clone'_refn : [#"../06_knights_tour.rs" 4 15 4 20] forall self : C06KnightsTour_Point_Type.t_point . inv0 self
+   -> (forall result : C06KnightsTour_Point_Type.t_point . result = self  -> inv1 result /\ result = self)
 end
diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
index da03d2a4a9..7a73cf7f08 100644
--- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg
+++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
@@ -123,7 +123,8 @@ module C07ReadWrite_ReadWrite
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv7 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv7 (shallow_model2 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -194,7 +195,8 @@ module C07ReadWrite_ReadWrite
     ensures { result = resolve0 self }
     
   predicate resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq t) (fin : Seq.seq t) =
-    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old' -> Seq.get old' i = Seq.get fin i
+    [#"../../../../../creusot-contracts/src/std/slice.rs" 129 8 129 96] forall i : int . 0 <= i /\ i <> UIntSize.to_int self /\ i < Seq.length old'
+     -> Seq.get old' i = Seq.get fin i
   val resolve_elswhere0 [@inline:trivial] (self : usize) (old' : Seq.seq t) (fin : Seq.seq t) : bool
     ensures { result = resolve_elswhere0 self old' fin }
     
diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index 4a52b2ef80..bcb27a7e3f 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -104,7 +104,8 @@ module C08Haystack_Search
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self}
     ensures { result = shallow_model2 self }
     
-  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
+  axiom shallow_model2_spec : forall self : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv9 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv10 (shallow_model2 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model2 self) <= UIntSize.to_int max0)
   predicate invariant9 (self : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv10 (shallow_model2 self)
   val invariant9 (self : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -201,7 +202,9 @@ module C08Haystack_Search
   predicate produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0 -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 21 8 27 9] Core_Ops_Range_Range_Type.range_end self = Core_Ops_Range_Range_Type.range_end o /\ deep_model0 (Core_Ops_Range_Range_Type.range_start self) <= deep_model0 (Core_Ops_Range_Range_Type.range_start o) /\ (Seq.length visited > 0
+     -> deep_model0 (Core_Ops_Range_Range_Type.range_start o) <= deep_model0 (Core_Ops_Range_Range_Type.range_end o)) /\ Seq.length visited = deep_model0 (Core_Ops_Range_Range_Type.range_start o) - deep_model0 (Core_Ops_Range_Range_Type.range_start self) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (Core_Ops_Range_Range_Type.range_start self) + i)
   val produces1 (self : Core_Ops_Range_Range_Type.t_range usize) (visited : Seq.seq usize) (o : Core_Ops_Range_Range_Type.t_range usize) : bool
     ensures { result = produces1 self visited o }
     
@@ -217,14 +220,22 @@ module C08Haystack_Search
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c}
     ensures { result = produces_trans1 a ab b bc c }
     
-  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv8 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv8 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
+  axiom produces_trans1_spec : forall a : Core_Ops_Range_Range_Type.t_range usize, ab : Seq.seq usize, b : Core_Ops_Range_Range_Type.t_range usize, bc : Seq.seq usize, c : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 37 15 37 32] produces1 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 38 15 38 32] produces1 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 22 40 23] inv1 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 31 40 33] inv8 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 52 40 53] inv1 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 61 40 63] inv8 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 40 82 40 83] inv1 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 39 14 39 42] produces1 a (Seq.(++) ab bc) c)
   use seq.Seq
   function produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
   val produces_refl1 (self : Core_Ops_Range_Range_Type.t_range usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self}
     ensures { result = produces_refl1 self }
     
-  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
+  axiom produces_refl1_spec : forall self : Core_Ops_Range_Range_Type.t_range usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 33 21 33 25] inv1 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 32 14 32 45] produces1 self (Seq.empty ) self)
   predicate invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant1 (self : Core_Ops_Range_Range_Type.t_range usize) : bool
@@ -249,7 +260,9 @@ module C08Haystack_Search
     requires {[#"../../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self}
     ensures { result = is_empty_log0 self }
     
-  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
+  axiom is_empty_log0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/ops.rs" 207 20 207 24] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/ops.rs" 206 4 206 88] not is_empty_log0 self
+   -> deep_model0 (start_log0 self) <= deep_model0 (end_log0 self))
   function range_inclusive_len0 (r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : int =
     [#"../../../../../creusot-contracts/src/std/iter/range.rs" 47 4 50 5] if is_empty_log0 r then
       0
@@ -260,11 +273,14 @@ module C08Haystack_Search
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r}
     ensures { result = range_inclusive_len0 r }
     
-  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
+  axiom range_inclusive_len0_spec : forall r : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 46 62 46 63] inv0 r)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 45 10 45 43] is_empty_log0 r = (range_inclusive_len0 r = 0))
   predicate produces0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (visited : Seq.seq usize) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize)
     
    =
-    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
+    [#"../../../../../creusot-contracts/src/std/iter/range.rs" 65 8 71 9] Seq.length visited = range_inclusive_len0 self - range_inclusive_len0 o /\ (is_empty_log0 self
+     -> is_empty_log0 o) /\ (is_empty_log0 o \/ end_log0 self = end_log0 o) /\ (forall i : int . 0 <= i /\ i < Seq.length visited
+     -> deep_model0 (Seq.get visited i) = deep_model0 (start_log0 self) + i)
   val produces0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) (visited : Seq.seq usize) (o : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : bool
     ensures { result = produces0 self visited o }
     
@@ -282,14 +298,22 @@ module C08Haystack_Search
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c}
     ensures { result = produces_trans0 a ab b bc c }
     
-  axiom produces_trans0_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, ab : Seq.seq usize, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, bc : Seq.seq usize, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces0 a ab b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces0 b bc c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv0 a) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv8 ab) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv0 b) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv8 bc) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces0 a (Seq.(++) ab bc) c)
+  axiom produces_trans0_spec : forall a : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, ab : Seq.seq usize, b : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize, bc : Seq.seq usize, c : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 81 15 81 32] produces0 a ab b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 82 15 82 32] produces0 b bc c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 22 84 23] inv0 a)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 31 84 33] inv8 ab)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 52 84 53] inv0 b)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 61 84 63] inv8 bc)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 84 82 84 83] inv0 c)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 83 14 83 42] produces0 a (Seq.(++) ab bc) c)
   function produces_refl0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : () =
     [#"../../../../../creusot-contracts/src/std/iter/range.rs" 74 4 74 10] ()
   val produces_refl0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : ()
     requires {[#"../../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self}
     ensures { result = produces_refl0 self }
     
-  axiom produces_refl0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces0 self (Seq.empty ) self)
+  axiom produces_refl0_spec : forall self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize . ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 77 21 77 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/iter/range.rs" 76 14 76 45] produces0 self (Seq.empty ) self)
   predicate invariant0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : bool
@@ -388,7 +412,8 @@ module C08Haystack_Search
   predicate match_at0 [#"../08_haystack.rs" 7 0 7 77] (needle : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (haystack : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (pos : int) (len : int)
     
    =
-    [#"../08_haystack.rs" 8 4 12 5] len <= Seq.length (shallow_model0 needle) /\ pos <= Seq.length (shallow_model0 haystack) - len /\ (forall i : int . 0 <= i /\ i < len -> index_logic1 needle i = index_logic1 haystack (pos + i))
+    [#"../08_haystack.rs" 8 4 12 5] len <= Seq.length (shallow_model0 needle) /\ pos <= Seq.length (shallow_model0 haystack) - len /\ (forall i : int . 0 <= i /\ i < len
+     -> index_logic1 needle i = index_logic1 haystack (pos + i))
   val match_at0 [#"../08_haystack.rs" 7 0 7 77] (needle : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (haystack : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (pos : int) (len : int) : bool
     ensures { result = match_at0 needle haystack pos len }
     
@@ -420,7 +445,8 @@ module C08Haystack_Search
     requires {inv3 end'}
     ensures { [#"../../../../../creusot-contracts/src/std/ops.rs" 220 26 220 53] start_log0 result = start }
     ensures { [#"../../../../../creusot-contracts/src/std/ops.rs" 221 26 221 49] end_log0 result = end' }
-    ensures { [#"../../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end' -> not is_empty_log0 result }
+    ensures { [#"../../../../../creusot-contracts/src/std/ops.rs" 222 16 222 93] deep_model0 start <= deep_model0 end'
+     -> not is_empty_log0 result }
     ensures { inv0 result }
     
   val len0 (self : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) : usize
@@ -430,8 +456,12 @@ module C08Haystack_Search
   let rec cfg search [#"../08_haystack.rs" 21 0 21 60] [@cfg:stackify] [@cfg:subregion_analysis] (needle : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) (haystack : Alloc_Vec_Vec_Type.t_vec uint8 (Alloc_Alloc_Global_Type.t_global)) : usize
     requires {[#"../08_haystack.rs" 15 11 15 65] Seq.length (shallow_model0 needle) >= 1 /\ Seq.length (shallow_model0 needle) <= Seq.length (shallow_model0 haystack)}
     ensures { [#"../08_haystack.rs" 16 10 16 85] UIntSize.to_int result = Seq.length (shallow_model0 haystack) \/ UIntSize.to_int result < Seq.length (shallow_model0 haystack) - Seq.length (shallow_model0 needle) + 1 }
-    ensures { [#"../08_haystack.rs" 17 0 19 108] UIntSize.to_int result < Seq.length (shallow_model0 haystack) -> match_at0 needle haystack (UIntSize.to_int result) (Seq.length (shallow_model0 needle)) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int result -> not match_at0 needle haystack i (Seq.length (shallow_model0 needle))) }
-    ensures { [#"../08_haystack.rs" 20 0 20 139] UIntSize.to_int result = Seq.length (shallow_model0 haystack) -> (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 haystack) -> not match_at0 needle haystack i (Seq.length (shallow_model0 needle))) }
+    ensures { [#"../08_haystack.rs" 17 0 19 108] UIntSize.to_int result < Seq.length (shallow_model0 haystack)
+     -> match_at0 needle haystack (UIntSize.to_int result) (Seq.length (shallow_model0 needle)) /\ (forall i : int . 0 <= i /\ i < UIntSize.to_int result
+     -> not match_at0 needle haystack i (Seq.length (shallow_model0 needle))) }
+    ensures { [#"../08_haystack.rs" 20 0 20 139] UIntSize.to_int result = Seq.length (shallow_model0 haystack)
+     -> (forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 haystack)
+     -> not match_at0 needle haystack i (Seq.length (shallow_model0 needle))) }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : usize;
@@ -503,7 +533,8 @@ module C08Haystack_Search
   BB7 {
     invariant { [#"../08_haystack.rs" 22 4 22 112] inv0 iter };
     invariant { [#"../08_haystack.rs" 22 4 22 112] produces0 (Snapshot.inner iter_old) (Snapshot.inner produced) iter };
-    invariant { [#"../08_haystack.rs" 22 4 22 112] forall k : int . 0 <= k /\ k < Seq.length (Snapshot.inner produced) -> not match_at0 needle haystack k (Seq.length (shallow_model0 needle)) };
+    invariant { [#"../08_haystack.rs" 22 4 22 112] forall k : int . 0 <= k /\ k < Seq.length (Snapshot.inner produced)
+     -> not match_at0 needle haystack k (Seq.length (shallow_model0 needle)) };
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
index 0393781d1b..dc1d4c242d 100644
--- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg
+++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
@@ -77,7 +77,8 @@ module C09Capacity_ChangeCapacity
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv2 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
@@ -122,7 +123,8 @@ module C09Capacity_ChangeCapacity
   let rec cfg change_capacity [#"../09_capacity.rs" 6 0 6 41] [@cfg:stackify] [@cfg:subregion_analysis] (v : borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global))) : ()
     requires {[#"../09_capacity.rs" 6 26 6 27] inv1 v}
     ensures { [#"../09_capacity.rs" 4 10 4 33] Seq.length (shallow_model0 ( ^ v)) = Seq.length (shallow_model1 v) }
-    ensures { [#"../09_capacity.rs" 5 0 5 69] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 v) -> index_logic0 ( ^ v) i = index_logic0 ( * v) i }
+    ensures { [#"../09_capacity.rs" 5 0 5 69] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 v)
+     -> index_logic0 ( ^ v) i = index_logic0 ( * v) i }
     
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -217,7 +219,8 @@ module C09Capacity_ClearVec
     requires {[#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self}
     ensures { result = shallow_model0 self }
     
-  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self) -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
+  axiom shallow_model0_spec : forall self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv0 self)
+   -> ([#"../../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv2 (shallow_model0 self)) && ([#"../../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model0 self) <= UIntSize.to_int max0)
   predicate invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) =
     [#"../../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv2 (shallow_model0 self)
   val invariant0 (self : Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)) : bool
diff --git a/why3/src/exp.rs b/why3/src/exp.rs
index 4acf9365c2..1194cd1d06 100644
--- a/why3/src/exp.rs
+++ b/why3/src/exp.rs
@@ -340,19 +340,11 @@ pub fn super_visit_trigger<T: ExpVisitor>(f: &mut T, trigger: &Trigger) {
 }
 
 impl Exp {
-    pub fn impure_qvar(q: QName) -> Self {
+    pub fn qvar(q: QName) -> Self {
         Exp::QVar(q)
     }
 
-    pub fn impure_var(v: Ident) -> Self {
-        Exp::Var(v)
-    }
-
-    pub fn pure_qvar(q: QName) -> Self {
-        Exp::QVar(q)
-    }
-
-    pub fn pure_var(v: impl Into<Ident>) -> Self {
+    pub fn var(v: impl Into<Ident>) -> Self {
         Exp::Var(v.into())
     }
 
@@ -872,7 +864,7 @@ impl Exp {
                         let mut extended = HashMap::new();
                         for (_, exp) in &mut subst {
                             for id in &bnds & &exp.fvs() {
-                                extended.insert(id.clone(), Exp::pure_var(format!("{}'", &*id)));
+                                extended.insert(id.clone(), Exp::var(format!("{}'", &*id)));
                             }
                         }
                         binders.iter_mut().for_each(|(id, _)| {
@@ -895,7 +887,7 @@ impl Exp {
                         let mut extended = HashMap::new();
                         for (_, exp) in &mut subst {
                             for id in &bnds & &exp.fvs() {
-                                extended.insert(id.clone(), Exp::pure_var(format!("{}'", &*id)));
+                                extended.insert(id.clone(), Exp::var(format!("{}'", &*id)));
                             }
                         }
                         binders.iter_mut().for_each(|(id, _)| {
diff --git a/why3/src/mlcfg/printer.rs b/why3/src/mlcfg/printer.rs
index 076f07818c..29431232fa 100644
--- a/why3/src/mlcfg/printer.rs
+++ b/why3/src/mlcfg/printer.rs
@@ -666,7 +666,14 @@ impl Print for Exp {
                 .append(" . ")
                 .append(exp.pretty(alloc)),
             Exp::Impl(box hyp, box exp) => {
-                parens!(alloc, self, hyp).append(" -> ").append(parens!(alloc, self, exp))
+                let hyp = parens!(alloc, self, hyp);
+                let impl_ = alloc
+                    .line()
+                    .append(alloc.text(" -> "))
+                    .append(parens!(alloc, self, exp))
+                    .group();
+
+                hyp.append(impl_)
             }
             Exp::Ascribe(e, t) => {
                 parens!(alloc, self, e).append(" : ").append(t.pretty(alloc)).group()
diff --git a/why3/src/name.rs b/why3/src/name.rs
index c45db84071..c1edf2e1c8 100644
--- a/why3/src/name.rs
+++ b/why3/src/name.rs
@@ -55,7 +55,7 @@ impl From<String> for Ident {
 
 impl From<QName> for Exp {
     fn from(q: QName) -> Self {
-        Exp::impure_qvar(q)
+        Exp::qvar(q)
     }
 }
 

From 52ce7e8b244549d208d43a0500bcce4f8db431a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Sat, 9 Mar 2024 19:58:52 +0100
Subject: [PATCH 59/66] setup: slight refactoring of the why3 config file
 generation

---
 .github/workflows/rust.yml |  4 ++--
 creusot-setup/src/lib.rs   |  7 +++++--
 creusot-setup/src/tools.rs | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2948aa9827..160fb88621 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -84,7 +84,7 @@ jobs:
         cargo run --bin cargo-creusot creusot setup install
         echo -e "\n>> ~/.config/creusot/Config.toml:\n"
         cat ~/.config/creusot/Config.toml
-        echo -e "\n>> ~/.config/creusot/.why3.conf:\n"
-        cat ~/.config/creusot/.why3.conf
+        echo -e "\n>> ~/.config/creusot/why3.conf:\n"
+        cat ~/.config/creusot/why3.conf
     - run: cargo test --test why3 "" -- --replay=none --diff-from=origin/master
     - run: cargo test --test why3 "" -- --skip-unstable
diff --git a/creusot-setup/src/lib.rs b/creusot-setup/src/lib.rs
index 1471b9ae8b..ebef8fd04a 100644
--- a/creusot-setup/src/lib.rs
+++ b/creusot-setup/src/lib.rs
@@ -13,9 +13,11 @@ use tools::*;
 use tools_versions_urls::*;
 use ToolsConfig::*;
 
+// CAUTION: on MacOS, [config_dir] and [data_dir] are in fact the same directory
 struct CfgPaths {
     config_dir: PathBuf,
     config_file: PathBuf,
+    why3_config_file: PathBuf,
     data_dir: PathBuf,
     bin_subdir: PathBuf,
     cache_dir: PathBuf,
@@ -32,6 +34,7 @@ fn get_config_paths(custom_config_dir: &Option<PathBuf>) -> anyhow::Result<CfgPa
     Ok(CfgPaths {
         config_dir: PathBuf::from(config_dir),
         config_file: config_dir.join("Config.toml"),
+        why3_config_file: config_dir.join("why3.conf"),
         data_dir: PathBuf::from(dirs.data_dir()),
         bin_subdir: dirs.data_dir().join("bin"),
         cache_dir: PathBuf::from(dirs.cache_dir()),
@@ -183,7 +186,7 @@ pub fn status_for_creusot(custom_config_dir: &Option<PathBuf>) -> anyhow::Result
                     }
                     Ok(CreusotFlags {
                         why3_path: why3_path.to_path_buf(),
-                        why3_config: Some(paths.config_dir.join(".why3.conf")),
+                        why3_config: Some(paths.why3_config_file),
                     })
                 }
             }
@@ -307,7 +310,7 @@ fn managed_download_and_generate_config(
     symlink_file(altergo_path, &paths.bin_subdir.join(ALTERGO.binary_name))?;
 
     // generate the corresponding .why3.conf
-    generate_why3_conf(why3_path, &paths.bin_subdir, &paths.config_dir)?;
+    generate_why3_conf(why3_path, &paths.bin_subdir, &paths.why3_config_file)?;
 
     // write the config file
     let config = Config {
diff --git a/creusot-setup/src/tools.rs b/creusot-setup/src/tools.rs
index 693834beb3..e01e099656 100644
--- a/creusot-setup/src/tools.rs
+++ b/creusot-setup/src/tools.rs
@@ -173,13 +173,22 @@ fn detect_why3_version(why3: &Path) -> Option<String> {
     })
 }
 
-pub fn generate_why3_conf(why3_path: &Path, bin_dir: &Path, dest_dir: &Path) -> anyhow::Result<()> {
+pub fn generate_why3_conf(
+    why3_path: &Path,
+    bin_dir: &Path,
+    dest_file: &Path,
+) -> anyhow::Result<()> {
     println!("Generating a fresh why3 configuration...");
-    let dest_file = dest_dir.join(".why3.conf");
-    let _ = fs::remove_file(dest_file);
+    // create or empty the destination file to avoid getting a warning from why3
+    // because it doesn't exist
+    {
+        let _ = fs::File::create(&dest_file);
+    }
     let status = Command::new(why3_path)
+        .arg("-C")
+        .arg(&dest_file)
         .args(["config", "detect"])
-        .envs([("PATH", bin_dir), ("HOME", dest_dir)])
+        .envs([("PATH", bin_dir)])
         .status()
         .context("launching 'why3 config detect' on downloaded solvers")?;
     if !status.success() {

From aff9f0b16000325342915c48e13c7a59e76c70e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C3=ABl=20Gu=C3=A9neau?= <armael.gueneau@ens-lyon.org>
Date: Mon, 11 Mar 2024 10:43:59 +0100
Subject: [PATCH 60/66] fix test 02_iter_mut

---
 .../tests/should_succeed/iterators/02_iter_mut/why3session.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
index 047a17ba5d..5841a8d79d 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "https://www.why3.org/why3session.dtd">
 <why3session shape_version="6">
-<prover id="0" name="CVC4" version="1.8" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="1" name="Z3" version="4.12.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="3" name="CVC5" version="1.0.5" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="4" name="Alt-Ergo" version="2.4.3" timelimit="1" steplimit="0" memlimit="1000"/>
@@ -24,7 +23,7 @@
     <proof prover="1"><result status="valid" time="0.137914" steps="123624"/></proof>
     </goal>
     <goal name="vc_produces_trans.0.0.1" proved="true">
-    <proof prover="0"><result status="valid" time="0.368971" steps="74078"/></proof>
+    <proof prover="1" timelimit="5"><result status="valid" time="0.102708" steps="573625"/></proof>
     </goal>
     <goal name="vc_produces_trans.0.0.2" proved="true">
     <proof prover="1"><result status="valid" time="0.126535" steps="573628"/></proof>

From c595c49df418efe03ad101ef890dfacd076d1223 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Thu, 29 Feb 2024 17:24:48 +0100
Subject: [PATCH 61/66] Remove unnecessary indirection in Expr

---
 creusot/src/translation/fmir.rs               | 10 +++++-----
 creusot/src/translation/function/statement.rs | 18 +++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index 2153be361a..1fd32b3f5b 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -96,14 +96,14 @@ impl<'tcx> Operand<'tcx> {
 pub enum ExprKind<'tcx> {
     Operand(Operand<'tcx>),
     // Revisit whether this is a good idea to allow general expression trees.
-    BinOp(BinOp, Box<Operand<'tcx>>, Box<Operand<'tcx>>),
-    UnaryOp(UnOp, Box<Operand<'tcx>>),
+    BinOp(BinOp, Operand<'tcx>, Operand<'tcx>),
+    UnaryOp(UnOp, Operand<'tcx>),
     Constructor(DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>),
-    Cast(Box<Operand<'tcx>>, Ty<'tcx>, Ty<'tcx>),
+    Cast(Operand<'tcx>, Ty<'tcx>, Ty<'tcx>),
     Tuple(Vec<Operand<'tcx>>),
-    Len(Box<Operand<'tcx>>),
+    Len(Operand<'tcx>),
     Array(Vec<Operand<'tcx>>),
-    Repeat(Box<Operand<'tcx>>, Box<Operand<'tcx>>),
+    Repeat(Operand<'tcx>, Operand<'tcx>),
 }
 
 impl<'tcx> Expr<'tcx> {
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index 843e97f707..4f847949df 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -108,13 +108,9 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 self.ctx.crash_and_error(si.span, "bitwise operations are currently unsupported")
             }
             Rvalue::BinaryOp(op, box (l, r)) | Rvalue::CheckedBinaryOp(op, box (l, r)) => {
-                ExprKind::BinOp(
-                    *op,
-                    Box::new(self.translate_operand(l)),
-                    Box::new(self.translate_operand(r)),
-                )
+                ExprKind::BinOp(*op, self.translate_operand(l), self.translate_operand(r))
             }
-            Rvalue::UnaryOp(op, v) => ExprKind::UnaryOp(*op, Box::new(self.translate_operand(v))),
+            Rvalue::UnaryOp(op, v) => ExprKind::UnaryOp(*op, self.translate_operand(v)),
             Rvalue::Aggregate(box kind, ops) => {
                 use rustc_middle::mir::AggregateKind::*;
                 let fields = ops.iter().map(|op| self.translate_operand(op)).collect();
@@ -159,20 +155,20 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             }
             Rvalue::Len(pl) => {
                 let e = Operand::Copy(self.translate_place(*pl));
-                ExprKind::Len(Box::new(e))
+                ExprKind::Len(e)
             }
             Rvalue::Cast(CastKind::IntToInt | CastKind::PtrToPtr, op, cast_ty) => {
                 let op_ty = op.ty(self.body, self.tcx);
-                ExprKind::Cast(Box::new(self.translate_operand(op)), op_ty, *cast_ty)
+                ExprKind::Cast(self.translate_operand(op), op_ty, *cast_ty)
             }
             Rvalue::Repeat(op, len) => ExprKind::Repeat(
-                Box::new(self.translate_operand(op)),
-                Box::new(Operand::Constant(crate::constant::from_ty_const(
+                self.translate_operand(op),
+                Operand::Constant(crate::constant::from_ty_const(
                     self.ctx,
                     *len,
                     self.param_env(),
                     si.span,
-                ))),
+                )),
             ),
 
             Rvalue::Cast(CastKind::PointerCoercion(PointerCoercion::Unsize), op, ty) => {

From 6fe4d144e89de4e4ae6715ba8b5d524a6cb83206 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Fri, 1 Mar 2024 10:45:37 +0100
Subject: [PATCH 62/66] Merge Expr with RValue

---
 creusot/src/backend/optimization.rs           | 88 ++++++++-----------
 creusot/src/backend/program.rs                | 78 ++++++++--------
 creusot/src/translation/fmir.rs               | 85 +++++++-----------
 creusot/src/translation/function/statement.rs | 37 ++++----
 .../src/translation/function/terminator.rs    | 11 +--
 5 files changed, 127 insertions(+), 172 deletions(-)

diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index d28a62db39..b78331cd1e 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -83,7 +83,7 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
         match b {
             Statement::Assignment(p, r, _) => {
                 self.write_place(p);
-                if let RValue::Expr(Expr { kind: ExprKind::Operand(_), .. }) = r {
+                if let RValue::Operand(_) = r {
                     self.move_chain(p.local);
                 }
                 self.visit_rvalue(r)
@@ -113,46 +113,40 @@ impl<'a, 'tcx> LocalUsage<'a, 'tcx> {
                 self.read_place(p);
                 self.read_place(p)
             }
-            RValue::Expr(e) => self.visit_expr(e),
-        }
-    }
-
-    // fn visit_term(&mut self, t: &Term<'tcx>) {}
-
-    fn visit_operand(&mut self, op: &Operand<'tcx>) {
-        match op {
-            Operand::Move(p) => self.read_place(p),
-            Operand::Copy(p) => self.read_place(p),
-            Operand::Constant(t) => self.visit_term(t),
-        }
-    }
-
-    fn visit_expr(&mut self, e: &Expr<'tcx>) {
-        match &e.kind {
-            ExprKind::Operand(op) => match op {
+            RValue::Operand(op) => match op {
                 Operand::Move(p) | Operand::Copy(p) => {
                     self.read_place(p);
                     // self.move_chain(p.local);
                 }
                 Operand::Constant(t) => self.visit_term(t),
             },
-            ExprKind::BinOp(_, l, r) => {
+            RValue::BinOp(_, l, r) => {
                 self.visit_operand(l);
                 self.visit_operand(r)
             }
-            ExprKind::UnaryOp(_, e) => self.visit_operand(e),
-            ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| self.visit_operand(e)),
-            ExprKind::Cast(e, _, _) => self.visit_operand(e),
-            ExprKind::Tuple(es) => es.iter().for_each(|e| self.visit_operand(e)),
-            ExprKind::Len(e) => self.visit_operand(e),
-            ExprKind::Array(es) => es.iter().for_each(|e| self.visit_operand(e)),
-            ExprKind::Repeat(l, r) => {
+            RValue::UnaryOp(_, e) => self.visit_operand(e),
+            RValue::Constructor(_, _, es) => es.iter().for_each(|e| self.visit_operand(e)),
+            RValue::Cast(e, _, _) => self.visit_operand(e),
+            RValue::Tuple(es) => es.iter().for_each(|e| self.visit_operand(e)),
+            RValue::Len(e) => self.visit_operand(e),
+            RValue::Array(es) => es.iter().for_each(|e| self.visit_operand(e)),
+            RValue::Repeat(l, r) => {
                 self.visit_operand(l);
                 self.visit_operand(r)
             }
         }
     }
 
+    // fn visit_term(&mut self, t: &Term<'tcx>) {}
+
+    fn visit_operand(&mut self, op: &Operand<'tcx>) {
+        match op {
+            Operand::Move(p) => self.read_place(p),
+            Operand::Copy(p) => self.read_place(p),
+            Operand::Constant(t) => self.visit_term(t),
+        }
+    }
+
     fn read_place(&mut self, p: &Place<'tcx>) {
         self.read(p.local, p.projection.is_empty());
         p.projection.iter().for_each(|p| match p {
@@ -219,6 +213,7 @@ impl<'a, 'tcx> TermVisitor<'tcx> for LocalUsage<'a, 'tcx> {
 }
 
 struct SimplePropagator<'tcx> {
+    /// Tracks how many reads and writes each variable has
     usage: HashMap<Symbol, Usage>,
     prop: HashMap<Symbol, Operand<'tcx>>,
     dead: HashSet<Symbol>,
@@ -244,14 +239,13 @@ impl<'tcx> SimplePropagator<'tcx> {
         for mut s in std::mem::take(&mut b.stmts) {
             self.visit_statement(&mut s);
             match s {
-                Statement::Assignment(l, RValue::Expr(r), _)
+                Statement::Assignment(l, RValue::Operand(op), _)
                     // we do not propagate calls to avoid moving them after the resolve of their arguments
                     if self.should_propagate(l.local) && !self.usage[&l.local].used_in_pure_ctx => {
-                        let Expr { kind: ExprKind::Operand(op), .. } = r else { panic!() };
                       self.prop.insert(l.local, op);
                       self.dead.insert(l.local);
                     }
-                Statement::Assignment(ref l, RValue::Expr(ref r), _) if self.should_erase(l.local) && r.is_pure() => {
+                Statement::Assignment(ref l, ref r, _) if self.should_erase(l.local) && r.is_pure() => {
                       self.dead.insert(l.local);
                 }
                 Statement::Resolve(_,_, ref p) => {
@@ -294,7 +288,21 @@ impl<'tcx> SimplePropagator<'tcx> {
             RValue::Borrow(_, p) => {
                 assert!(self.prop.get(&p.local).is_none(), "Trying to propagate borrowed variable")
             }
-            RValue::Expr(e) => self.visit_expr(e),
+            RValue::Operand(op) => self.visit_operand(op),
+            RValue::BinOp(_, l, r) => {
+                self.visit_operand(l);
+                self.visit_operand(r)
+            }
+            RValue::UnaryOp(_, e) => self.visit_operand(e),
+            RValue::Constructor(_, _, es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
+            RValue::Cast(e, _, _) => self.visit_operand(e),
+            RValue::Tuple(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
+            RValue::Len(e) => self.visit_operand(e),
+            RValue::Array(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
+            RValue::Repeat(l, r) => {
+                self.visit_operand(l);
+                self.visit_operand(r)
+            }
         }
     }
 
@@ -309,26 +317,6 @@ impl<'tcx> SimplePropagator<'tcx> {
         }
     }
 
-    fn visit_expr(&mut self, e: &mut Expr<'tcx>) {
-        match &mut e.kind {
-            ExprKind::Operand(op) => self.visit_operand(op),
-            ExprKind::BinOp(_, l, r) => {
-                self.visit_operand(l);
-                self.visit_operand(r)
-            }
-            ExprKind::UnaryOp(_, e) => self.visit_operand(e),
-            ExprKind::Constructor(_, _, es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
-            ExprKind::Cast(e, _, _) => self.visit_operand(e),
-            ExprKind::Tuple(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
-            ExprKind::Len(e) => self.visit_operand(e),
-            ExprKind::Array(es) => es.iter_mut().for_each(|e| self.visit_operand(e)),
-            ExprKind::Repeat(l, r) => {
-                self.visit_operand(l);
-                self.visit_operand(r)
-            }
-        }
-    }
-
     fn visit_term(&mut self, _t: &mut Term<'tcx>) {
         // TODO: Find a way to propagate Expr into Term
         //   _t.subst_with(|s| {
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index f3abb35d62..521b292ab1 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -12,9 +12,7 @@ use crate::{
     fmir::{BorrowKind, Operand},
     translation::{
         binop_to_binop,
-        fmir::{
-            self, Block, Branches, Expr, ExprKind, LocalDecls, Place, RValue, Statement, Terminator,
-        },
+        fmir::{self, Block, Branches, LocalDecls, Place, RValue, Statement, Terminator},
         function::promoted,
         unop_to_unop,
     },
@@ -23,7 +21,7 @@ use crate::{
 use rustc_hir::{def_id::DefId, Unsafety};
 use rustc_middle::{
     mir::{BasicBlock, BinOp, ProjectionElem},
-    ty::{GenericArgsRef, TyKind},
+    ty::{GenericArgsRef, Ty, TyKind},
 };
 use rustc_span::{Span, DUMMY_SP};
 use rustc_type_ir::{IntTy, UintTy};
@@ -310,29 +308,30 @@ impl<'tcx> Operand<'tcx> {
     }
 }
 
-impl<'tcx> Expr<'tcx> {
+impl<'tcx> RValue<'tcx> {
     pub(crate) fn to_why<N: Namer<'tcx>>(
         self,
         ctx: &mut Why3Generator<'tcx>,
         names: &mut N,
         locals: &LocalDecls<'tcx>,
+        ty: Ty<'tcx>,
     ) -> Exp {
-        let e = match self.kind {
-            ExprKind::Operand(op) => op.to_why(ctx, names, locals),
-            ExprKind::BinOp(BinOp::BitAnd, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
+        let e = match self {
+            RValue::Operand(op) => op.to_why(ctx, names, locals),
+            RValue::BinOp(BinOp::BitAnd, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 l.to_why(ctx, names, locals).lazy_and(r.to_why(ctx, names, locals))
             }
-            ExprKind::BinOp(BinOp::Eq, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
+            RValue::BinOp(BinOp::Eq, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
                 Exp::qvar(QName::from_string("Bool.eqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
-            ExprKind::BinOp(BinOp::Ne, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
+            RValue::BinOp(BinOp::Ne, l, r) if l.ty(ctx.tcx, locals).is_bool() => {
                 names.import_prelude_module(PreludeModule::Bool);
                 Exp::qvar(QName::from_string("Bool.neqb").unwrap())
                     .app(vec![l.to_why(ctx, names, locals), r.to_why(ctx, names, locals)])
             }
-            ExprKind::BinOp(op, l, r) => {
+            RValue::BinOp(op, l, r) => {
                 let ty = l.ty(ctx.tcx, locals);
                 // Hack
                 translate_ty(ctx, names, DUMMY_SP, ty);
@@ -343,20 +342,20 @@ impl<'tcx> Expr<'tcx> {
                     Box::new(r.to_why(ctx, names, locals)),
                 )
             }
-            ExprKind::UnaryOp(op, arg) => Exp::UnaryOp(
+            RValue::UnaryOp(op, arg) => Exp::UnaryOp(
                 unop_to_unop(arg.ty(ctx.tcx, locals), op),
                 Box::new(arg.to_why(ctx, names, locals)),
             ),
-            ExprKind::Constructor(id, subst, args) => {
+            RValue::Constructor(id, subst, args) => {
                 let args = args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
 
                 let ctor = names.constructor(id, subst);
                 Exp::Constructor { ctor, args }
             }
-            ExprKind::Tuple(f) => {
+            RValue::Tuple(f) => {
                 Exp::Tuple(f.into_iter().map(|f| f.to_why(ctx, names, locals)).collect())
             }
-            ExprKind::Cast(e, source, target) => {
+            RValue::Cast(e, source, target) => {
                 let to_int = match source.kind() {
                     TyKind::Int(ity) => {
                         names.import_prelude_module(int_to_prelude(*ity));
@@ -387,14 +386,14 @@ impl<'tcx> Expr<'tcx> {
 
                 from_int.app_to(to_int.app_to(e.to_why(ctx, names, locals)))
             }
-            ExprKind::Len(pl) => {
+            RValue::Len(pl) => {
                 let len_call = Exp::qvar(QName::from_string("Slice.length").unwrap())
                     .app_to(pl.to_why(ctx, names, locals));
                 len_call
             }
-            ExprKind::Array(fields) => {
+            RValue::Array(fields) => {
                 let id = Ident::build("__arr_temp");
-                let ty = translate_ty(ctx, names, DUMMY_SP, self.ty);
+                let ty = translate_ty(ctx, names, DUMMY_SP, ty);
 
                 let len = fields.len();
 
@@ -423,36 +422,37 @@ impl<'tcx> Expr<'tcx> {
                     )),
                 }
             }
-            ExprKind::Repeat(e, len) => Exp::qvar(QName::from_string("Slice.create").unwrap())
+            RValue::Repeat(e, len) => Exp::qvar(QName::from_string("Slice.create").unwrap())
                 .app_to(len.to_why(ctx, names, locals))
                 .app_to(Exp::FnLit(Box::new(e.to_why(ctx, names, locals)))),
+            RValue::Ghost(t) => lower_pure(ctx, names, &t),
+            RValue::Borrow(_, _) => todo!(),
         };
 
-        if self.span != DUMMY_SP {
-            ctx.attach_span(self.span, e)
-        } else {
-            e
-        }
+        e
     }
 
+    /// Gather the set of places which are moved out of by an expression
     fn invalidated_places(&self, places: &mut Vec<fmir::Place<'tcx>>) {
-        match &self.kind {
-            ExprKind::Operand(Operand::Move(p)) => places.push(p.clone()),
-            ExprKind::Operand(_) => {}
-            ExprKind::BinOp(_, l, r) => {
+        match &self {
+            RValue::Operand(Operand::Move(p)) => places.push(p.clone()),
+            RValue::Operand(_) => {}
+            RValue::BinOp(_, l, r) => {
                 l.invalidated_places(places);
                 r.invalidated_places(places)
             }
-            ExprKind::UnaryOp(_, e) => e.invalidated_places(places),
-            ExprKind::Constructor(_, _, es) => es.iter().for_each(|e| e.invalidated_places(places)),
-            ExprKind::Cast(e, _, _) => e.invalidated_places(places),
-            ExprKind::Tuple(es) => es.iter().for_each(|e| e.invalidated_places(places)),
-            ExprKind::Len(e) => e.invalidated_places(places),
-            ExprKind::Array(f) => f.iter().for_each(|f| f.invalidated_places(places)),
-            ExprKind::Repeat(e, len) => {
+            RValue::UnaryOp(_, e) => e.invalidated_places(places),
+            RValue::Constructor(_, _, es) => es.iter().for_each(|e| e.invalidated_places(places)),
+            RValue::Cast(e, _, _) => e.invalidated_places(places),
+            RValue::Tuple(es) => es.iter().for_each(|e| e.invalidated_places(places)),
+            RValue::Len(e) => e.invalidated_places(places),
+            RValue::Array(f) => f.iter().for_each(|f| f.invalidated_places(places)),
+            RValue::Repeat(e, len) => {
                 e.invalidated_places(places);
                 len.invalidated_places(places)
             }
+            RValue::Ghost(_) => {}
+            RValue::Borrow(_, _) => {}
         }
     }
 }
@@ -703,14 +703,10 @@ impl<'tcx> Statement<'tcx> {
                     place::create_assign_inner(ctx, names, locals, &rhs, reassign, span),
                 ]
             }
-            Statement::Assignment(lhs, RValue::Ghost(rhs), span) => {
-                let ghost = lower_pure(ctx, names, &rhs);
-                vec![place::create_assign_inner(ctx, names, locals, &lhs, ghost, span)]
-            }
-            Statement::Assignment(lhs, RValue::Expr(rhs), span) => {
+            Statement::Assignment(lhs, rhs, span) => {
                 let mut invalid = Vec::new();
                 rhs.invalidated_places(&mut invalid);
-                let rhs = rhs.to_why(ctx, names, locals);
+                let rhs = rhs.to_why(ctx, names, locals, lhs.ty(ctx.tcx, locals));
                 let mut exps =
                     vec![place::create_assign_inner(ctx, names, locals, &lhs, rhs, span)];
                 invalidate_places(ctx, names, locals, span, invalid, &mut exps);
diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index 1fd32b3f5b..a8d2c171c0 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -64,13 +64,44 @@ pub enum BorrowKind {
 pub enum RValue<'tcx> {
     Ghost(Term<'tcx>),
     Borrow(BorrowKind, Place<'tcx>),
-    Expr(Expr<'tcx>),
+    Operand(Operand<'tcx>),
+    BinOp(BinOp, Operand<'tcx>, Operand<'tcx>),
+    UnaryOp(UnOp, Operand<'tcx>),
+    Constructor(DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>),
+    Cast(Operand<'tcx>, Ty<'tcx>, Ty<'tcx>),
+    Tuple(Vec<Operand<'tcx>>),
+    Len(Operand<'tcx>),
+    Array(Vec<Operand<'tcx>>),
+    Repeat(Operand<'tcx>, Operand<'tcx>),
+}
+
+impl<'tcx> RValue<'tcx> {
+    /// Returns true if the expression generates verification conditions
+    pub fn is_pure(&self) -> bool {
+        match &self {
+            RValue::Operand(_) => true,
+            RValue::BinOp(BinOp::Add | BinOp::Mul | BinOp::Rem | BinOp::Div | BinOp::Sub, _, _) => {
+                false
+            }
+            RValue::BinOp(_, _, _) => true,
+            RValue::UnaryOp(UnOp::Neg, _) => false,
+            RValue::UnaryOp(_, _) => true,
+            RValue::Constructor(_, _, _) => true,
+            RValue::Cast(_, _, _) => false,
+            RValue::Tuple(_) => true,
+            RValue::Len(_) => true,
+            RValue::Array(_) => true,
+            RValue::Repeat(_, _) => true,
+            RValue::Ghost(_) => true,
+            RValue::Borrow(_, _) => false,
+        }
+    }
 }
 
 // TODO Inline `Expr` in to `RValue`
 #[derive(Clone, Debug)]
 pub struct Expr<'tcx> {
-    pub kind: ExprKind<'tcx>,
+    pub kind: (),
     pub ty: Ty<'tcx>,
     pub span: Span,
 }
@@ -92,56 +123,6 @@ impl<'tcx> Operand<'tcx> {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum ExprKind<'tcx> {
-    Operand(Operand<'tcx>),
-    // Revisit whether this is a good idea to allow general expression trees.
-    BinOp(BinOp, Operand<'tcx>, Operand<'tcx>),
-    UnaryOp(UnOp, Operand<'tcx>),
-    Constructor(DefId, GenericArgsRef<'tcx>, Vec<Operand<'tcx>>),
-    Cast(Operand<'tcx>, Ty<'tcx>, Ty<'tcx>),
-    Tuple(Vec<Operand<'tcx>>),
-    Len(Operand<'tcx>),
-    Array(Vec<Operand<'tcx>>),
-    Repeat(Operand<'tcx>, Operand<'tcx>),
-}
-
-impl<'tcx> Expr<'tcx> {
-    pub fn is_call(&self) -> bool {
-        match &self.kind {
-            ExprKind::Operand(_) => false,
-            ExprKind::BinOp(_, _, _) => false,
-            ExprKind::UnaryOp(_, _) => false,
-            ExprKind::Constructor(_, _, _) => false,
-            ExprKind::Cast(_, _, _) => false,
-            ExprKind::Tuple(_) => false,
-            ExprKind::Len(_) => false,
-            ExprKind::Array(_) => false,
-            ExprKind::Repeat(_, _) => false,
-        }
-    }
-
-    pub fn is_pure(&self) -> bool {
-        match &self.kind {
-            ExprKind::Operand(_) => true,
-            ExprKind::BinOp(
-                BinOp::Add | BinOp::Mul | BinOp::Rem | BinOp::Div | BinOp::Sub,
-                _,
-                _,
-            ) => false,
-            ExprKind::BinOp(_, _, _) => true,
-            ExprKind::UnaryOp(UnOp::Neg, _) => false,
-            ExprKind::UnaryOp(_, _) => true,
-            ExprKind::Constructor(_, _, _) => true,
-            ExprKind::Cast(_, _, _) => false,
-            ExprKind::Tuple(_) => true,
-            ExprKind::Len(_) => true,
-            ExprKind::Array(_) => true,
-            ExprKind::Repeat(_, _) => true,
-        }
-    }
-}
-
 #[derive(Clone)]
 pub enum Terminator<'tcx> {
     Goto(BasicBlock),
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index 4f847949df..ac596ec0a2 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -3,7 +3,7 @@ use crate::{
     analysis::NotFinalPlaces,
     fmir::Operand,
     translation::{
-        fmir::{self, Expr, ExprKind, RValue},
+        fmir::{self, RValue},
         specification::inv_subst,
     },
     util::{self, snapshot_closure_id},
@@ -72,16 +72,16 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
         rvalue: &'_ Rvalue<'tcx>,
         loc: Location,
     ) {
-        let ty = rvalue.ty(self.body, self.tcx);
+        let _ty = rvalue.ty(self.body, self.tcx);
         let span = si.span;
-        let rval: ExprKind<'tcx> = match rvalue {
+        let rval: RValue<'tcx> = match rvalue {
             Rvalue::Use(op) => match op {
-                Move(_pl) | Copy(_pl) => ExprKind::Operand(self.translate_operand(op)),
+                Move(_pl) | Copy(_pl) => RValue::Operand(self.translate_operand(op)),
                 Constant(box c) => {
                     if snapshot_closure_id(self.tcx, c.const_.ty()).is_some() {
                         return;
                     };
-                    ExprKind::Operand(self.translate_operand(op))
+                    RValue::Operand(self.translate_operand(op))
                 }
             },
             Rvalue::Ref(_, ss, pl) => match ss {
@@ -91,7 +91,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                     }
 
                     let op = Operand::Copy(self.translate_place(self.compute_ref_place(*pl, loc)));
-                    ExprKind::Operand(op)
+                    RValue::Operand(op)
                 }
                 Mut { .. } => {
                     if self.erased_locals.contains(pl.local) {
@@ -108,20 +108,20 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 self.ctx.crash_and_error(si.span, "bitwise operations are currently unsupported")
             }
             Rvalue::BinaryOp(op, box (l, r)) | Rvalue::CheckedBinaryOp(op, box (l, r)) => {
-                ExprKind::BinOp(*op, self.translate_operand(l), self.translate_operand(r))
+                RValue::BinOp(*op, self.translate_operand(l), self.translate_operand(r))
             }
-            Rvalue::UnaryOp(op, v) => ExprKind::UnaryOp(*op, self.translate_operand(v)),
+            Rvalue::UnaryOp(op, v) => RValue::UnaryOp(*op, self.translate_operand(v)),
             Rvalue::Aggregate(box kind, ops) => {
                 use rustc_middle::mir::AggregateKind::*;
                 let fields = ops.iter().map(|op| self.translate_operand(op)).collect();
 
                 match kind {
-                    Tuple => ExprKind::Tuple(fields),
+                    Tuple => RValue::Tuple(fields),
                     Adt(adt, varix, subst, _, _) => {
                         // self.ctx.translate(*adt);
                         let variant = self.tcx.adt_def(*adt).variant(*varix).def_id;
 
-                        ExprKind::Constructor(variant, subst, fields)
+                        RValue::Constructor(variant, subst, fields)
                     }
                     Closure(def_id, subst) => {
                         if util::is_invariant(self.tcx, *def_id)
@@ -143,10 +143,10 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                         } else if util::is_spec(self.tcx, *def_id) {
                             return;
                         } else {
-                            ExprKind::Constructor(*def_id, subst, fields)
+                            RValue::Constructor(*def_id, subst, fields)
                         }
                     }
-                    Array(_) => ExprKind::Array(fields),
+                    Array(_) => RValue::Array(fields),
                     _ => self.ctx.crash_and_error(
                         si.span,
                         &format!("the rvalue {:?} is not currently supported", kind),
@@ -155,13 +155,13 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             }
             Rvalue::Len(pl) => {
                 let e = Operand::Copy(self.translate_place(*pl));
-                ExprKind::Len(e)
+                RValue::Len(e)
             }
             Rvalue::Cast(CastKind::IntToInt | CastKind::PtrToPtr, op, cast_ty) => {
                 let op_ty = op.ty(self.body, self.tcx);
-                ExprKind::Cast(self.translate_operand(op), op_ty, *cast_ty)
+                RValue::Cast(self.translate_operand(op), op_ty, *cast_ty)
             }
-            Rvalue::Repeat(op, len) => ExprKind::Repeat(
+            Rvalue::Repeat(op, len) => RValue::Repeat(
                 self.translate_operand(op),
                 Operand::Constant(crate::constant::from_ty_const(
                     self.ctx,
@@ -174,7 +174,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             Rvalue::Cast(CastKind::PointerCoercion(PointerCoercion::Unsize), op, ty) => {
                 if let Some(t) = ty.builtin_deref(true) && t.ty.is_slice() {
                     // treat &[T; N] to &[T] casts as normal assignments
-                    ExprKind::Operand(self.translate_operand(op))
+                    RValue::Operand(self.translate_operand(op))
                 } else {
                     // TODO: Since we don't do anything with casts into `dyn` objects, just ignore them
                     return;
@@ -205,7 +205,6 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 &format!("MIR code used an unsupported Rvalue {:?}", rvalue),
             ),
         };
-        let rval = Expr { span, ty, kind: rval };
 
         if let Some(resolver) = &mut self.resolver {
             let need_resolve_before = resolver.need_resolve_locals_before(loc);
@@ -215,7 +214,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 self.emit_resolve(*place);
             }
 
-            self.emit_assignment(place, RValue::Expr(rval), span);
+            self.emit_assignment(place, rval, span);
 
             // Check if the local is a zombie:
             // if lhs local is dead after the assignment, emit resolve
@@ -223,7 +222,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 self.emit_resolve(*place);
             }
         } else {
-            self.emit_assignment(place, RValue::Expr(rval), span);
+            self.emit_assignment(place, rval, span);
         }
     }
 
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index dc33ca92b9..d73786d91b 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -111,16 +111,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 if self.is_box_new(fun_def_id) {
                     assert_eq!(func_args.len(), 1);
 
-                    let arg_ty = func_args[0].ty(self.tcx, &self.vars);
-                    self.emit_assignment(
-                        &loc,
-                        RValue::Expr(Expr {
-                            kind: ExprKind::Operand(func_args.remove(0)),
-                            ty: arg_ty,
-                            span,
-                        }),
-                        span,
-                    );
+                    self.emit_assignment(&loc, RValue::Operand(func_args.remove(0)), span);
                 } else {
                     let (fun_def_id, subst) =
                         resolve_function(self.ctx, self.param_env(), fun_def_id, subst, span);

From bf1c6259ca6ca2bed683e875746d8a58b2e83869 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Mon, 11 Mar 2024 11:45:15 +0100
Subject: [PATCH 63/66] Update spans

---
 creusot/src/backend/optimization.rs           |   3 +
 .../bug/01_resolve_unsoundness.mlcfg          |   8 +-
 creusot/tests/should_fail/bug/222.mlcfg       |   2 +-
 creusot/tests/should_fail/bug/492.mlcfg       |  10 +-
 creusot/tests/should_fail/bug/692.mlcfg       |  24 +-
 creusot/tests/should_fail/bug/695.mlcfg       |  28 +-
 creusot/tests/should_fail/bug/869.mlcfg       |   4 +-
 .../tests/should_fail/bug/specialize.mlcfg    |   6 +-
 creusot/tests/should_fail/bug/subregion.mlcfg |  12 +-
 creusot/tests/should_fail/final_borrows.mlcfg |  18 +-
 .../should_fail/opaque_unproveable.mlcfg      |   2 +-
 .../traits/17_impl_refinement.mlcfg           |   2 +-
 creusot/tests/should_succeed/100doors.mlcfg   |  26 +-
 creusot/tests/should_succeed/all_zero.mlcfg   |   8 +-
 creusot/tests/should_succeed/bdd.mlcfg        | 168 +++----
 .../tests/should_succeed/binary_search.mlcfg  |  68 +--
 .../tests/should_succeed/bug/02_derive.mlcfg  |   2 +-
 creusot/tests/should_succeed/bug/168.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/173.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/195.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/206.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/235.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/256.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/258.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/271.mlcfg    |  22 +-
 creusot/tests/should_succeed/bug/273.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/387.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/395.mlcfg    |  22 +-
 creusot/tests/should_succeed/bug/463.mlcfg    |  12 +-
 creusot/tests/should_succeed/bug/486.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/510.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/511.mlcfg    |  24 +-
 creusot/tests/should_succeed/bug/528.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/545.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/552.mlcfg    |   4 +-
 creusot/tests/should_succeed/bug/570.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/594.mlcfg    |  38 +-
 creusot/tests/should_succeed/bug/641.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/653.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/682.mlcfg    |   6 +-
 creusot/tests/should_succeed/bug/691.mlcfg    |  10 +-
 creusot/tests/should_succeed/bug/693.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/789.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/791.mlcfg    |   2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |   8 +-
 creusot/tests/should_succeed/bug/949.mlcfg    |   6 +-
 .../should_succeed/bug/final_borrows.mlcfg    |  60 +--
 .../should_succeed/bug/minus_assoc.mlcfg      |   2 +-
 .../tests/should_succeed/bug/two_phase.mlcfg  |   2 +-
 creusot/tests/should_succeed/cell/01.mlcfg    |   8 +-
 creusot/tests/should_succeed/cell/02.mlcfg    |  22 +-
 .../should_succeed/cell/02/why3session.xml    |  30 +-
 .../tests/should_succeed/checked_ops.mlcfg    | 464 +++++++++---------
 creusot/tests/should_succeed/clones/01.mlcfg  |   2 +-
 creusot/tests/should_succeed/clones/02.mlcfg  |   2 +-
 creusot/tests/should_succeed/clones/03.mlcfg  |   6 +-
 creusot/tests/should_succeed/clones/04.mlcfg  |   2 +-
 .../should_succeed/closures/01_basic.mlcfg    |  46 +-
 .../should_succeed/closures/02_nested.mlcfg   |  14 +-
 .../closures/03_generic_bound.mlcfg           |   6 +-
 .../closures/04_generic_closure.mlcfg         |   8 +-
 .../should_succeed/closures/05_map.mlcfg      |   8 +-
 .../should_succeed/closures/06_fn_specs.mlcfg |   6 +-
 .../closures/07_mutable_capture.mlcfg         |  16 +-
 .../closures/08_multiple_calls.mlcfg          |   8 +-
 creusot/tests/should_succeed/drop_pair.mlcfg  |   8 +-
 creusot/tests/should_succeed/duration.mlcfg   |  24 +-
 .../should_succeed/filter_positive.mlcfg      |  40 +-
 .../should_succeed/ghost_ptr_token.mlcfg      |  10 +-
 creusot/tests/should_succeed/hashmap.mlcfg    | 100 ++--
 .../should_succeed/heapsort_generic.mlcfg     |  48 +-
 creusot/tests/should_succeed/hillel.mlcfg     |  92 ++--
 creusot/tests/should_succeed/immut.mlcfg      |   6 +-
 .../tests/should_succeed/index_range.mlcfg    | 392 +++++++--------
 .../inplace_list_reversal.mlcfg               |  20 +-
 creusot/tests/should_succeed/instant.mlcfg    |   2 +-
 .../should_succeed/invariant_moves.mlcfg      |   2 +-
 .../tests/should_succeed/ite_normalize.mlcfg  |  86 ++--
 .../should_succeed/iterators/01_range.mlcfg   |  24 +-
 .../iterators/02_iter_mut.mlcfg               |  14 +-
 .../iterators/03_std_iterators.mlcfg          |  98 ++--
 .../should_succeed/iterators/04_skip.mlcfg    |  12 +-
 .../should_succeed/iterators/05_map.mlcfg     |  10 +-
 .../iterators/06_map_precond.mlcfg            |  44 +-
 .../should_succeed/iterators/07_fuse.mlcfg    |  12 +-
 .../iterators/08_collect_extend.mlcfg         |  20 +-
 .../should_succeed/iterators/09_empty.mlcfg   |   2 +-
 .../should_succeed/iterators/11_repeat.mlcfg  |   2 +-
 .../should_succeed/iterators/12_zip.mlcfg     |  16 +-
 .../iterators/15_enumerate.mlcfg              |  14 +-
 .../should_succeed/iterators/16_take.mlcfg    |   6 +-
 creusot/tests/should_succeed/knapsack.mlcfg   |  60 +--
 .../tests/should_succeed/knapsack_full.mlcfg  |  62 +--
 .../should_succeed/lang/assoc_type.mlcfg      |   2 +-
 .../should_succeed/lang/branch_borrow_2.mlcfg |  56 +--
 creusot/tests/should_succeed/lang/const.mlcfg |   2 +-
 creusot/tests/should_succeed/lang/empty.mlcfg |   2 +-
 .../tests/should_succeed/lang/float_ops.mlcfg |  12 +-
 .../tests/should_succeed/lang/literals.mlcfg  |  10 +-
 .../should_succeed/lang/module_paths.mlcfg    |   2 +-
 .../tests/should_succeed/lang/modules.mlcfg   |   8 +-
 .../tests/should_succeed/lang/move_path.mlcfg |  10 +-
 .../should_succeed/lang/multiple_scopes.mlcfg |  10 +-
 .../lang/promoted_constants.mlcfg             |  30 +-
 .../tests/should_succeed/lang/unary_op.mlcfg  |   2 +-
 .../tests/should_succeed/lang/unions.mlcfg    |   2 +-
 .../tests/should_succeed/lang/while_let.mlcfg |   8 +-
 .../tests/should_succeed/list_index_mut.mlcfg |  20 +-
 .../should_succeed/list_reversal_lasso.mlcfg  |  48 +-
 creusot/tests/should_succeed/loop.mlcfg       |   6 +-
 .../tests/should_succeed/mapping_test.mlcfg   |   8 +-
 creusot/tests/should_succeed/match_int.mlcfg  |  12 +-
 creusot/tests/should_succeed/mc91.mlcfg       |   6 +-
 creusot/tests/should_succeed/mutex.mlcfg      |  24 +-
 .../should_succeed/one_side_update.mlcfg      |  10 +-
 creusot/tests/should_succeed/option.mlcfg     |  82 ++--
 creusot/tests/should_succeed/ord_trait.mlcfg  |   6 +-
 .../should_succeed/projection_toggle.mlcfg    |  10 +-
 .../tests/should_succeed/projections.mlcfg    |  26 +-
 creusot/tests/should_succeed/prophecy.mlcfg   |   6 +-
 .../tests/should_succeed/red_black_tree.mlcfg | 248 +++++-----
 creusot/tests/should_succeed/replace.mlcfg    |   4 +-
 .../tests/should_succeed/resolve_uninit.mlcfg |  26 +-
 creusot/tests/should_succeed/result/own.mlcfg | 122 ++---
 .../tests/should_succeed/result/result.mlcfg  | 104 ++--
 .../should_succeed/rusthorn/inc_max.mlcfg     |   8 +-
 .../should_succeed/rusthorn/inc_max_3.mlcfg   |  32 +-
 .../rusthorn/inc_max_many.mlcfg               |  14 +-
 .../rusthorn/inc_max_repeat.mlcfg             |  20 +-
 .../rusthorn/inc_some_2_list.mlcfg            |  28 +-
 .../rusthorn/inc_some_2_tree.mlcfg            |  32 +-
 .../rusthorn/inc_some_list.mlcfg              |  16 +-
 .../rusthorn/inc_some_tree.mlcfg              |  20 +-
 .../selection_sort_generic.mlcfg              |  30 +-
 creusot/tests/should_succeed/slices/01.mlcfg  |  32 +-
 .../tests/should_succeed/slices/02_std.mlcfg  |   8 +-
 .../tests/should_succeed/sparse_array.mlcfg   |  52 +-
 creusot/tests/should_succeed/spec_tests.mlcfg |   2 +-
 .../specification/division.mlcfg              |   6 +-
 .../should_succeed/specification/forall.mlcfg |   2 +-
 .../specification/logic_call.mlcfg            |   2 +-
 .../specification/logic_functions.mlcfg       |   4 +-
 .../should_succeed/specification/loops.mlcfg  |   2 +-
 .../should_succeed/specification/model.mlcfg  |   4 +-
 .../should_succeed/specification/opaque.mlcfg |   2 +-
 .../tests/should_succeed/split_borrow.mlcfg   |  34 +-
 creusot/tests/should_succeed/std_types.mlcfg  |   2 +-
 creusot/tests/should_succeed/sum.mlcfg        |  12 +-
 .../tests/should_succeed/sum_of_odds.mlcfg    |  20 +-
 .../tests/should_succeed/swap_borrows.mlcfg   |  14 +-
 creusot/tests/should_succeed/switch.mlcfg     |  12 +-
 .../tests/should_succeed/switch_struct.mlcfg  |   8 +-
 .../should_succeed/syntax/01_idents.mlcfg     |  10 +-
 .../should_succeed/syntax/02_operators.mlcfg  |  42 +-
 .../should_succeed/syntax/04_assoc_prec.mlcfg |   4 +-
 .../syntax/05_annotations.mlcfg               |   2 +-
 .../should_succeed/syntax/05_pearlite.mlcfg   |  10 +-
 .../syntax/07_extern_spec.mlcfg               |   2 +-
 .../should_succeed/syntax/09_maintains.mlcfg  |  10 +-
 .../syntax/10_mutual_rec_types.mlcfg          |   8 +-
 .../syntax/11_array_types.mlcfg               |  14 +-
 .../should_succeed/syntax/12_ghost_code.mlcfg |  26 +-
 .../should_succeed/syntax/13_vec_macro.mlcfg  |   4 +-
 .../should_succeed/syntax/14_const_fns.mlcfg  |   2 +-
 .../should_succeed/syntax/derive_macros.mlcfg |  44 +-
 .../tests/should_succeed/take_first_mut.mlcfg |  10 +-
 creusot/tests/should_succeed/trait.mlcfg      |   4 +-
 creusot/tests/should_succeed/trait_impl.mlcfg |   4 +-
 creusot/tests/should_succeed/traits/03.mlcfg  |   6 +-
 creusot/tests/should_succeed/traits/04.mlcfg  |   2 +-
 creusot/tests/should_succeed/traits/07.mlcfg  |   4 +-
 creusot/tests/should_succeed/traits/08.mlcfg  |   4 +-
 creusot/tests/should_succeed/traits/09.mlcfg  |   4 +-
 creusot/tests/should_succeed/traits/11.mlcfg  |   2 +-
 .../traits/12_default_method.mlcfg            |   4 +-
 .../traits/15_impl_interfaces.mlcfg           |   2 +-
 .../traits/16_impl_cloning.mlcfg              |   2 +-
 .../tests/should_succeed/two_modules.mlcfg    |   6 +-
 .../should_succeed/type_constructors.mlcfg    |   4 +-
 .../type_invariants/borrows.mlcfg             |  38 +-
 .../type_invariants/generated.mlcfg           |   2 +-
 .../type_invariants/non_zero.mlcfg            |  10 +-
 .../type_invariants/type_invariants.mlcfg     |   2 +-
 .../type_invariants/vec_inv.mlcfg             |   2 +-
 .../tests/should_succeed/unused_in_loop.mlcfg |   4 +-
 creusot/tests/should_succeed/vecdeque.mlcfg   |  22 +-
 creusot/tests/should_succeed/vector/01.mlcfg  |  12 +-
 .../should_succeed/vector/02_gnome.mlcfg      |  22 +-
 .../vector/03_knuth_shuffle.mlcfg             |  14 +-
 .../vector/04_binary_search.mlcfg             |  38 +-
 .../vector/05_binary_search_generic.mlcfg     |  34 +-
 .../vector/06_knights_tour.mlcfg              | 136 ++---
 .../should_succeed/vector/07_read_write.mlcfg |   4 +-
 .../should_succeed/vector/08_haystack.mlcfg   |  22 +-
 .../should_succeed/vector/09_capacity.mlcfg   |   4 +-
 195 files changed, 2250 insertions(+), 2247 deletions(-)

diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index b78331cd1e..20d5b42561 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -245,6 +245,9 @@ impl<'tcx> SimplePropagator<'tcx> {
                       self.prop.insert(l.local, op);
                       self.dead.insert(l.local);
                     }
+                Statement::Assignment(_, RValue::Ghost(_), _) => {
+                    out_stmts.push(s)
+                }
                 Statement::Assignment(ref l, ref r, _) if self.should_erase(l.local) && r.is_pure() => {
                       self.dead.insert(l.local);
                 }
diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
index e65d13878a..3d790278c7 100644
--- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
+++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
@@ -132,7 +132,7 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB1
   }
   BB1 {
-    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] [#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
+    [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -140,7 +140,7 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB3
   }
   BB3 {
-    [#"../01_resolve_unsoundness.rs" 13 10 13 16] _9 <- ([#"../01_resolve_unsoundness.rs" 13 10 13 16] i <= n);
+    [#"../01_resolve_unsoundness.rs" 13 10 13 16] _9 <- i <= n;
     switch (_9)
       | False -> goto BB6
       | True -> goto BB4
@@ -154,11 +154,11 @@ module C01ResolveUnsoundness_MakeVecOfSize
     goto BB5
   }
   BB5 {
-    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + ([#"../01_resolve_unsoundness.rs" 15 13 15 14] (1 : usize)));
+    [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- i + ([#"../01_resolve_unsoundness.rs" 15 13 15 14] (1 : usize));
     goto BB2
   }
   BB6 {
-    [#"../01_resolve_unsoundness.rs" 17 11 17 14] _0 <- ([#"../01_resolve_unsoundness.rs" 17 11 17 14] out);
+    [#"../01_resolve_unsoundness.rs" 17 11 17 14] _0 <- out;
     out <- any Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global);
     goto BB7
   }
diff --git a/creusot/tests/should_fail/bug/222.mlcfg b/creusot/tests/should_fail/bug/222.mlcfg
index a3ba445795..2d61a81f46 100644
--- a/creusot/tests/should_fail/bug/222.mlcfg
+++ b/creusot/tests/should_fail/bug/222.mlcfg
@@ -106,7 +106,7 @@ module C222_UsesInvariant
     goto BB2
   }
   BB2 {
-    [#"../222.rs" 40 42 42 1] _0 <- ([#"../222.rs" 40 42 42 1] [#"../222.rs" 40 42 42 1] ());
+    [#"../222.rs" 40 42 42 1] _0 <- ([#"../222.rs" 40 42 42 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/492.mlcfg b/creusot/tests/should_fail/bug/492.mlcfg
index e142f65282..5850553b28 100644
--- a/creusot/tests/should_fail/bug/492.mlcfg
+++ b/creusot/tests/should_fail/bug/492.mlcfg
@@ -52,7 +52,7 @@ module C492_ReborrowTuple
     [#"../492.rs" 6 5 6 6] _3 <- Borrow.borrow_final ( * x) (Borrow.get_id x);
     [#"../492.rs" 6 5 6 6] x <- { x with current = ( ^ _3) ; };
     assume { inv0 ( ^ _3) };
-    [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, ([#"../492.rs" 6 8 6 10] (32 : uint32))));
+    [#"../492.rs" 6 4 6 11] _0 <- (_3, ([#"../492.rs" 6 8 6 10] (32 : uint32)));
     _3 <- any borrowed t;
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
@@ -119,7 +119,7 @@ module C492_Test
     goto BB0
   }
   BB0 {
-    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] [#"../492.rs" 11 16 11 17] (5 : int32));
+    [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] (5 : int32));
     [#"../492.rs" 12 34 12 40] _6 <- Borrow.borrow_mut x;
     [#"../492.rs" 12 34 12 40] x <-  ^ _6;
     [#"../492.rs" 12 34 12 40] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -129,14 +129,14 @@ module C492_Test
     goto BB1
   }
   BB1 {
-    [#"../492.rs" 12 9 12 12] res <- ([#"../492.rs" 12 9 12 12] let (a, _) = _4 in a);
+    [#"../492.rs" 12 9 12 12] res <- (let (a, _) = _4 in a);
     _4 <- (let (x0, x1) = _4 in (any borrowed int32, x1));
     assume { resolve0 _4 };
     assume { resolve1 _6 };
     assert { [@expl:assertion] [#"../492.rs" 13 18 13 30]  ^ res = (5 : int32) };
-    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] [#"../492.rs" 14 11 14 13] (10 : int32)) ; };
+    [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 11 14 13] (10 : int32)) ; };
     assume { resolve1 res };
-    [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] [#"../492.rs" 10 14 15 1] ());
+    [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/692.mlcfg b/creusot/tests/should_fail/bug/692.mlcfg
index 80de0a8417..cb29a724e9 100644
--- a/creusot/tests/should_fail/bug/692.mlcfg
+++ b/creusot/tests/should_fail/bug/692.mlcfg
@@ -177,7 +177,7 @@ module C692_Incorrect
     goto BB1
   }
   BB1 {
-    [#"../692.rs" 8 77 8 79] _0 <- ([#"../692.rs" 8 77 8 79] [#"../692.rs" 8 77 8 79] ());
+    [#"../692.rs" 8 77 8 79] _0 <- ([#"../692.rs" 8 77 8 79] ());
     goto BB2
   }
   BB2 {
@@ -239,19 +239,19 @@ module C692_ValidNormal_Closure2
       end
   }
   BB1 {
-    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] [#"../692.rs" 16 25 16 26] (2 : uint32));
+    [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] [#"../692.rs" 16 36 16 37] (1 : uint32));
+    [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] (1 : uint32));
     goto BB3
   }
   BB3 {
-    [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 =  * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = ([#"../692.rs" 16 14 16 39] _4) ; })) ; };
+    [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 =  * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = _4 ; })) ; };
     _4 <- any uint32;
     assume { resolve0 _1 };
-    [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] [#"../692.rs" 16 14 16 39] ());
-    [#"../692.rs" 15 17 15 64] _0 <- ([#"../692.rs" 15 17 15 64] res);
+    [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] ());
+    [#"../692.rs" 15 17 15 64] _0 <- res;
     return _0
   }
   
@@ -287,8 +287,8 @@ module C692_ValidNormal_Closure1
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] field_00 _1 > ([#"../692.rs" 14 11 14 15] (7 : uint32)));
-    [#"../692.rs" 13 15 13 47] _0 <- ([#"../692.rs" 13 15 13 47] res);
+    [#"../692.rs" 14 7 14 15] res <- field_00 _1 > ([#"../692.rs" 14 11 14 15] (7 : uint32));
+    [#"../692.rs" 13 15 13 47] _0 <- res;
     return _0
   }
   
@@ -362,11 +362,11 @@ module C692_ValidNormal
     goto BB0
   }
   BB0 {
-    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] [#"../692.rs" 12 16 12 20] (0 : uint32));
-    [#"../692.rs" 13 15 13 47] cond <- ([#"../692.rs" 13 15 13 47] C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n);
+    [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] (0 : uint32));
+    [#"../692.rs" 13 15 13 47] cond <- C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n;
     [#"../692.rs" 15 17 15 64] _7 <- Borrow.borrow_mut r;
     [#"../692.rs" 15 17 15 64] r <-  ^ _7;
-    [#"../692.rs" 15 17 15 64] branch <- ([#"../692.rs" 15 17 15 64] C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 _7);
+    [#"../692.rs" 15 17 15 64] branch <- C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 _7;
     _7 <- any borrowed uint32;
     assume { resolve0 cond };
     [#"../692.rs" 17 4 17 27] _8 <- ([#"../692.rs" 17 4 17 27] incorrect0 cond branch);
@@ -374,7 +374,7 @@ module C692_ValidNormal
     goto BB1
   }
   BB1 {
-    [#"../692.rs" 18 4 18 5] _0 <- ([#"../692.rs" 18 4 18 5] r);
+    [#"../692.rs" 18 4 18 5] _0 <- r;
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/695.mlcfg b/creusot/tests/should_fail/bug/695.mlcfg
index 095ac86c5c..453040b272 100644
--- a/creusot/tests/should_fail/bug/695.mlcfg
+++ b/creusot/tests/should_fail/bug/695.mlcfg
@@ -212,7 +212,7 @@ module C695_InversedIf
     goto BB2
   }
   BB2 {
-    [#"../695.rs" 7 8 7 14] _7 <- ([#"../695.rs" 7 8 7 14] ());
+    [#"../695.rs" 7 8 7 14] _7 <- ();
     [#"../695.rs" 7 8 7 14] _5 <- ([#"../695.rs" 7 8 7 14] call0 cond _7);
     _7 <- any ();
     goto BB3
@@ -226,7 +226,7 @@ module C695_InversedIf
   BB4 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 10 8 10 21] _11 <- ([#"../695.rs" 10 8 10 21] (([#"../695.rs" 10 15 10 20] false)));
+    [#"../695.rs" 10 8 10 21] _11 <- (([#"../695.rs" 10 15 10 20] false));
     [#"../695.rs" 10 8 10 21] _0 <- ([#"../695.rs" 10 8 10 21] call_once0 branch _11);
     branch <- any b;
     _11 <- any bool;
@@ -235,7 +235,7 @@ module C695_InversedIf
   BB5 {
     assert { [@expl:type invariant] inv0 cond };
     assume { resolve0 cond };
-    [#"../695.rs" 8 8 8 20] _9 <- ([#"../695.rs" 8 8 8 20] (([#"../695.rs" 8 15 8 19] true)));
+    [#"../695.rs" 8 8 8 20] _9 <- (([#"../695.rs" 8 15 8 19] true));
     [#"../695.rs" 8 8 8 20] _0 <- ([#"../695.rs" 8 8 8 20] call_once0 branch _9);
     branch <- any b;
     _9 <- any bool;
@@ -307,19 +307,19 @@ module C695_Valid_Closure2
       end
   }
   BB1 {
-    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] [#"../695.rs" 20 25 20 26] (2 : uint32));
+    [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] (2 : uint32));
     goto BB3
   }
   BB2 {
-    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] [#"../695.rs" 20 36 20 37] (1 : uint32));
+    [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] (1 : uint32));
     goto BB3
   }
   BB3 {
-    [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 =  * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = ([#"../695.rs" 20 14 20 39] _4) ; })) ; };
+    [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 =  * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = _4 ; })) ; };
     _4 <- any uint32;
     assume { resolve0 _1 };
-    [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] [#"../695.rs" 20 14 20 39] ());
-    [#"../695.rs" 19 17 19 64] _0 <- ([#"../695.rs" 19 17 19 64] res);
+    [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] ());
+    [#"../695.rs" 19 17 19 64] _0 <- res;
     return _0
   }
   
@@ -355,8 +355,8 @@ module C695_Valid_Closure1
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] field_00 _1 > ([#"../695.rs" 18 11 18 15] (7 : uint32)));
-    [#"../695.rs" 17 15 17 47] _0 <- ([#"../695.rs" 17 15 17 47] res);
+    [#"../695.rs" 18 7 18 15] res <- field_00 _1 > ([#"../695.rs" 18 11 18 15] (7 : uint32));
+    [#"../695.rs" 17 15 17 47] _0 <- res;
     return _0
   }
   
@@ -434,11 +434,11 @@ module C695_Valid
     goto BB0
   }
   BB0 {
-    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] [#"../695.rs" 16 16 16 20] (0 : uint32));
-    [#"../695.rs" 17 15 17 47] cond <- ([#"../695.rs" 17 15 17 47] C695_Valid_Closure1.C695_Valid_Closure1 n);
+    [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] (0 : uint32));
+    [#"../695.rs" 17 15 17 47] cond <- C695_Valid_Closure1.C695_Valid_Closure1 n;
     [#"../695.rs" 19 17 19 64] _7 <- Borrow.borrow_mut r;
     [#"../695.rs" 19 17 19 64] r <-  ^ _7;
-    [#"../695.rs" 19 17 19 64] branch <- ([#"../695.rs" 19 17 19 64] C695_Valid_Closure2.C695_Valid_Closure2 _7);
+    [#"../695.rs" 19 17 19 64] branch <- C695_Valid_Closure2.C695_Valid_Closure2 _7;
     _7 <- any borrowed uint32;
     assume { resolve0 cond };
     [#"../695.rs" 21 4 21 29] _8 <- ([#"../695.rs" 21 4 21 29] inversed_if0 cond branch);
@@ -447,7 +447,7 @@ module C695_Valid
   }
   BB1 {
     assert { [@expl:assertion] [#"../695.rs" 22 20 22 25] false };
-    [#"../695.rs" 23 4 23 5] _0 <- ([#"../695.rs" 23 4 23 5] r);
+    [#"../695.rs" 23 4 23 5] _0 <- r;
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/869.mlcfg b/creusot/tests/should_fail/bug/869.mlcfg
index 3e719f8f9e..acbbc69fb9 100644
--- a/creusot/tests/should_fail/bug/869.mlcfg
+++ b/creusot/tests/should_fail/bug/869.mlcfg
@@ -61,13 +61,13 @@ module C869_Unsound
     goto BB3
   }
   BB3 {
-    [#"../869.rs" 18 4 18 64] evil <- { evil with current = ([#"../869.rs" 18 4 18 64] _15) ; };
+    [#"../869.rs" 18 4 18 64] evil <- { evil with current = _15 ; };
     _15 <- any Snapshot.snap_ty bool;
     assume { resolve0 evil };
     assume { resolve0 xm };
     assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( ^ evil)) };
     assert { [@expl:assertion] [#"../869.rs" 20 20 20 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( * evil)) };
-    [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] [#"../869.rs" 4 17 21 1] ());
+    [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg
index a226b35a67..587f7d4083 100644
--- a/creusot/tests/should_fail/bug/specialize.mlcfg
+++ b/creusot/tests/should_fail/bug/specialize.mlcfg
@@ -62,7 +62,7 @@ module Specialize_F
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 24 20 24 25] false };
-    [#"../specialize.rs" 21 18 25 1] _0 <- ([#"../specialize.rs" 21 18 25 1] [#"../specialize.rs" 21 18 25 1] ());
+    [#"../specialize.rs" 21 18 25 1] _0 <- ([#"../specialize.rs" 21 18 25 1] ());
     goto BB2
   }
   BB2 {
@@ -127,7 +127,7 @@ module Specialize_G
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 31 20 31 25] false };
-    [#"../specialize.rs" 27 19 32 1] _0 <- ([#"../specialize.rs" 27 19 32 1] [#"../specialize.rs" 27 19 32 1] ());
+    [#"../specialize.rs" 27 19 32 1] _0 <- ([#"../specialize.rs" 27 19 32 1] ());
     goto BB2
   }
   BB2 {
@@ -193,7 +193,7 @@ module Specialize_H
   }
   BB1 {
     assert { [@expl:assertion] [#"../specialize.rs" 37 20 37 25] false };
-    [#"../specialize.rs" 34 18 38 1] _0 <- ([#"../specialize.rs" 34 18 38 1] [#"../specialize.rs" 34 18 38 1] ());
+    [#"../specialize.rs" 34 18 38 1] _0 <- ([#"../specialize.rs" 34 18 38 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_fail/bug/subregion.mlcfg b/creusot/tests/should_fail/bug/subregion.mlcfg
index 372f9de375..d2c2f0e23d 100644
--- a/creusot/tests/should_fail/bug/subregion.mlcfg
+++ b/creusot/tests/should_fail/bug/subregion.mlcfg
@@ -15,7 +15,7 @@ module Subregion_ListReversalH
     goto BB0
   }
   BB0 {
-    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] [#"../subregion.rs" 4 16 4 17] (0 : usize));
+    [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -23,7 +23,7 @@ module Subregion_ListReversalH
     goto BB2
   }
   BB2 {
-    [#"../subregion.rs" 6 10 6 16] _7 <- ([#"../subregion.rs" 6 10 6 16] l <> ([#"../subregion.rs" 6 15 6 16] (0 : usize)));
+    [#"../subregion.rs" 6 10 6 16] _7 <- l <> ([#"../subregion.rs" 6 15 6 16] (0 : usize));
     switch (_7)
       | False -> goto BB4
       | True -> goto BB3
@@ -31,13 +31,13 @@ module Subregion_ListReversalH
   }
   BB3 {
     assert { [@expl:assertion] [#"../subregion.rs" 7 22 7 27] false };
-    [#"../subregion.rs" 8 16 8 17] x <- ([#"../subregion.rs" 8 16 8 17] r);
-    [#"../subregion.rs" 9 18 9 19] tmp <- ([#"../subregion.rs" 9 18 9 19] l);
-    [#"../subregion.rs" 10 8 10 15] r <- ([#"../subregion.rs" 10 8 10 15] tmp);
+    [#"../subregion.rs" 8 16 8 17] x <- r;
+    [#"../subregion.rs" 9 18 9 19] tmp <- l;
+    [#"../subregion.rs" 10 8 10 15] r <- tmp;
     goto BB1
   }
   BB4 {
-    [#"../subregion.rs" 13 11 13 12] _0 <- ([#"../subregion.rs" 13 11 13 12] r);
+    [#"../subregion.rs" 13 11 13 12] _0 <- r;
     return _0
   }
   
diff --git a/creusot/tests/should_fail/final_borrows.mlcfg b/creusot/tests/should_fail/final_borrows.mlcfg
index c44cf38b7f..a0dc3f2ace 100644
--- a/creusot/tests/should_fail/final_borrows.mlcfg
+++ b/creusot/tests/should_fail/final_borrows.mlcfg
@@ -48,7 +48,7 @@ module FinalBorrows_NotFinalBorrow
     assume { inv0 ( ^ _b2) };
     assert { [@expl:type invariant] inv1 _b2 };
     assume { resolve0 _b2 };
-    [#"../final_borrows.rs" 5 40 9 1] _0 <- ([#"../final_borrows.rs" 5 40 9 1] [#"../final_borrows.rs" 5 40 9 1] ());
+    [#"../final_borrows.rs" 5 40 9 1] _0 <- ([#"../final_borrows.rs" 5 40 9 1] ());
     assert { [@expl:type invariant] inv1 bor };
     assume { resolve0 bor };
     return _0
@@ -106,7 +106,7 @@ module FinalBorrows_StoreChangesProphecy
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = ([#"../final_borrows.rs" 14 4 14 8] x) ; };
+    [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = x ; };
     x <- any t;
     assert { [@expl:type invariant] inv0 ( * bor) };
     assume { resolve1 ( * bor) };
@@ -116,7 +116,7 @@ module FinalBorrows_StoreChangesProphecy
   }
   BB3 {
     assert { [@expl:assertion] [#"../final_borrows.rs" 15 18 15 27] b1 = bor };
-    [#"../final_borrows.rs" 11 52 16 1] _0 <- ([#"../final_borrows.rs" 11 52 16 1] [#"../final_borrows.rs" 11 52 16 1] ());
+    [#"../final_borrows.rs" 11 52 16 1] _0 <- ([#"../final_borrows.rs" 11 52 16 1] ());
     goto BB4
   }
   BB4 {
@@ -134,7 +134,7 @@ module FinalBorrows_CallChangesProphecy_Inner
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] [#"../final_borrows.rs" 20 8 20 9] (2 : int32));
+    [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] (2 : int32));
     return _0
   }
   
@@ -167,11 +167,11 @@ module FinalBorrows_CallChangesProphecy
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 24 4 24 18] bor <- { bor with current = ([#"../final_borrows.rs" 24 4 24 18] _3) ; };
+    [#"../final_borrows.rs" 24 4 24 18] bor <- { bor with current = _3 ; };
     _3 <- any int32;
     assume { resolve0 bor };
     assert { [@expl:assertion] [#"../final_borrows.rs" 25 18 25 27] b1 = bor };
-    [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] [#"../final_borrows.rs" 18 44 26 1] ());
+    [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] ());
     return _0
   }
   
@@ -372,9 +372,9 @@ module FinalBorrows_Indexing
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] [#"../final_borrows.rs" 38 11 38 12] (0 : usize));
-    [#"../final_borrows.rs" 38 9 38 13] _7 <- ([#"../final_borrows.rs" 38 9 38 13] Slice.length ( * x));
-    [#"../final_borrows.rs" 38 9 38 13] _8 <- ([#"../final_borrows.rs" 38 9 38 13] _6 < _7);
+    [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] (0 : usize));
+    [#"../final_borrows.rs" 38 9 38 13] _7 <- Slice.length ( * x);
+    [#"../final_borrows.rs" 38 9 38 13] _8 <- _6 < _7;
     assert { [@expl:index in bounds] [#"../final_borrows.rs" 38 9 38 13] _8 };
     goto BB1
   }
diff --git a/creusot/tests/should_fail/opaque_unproveable.mlcfg b/creusot/tests/should_fail/opaque_unproveable.mlcfg
index d16c6770d3..3e329c822b 100644
--- a/creusot/tests/should_fail/opaque_unproveable.mlcfg
+++ b/creusot/tests/should_fail/opaque_unproveable.mlcfg
@@ -12,7 +12,7 @@ module OpaqueUnproveable_Test
   }
   BB0 {
     assert { [@expl:assertion] [#"../opaque_unproveable.rs" 16 18 16 29] opaque0 () };
-    [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- ([#"../opaque_unproveable.rs" 14 14 17 1] [#"../opaque_unproveable.rs" 14 14 17 1] ());
+    [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- ([#"../opaque_unproveable.rs" 14 14 17 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
index a712c14c11..d1733c93df 100644
--- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
+++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg
@@ -14,7 +14,7 @@ module C17ImplRefinement_Impl0_MyFunction
     goto BB0
   }
   BB0 {
-    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] [#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
+    [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index b6db1c061c..564b703489 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -397,7 +397,7 @@ module C100doors_F
     goto BB1
   }
   BB1 {
-    [#"../100doors.rs" 21 16 21 22] _3 <- ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range ([#"../100doors.rs" 21 16 21 17] (1 : usize)) ([#"../100doors.rs" 21 19 21 22] (101 : usize)));
+    [#"../100doors.rs" 21 16 21 22] _3 <- Core_Ops_Range_Range_Type.C_Range ([#"../100doors.rs" 21 16 21 17] (1 : usize)) ([#"../100doors.rs" 21 19 21 22] (101 : usize));
     [#"../100doors.rs" 20 4 20 41] iter <- ([#"../100doors.rs" 20 4 20 41] into_iter0 _3);
     _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
@@ -440,7 +440,7 @@ module C100doors_F
   }
   BB9 {
     assume { resolve2 door_open };
-    [#"../100doors.rs" 20 4 20 41] _0 <- ([#"../100doors.rs" 20 4 20 41] [#"../100doors.rs" 20 4 20 41] ());
+    [#"../100doors.rs" 20 4 20 41] _0 <- ([#"../100doors.rs" 20 4 20 41] ());
     goto BB21
   }
   BB10 {
@@ -452,15 +452,15 @@ module C100doors_F
     absurd
   }
   BB12 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _12;
     [#"../100doors.rs" 20 4 20 41] _17 <- ([#"../100doors.rs" 20 4 20 41] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
-    [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] _17);
+    [#"../100doors.rs" 20 4 20 41] produced <- _17;
     _17 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../100doors.rs" 22 30 22 34] door <- ([#"../100doors.rs" 22 30 22 34] pass);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- __creusot_proc_iter_elem;
+    [#"../100doors.rs" 22 30 22 34] door <- pass;
     goto BB14
   }
   BB14 {
@@ -472,14 +472,14 @@ module C100doors_F
     goto BB16
   }
   BB16 {
-    [#"../100doors.rs" 25 14 25 25] _23 <- ([#"../100doors.rs" 25 14 25 25] door <= ([#"../100doors.rs" 25 22 25 25] (100 : usize)));
+    [#"../100doors.rs" 25 14 25 25] _23 <- door <= ([#"../100doors.rs" 25 22 25 25] (100 : usize));
     switch (_23)
       | False -> goto BB20
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../100doors.rs" 26 45 26 53] _28 <- ([#"../100doors.rs" 26 45 26 53] door - ([#"../100doors.rs" 26 52 26 53] (1 : usize)));
+    [#"../100doors.rs" 26 45 26 53] _28 <- door - ([#"../100doors.rs" 26 52 26 53] (1 : usize));
     [#"../100doors.rs" 26 44 26 54] _26 <- ([#"../100doors.rs" 26 44 26 54] index0 door_open _28);
     _28 <- any usize;
     goto BB18
@@ -487,21 +487,21 @@ module C100doors_F
   BB18 {
     [#"../100doors.rs" 26 12 26 21] _31 <- Borrow.borrow_mut door_open;
     [#"../100doors.rs" 26 12 26 21] door_open <-  ^ _31;
-    [#"../100doors.rs" 26 22 26 30] _32 <- ([#"../100doors.rs" 26 22 26 30] door - ([#"../100doors.rs" 26 29 26 30] (1 : usize)));
+    [#"../100doors.rs" 26 22 26 30] _32 <- door - ([#"../100doors.rs" 26 29 26 30] (1 : usize));
     [#"../100doors.rs" 26 21 26 31] _30 <- ([#"../100doors.rs" 26 21 26 31] index_mut0 _31 _32);
     _31 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global));
     _32 <- any usize;
     goto BB19
   }
   BB19 {
-    [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = ([#"../100doors.rs" 26 12 26 54] not _26) ; };
+    [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = (not _26) ; };
     assume { resolve1 _30 };
-    [#"../100doors.rs" 27 12 27 24] door <- ([#"../100doors.rs" 27 12 27 24] door + pass);
-    [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] [#"../100doors.rs" 25 26 28 9] ());
+    [#"../100doors.rs" 27 12 27 24] door <- door + pass;
+    [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] ());
     goto BB15
   }
   BB20 {
-    [#"../100doors.rs" 25 8 28 9] _11 <- ([#"../100doors.rs" 25 8 28 9] [#"../100doors.rs" 25 8 28 9] ());
+    [#"../100doors.rs" 25 8 28 9] _11 <- ([#"../100doors.rs" 25 8 28 9] ());
     goto BB6
   }
   BB21 {
diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg
index 7f2f2add47..471290ad32 100644
--- a/creusot/tests/should_succeed/all_zero.mlcfg
+++ b/creusot/tests/should_succeed/all_zero.mlcfg
@@ -86,7 +86,7 @@ module AllZero_AllZero
     goto BB1
   }
   BB1 {
-    [#"../all_zero.rs" 37 21 37 22] loop_l <- ([#"../all_zero.rs" 37 21 37 22] l);
+    [#"../all_zero.rs" 37 21 37 22] loop_l <- l;
     l <- any borrowed (AllZero_List_Type.t_list);
     goto BB2
   }
@@ -113,19 +113,19 @@ module AllZero_AllZero
     [#"../all_zero.rs" 43 19 43 24] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons ( ^ value) x1) ; };
     [#"../all_zero.rs" 43 26 43 30] next <- Borrow.borrow_final (AllZero_List_Type.cons_1 ( * loop_l)) (Borrow.inherit_id (Borrow.get_id loop_l) 2);
     [#"../all_zero.rs" 43 26 43 30] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 =  * loop_l in AllZero_List_Type.C_Cons x0 ( ^ next)) ; };
-    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] [#"../all_zero.rs" 44 17 44 18] (0 : uint32)) ; };
+    [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 17 44 18] (0 : uint32)) ; };
     assume { resolve0 value };
     [#"../all_zero.rs" 45 17 45 21] _13 <- Borrow.borrow_mut ( * next);
     [#"../all_zero.rs" 45 17 45 21] next <- { next with current = ( ^ _13) ; };
     assume { resolve1 loop_l };
-    [#"../all_zero.rs" 45 8 45 21] loop_l <- ([#"../all_zero.rs" 45 8 45 21] _13);
+    [#"../all_zero.rs" 45 8 45 21] loop_l <- _13;
     _13 <- any borrowed (AllZero_List_Type.t_list);
     assume { resolve2 next };
     goto BB2
   }
   BB6 {
     assume { resolve1 loop_l };
-    [#"../all_zero.rs" 43 4 46 5] _0 <- ([#"../all_zero.rs" 43 4 46 5] [#"../all_zero.rs" 43 4 46 5] ());
+    [#"../all_zero.rs" 43 4 46 5] _0 <- ([#"../all_zero.rs" 43 4 46 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index 25edba4d23..d9d5f152f6 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -224,7 +224,7 @@ module Bdd_Impl13_AssertReceiverIsTotalEq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 90 9 90 11] _0 <- ([#"../bdd.rs" 90 9 90 11] [#"../bdd.rs" 90 9 90 11] ());
+    [#"../bdd.rs" 90 9 90 11] _0 <- ([#"../bdd.rs" 90 9 90 11] ());
     return _0
   }
   
@@ -260,7 +260,7 @@ module Bdd_Impl7_Eq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 203 8 203 21] _0 <- ([#"../bdd.rs" 203 8 203 21] Bdd_Bdd_Type.bdd_1 self = Bdd_Bdd_Type.bdd_1 o);
+    [#"../bdd.rs" 203 8 203 21] _0 <- Bdd_Bdd_Type.bdd_1 self = Bdd_Bdd_Type.bdd_1 o;
     return _0
   }
   
@@ -359,7 +359,7 @@ module Bdd_Impl14_Eq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 90 13 90 22] _4 <- ([#"../bdd.rs" 90 13 90 22] (self, rhs));
+    [#"../bdd.rs" 90 13 90 22] _4 <- (self, rhs);
     switch (let (a, _) = _4 in a)
       | Bdd_Node_Type.C_False -> goto BB1
       | Bdd_Node_Type.C_True -> goto BB4
@@ -377,7 +377,7 @@ module Bdd_Impl14_Eq
   }
   BB3 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
     goto BB22
   }
   BB4 {
@@ -400,21 +400,21 @@ module Bdd_Impl14_Eq
   }
   BB8 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB9 {
     assume { resolve0 _4 };
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB22
   }
   BB10 {
-    [#"../bdd.rs" 94 9 94 10] v_1 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v (let (a, _) = _4 in a));
-    [#"../bdd.rs" 94 17 94 23] childt_1 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt (let (a, _) = _4 in a));
-    [#"../bdd.rs" 94 38 94 44] childf_1 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf (let (a, _) = _4 in a));
-    [#"../bdd.rs" 94 9 94 10] v_2 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v (let (_, a) = _4 in a));
-    [#"../bdd.rs" 94 17 94 23] childt_2 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt (let (_, a) = _4 in a));
-    [#"../bdd.rs" 94 38 94 44] childf_2 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf (let (_, a) = _4 in a));
+    [#"../bdd.rs" 94 9 94 10] v_1 <- Bdd_Node_Type.if_v (let (a, _) = _4 in a);
+    [#"../bdd.rs" 94 17 94 23] childt_1 <- Bdd_Node_Type.if_childt (let (a, _) = _4 in a);
+    [#"../bdd.rs" 94 38 94 44] childf_1 <- Bdd_Node_Type.if_childf (let (a, _) = _4 in a);
+    [#"../bdd.rs" 94 9 94 10] v_2 <- Bdd_Node_Type.if_v (let (_, a) = _4 in a);
+    [#"../bdd.rs" 94 17 94 23] childt_2 <- Bdd_Node_Type.if_childt (let (_, a) = _4 in a);
+    [#"../bdd.rs" 94 38 94 44] childf_2 <- Bdd_Node_Type.if_childf (let (_, a) = _4 in a);
     assume { resolve0 _4 };
     [#"../bdd.rs" 90 13 90 22] _17 <- ([#"../bdd.rs" 90 13 90 22] eq0 childf_1 childf_2);
     goto BB11
@@ -446,7 +446,7 @@ module Bdd_Impl14_Eq
       end
   }
   BB16 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] true);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true);
     goto BB21
   }
   BB17 {
@@ -459,7 +459,7 @@ module Bdd_Impl14_Eq
     goto BB20
   }
   BB20 {
-    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] [#"../bdd.rs" 90 13 90 22] false);
+    [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false);
     goto BB21
   }
   BB21 {
@@ -483,7 +483,7 @@ module Bdd_Impl0_Clone
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 110 8 110 13] _0 <- ([#"../bdd.rs" 110 8 110 13] self);
+    [#"../bdd.rs" 110 8 110 13] _0 <- self;
     return _0
   }
   
@@ -532,10 +532,10 @@ module Bdd_Impl15_Clone
     goto BB6
   }
   BB3 {
-    [#"../bdd.rs" 94 9 94 10] v_1 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v self);
-    [#"../bdd.rs" 94 17 94 23] childt_1 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt self);
-    [#"../bdd.rs" 94 38 94 44] childf_1 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf self);
-    [#"../bdd.rs" 90 24 90 29] _9 <- ([#"../bdd.rs" 90 24 90 29] v_1);
+    [#"../bdd.rs" 94 9 94 10] v_1 <- Bdd_Node_Type.if_v self;
+    [#"../bdd.rs" 94 17 94 23] childt_1 <- Bdd_Node_Type.if_childt self;
+    [#"../bdd.rs" 94 38 94 44] childf_1 <- Bdd_Node_Type.if_childf self;
+    [#"../bdd.rs" 90 24 90 29] _9 <- v_1;
     [#"../bdd.rs" 90 24 90 29] _7 <- ([#"../bdd.rs" 90 24 90 29] clone0 _9);
     goto BB7
   }
@@ -544,25 +544,25 @@ module Bdd_Impl15_Clone
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 91 5 92 9] _0 <- ([#"../bdd.rs" 91 5 92 9] Bdd_Node_Type.C_False);
+    [#"../bdd.rs" 91 5 92 9] _0 <- Bdd_Node_Type.C_False;
     goto BB10
   }
   BB6 {
-    [#"../bdd.rs" 91 5 93 8] _0 <- ([#"../bdd.rs" 91 5 93 8] Bdd_Node_Type.C_True);
+    [#"../bdd.rs" 91 5 93 8] _0 <- Bdd_Node_Type.C_True;
     goto BB10
   }
   BB7 {
-    [#"../bdd.rs" 90 24 90 29] _12 <- ([#"../bdd.rs" 90 24 90 29] childt_1);
+    [#"../bdd.rs" 90 24 90 29] _12 <- childt_1;
     [#"../bdd.rs" 90 24 90 29] _10 <- ([#"../bdd.rs" 90 24 90 29] clone1 _12);
     goto BB8
   }
   BB8 {
-    [#"../bdd.rs" 90 24 90 29] _15 <- ([#"../bdd.rs" 90 24 90 29] childf_1);
+    [#"../bdd.rs" 90 24 90 29] _15 <- childf_1;
     [#"../bdd.rs" 90 24 90 29] _13 <- ([#"../bdd.rs" 90 24 90 29] clone1 _15);
     goto BB9
   }
   BB9 {
-    [#"../bdd.rs" 90 24 90 29] _0 <- ([#"../bdd.rs" 90 24 90 29] Bdd_Node_Type.C_If _7 _10 _13);
+    [#"../bdd.rs" 90 24 90 29] _0 <- Bdd_Node_Type.C_If _7 _10 _13;
     _7 <- any uint64;
     _10 <- any Bdd_Bdd_Type.t_bdd;
     _13 <- any Bdd_Bdd_Type.t_bdd;
@@ -584,7 +584,7 @@ module Bdd_Impl19_AssertReceiverIsTotalEq
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 104 15 104 17] _0 <- ([#"../bdd.rs" 104 15 104 17] [#"../bdd.rs" 104 15 104 17] ());
+    [#"../bdd.rs" 104 15 104 17] _0 <- ([#"../bdd.rs" 104 15 104 17] ());
     return _0
   }
   
@@ -682,9 +682,9 @@ module Bdd_Impl1_Hash
     goto BB6
   }
   BB3 {
-    [#"../bdd.rs" 120 17 120 18] v <- ([#"../bdd.rs" 120 17 120 18] Bdd_Node_Type.if_v self);
-    [#"../bdd.rs" 120 20 120 26] childt <- ([#"../bdd.rs" 120 20 120 26] Bdd_Node_Type.if_childt self);
-    [#"../bdd.rs" 120 28 120 34] childf <- ([#"../bdd.rs" 120 28 120 34] Bdd_Node_Type.if_childf self);
+    [#"../bdd.rs" 120 17 120 18] v <- Bdd_Node_Type.if_v self;
+    [#"../bdd.rs" 120 20 120 26] childt <- Bdd_Node_Type.if_childt self;
+    [#"../bdd.rs" 120 28 120 34] childf <- Bdd_Node_Type.if_childf self;
     [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childt) ([#"../bdd.rs" 121 53 121 54] (5 : uint64)));
     goto BB7
   }
@@ -693,11 +693,11 @@ module Bdd_Impl1_Hash
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] [#"../bdd.rs" 118 21 118 22] (1 : uint64));
+    [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] (1 : uint64));
     goto BB11
   }
   BB6 {
-    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] [#"../bdd.rs" 119 20 119 21] (2 : uint64));
+    [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] (2 : uint64));
     goto BB11
   }
   BB7 {
@@ -759,7 +759,7 @@ module Bdd_Impl2_Hash
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 143 8 143 14] _0 <- ([#"../bdd.rs" 143 8 143 14] Bdd_Bdd_Type.bdd_1 self);
+    [#"../bdd.rs" 143 8 143 14] _0 <- Bdd_Bdd_Type.bdd_1 self;
     return _0
   }
   
@@ -1777,7 +1777,7 @@ module Bdd_Impl11_New
     ensures { [#"../bdd.rs" 67 18 67 47] shallow_model0 result = Const.const (Core_Option_Option_Type.C_None) }
     
   let constant promoted0 [#"../bdd.rs" 424 4 424 52]  : Bdd_Node_Type.t_node = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../bdd.rs" 425 17 425 21] Bdd_Node_Type.C_True in let _0 = [#"../bdd.rs" 425 16 425 21] _1 in _0
+    let _1 = Bdd_Node_Type.C_True in let _0 = _1 in _0
   let rec cfg new [#"../bdd.rs" 424 4 424 52] [@cfg:stackify] [@cfg:subregion_analysis] (alloc : Bdd_Bumpalo_Bump_Type.t_bump) : Bdd_Context_Type.t_context
     ensures { [#"../bdd.rs" 424 48 424 52] inv0 result }
     
@@ -1794,8 +1794,8 @@ module Bdd_Impl11_New
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] [#"../bdd.rs" 425 16 425 21] promoted0);
-    [#"../bdd.rs" 425 16 425 21] t <- ([#"../bdd.rs" 425 16 425 21] _10);
+    [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] promoted0);
+    [#"../bdd.rs" 425 16 425 21] t <- _10;
     [#"../bdd.rs" 428 22 428 47] _5 <- ([#"../bdd.rs" 428 22 428 47] new0 ([#"../bdd.rs" 428 22 428 47] ()));
     goto BB1
   }
@@ -1812,7 +1812,7 @@ module Bdd_Impl11_New
     goto BB4
   }
   BB4 {
-    [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 ([#"../bdd.rs" 432 17 432 18] (0 : uint64)));
+    [#"../bdd.rs" 426 8 433 9] _0 <- Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 ([#"../bdd.rs" 432 17 432 18] (0 : uint64));
     _5 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd);
     _6 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
     _8 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd);
@@ -2097,7 +2097,7 @@ module Bdd_Impl11_Hashcons
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 441 44 441 46] _11 <- ([#"../bdd.rs" 441 44 441 46] n);
+    [#"../bdd.rs" 441 44 441 46] _11 <- n;
     [#"../bdd.rs" 441 26 441 47] _8 <- ([#"../bdd.rs" 441 26 441 47] get0 (Bdd_Context_Type.context_hashcons ( * self)) _11);
     goto BB1
   }
@@ -2111,11 +2111,11 @@ module Bdd_Impl11_Hashcons
     goto BB3
   }
   BB3 {
-    [#"../bdd.rs" 441 21 441 22] r <- ([#"../bdd.rs" 441 21 441 22] Core_Option_Option_Type.some_0 _8);
+    [#"../bdd.rs" 441 21 441 22] r <- Core_Option_Option_Type.some_0 _8;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:assertion] [#"../bdd.rs" 442 28 442 38] shallow_model0 (Bdd_Bdd_Type.bdd_0 r) = shallow_model1 n };
-    [#"../bdd.rs" 443 19 443 20] _0 <- ([#"../bdd.rs" 443 19 443 20] r);
+    [#"../bdd.rs" 443 19 443 20] _0 <- r;
     goto BB12
   }
   BB4 {
@@ -2123,7 +2123,7 @@ module Bdd_Impl11_Hashcons
     goto BB5
   }
   BB5 {
-    [#"../bdd.rs" 445 16 445 50] r1 <- ([#"../bdd.rs" 445 16 445 50] Bdd_Bdd_Type.C_Bdd ( * _19) (Bdd_Context_Type.context_cnt ( * self)));
+    [#"../bdd.rs" 445 16 445 50] r1 <- Bdd_Bdd_Type.C_Bdd ( * _19) (Bdd_Context_Type.context_cnt ( * self));
     assume { resolve1 _19 };
     [#"../bdd.rs" 446 8 446 21] _24 <- Borrow.borrow_final (Bdd_Context_Type.context_hashcons ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../bdd.rs" 446 8 446 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 ( ^ _24) x2 x3 x4 x5) ; };
@@ -2136,10 +2136,10 @@ module Bdd_Impl11_Hashcons
     goto BB7
   }
   BB7 {
-    [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 77] _27) x3 x4 x5) ; };
+    [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 _27 x3 x4 x5) ; };
     _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node));
-    [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 34] ([#"../bdd.rs" 448 22 448 30] (18446744073709551615 : uint64)) - ([#"../bdd.rs" 448 33 448 34] (1 : uint64)));
-    [#"../bdd.rs" 448 11 448 34] _30 <- ([#"../bdd.rs" 448 11 448 34] Bdd_Context_Type.context_cnt ( * self) > _32);
+    [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 30] (18446744073709551615 : uint64)) - ([#"../bdd.rs" 448 33 448 34] (1 : uint64));
+    [#"../bdd.rs" 448 11 448 34] _30 <- Bdd_Context_Type.context_cnt ( * self) > _32;
     _32 <- any uint64;
     switch (_30)
       | False -> goto BB11
@@ -2153,14 +2153,14 @@ module Bdd_Impl11_Hashcons
     goto BB10
   }
   BB10 {
-    [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 451 16 451 35] Bdd_Context_Type.context_cnt ( * self))) ; };
+    [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 (Bdd_Context_Type.context_cnt ( * self))) ; };
     goto BB9
   }
   BB11 {
-    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + ([#"../bdd.rs" 454 20 454 21] (1 : uint64)))) ; };
+    [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 (Bdd_Context_Type.context_cnt ( * self) + ([#"../bdd.rs" 454 20 454 21] (1 : uint64)))) ; };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../bdd.rs" 455 8 455 9] _0 <- ([#"../bdd.rs" 455 8 455 9] r1);
+    [#"../bdd.rs" 455 8 455 9] _0 <- r1;
     goto BB12
   }
   BB12 {
@@ -2372,14 +2372,14 @@ module Bdd_Impl11_Node
   BB2 {
     assert { [@expl:type invariant] inv1 self };
     assume { resolve0 self };
-    [#"../bdd.rs" 467 19 467 25] _0 <- ([#"../bdd.rs" 467 19 467 25] childt);
+    [#"../bdd.rs" 467 19 467 25] _0 <- childt;
     goto BB5
   }
   BB3 {
     [#"../bdd.rs" 469 8 469 12] _17 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 469 8 469 12] self <- { self with current = ( ^ _17) ; };
     assume { inv0 ( ^ _17) };
-    [#"../bdd.rs" 469 22 469 49] _18 <- ([#"../bdd.rs" 469 22 469 49] Bdd_Node_Type.C_If x childt childf);
+    [#"../bdd.rs" 469 22 469 49] _18 <- Bdd_Node_Type.C_If x childt childf;
     [#"../bdd.rs" 469 8 469 50] _0 <- ([#"../bdd.rs" 469 8 469 50] hashcons0 _17 _18);
     _17 <- any borrowed (Bdd_Context_Type.t_context);
     _18 <- any Bdd_Node_Type.t_node;
@@ -2561,7 +2561,7 @@ module Bdd_Impl11_True
     [#"../bdd.rs" 477 8 477 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 477 8 477 12] self <- { self with current = ( ^ _6) ; };
     assume { inv0 ( ^ _6) };
-    [#"../bdd.rs" 477 22 477 26] _7 <- ([#"../bdd.rs" 477 22 477 26] Bdd_Node_Type.C_True);
+    [#"../bdd.rs" 477 22 477 26] _7 <- Bdd_Node_Type.C_True;
     [#"../bdd.rs" 477 8 477 27] _0 <- ([#"../bdd.rs" 477 8 477 27] hashcons0 _6 _7);
     _6 <- any borrowed (Bdd_Context_Type.t_context);
     _7 <- any Bdd_Node_Type.t_node;
@@ -2740,7 +2740,7 @@ module Bdd_Impl11_False
     [#"../bdd.rs" 485 8 485 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self);
     [#"../bdd.rs" 485 8 485 12] self <- { self with current = ( ^ _6) ; };
     assume { inv0 ( ^ _6) };
-    [#"../bdd.rs" 485 22 485 27] _7 <- ([#"../bdd.rs" 485 22 485 27] Bdd_Node_Type.C_False);
+    [#"../bdd.rs" 485 22 485 27] _7 <- Bdd_Node_Type.C_False;
     [#"../bdd.rs" 485 8 485 28] _0 <- ([#"../bdd.rs" 485 8 485 28] hashcons0 _6 _7);
     _6 <- any borrowed (Bdd_Context_Type.t_context);
     _7 <- any Bdd_Node_Type.t_node;
@@ -3263,7 +3263,7 @@ module Bdd_Impl11_Not
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 504 43 504 45] _13 <- ([#"../bdd.rs" 504 43 504 45] x);
+    [#"../bdd.rs" 504 43 504 45] _13 <- x;
     [#"../bdd.rs" 504 25 504 46] _10 <- ([#"../bdd.rs" 504 25 504 46] get0 (Bdd_Context_Type.context_not_memo ( * self)) _13);
     goto BB1
   }
@@ -3277,8 +3277,8 @@ module Bdd_Impl11_Not
     goto BB3
   }
   BB3 {
-    [#"../bdd.rs" 504 20 504 21] r <- ([#"../bdd.rs" 504 20 504 21] Core_Option_Option_Type.some_0 _10);
-    [#"../bdd.rs" 505 19 505 21] _0 <- ([#"../bdd.rs" 505 19 505 21] r);
+    [#"../bdd.rs" 504 20 504 21] r <- Core_Option_Option_Type.some_0 _10;
+    [#"../bdd.rs" 505 19 505 21] _0 <- r;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     goto BB18
@@ -3303,9 +3303,9 @@ module Bdd_Impl11_Not
     goto BB9
   }
   BB8 {
-    [#"../bdd.rs" 510 17 510 18] v <- ([#"../bdd.rs" 510 17 510 18] Bdd_Node_Type.if_v (Bdd_Bdd_Type.bdd_0 x));
-    [#"../bdd.rs" 510 20 510 26] childt <- ([#"../bdd.rs" 510 20 510 26] Bdd_Node_Type.if_childt (Bdd_Bdd_Type.bdd_0 x));
-    [#"../bdd.rs" 510 28 510 34] childf <- ([#"../bdd.rs" 510 28 510 34] Bdd_Node_Type.if_childf (Bdd_Bdd_Type.bdd_0 x));
+    [#"../bdd.rs" 510 17 510 18] v <- Bdd_Node_Type.if_v (Bdd_Bdd_Type.bdd_0 x);
+    [#"../bdd.rs" 510 20 510 26] childt <- Bdd_Node_Type.if_childt (Bdd_Bdd_Type.bdd_0 x);
+    [#"../bdd.rs" 510 28 510 34] childf <- Bdd_Node_Type.if_childf (Bdd_Bdd_Type.bdd_0 x);
     [#"../bdd.rs" 511 29 511 33] _25 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 511 29 511 33] self <- { self with current = ( ^ _25) ; };
     assume { inv1 ( ^ _25) };
@@ -3364,7 +3364,7 @@ module Bdd_Impl11_Not
   BB17 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../bdd.rs" 517 8 517 9] _0 <- ([#"../bdd.rs" 517 8 517 9] r1);
+    [#"../bdd.rs" 517 8 517 9] _0 <- r1;
     goto BB18
   }
   BB18 {
@@ -3775,8 +3775,8 @@ module Bdd_Impl11_And
     goto BB0
   }
   BB0 {
-    [#"../bdd.rs" 528 44 528 50] _16 <- ([#"../bdd.rs" 528 44 528 50] (a, b));
-    [#"../bdd.rs" 528 43 528 50] _15 <- ([#"../bdd.rs" 528 43 528 50] _16);
+    [#"../bdd.rs" 528 44 528 50] _16 <- (a, b);
+    [#"../bdd.rs" 528 43 528 50] _15 <- _16;
     [#"../bdd.rs" 528 25 528 51] _12 <- ([#"../bdd.rs" 528 25 528 51] get0 (Bdd_Context_Type.context_and_memo ( * self)) _15);
     goto BB1
   }
@@ -3791,8 +3791,8 @@ module Bdd_Impl11_And
     goto BB3
   }
   BB3 {
-    [#"../bdd.rs" 528 20 528 21] r <- ([#"../bdd.rs" 528 20 528 21] Core_Option_Option_Type.some_0 _12);
-    [#"../bdd.rs" 529 19 529 21] _0 <- ([#"../bdd.rs" 529 19 529 21] r);
+    [#"../bdd.rs" 528 20 528 21] r <- Core_Option_Option_Type.some_0 _12;
+    [#"../bdd.rs" 529 19 529 21] _0 <- r;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
     goto BB35
@@ -3802,7 +3802,7 @@ module Bdd_Impl11_And
     absurd
   }
   BB5 {
-    [#"../bdd.rs" 531 22 531 34] _23 <- ([#"../bdd.rs" 531 22 531 34] (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b));
+    [#"../bdd.rs" 531 22 531 34] _23 <- (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b);
     switch (let (a, _) = _23 in a)
       | Bdd_Node_Type.C_True -> goto BB7
       | _ -> goto BB6
@@ -3846,25 +3846,25 @@ module Bdd_Impl11_And
       end
   }
   BB14 {
-    [#"../bdd.rs" 537 24 537 26] vb <- ([#"../bdd.rs" 537 24 537 26] Bdd_Node_Type.if_v (let (_, a) = _23 in a));
-    [#"../bdd.rs" 537 36 537 43] childtb <- ([#"../bdd.rs" 537 36 537 43] Bdd_Node_Type.if_childt (let (_, a) = _23 in a));
-    [#"../bdd.rs" 537 53 537 60] childfb <- ([#"../bdd.rs" 537 53 537 60] Bdd_Node_Type.if_childf (let (_, a) = _23 in a));
-    [#"../bdd.rs" 536 24 536 26] va <- ([#"../bdd.rs" 536 24 536 26] Bdd_Node_Type.if_v (let (a, _) = _23 in a));
-    [#"../bdd.rs" 536 36 536 43] childta <- ([#"../bdd.rs" 536 36 536 43] Bdd_Node_Type.if_childt (let (a, _) = _23 in a));
-    [#"../bdd.rs" 536 53 536 60] childfa <- ([#"../bdd.rs" 536 53 536 60] Bdd_Node_Type.if_childf (let (a, _) = _23 in a));
+    [#"../bdd.rs" 537 24 537 26] vb <- Bdd_Node_Type.if_v (let (_, a) = _23 in a);
+    [#"../bdd.rs" 537 36 537 43] childtb <- Bdd_Node_Type.if_childt (let (_, a) = _23 in a);
+    [#"../bdd.rs" 537 53 537 60] childfb <- Bdd_Node_Type.if_childf (let (_, a) = _23 in a);
+    [#"../bdd.rs" 536 24 536 26] va <- Bdd_Node_Type.if_v (let (a, _) = _23 in a);
+    [#"../bdd.rs" 536 36 536 43] childta <- Bdd_Node_Type.if_childt (let (a, _) = _23 in a);
+    [#"../bdd.rs" 536 53 536 60] childfa <- Bdd_Node_Type.if_childf (let (a, _) = _23 in a);
     assume { resolve2 _23 };
-    [#"../bdd.rs" 540 29 540 32] _45 <- ([#"../bdd.rs" 540 29 540 32] vb);
+    [#"../bdd.rs" 540 29 540 32] _45 <- vb;
     [#"../bdd.rs" 540 22 540 33] _42 <- ([#"../bdd.rs" 540 22 540 33] cmp0 va _45);
     goto BB19
   }
   BB15 {
     assume { resolve2 _23 };
-    [#"../bdd.rs" 532 25 532 26] r1 <- ([#"../bdd.rs" 532 25 532 26] b);
+    [#"../bdd.rs" 532 25 532 26] r1 <- b;
     goto BB33
   }
   BB16 {
     assume { resolve2 _23 };
-    [#"../bdd.rs" 533 25 533 26] r1 <- ([#"../bdd.rs" 533 25 533 26] a);
+    [#"../bdd.rs" 533 25 533 26] r1 <- a;
     goto BB33
   }
   BB17 {
@@ -3890,7 +3890,7 @@ module Bdd_Impl11_And
     goto BB26
   }
   BB21 {
-    [#"../bdd.rs" 552 24 552 30] v <- ([#"../bdd.rs" 552 24 552 30] va);
+    [#"../bdd.rs" 552 24 552 30] v <- va;
     [#"../bdd.rs" 553 33 553 37] _67 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 553 33 553 37] self <- { self with current = ( ^ _67) ; };
     assume { inv1 ( ^ _67) };
@@ -3902,7 +3902,7 @@ module Bdd_Impl11_And
     goto BB23
   }
   BB23 {
-    [#"../bdd.rs" 542 24 542 30] v <- ([#"../bdd.rs" 542 24 542 30] vb);
+    [#"../bdd.rs" 542 24 542 30] v <- vb;
     [#"../bdd.rs" 543 33 543 37] _49 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 543 33 543 37] self <- { self with current = ( ^ _49) ; };
     assume { inv1 ( ^ _49) };
@@ -3911,7 +3911,7 @@ module Bdd_Impl11_And
     goto BB24
   }
   BB24 {
-    [#"../bdd.rs" 543 24 543 53] childt <- ([#"../bdd.rs" 543 24 543 53] _48);
+    [#"../bdd.rs" 543 24 543 53] childt <- _48;
     _48 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 544 33 544 37] _53 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 544 33 544 37] self <- { self with current = ( ^ _53) ; };
@@ -3921,13 +3921,13 @@ module Bdd_Impl11_And
     goto BB25
   }
   BB25 {
-    [#"../bdd.rs" 544 24 544 53] childf <- ([#"../bdd.rs" 544 24 544 53] _52);
+    [#"../bdd.rs" 544 24 544 53] childf <- _52;
     _52 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] [#"../bdd.rs" 541 31 545 21] ());
+    [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] ());
     goto BB31
   }
   BB26 {
-    [#"../bdd.rs" 547 24 547 30] v <- ([#"../bdd.rs" 547 24 547 30] va);
+    [#"../bdd.rs" 547 24 547 30] v <- va;
     [#"../bdd.rs" 548 33 548 37] _58 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 548 33 548 37] self <- { self with current = ( ^ _58) ; };
     assume { inv1 ( ^ _58) };
@@ -3936,7 +3936,7 @@ module Bdd_Impl11_And
     goto BB27
   }
   BB27 {
-    [#"../bdd.rs" 548 24 548 53] childt <- ([#"../bdd.rs" 548 24 548 53] _57);
+    [#"../bdd.rs" 548 24 548 53] childt <- _57;
     _57 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 549 33 549 37] _62 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 549 33 549 37] self <- { self with current = ( ^ _62) ; };
@@ -3946,13 +3946,13 @@ module Bdd_Impl11_And
     goto BB28
   }
   BB28 {
-    [#"../bdd.rs" 549 24 549 53] childf <- ([#"../bdd.rs" 549 24 549 53] _61);
+    [#"../bdd.rs" 549 24 549 53] childf <- _61;
     _61 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] [#"../bdd.rs" 546 28 550 21] ());
+    [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] ());
     goto BB31
   }
   BB29 {
-    [#"../bdd.rs" 553 24 553 59] childt <- ([#"../bdd.rs" 553 24 553 59] _66);
+    [#"../bdd.rs" 553 24 553 59] childt <- _66;
     _66 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 554 33 554 37] _71 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 554 33 554 37] self <- { self with current = ( ^ _71) ; };
@@ -3962,9 +3962,9 @@ module Bdd_Impl11_And
     goto BB30
   }
   BB30 {
-    [#"../bdd.rs" 554 24 554 59] childf <- ([#"../bdd.rs" 554 24 554 59] _70);
+    [#"../bdd.rs" 554 24 554 59] childf <- _70;
     _70 <- any Bdd_Bdd_Type.t_bdd;
-    [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] [#"../bdd.rs" 551 29 555 21] ());
+    [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] ());
     goto BB31
   }
   BB31 {
@@ -3981,7 +3981,7 @@ module Bdd_Impl11_And
   BB33 {
     [#"../bdd.rs" 560 8 560 21] _79 <- Borrow.borrow_final (Bdd_Context_Type.context_and_memo ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5);
     [#"../bdd.rs" 560 8 560 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 ( ^ _79) x5) ; };
-    [#"../bdd.rs" 560 26 560 32] _80 <- ([#"../bdd.rs" 560 26 560 32] (a, b));
+    [#"../bdd.rs" 560 26 560 32] _80 <- (a, b);
     [#"../bdd.rs" 560 8 560 36] _78 <- ([#"../bdd.rs" 560 8 560 36] add0 _79 _80 r1);
     _79 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd));
     _80 <- any (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd);
@@ -3990,7 +3990,7 @@ module Bdd_Impl11_And
   BB34 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
-    [#"../bdd.rs" 561 8 561 9] _0 <- ([#"../bdd.rs" 561 8 561 9] r1);
+    [#"../bdd.rs" 561 8 561 9] _0 <- r1;
     goto BB35
   }
   BB35 {
diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg
index 74f0a7549e..44aa71e564 100644
--- a/creusot/tests/should_succeed/binary_search.mlcfg
+++ b/creusot/tests/should_succeed/binary_search.mlcfg
@@ -140,8 +140,8 @@ module BinarySearch_Impl0_Index
     goto BB0
   }
   BB0 {
-    [#"../binary_search.rs" 46 22 46 24] orig_ix <- ([#"../binary_search.rs" 46 22 46 24] ix);
-    [#"../binary_search.rs" 47 20 47 24] l <- ([#"../binary_search.rs" 47 20 47 24] self);
+    [#"../binary_search.rs" 46 22 46 24] orig_ix <- ix;
+    [#"../binary_search.rs" 47 20 47 24] l <- self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     goto BB1
@@ -161,11 +161,11 @@ module BinarySearch_Impl0_Index
     goto BB4
   }
   BB4 {
-    [#"../binary_search.rs" 51 23 51 24] t <- ([#"../binary_search.rs" 51 23 51 24] BinarySearch_List_Type.cons_0 l);
-    [#"../binary_search.rs" 51 26 51 28] ls <- ([#"../binary_search.rs" 51 26 51 28] BinarySearch_List_Type.cons_1 l);
+    [#"../binary_search.rs" 51 23 51 24] t <- BinarySearch_List_Type.cons_0 l;
+    [#"../binary_search.rs" 51 26 51 28] ls <- BinarySearch_List_Type.cons_1 l;
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 52 15 52 21] _14 <- ([#"../binary_search.rs" 52 15 52 21] ix > ([#"../binary_search.rs" 52 20 52 21] (0 : usize)));
+    [#"../binary_search.rs" 52 15 52 21] _14 <- ix > ([#"../binary_search.rs" 52 20 52 21] (0 : usize));
     switch (_14)
       | False -> goto BB6
       | True -> goto BB5
@@ -174,19 +174,19 @@ module BinarySearch_Impl0_Index
   BB5 {
     assert { [@expl:type invariant] inv2 t };
     assume { resolve2 t };
-    [#"../binary_search.rs" 53 20 53 24] _17 <- ([#"../binary_search.rs" 53 20 53 24] ls);
+    [#"../binary_search.rs" 53 20 53 24] _17 <- ls;
     assert { [@expl:type invariant] inv1 ls };
     assume { resolve1 ls };
     assert { [@expl:type invariant] inv1 _17 };
     assume { resolve1 _17 };
-    [#"../binary_search.rs" 53 16 53 24] l <- ([#"../binary_search.rs" 53 16 53 24] _17);
-    [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - ([#"../binary_search.rs" 54 22 54 23] (1 : usize)));
+    [#"../binary_search.rs" 53 16 53 24] l <- _17;
+    [#"../binary_search.rs" 54 16 54 23] ix <- ix - ([#"../binary_search.rs" 54 22 54 23] (1 : usize));
     goto BB1
   }
   BB6 {
     assert { [@expl:type invariant] inv1 ls };
     assume { resolve1 ls };
-    [#"../binary_search.rs" 56 23 56 24] _0 <- ([#"../binary_search.rs" 56 23 56 24] t);
+    [#"../binary_search.rs" 56 23 56 24] _0 <- t;
     assert { [@expl:type invariant] inv2 t };
     assume { resolve2 t };
     return _0
@@ -268,8 +268,8 @@ module BinarySearch_Impl0_Len
     goto BB0
   }
   BB0 {
-    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] [#"../binary_search.rs" 67 29 67 30] (0 : usize));
-    [#"../binary_search.rs" 68 20 68 24] l <- ([#"../binary_search.rs" 68 20 68 24] self);
+    [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] (0 : usize));
+    [#"../binary_search.rs" 68 20 68 24] l <- self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     goto BB1
@@ -288,19 +288,19 @@ module BinarySearch_Impl0_Len
     goto BB4
   }
   BB4 {
-    [#"../binary_search.rs" 70 26 70 28] ls <- ([#"../binary_search.rs" 70 26 70 28] BinarySearch_List_Type.cons_1 l);
+    [#"../binary_search.rs" 70 26 70 28] ls <- BinarySearch_List_Type.cons_1 l;
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + ([#"../binary_search.rs" 71 19 71 20] (1 : usize)));
+    [#"../binary_search.rs" 71 12 71 20] len <- len + ([#"../binary_search.rs" 71 19 71 20] (1 : usize));
     assert { [@expl:type invariant] inv1 ls };
     assume { resolve1 ls };
-    [#"../binary_search.rs" 72 12 72 18] l <- ([#"../binary_search.rs" 72 12 72 18] ls);
+    [#"../binary_search.rs" 72 12 72 18] l <- ls;
     goto BB1
   }
   BB5 {
     assert { [@expl:type invariant] inv0 l };
     assume { resolve0 l };
-    [#"../binary_search.rs" 74 8 74 11] _0 <- ([#"../binary_search.rs" 74 8 74 11] len);
+    [#"../binary_search.rs" 74 8 74 11] _0 <- len;
     return _0
   }
   
@@ -443,7 +443,7 @@ module BinarySearch_BinarySearch
     goto BB1
   }
   BB1 {
-    [#"../binary_search.rs" 110 7 110 21] _9 <- ([#"../binary_search.rs" 110 7 110 21] _10 = ([#"../binary_search.rs" 110 20 110 21] (0 : usize)));
+    [#"../binary_search.rs" 110 7 110 21] _9 <- _10 = ([#"../binary_search.rs" 110 20 110 21] (0 : usize));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB3
@@ -451,7 +451,7 @@ module BinarySearch_BinarySearch
       end
   }
   BB2 {
-    [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 111 19 111 20] (0 : usize)));
+    [#"../binary_search.rs" 111 15 111 21] _0 <- Core_Result_Result_Type.C_Err ([#"../binary_search.rs" 111 19 111 20] (0 : usize));
     goto BB21
   }
   BB3 {
@@ -459,7 +459,7 @@ module BinarySearch_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] [#"../binary_search.rs" 114 19 114 20] (0 : usize));
+    [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -471,42 +471,42 @@ module BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    [#"../binary_search.rs" 119 10 119 18] _21 <- ([#"../binary_search.rs" 119 10 119 18] size > ([#"../binary_search.rs" 119 17 119 18] (1 : usize)));
+    [#"../binary_search.rs" 119 10 119 18] _21 <- size > ([#"../binary_search.rs" 119 17 119 18] (1 : usize));
     switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] ([#"../binary_search.rs" 120 26 120 27] (2 : usize)) = ([#"../binary_search.rs" 120 19 120 27] (0 : usize)));
+    [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 26 120 27] (2 : usize)) = ([#"../binary_search.rs" 120 19 120 27] (0 : usize));
     assert { [@expl:division by zero] [#"../binary_search.rs" 120 19 120 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] size / ([#"../binary_search.rs" 120 26 120 27] (2 : usize)));
-    [#"../binary_search.rs" 121 18 121 29] mid <- ([#"../binary_search.rs" 121 18 121 29] base + half);
+    [#"../binary_search.rs" 120 19 120 27] half <- size / ([#"../binary_search.rs" 120 26 120 27] (2 : usize));
+    [#"../binary_search.rs" 121 18 121 29] mid <- base + half;
     [#"../binary_search.rs" 123 19 123 33] _32 <- ([#"../binary_search.rs" 123 19 123 33] index0 arr mid);
     goto BB9
   }
   BB9 {
-    [#"../binary_search.rs" 123 18 123 40] _30 <- ([#"../binary_search.rs" 123 18 123 40] _32 > elem);
+    [#"../binary_search.rs" 123 18 123 40] _30 <- _32 > elem;
     switch (_30)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../binary_search.rs" 123 43 123 47] _29 <- ([#"../binary_search.rs" 123 43 123 47] base);
+    [#"../binary_search.rs" 123 43 123 47] _29 <- base;
     goto BB12
   }
   BB11 {
-    [#"../binary_search.rs" 123 57 123 60] _29 <- ([#"../binary_search.rs" 123 57 123 60] mid);
+    [#"../binary_search.rs" 123 57 123 60] _29 <- mid;
     goto BB12
   }
   BB12 {
-    [#"../binary_search.rs" 123 8 123 62] base <- ([#"../binary_search.rs" 123 8 123 62] _29);
+    [#"../binary_search.rs" 123 8 123 62] base <- _29;
     _29 <- any usize;
-    [#"../binary_search.rs" 124 8 124 20] size <- ([#"../binary_search.rs" 124 8 124 20] size - half);
+    [#"../binary_search.rs" 124 8 124 20] size <- size - half;
     goto BB5
   }
   BB13 {
@@ -514,32 +514,32 @@ module BinarySearch_BinarySearch
     goto BB14
   }
   BB14 {
-    [#"../binary_search.rs" 127 14 127 30] cmp <- ([#"../binary_search.rs" 127 14 127 30] _41);
-    [#"../binary_search.rs" 128 7 128 18] _44 <- ([#"../binary_search.rs" 128 7 128 18] cmp = elem);
+    [#"../binary_search.rs" 127 14 127 30] cmp <- _41;
+    [#"../binary_search.rs" 128 7 128 18] _44 <- cmp = elem;
     switch (_44)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../binary_search.rs" 129 8 129 16] _0 <- ([#"../binary_search.rs" 129 8 129 16] Core_Result_Result_Type.C_Ok base);
+    [#"../binary_search.rs" 129 8 129 16] _0 <- Core_Result_Result_Type.C_Ok base;
     goto BB20
   }
   BB16 {
-    [#"../binary_search.rs" 130 14 130 24] _48 <- ([#"../binary_search.rs" 130 14 130 24] cmp < elem);
+    [#"../binary_search.rs" 130 14 130 24] _48 <- cmp < elem;
     switch (_48)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../binary_search.rs" 131 12 131 20] _51 <- ([#"../binary_search.rs" 131 12 131 20] base + ([#"../binary_search.rs" 131 19 131 20] (1 : usize)));
-    [#"../binary_search.rs" 131 8 131 21] _0 <- ([#"../binary_search.rs" 131 8 131 21] Core_Result_Result_Type.C_Err _51);
+    [#"../binary_search.rs" 131 12 131 20] _51 <- base + ([#"../binary_search.rs" 131 19 131 20] (1 : usize));
+    [#"../binary_search.rs" 131 8 131 21] _0 <- Core_Result_Result_Type.C_Err _51;
     _51 <- any usize;
     goto BB19
   }
   BB18 {
-    [#"../binary_search.rs" 133 8 133 17] _0 <- ([#"../binary_search.rs" 133 8 133 17] Core_Result_Result_Type.C_Err base);
+    [#"../binary_search.rs" 133 8 133 17] _0 <- Core_Result_Result_Type.C_Err base;
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/bug/02_derive.mlcfg b/creusot/tests/should_succeed/bug/02_derive.mlcfg
index bde749a147..a1c2553229 100644
--- a/creusot/tests/should_succeed/bug/02_derive.mlcfg
+++ b/creusot/tests/should_succeed/bug/02_derive.mlcfg
@@ -15,7 +15,7 @@ module C02Derive_Impl0_Clone
     goto BB0
   }
   BB0 {
-    [#"../02_derive.rs" 3 9 3 14] _0 <- ([#"../02_derive.rs" 3 9 3 14] C02Derive_Lit_Type.C_Lit);
+    [#"../02_derive.rs" 3 9 3 14] _0 <- C02Derive_Lit_Type.C_Lit;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/168.mlcfg b/creusot/tests/should_succeed/bug/168.mlcfg
index 90ce3d79d0..44d49dffa9 100644
--- a/creusot/tests/should_succeed/bug/168.mlcfg
+++ b/creusot/tests/should_succeed/bug/168.mlcfg
@@ -9,7 +9,7 @@ module C168_MaxInt
     goto BB0
   }
   BB0 {
-    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] [#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
+    [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] (18446744073709551615 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/173.mlcfg b/creusot/tests/should_succeed/bug/173.mlcfg
index a4b853638f..ddd9bd8528 100644
--- a/creusot/tests/should_succeed/bug/173.mlcfg
+++ b/creusot/tests/should_succeed/bug/173.mlcfg
@@ -12,11 +12,11 @@ module C173_Test233
     goto BB0
   }
   BB0 {
-    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] [#"../173.rs" 20 12 20 14] (17 : int32));
+    [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] (17 : int32));
     assert { [@expl:assertion] [#"../173.rs" 21 19 21 27] Int32.to_int x = 17 };
-    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] [#"../173.rs" 22 12 22 14] (42 : int32));
+    [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] (42 : int32));
     assert { [@expl:assertion] [#"../173.rs" 23 19 23 27] Int32.to_int x1 = 42 };
-    [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] [#"../173.rs" 19 18 24 1] ());
+    [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/195.mlcfg b/creusot/tests/should_succeed/bug/195.mlcfg
index 92cf7439f1..dba60edf38 100644
--- a/creusot/tests/should_succeed/bug/195.mlcfg
+++ b/creusot/tests/should_succeed/bug/195.mlcfg
@@ -9,7 +9,7 @@ module C195_Example
     goto BB0
   }
   BB0 {
-    [#"../195.rs" 4 41 4 43] _0 <- ([#"../195.rs" 4 41 4 43] [#"../195.rs" 4 41 4 43] ());
+    [#"../195.rs" 4 41 4 43] _0 <- ([#"../195.rs" 4 41 4 43] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg
index 962eca159a..11aa875188 100644
--- a/creusot/tests/should_succeed/bug/206.mlcfg
+++ b/creusot/tests/should_succeed/bug/206.mlcfg
@@ -153,7 +153,7 @@ module C206_Ex
     goto BB0
   }
   BB0 {
-    [#"../206.rs" 20 17 20 19] _0 <- ([#"../206.rs" 20 17 20 19] [#"../206.rs" 20 17 20 19] ());
+    [#"../206.rs" 20 17 20 19] _0 <- ([#"../206.rs" 20 17 20 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/235.mlcfg b/creusot/tests/should_succeed/bug/235.mlcfg
index 2a925a016e..bd9523302e 100644
--- a/creusot/tests/should_succeed/bug/235.mlcfg
+++ b/creusot/tests/should_succeed/bug/235.mlcfg
@@ -24,7 +24,7 @@ module C235_F
     goto BB1
   }
   BB4 {
-    [#"../235.rs" 8 4 8 17] _0 <- ([#"../235.rs" 8 4 8 17] [#"../235.rs" 8 4 8 17] ());
+    [#"../235.rs" 8 4 8 17] _0 <- ([#"../235.rs" 8 4 8 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/256.mlcfg b/creusot/tests/should_succeed/bug/256.mlcfg
index b843973f09..a8c2f35f0e 100644
--- a/creusot/tests/should_succeed/bug/256.mlcfg
+++ b/creusot/tests/should_succeed/bug/256.mlcfg
@@ -11,8 +11,8 @@ module C256_U8Safe
     goto BB0
   }
   BB0 {
-    [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] u + ([#"../256.rs" 4 16 4 17] (0 : uint8)));
-    [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] [#"../256.rs" 3 22 5 1] ());
+    [#"../256.rs" 4 12 4 17] _2 <- u + ([#"../256.rs" 4 16 4 17] (0 : uint8));
+    [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] ());
     return _0
   }
   
@@ -75,7 +75,7 @@ module C256_Bug256
     goto BB0
   }
   BB0 {
-    [#"../256.rs" 8 27 8 29] _0 <- ([#"../256.rs" 8 27 8 29] [#"../256.rs" 8 27 8 29] ());
+    [#"../256.rs" 8 27 8 29] _0 <- ([#"../256.rs" 8 27 8 29] ());
     goto BB1
   }
   BB1 {
diff --git a/creusot/tests/should_succeed/bug/258.mlcfg b/creusot/tests/should_succeed/bug/258.mlcfg
index 132780b4ca..52cd1f2235 100644
--- a/creusot/tests/should_succeed/bug/258.mlcfg
+++ b/creusot/tests/should_succeed/bug/258.mlcfg
@@ -9,7 +9,7 @@ module C258_Err
     goto BB0
   }
   BB0 {
-    [#"../258.rs" 3 23 3 25] _0 <- ([#"../258.rs" 3 23 3 25] [#"../258.rs" 3 23 3 25] ());
+    [#"../258.rs" 3 23 3 25] _0 <- ([#"../258.rs" 3 23 3 25] ());
     return _0
   }
   
@@ -24,7 +24,7 @@ module C258_Err2
     goto BB0
   }
   BB0 {
-    [#"../258.rs" 5 25 5 27] _0 <- ([#"../258.rs" 5 25 5 27] [#"../258.rs" 5 25 5 27] ());
+    [#"../258.rs" 5 25 5 27] _0 <- ([#"../258.rs" 5 25 5 27] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/271.mlcfg b/creusot/tests/should_succeed/bug/271.mlcfg
index c38fe9480a..1834729226 100644
--- a/creusot/tests/should_succeed/bug/271.mlcfg
+++ b/creusot/tests/should_succeed/bug/271.mlcfg
@@ -10,15 +10,15 @@ module C271_Ex
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] [#"../271.rs" 6 12 6 13] (0 : int32));
+    [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] (0 : int32));
     goto BB2
   }
   BB1 {
-    [#"../271.rs" 9 13 9 15] _0 <- ([#"../271.rs" 9 13 9 15] [#"../271.rs" 9 13 9 15] ());
+    [#"../271.rs" 9 13 9 15] _0 <- ([#"../271.rs" 9 13 9 15] ());
     goto BB3
   }
   BB2 {
-    [#"../271.rs" 8 13 8 15] _0 <- ([#"../271.rs" 8 13 8 15] [#"../271.rs" 8 13 8 15] ());
+    [#"../271.rs" 8 13 8 15] _0 <- ([#"../271.rs" 8 13 8 15] ());
     goto BB3
   }
   BB3 {
@@ -37,7 +37,7 @@ module C271_Ex2
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] [#"../271.rs" 14 12 14 13] (0 : int32));
+    [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
@@ -56,15 +56,15 @@ module C271_Ex2
     goto BB6
   }
   BB4 {
-    [#"../271.rs" 18 13 18 15] _0 <- ([#"../271.rs" 18 13 18 15] [#"../271.rs" 18 13 18 15] ());
+    [#"../271.rs" 18 13 18 15] _0 <- ([#"../271.rs" 18 13 18 15] ());
     goto BB7
   }
   BB5 {
-    [#"../271.rs" 16 17 16 19] _0 <- ([#"../271.rs" 16 17 16 19] [#"../271.rs" 16 17 16 19] ());
+    [#"../271.rs" 16 17 16 19] _0 <- ([#"../271.rs" 16 17 16 19] ());
     goto BB7
   }
   BB6 {
-    [#"../271.rs" 17 13 17 15] _0 <- ([#"../271.rs" 17 13 17 15] [#"../271.rs" 17 13 17 15] ());
+    [#"../271.rs" 17 13 17 15] _0 <- ([#"../271.rs" 17 13 17 15] ());
     goto BB7
   }
   BB7 {
@@ -89,7 +89,7 @@ module C271_Ex3
     goto BB0
   }
   BB0 {
-    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] [#"../271.rs" 23 12 23 13] (0 : int32));
+    [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] (0 : int32));
     switch (a = 0)
       | True -> goto BB1
       | False -> switch (a = 1)
@@ -114,15 +114,15 @@ module C271_Ex3
     goto BB7
   }
   BB5 {
-    [#"../271.rs" 27 13 27 15] _0 <- ([#"../271.rs" 27 13 27 15] [#"../271.rs" 27 13 27 15] ());
+    [#"../271.rs" 27 13 27 15] _0 <- ([#"../271.rs" 27 13 27 15] ());
     goto BB8
   }
   BB6 {
-    [#"../271.rs" 25 17 25 19] _0 <- ([#"../271.rs" 25 17 25 19] [#"../271.rs" 25 17 25 19] ());
+    [#"../271.rs" 25 17 25 19] _0 <- ([#"../271.rs" 25 17 25 19] ());
     goto BB8
   }
   BB7 {
-    [#"../271.rs" 26 17 26 19] _0 <- ([#"../271.rs" 26 17 26 19] [#"../271.rs" 26 17 26 19] ());
+    [#"../271.rs" 26 17 26 19] _0 <- ([#"../271.rs" 26 17 26 19] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/bug/273.mlcfg b/creusot/tests/should_succeed/bug/273.mlcfg
index 89d513cad7..b536928236 100644
--- a/creusot/tests/should_succeed/bug/273.mlcfg
+++ b/creusot/tests/should_succeed/bug/273.mlcfg
@@ -21,7 +21,7 @@ module C273_Ex
     goto BB0
   }
   BB0 {
-    [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some ([#"../273.rs" 5 26 5 30] true));
+    [#"../273.rs" 5 21 5 31] _1 <- Core_Option_Option_Type.C_Some ([#"../273.rs" 5 26 5 30] true);
     switch (_1)
       | Core_Option_Option_Type.C_Some _ -> goto BB1
       | _ -> goto BB3
@@ -31,13 +31,13 @@ module C273_Ex
     goto BB2
   }
   BB2 {
-    [#"../273.rs" 5 16 5 17] b <- ([#"../273.rs" 5 16 5 17] Core_Option_Option_Type.some_0 _1);
+    [#"../273.rs" 5 16 5 17] b <- Core_Option_Option_Type.some_0 _1;
     assert { [@expl:assertion] [#"../273.rs" 6 22 6 23] b };
-    [#"../273.rs" 5 32 7 5] _0 <- ([#"../273.rs" 5 32 7 5] [#"../273.rs" 5 32 7 5] ());
+    [#"../273.rs" 5 32 7 5] _0 <- ([#"../273.rs" 5 32 7 5] ());
     goto BB4
   }
   BB3 {
-    [#"../273.rs" 7 5 7 5] _0 <- ([#"../273.rs" 7 5 7 5] [#"../273.rs" 7 5 7 5] ());
+    [#"../273.rs" 7 5 7 5] _0 <- ([#"../273.rs" 7 5 7 5] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/bug/387.mlcfg b/creusot/tests/should_succeed/bug/387.mlcfg
index 7be97d4802..8033a5e1b7 100644
--- a/creusot/tests/should_succeed/bug/387.mlcfg
+++ b/creusot/tests/should_succeed/bug/387.mlcfg
@@ -46,7 +46,7 @@ module C387_UseTree
     goto BB0
   }
   BB0 {
-    [#"../387.rs" 13 26 13 28] _0 <- ([#"../387.rs" 13 26 13 28] [#"../387.rs" 13 26 13 28] ());
+    [#"../387.rs" 13 26 13 28] _0 <- ([#"../387.rs" 13 26 13 28] ());
     return _0
   }
   
@@ -119,7 +119,7 @@ module C387_Impl0_Height
     goto BB4
   }
   BB2 {
-    [#"../387.rs" 19 22 19 23] n <- ([#"../387.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C387_Tree_Type.tree_0 self));
+    [#"../387.rs" 19 22 19 23] n <- Core_Option_Option_Type.some_0 (C387_Tree_Type.tree_0 self);
     [#"../387.rs" 19 29 19 44] _5 <- ([#"../387.rs" 19 29 19 44] height (C387_Node_Type.node_left n));
     goto BB5
   }
@@ -128,7 +128,7 @@ module C387_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] [#"../387.rs" 18 26 18 27] (0 : uint64));
+    [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
@@ -142,7 +142,7 @@ module C387_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + ([#"../387.rs" 19 69 19 70] (1 : uint64)));
+    [#"../387.rs" 19 29 19 70] _0 <- _4 + ([#"../387.rs" 19 69 19 70] (1 : uint64));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/bug/395.mlcfg b/creusot/tests/should_succeed/bug/395.mlcfg
index 631cc017ea..829d2fba43 100644
--- a/creusot/tests/should_succeed/bug/395.mlcfg
+++ b/creusot/tests/should_succeed/bug/395.mlcfg
@@ -19,28 +19,28 @@ module C395_SignedDivision
     goto BB0
   }
   BB0 {
-    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] [#"../395.rs" 4 12 4 14] (10 : int32));
-    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] [#"../395.rs" 5 12 5 13] (1 : int32));
-    [#"../395.rs" 7 12 7 13] _6 <- ([#"../395.rs" 7 12 7 13] x);
-    [#"../395.rs" 7 16 7 17] _7 <- ([#"../395.rs" 7 16 7 17] y);
-    [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] (0 : int32)));
+    [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] (10 : int32));
+    [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] (1 : int32));
+    [#"../395.rs" 7 12 7 13] _6 <- x;
+    [#"../395.rs" 7 16 7 17] _7 <- y;
+    [#"../395.rs" 7 12 7 17] _8 <- _7 = ([#"../395.rs" 7 12 7 17] (0 : int32));
     assert { [@expl:division by zero] [#"../395.rs" 7 12 7 17] not _8 };
     goto BB1
   }
   BB1 {
-    [#"../395.rs" 7 12 7 17] _9 <- ([#"../395.rs" 7 12 7 17] _7 = ([#"../395.rs" 7 12 7 17] (-1 : int32)));
-    [#"../395.rs" 7 12 7 17] _10 <- ([#"../395.rs" 7 12 7 17] _6 = ([#"../395.rs" 7 12 7 17] (-2147483648 : int32)));
-    [#"../395.rs" 7 12 7 17] _11 <- ([#"../395.rs" 7 12 7 17] _9 && _10);
+    [#"../395.rs" 7 12 7 17] _9 <- _7 = ([#"../395.rs" 7 12 7 17] (-1 : int32));
+    [#"../395.rs" 7 12 7 17] _10 <- _6 = ([#"../395.rs" 7 12 7 17] (-2147483648 : int32));
+    [#"../395.rs" 7 12 7 17] _11 <- _9 && _10;
     _9 <- any bool;
     _10 <- any bool;
     assert { [@expl:Div overflow] [#"../395.rs" 7 12 7 17] not _11 };
     goto BB2
   }
   BB2 {
-    [#"../395.rs" 7 12 7 17] _5 <- ([#"../395.rs" 7 12 7 17] _6 / _7);
+    [#"../395.rs" 7 12 7 17] _5 <- _6 / _7;
     _6 <- any int32;
     _7 <- any int32;
-    [#"../395.rs" 7 12 7 23] _4 <- ([#"../395.rs" 7 12 7 23] _5 = ([#"../395.rs" 7 21 7 23] (10 : int32)));
+    [#"../395.rs" 7 12 7 23] _4 <- _5 = ([#"../395.rs" 7 21 7 23] (10 : int32));
     _5 <- any int32;
     switch (_4)
       | False -> goto BB4
@@ -48,7 +48,7 @@ module C395_SignedDivision
       end
   }
   BB3 {
-    [#"../395.rs" 3 25 8 1] _0 <- ([#"../395.rs" 3 25 8 1] [#"../395.rs" 3 25 8 1] ());
+    [#"../395.rs" 3 25 8 1] _0 <- ([#"../395.rs" 3 25 8 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/bug/463.mlcfg b/creusot/tests/should_succeed/bug/463.mlcfg
index ef92830735..872ee88137 100644
--- a/creusot/tests/should_succeed/bug/463.mlcfg
+++ b/creusot/tests/should_succeed/bug/463.mlcfg
@@ -26,9 +26,9 @@ module C463_Test_Closure0
     goto BB0
   }
   BB0 {
-    [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] x + ([#"../463.rs" 7 23 7 24] (1 : usize)));
-    [#"../463.rs" 5 8 5 30] res <- ([#"../463.rs" 5 8 5 30] res1);
-    [#"../463.rs" 6 8 6 37] _0 <- ([#"../463.rs" 6 8 6 37] res);
+    [#"../463.rs" 7 19 7 24] res1 <- x + ([#"../463.rs" 7 23 7 24] (1 : usize));
+    [#"../463.rs" 5 8 5 30] res <- res1;
+    [#"../463.rs" 6 8 6 37] _0 <- res;
     return _0
   }
   
@@ -56,8 +56,8 @@ module C463_Test
     goto BB0
   }
   BB0 {
-    [#"../463.rs" 6 8 6 37] c <- ([#"../463.rs" 6 8 6 37] C463_Test_Closure0.C463_Test_Closure0);
-    [#"../463.rs" 9 12 9 16] _4 <- ([#"../463.rs" 9 12 9 16] (([#"../463.rs" 9 14 9 15] (2 : usize))));
+    [#"../463.rs" 6 8 6 37] c <- C463_Test_Closure0.C463_Test_Closure0;
+    [#"../463.rs" 9 12 9 16] _4 <- (([#"../463.rs" 9 14 9 15] (2 : usize)));
     [#"../463.rs" 9 12 9 16] y <- ([#"../463.rs" 9 12 9 16] let (a) = _4 in closure00 c a);
     _4 <- any usize;
     goto BB1
@@ -65,7 +65,7 @@ module C463_Test
   BB1 {
     assume { resolve0 c };
     assert { [@expl:assertion] [#"../463.rs" 10 18 10 25] UIntSize.to_int y = 3 };
-    [#"../463.rs" 10 4 10 26] _0 <- ([#"../463.rs" 10 4 10 26] [#"../463.rs" 10 4 10 26] ());
+    [#"../463.rs" 10 4 10 26] _0 <- ([#"../463.rs" 10 4 10 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/486.mlcfg b/creusot/tests/should_succeed/bug/486.mlcfg
index 46947df410..d195ef24eb 100644
--- a/creusot/tests/should_succeed/bug/486.mlcfg
+++ b/creusot/tests/should_succeed/bug/486.mlcfg
@@ -25,8 +25,8 @@ module C486_Test
     goto BB0
   }
   BB0 {
-    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] [#"../486.rs" 8 11 8 12] (5 : uint32)) ; }));
-    [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] [#"../486.rs" 8 4 8 12] ());
+    [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 11 8 12] (5 : uint32)) ; }));
+    [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/510.mlcfg b/creusot/tests/should_succeed/bug/510.mlcfg
index ec0642925c..8ae4f2c100 100644
--- a/creusot/tests/should_succeed/bug/510.mlcfg
+++ b/creusot/tests/should_succeed/bug/510.mlcfg
@@ -12,8 +12,8 @@ module C510_TestBool
     goto BB0
   }
   BB0 {
-    [#"../510.rs" 4 16 4 25] _bing <- ([#"../510.rs" 4 16 4 25] UInt8.of_int (Bool.to_int inp));
-    [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] [#"../510.rs" 3 28 5 1] ());
+    [#"../510.rs" 4 16 4 25] _bing <- UInt8.of_int (Bool.to_int inp);
+    [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] ());
     return _0
   }
   
@@ -30,8 +30,8 @@ module C510_TestChar
     goto BB0
   }
   BB0 {
-    [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int ([#"../510.rs" 8 4 8 6] (22 : uint8))));
-    [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] [#"../510.rs" 7 19 9 1] ());
+    [#"../510.rs" 8 4 8 14] _1 <- Char.chr (UInt8.to_int ([#"../510.rs" 8 4 8 6] (22 : uint8)));
+    [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/511.mlcfg b/creusot/tests/should_succeed/bug/511.mlcfg
index be539a3f29..9d28ef5414 100644
--- a/creusot/tests/should_succeed/bug/511.mlcfg
+++ b/creusot/tests/should_succeed/bug/511.mlcfg
@@ -12,8 +12,8 @@ module C511_TestU8
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 4 16 4 28] _bing <- ([#"../511.rs" 4 16 4 28] UIntSize.of_int (UInt8.to_int inp));
-    [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] [#"../511.rs" 3 24 5 1] ());
+    [#"../511.rs" 4 16 4 28] _bing <- UIntSize.of_int (UInt8.to_int inp);
+    [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] ());
     return _0
   }
   
@@ -31,8 +31,8 @@ module C511_TestU16
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 8 16 8 28] _bing <- ([#"../511.rs" 8 16 8 28] UIntSize.of_int (UInt16.to_int inp));
-    [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] [#"../511.rs" 7 26 9 1] ());
+    [#"../511.rs" 8 16 8 28] _bing <- UIntSize.of_int (UInt16.to_int inp);
+    [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] ());
     return _0
   }
   
@@ -50,8 +50,8 @@ module C511_TestU128
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 12 16 12 28] _bing <- ([#"../511.rs" 12 16 12 28] UIntSize.of_int (UInt128.to_int inp));
-    [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] [#"../511.rs" 11 28 13 1] ());
+    [#"../511.rs" 12 16 12 28] _bing <- UIntSize.of_int (UInt128.to_int inp);
+    [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] ());
     return _0
   }
   
@@ -69,8 +69,8 @@ module C511_TestI8
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 16 16 16 28] _bing <- ([#"../511.rs" 16 16 16 28] UIntSize.of_int (Int8.to_int inp));
-    [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] [#"../511.rs" 15 24 17 1] ());
+    [#"../511.rs" 16 16 16 28] _bing <- UIntSize.of_int (Int8.to_int inp);
+    [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] ());
     return _0
   }
   
@@ -88,8 +88,8 @@ module C511_TestI16
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 20 16 20 28] _bing <- ([#"../511.rs" 20 16 20 28] UIntSize.of_int (Int16.to_int inp));
-    [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] [#"../511.rs" 19 26 21 1] ());
+    [#"../511.rs" 20 16 20 28] _bing <- UIntSize.of_int (Int16.to_int inp);
+    [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] ());
     return _0
   }
   
@@ -107,8 +107,8 @@ module C511_TestI128
     goto BB0
   }
   BB0 {
-    [#"../511.rs" 24 16 24 28] _bing <- ([#"../511.rs" 24 16 24 28] UIntSize.of_int (Int128.to_int inp));
-    [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] [#"../511.rs" 23 28 25 1] ());
+    [#"../511.rs" 24 16 24 28] _bing <- UIntSize.of_int (Int128.to_int inp);
+    [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/528.mlcfg b/creusot/tests/should_succeed/bug/528.mlcfg
index 7b9b4401ee..9e4e516f9e 100644
--- a/creusot/tests/should_succeed/bug/528.mlcfg
+++ b/creusot/tests/should_succeed/bug/528.mlcfg
@@ -10,7 +10,7 @@ module C528_Neq
     goto BB0
   }
   BB0 {
-    [#"../528.rs" 4 4 4 10] _0 <- ([#"../528.rs" 4 4 4 10] Bool.neqb a b);
+    [#"../528.rs" 4 4 4 10] _0 <- Bool.neqb a b;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/545.mlcfg b/creusot/tests/should_succeed/bug/545.mlcfg
index 23677ff4f7..7df3e0458e 100644
--- a/creusot/tests/should_succeed/bug/545.mlcfg
+++ b/creusot/tests/should_succeed/bug/545.mlcfg
@@ -10,7 +10,7 @@ module C545_NegativeIsNegative
   }
   BB0 {
     assert { [@expl:assertion] [#"../545.rs" 5 18 5 32] (0 : int32) > (-100 : int32) };
-    [#"../545.rs" 4 30 6 1] _0 <- ([#"../545.rs" 4 30 6 1] [#"../545.rs" 4 30 6 1] ());
+    [#"../545.rs" 4 30 6 1] _0 <- ([#"../545.rs" 4 30 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/552.mlcfg b/creusot/tests/should_succeed/bug/552.mlcfg
index 4e77aeaf09..ac2b8dc467 100644
--- a/creusot/tests/should_succeed/bug/552.mlcfg
+++ b/creusot/tests/should_succeed/bug/552.mlcfg
@@ -27,7 +27,7 @@ module C552_Impl1_Transition
     goto BB0
   }
   BB0 {
-    [#"../552.rs" 32 8 32 18] _0 <- ([#"../552.rs" 32 8 32 18] C552_Transition_Type.C_Transition);
+    [#"../552.rs" 32 8 32 18] _0 <- C552_Transition_Type.C_Transition;
     return _0
   }
   
@@ -66,7 +66,7 @@ module C552_Impl0_Step
   }
   BB1 {
     assume { resolve0 self };
-    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] [#"../552.rs" 25 8 25 13] false);
+    [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] false);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/570.mlcfg b/creusot/tests/should_succeed/bug/570.mlcfg
index 9647f01c42..c6943b9349 100644
--- a/creusot/tests/should_succeed/bug/570.mlcfg
+++ b/creusot/tests/should_succeed/bug/570.mlcfg
@@ -31,7 +31,7 @@ module C570_TestProgram
     goto BB0
   }
   BB0 {
-    [#"../570.rs" 12 27 14 1] _0 <- ([#"../570.rs" 12 27 14 1] [#"../570.rs" 12 27 14 1] ());
+    [#"../570.rs" 12 27 14 1] _0 <- ([#"../570.rs" 12 27 14 1] ());
     return _0
   }
   
@@ -50,8 +50,8 @@ module C570_TestAssign
     goto BB0
   }
   BB0 {
-    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] [#"../570.rs" 17 13 17 14] (2 : int32))));
-    [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] [#"../570.rs" 16 30 18 1] ());
+    [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 13 17 14] (2 : int32))));
+    [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/594.mlcfg b/creusot/tests/should_succeed/bug/594.mlcfg
index 123639733d..8fc09744f2 100644
--- a/creusot/tests/should_succeed/bug/594.mlcfg
+++ b/creusot/tests/should_succeed/bug/594.mlcfg
@@ -23,9 +23,9 @@ module C594_TestProgram
     goto BB0
   }
   BB0 {
-    [#"../594.rs" 11 21 11 22] x <- ([#"../594.rs" 11 21 11 22] let (a, _) = _1 in a);
+    [#"../594.rs" 11 21 11 22] x <- (let (a, _) = _1 in a);
     assume { resolve0 _1 };
-    [#"../594.rs" 12 4 12 5] _0 <- ([#"../594.rs" 12 4 12 5] x);
+    [#"../594.rs" 12 4 12 5] _0 <- x;
     return _0
   }
   
@@ -66,11 +66,11 @@ module C594_TestClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../594.rs" 17 10 17 12] _a <- ([#"../594.rs" 17 10 17 12] let (a, _) = _3 in a);
-    [#"../594.rs" 17 14 17 15] b <- ([#"../594.rs" 17 14 17 15] let (_, a) = _3 in a);
+    [#"../594.rs" 17 10 17 12] _a <- (let (a, _) = _3 in a);
+    [#"../594.rs" 17 14 17 15] b <- (let (_, a) = _3 in a);
     assume { resolve0 _3 };
-    [#"../594.rs" 17 18 17 19] res <- ([#"../594.rs" 17 18 17 19] b);
-    [#"../594.rs" 16 14 16 37] _0 <- ([#"../594.rs" 16 14 16 37] res);
+    [#"../594.rs" 17 18 17 19] res <- b;
+    [#"../594.rs" 16 14 16 37] _0 <- res;
     return _0
   }
   
@@ -111,11 +111,11 @@ module C594_TestClosure_Closure1
     goto BB0
   }
   BB0 {
-    [#"../594.rs" 19 6 19 8] _a <- ([#"../594.rs" 19 6 19 8] let (a, _) = _2 in a);
-    [#"../594.rs" 19 10 19 11] b <- ([#"../594.rs" 19 10 19 11] let (_, a) = _2 in a);
+    [#"../594.rs" 19 6 19 8] _a <- (let (a, _) = _2 in a);
+    [#"../594.rs" 19 10 19 11] b <- (let (_, a) = _2 in a);
     assume { resolve0 _2 };
-    [#"../594.rs" 19 14 19 15] res <- ([#"../594.rs" 19 14 19 15] b);
-    [#"../594.rs" 18 14 18 37] _0 <- ([#"../594.rs" 18 14 18 37] res);
+    [#"../594.rs" 19 14 19 15] res <- b;
+    [#"../594.rs" 18 14 18 37] _0 <- res;
     return _0
   }
   
@@ -162,10 +162,10 @@ module C594_TestClosure
     goto BB0
   }
   BB0 {
-    [#"../594.rs" 16 14 16 37] cl1 <- ([#"../594.rs" 16 14 16 37] C594_TestClosure_Closure0.C594_TestClosure_Closure0);
-    [#"../594.rs" 18 14 18 37] cl2 <- ([#"../594.rs" 18 14 18 37] C594_TestClosure_Closure1.C594_TestClosure_Closure1);
-    [#"../594.rs" 20 22 20 28] _6 <- ([#"../594.rs" 20 22 20 28] (([#"../594.rs" 20 23 20 24] (0 : int32)), ([#"../594.rs" 20 26 20 27] (3 : int32))));
-    [#"../594.rs" 20 13 20 29] _5 <- ([#"../594.rs" 20 13 20 29] (([#"../594.rs" 20 19 20 20] (4 : int32)), _6));
+    [#"../594.rs" 16 14 16 37] cl1 <- C594_TestClosure_Closure0.C594_TestClosure_Closure0;
+    [#"../594.rs" 18 14 18 37] cl2 <- C594_TestClosure_Closure1.C594_TestClosure_Closure1;
+    [#"../594.rs" 20 22 20 28] _6 <- (([#"../594.rs" 20 23 20 24] (0 : int32)), ([#"../594.rs" 20 26 20 27] (3 : int32)));
+    [#"../594.rs" 20 13 20 29] _5 <- (([#"../594.rs" 20 19 20 20] (4 : int32)), _6);
     _6 <- any (int32, int32);
     [#"../594.rs" 20 13 20 29] _a <- ([#"../594.rs" 20 13 20 29] let (a, b) = _5 in closure00 cl1 a b);
     _5 <- any (int32, (int32, int32));
@@ -173,8 +173,8 @@ module C594_TestClosure
   }
   BB1 {
     assume { resolve0 cl1 };
-    [#"../594.rs" 21 19 21 25] _10 <- ([#"../594.rs" 21 19 21 25] (([#"../594.rs" 21 20 21 21] (0 : int32)), ([#"../594.rs" 21 23 21 24] (4 : int32))));
-    [#"../594.rs" 21 13 21 26] _9 <- ([#"../594.rs" 21 13 21 26] (_10));
+    [#"../594.rs" 21 19 21 25] _10 <- (([#"../594.rs" 21 20 21 21] (0 : int32)), ([#"../594.rs" 21 23 21 24] (4 : int32)));
+    [#"../594.rs" 21 13 21 26] _9 <- (_10);
     _10 <- any (int32, int32);
     [#"../594.rs" 21 13 21 26] _b <- ([#"../594.rs" 21 13 21 26] let (a) = _9 in closure10 cl2 a);
     _9 <- any (int32, int32);
@@ -182,7 +182,7 @@ module C594_TestClosure
   }
   BB2 {
     assume { resolve1 cl2 };
-    [#"../594.rs" 15 22 22 1] _0 <- ([#"../594.rs" 15 22 22 1] [#"../594.rs" 15 22 22 1] ());
+    [#"../594.rs" 15 22 22 1] _0 <- ([#"../594.rs" 15 22 22 1] ());
     return _0
   }
   
@@ -219,9 +219,9 @@ module C594_Impl0_TestMethod
     goto BB0
   }
   BB0 {
-    [#"../594.rs" 33 30 33 31] x <- ([#"../594.rs" 33 30 33 31] let (a, _) = _2 in a);
+    [#"../594.rs" 33 30 33 31] x <- (let (a, _) = _2 in a);
     assume { resolve0 _2 };
-    [#"../594.rs" 34 8 34 9] _0 <- ([#"../594.rs" 34 8 34 9] x);
+    [#"../594.rs" 34 8 34 9] _0 <- x;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/641.mlcfg b/creusot/tests/should_succeed/bug/641.mlcfg
index c3eeffd50d..99b5272429 100644
--- a/creusot/tests/should_succeed/bug/641.mlcfg
+++ b/creusot/tests/should_succeed/bug/641.mlcfg
@@ -15,7 +15,7 @@ module C641_TestMaintains
     goto BB0
   }
   BB0 {
-    [#"../641.rs" 16 24 16 26] _0 <- ([#"../641.rs" 16 24 16 26] [#"../641.rs" 16 24 16 26] ());
+    [#"../641.rs" 16 24 16 26] _0 <- ([#"../641.rs" 16 24 16 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/653.mlcfg b/creusot/tests/should_succeed/bug/653.mlcfg
index 51cc10c951..1ee383f716 100644
--- a/creusot/tests/should_succeed/bug/653.mlcfg
+++ b/creusot/tests/should_succeed/bug/653.mlcfg
@@ -13,7 +13,7 @@ module C653_Omg
     goto BB0
   }
   BB0 {
-    [#"../653.rs" 7 4 7 5] _0 <- ([#"../653.rs" 7 4 7 5] n);
+    [#"../653.rs" 7 4 7 5] _0 <- n;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/682.mlcfg b/creusot/tests/should_succeed/bug/682.mlcfg
index a486542f6f..9579eab642 100644
--- a/creusot/tests/should_succeed/bug/682.mlcfg
+++ b/creusot/tests/should_succeed/bug/682.mlcfg
@@ -21,9 +21,9 @@ module C682_AddSome
     goto BB0
   }
   BB0 {
-    [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11]  * a + ([#"../682.rs" 7 10 7 11] (1 : uint64))) ; };
+    [#"../682.rs" 7 4 7 11] a <- { a with current = ( * a + ([#"../682.rs" 7 10 7 11] (1 : uint64))) ; };
     assume { resolve0 a };
-    [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] [#"../682.rs" 6 25 8 1] ());
+    [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] ());
     return _0
   }
   
@@ -73,7 +73,7 @@ module C682_Foo
   BB2 {
     assume { resolve0 a };
     assert { [@expl:assertion] [#"../682.rs" 15 18 15 27]  * a > Snapshot.inner a_p };
-    [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] [#"../682.rs" 12 24 16 1] ());
+    [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/691.mlcfg b/creusot/tests/should_succeed/bug/691.mlcfg
index bdeccc4419..17b1695524 100644
--- a/creusot/tests/should_succeed/bug/691.mlcfg
+++ b/creusot/tests/should_succeed/bug/691.mlcfg
@@ -42,8 +42,8 @@ module C691_Example_Closure0
     goto BB0
   }
   BB0 {
-    [#"../691.rs" 11 7 11 9] res <- ([#"../691.rs" 11 7 11 9] ());
-    [#"../691.rs" 10 12 10 39] _0 <- ([#"../691.rs" 10 12 10 39] res);
+    [#"../691.rs" 11 7 11 9] res <- ();
+    [#"../691.rs" 10 12 10 39] _0 <- res;
     return _0
   }
   
@@ -65,10 +65,10 @@ module C691_Example
     goto BB0
   }
   BB0 {
-    [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo ([#"../691.rs" 9 23 9 27] (2 : uint32)));
-    [#"../691.rs" 10 12 10 39] _2 <- ([#"../691.rs" 10 12 10 39] C691_Example_Closure0.C691_Example_Closure0 c);
+    [#"../691.rs" 9 12 9 29] c <- C691_Foo_Type.C_Foo ([#"../691.rs" 9 23 9 27] (2 : uint32));
+    [#"../691.rs" 10 12 10 39] _2 <- C691_Example_Closure0.C691_Example_Closure0 c;
     assume { resolve0 _2 };
-    [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] [#"../691.rs" 8 17 12 1] ());
+    [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/693.mlcfg b/creusot/tests/should_succeed/bug/693.mlcfg
index 40582b400a..f7448bd02b 100644
--- a/creusot/tests/should_succeed/bug/693.mlcfg
+++ b/creusot/tests/should_succeed/bug/693.mlcfg
@@ -24,7 +24,7 @@ module C693_F
     goto BB0
   }
   BB0 {
-    [#"../693.rs" 3 22 3 24] _0 <- ([#"../693.rs" 3 22 3 24] [#"../693.rs" 3 22 3 24] ());
+    [#"../693.rs" 3 22 3 24] _0 <- ([#"../693.rs" 3 22 3 24] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/bug/789.mlcfg b/creusot/tests/should_succeed/bug/789.mlcfg
index 582e83e6ea..18928f3795 100644
--- a/creusot/tests/should_succeed/bug/789.mlcfg
+++ b/creusot/tests/should_succeed/bug/789.mlcfg
@@ -9,7 +9,7 @@ module C789_Meta
     goto BB0
   }
   BB0 {
-    [#"../789.rs" 3 23 3 25] _0 <- ([#"../789.rs" 3 23 3 25] [#"../789.rs" 3 23 3 25] ());
+    [#"../789.rs" 3 23 3 25] _0 <- ([#"../789.rs" 3 23 3 25] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/791.mlcfg b/creusot/tests/should_succeed/bug/791.mlcfg
index ec8305f0e0..b0383fbf44 100644
--- a/creusot/tests/should_succeed/bug/791.mlcfg
+++ b/creusot/tests/should_succeed/bug/791.mlcfg
@@ -7,7 +7,7 @@ module C791_ILoveFloats
     goto BB0
   }
   BB0 {
-    [#"../791.rs" 3 23 6 1] _0 <- ([#"../791.rs" 3 23 6 1] [#"../791.rs" 3 23 6 1] ());
+    [#"../791.rs" 3 23 6 1] _0 <- ([#"../791.rs" 3 23 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index e0ccd86ee7..a8283c3378 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -298,7 +298,7 @@ module C874_CanExtend
     goto BB0
   }
   BB0 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 5 21 5 22] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 5 24 5 25] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 5 27 5 28] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB1
   }
   BB1 {
@@ -310,7 +310,7 @@ module C874_CanExtend
     goto BB3
   }
   BB3 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 6 17 6 18] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 6 20 6 21] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 6 23 6 24] (6 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB4
   }
   BB4 {
@@ -331,7 +331,7 @@ module C874_CanExtend
   }
   BB7 {
     assume { resolve0 v };
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../874.rs" 9 17 9 18] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../874.rs" 9 20 9 21] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../874.rs" 9 23 9 24] (3 : int32))}; assume {Seq.get (__arr_temp.elts) 3 = ([#"../874.rs" 9 26 9 27] (4 : int32))}; assume {Seq.get (__arr_temp.elts) 4 = ([#"../874.rs" 9 29 9 30] (5 : int32))}; assume {Seq.get (__arr_temp.elts) 5 = ([#"../874.rs" 9 32 9 33] (6 : int32))}; assume {Slice.length __arr_temp = 6}; __arr_temp);
     goto BB8
   }
   BB8 {
@@ -348,7 +348,7 @@ module C874_CanExtend
     goto BB11
   }
   BB11 {
-    [#"../874.rs" 4 20 11 1] _0 <- ([#"../874.rs" 4 20 11 1] [#"../874.rs" 4 20 11 1] ());
+    [#"../874.rs" 4 20 11 1] _0 <- ([#"../874.rs" 4 20 11 1] ());
     goto BB12
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg
index 0cacf416bb..1ed0429b90 100644
--- a/creusot/tests/should_succeed/bug/949.mlcfg
+++ b/creusot/tests/should_succeed/bug/949.mlcfg
@@ -266,7 +266,7 @@ module C949_Main
     goto BB1
   }
   BB1 {
-    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 12 6 23] [#"../949.rs" 6 21 6 22] (1 : int32));
+    [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 21 6 22] (1 : int32));
     goto BB2
   }
   BB2 {
@@ -285,9 +285,9 @@ module C949_Main
     goto BB4
   }
   BB4 {
-    [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + ([#"../949.rs" 9 10 9 11] (5 : int32)));
+    [#"../949.rs" 9 4 9 11] r <- r + ([#"../949.rs" 9 10 9 11] (5 : int32));
     assume { resolve0 r };
-    [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] [#"../949.rs" 4 14 10 1] ());
+    [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] ());
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/bug/final_borrows.mlcfg b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
index cf7120e40d..81b622f4ec 100644
--- a/creusot/tests/should_succeed/bug/final_borrows.mlcfg
+++ b/creusot/tests/should_succeed/bug/final_borrows.mlcfg
@@ -569,9 +569,9 @@ module FinalBorrows_Set7
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] [#"../final_borrows.rs" 49 9 49 10] (7 : int32)) ; };
+    [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 9 49 10] (7 : int32)) ; };
     assume { resolve0 r };
-    [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] [#"../final_borrows.rs" 48 22 50 1] ());
+    [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] ());
     return _0
   }
   
@@ -604,7 +604,7 @@ module FinalBorrows_NotFinalBorrowWorks
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] [#"../final_borrows.rs" 54 16 54 20] (1 : int32));
+    [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] (1 : int32));
     [#"../final_borrows.rs" 55 12 55 18] r <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 55 12 55 18] x <-  ^ r;
     [#"../final_borrows.rs" 56 13 56 20] r1 <- Borrow.borrow_final ( * r) (Borrow.get_id r);
@@ -617,10 +617,10 @@ module FinalBorrows_NotFinalBorrowWorks
   }
   BB1 {
     assume { resolve0 r1 };
-    [#"../final_borrows.rs" 58 12 58 14] y <- ([#"../final_borrows.rs" 58 12 58 14]  * r);
-    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] [#"../final_borrows.rs" 59 9 59 10] (2 : int32)) ; };
+    [#"../final_borrows.rs" 58 12 58 14] y <-  * r;
+    [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 9 59 10] (2 : int32)) ; };
     assume { resolve0 r };
-    [#"../final_borrows.rs" 60 11 60 16] _0 <- ([#"../final_borrows.rs" 60 11 60 16] x + y);
+    [#"../final_borrows.rs" 60 11 60 16] _0 <- x + y;
     return _0
   }
   
@@ -653,13 +653,13 @@ module FinalBorrows_Branching
     goto BB0
   }
   BB0 {
-    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] [#"../final_borrows.rs" 65 16 65 17] (3 : int32));
+    [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] (3 : int32));
     [#"../final_borrows.rs" 67 17 67 23] r1 <- Borrow.borrow_mut x;
     [#"../final_borrows.rs" 67 17 67 23] x <-  ^ r1;
     [#"../final_borrows.rs" 69 13 69 21] r2 <- Borrow.borrow_mut ( * r1);
     [#"../final_borrows.rs" 69 13 69 21] r1 <- { r1 with current = ( ^ r2) ; };
     assume { resolve0 r2 };
-    [#"../final_borrows.rs" 70 4 70 11] y <- ([#"../final_borrows.rs" 70 4 70 11]  * r2);
+    [#"../final_borrows.rs" 70 4 70 11] y <-  * r2;
     switch (b)
       | False -> goto BB2
       | True -> goto BB1
@@ -671,25 +671,25 @@ module FinalBorrows_Branching
     [#"../final_borrows.rs" 73 13 73 19] y <-  ^ _11;
     [#"../final_borrows.rs" 73 13 73 19] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11);
     [#"../final_borrows.rs" 73 13 73 19] _11 <- { _11 with current = ( ^ _10) ; };
-    [#"../final_borrows.rs" 73 8 73 19] r1 <- ([#"../final_borrows.rs" 73 8 73 19] _10);
+    [#"../final_borrows.rs" 73 8 73 19] r1 <- _10;
     _10 <- any borrowed int32;
     assume { resolve0 _11 };
     assume { resolve0 r1 };
-    [#"../final_borrows.rs" 74 8 74 15] y <- ([#"../final_borrows.rs" 74 8 74 15]  * r1);
-    [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] [#"../final_borrows.rs" 71 9 75 5] ());
+    [#"../final_borrows.rs" 74 8 74 15] y <-  * r1;
+    [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] ());
     goto BB3
   }
   BB2 {
     [#"../final_borrows.rs" 77 17 77 25] r21 <- Borrow.borrow_final ( * r1) (Borrow.get_id r1);
     [#"../final_borrows.rs" 77 17 77 25] r1 <- { r1 with current = ( ^ r21) ; };
     assume { resolve0 r21 };
-    [#"../final_borrows.rs" 78 8 78 15] y <- ([#"../final_borrows.rs" 78 8 78 15]  * r21);
+    [#"../final_borrows.rs" 78 8 78 15] y <-  * r21;
     assume { resolve0 r1 };
-    [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] [#"../final_borrows.rs" 75 11 79 5] ());
+    [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] ());
     goto BB3
   }
   BB3 {
-    [#"../final_borrows.rs" 80 4 80 5] _0 <- ([#"../final_borrows.rs" 80 4 80 5] y);
+    [#"../final_borrows.rs" 80 4 80 5] _0 <- y;
     return _0
   }
   
@@ -842,7 +842,7 @@ module FinalBorrows_BoxDeref
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 95 4 95 6] _0 <- ([#"../final_borrows.rs" 95 4 95 6] x);
+    [#"../final_borrows.rs" 95 4 95 6] _0 <- x;
     x <- any t;
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
@@ -927,7 +927,7 @@ module FinalBorrows_BoxReborrowDirect
     goto BB1
   }
   BB1 {
-    [#"../final_borrows.rs" 101 4 103 5] _0 <- ([#"../final_borrows.rs" 101 4 103 5] [#"../final_borrows.rs" 101 4 103 5] ());
+    [#"../final_borrows.rs" 101 4 103 5] _0 <- ([#"../final_borrows.rs" 101 4 103 5] ());
     goto BB2
   }
   BB2 {
@@ -997,7 +997,7 @@ module FinalBorrows_BoxReborrowIndirect
     assume { inv0 ( ^ borrow) };
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve0 _4 };
-    [#"../final_borrows.rs" 109 4 109 11] _0 <- ([#"../final_borrows.rs" 109 4 109 11]  * borrow);
+    [#"../final_borrows.rs" 109 4 109 11] _0 <-  * borrow;
     assert { [@expl:type invariant] inv1 borrow };
     assume { resolve0 borrow };
     assert { [@expl:type invariant] inv2 x };
@@ -1039,7 +1039,7 @@ module FinalBorrows_BoxReborrowInStruct
     [#"../final_borrows.rs" 115 27 115 37] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
     [#"../final_borrows.rs" 115 27 115 37] _5 <- { _5 with current = ( ^ borrow) ; };
     assume { resolve0 _5 };
-    [#"../final_borrows.rs" 116 4 116 11] _0 <- ([#"../final_borrows.rs" 116 4 116 11]  * borrow);
+    [#"../final_borrows.rs" 116 4 116 11] _0 <-  * borrow;
     assume { resolve0 borrow };
     assume { resolve1 x };
     return _0
@@ -1169,7 +1169,7 @@ module FinalBorrows_BorrowInBoxTuple1
     [#"../final_borrows.rs" 127 27 127 39] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
     [#"../final_borrows.rs" 127 27 127 39] _5 <- { _5 with current = ( ^ borrow) ; };
     assume { resolve0 _5 };
-    [#"../final_borrows.rs" 128 4 128 11] _0 <- ([#"../final_borrows.rs" 128 4 128 11]  * borrow);
+    [#"../final_borrows.rs" 128 4 128 11] _0 <-  * borrow;
     assume { resolve0 borrow };
     assume { resolve1 x };
     goto BB2
@@ -1225,7 +1225,7 @@ module FinalBorrows_BorrowInBoxTuple2
     [#"../final_borrows.rs" 134 27 134 39] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
     [#"../final_borrows.rs" 134 27 134 39] _5 <- { _5 with current = ( ^ borrow) ; };
     assume { resolve0 _5 };
-    [#"../final_borrows.rs" 135 4 135 11] _0 <- ([#"../final_borrows.rs" 135 4 135 11]  * borrow);
+    [#"../final_borrows.rs" 135 4 135 11] _0 <-  * borrow;
     assume { resolve0 borrow };
     assume { resolve1 x };
     goto BB2
@@ -1291,13 +1291,13 @@ module FinalBorrows_SharedBorrowNoGen
     assume { inv0 ( ^ b1) };
     assert { [@expl:type invariant] inv1 b1 };
     assume { resolve0 b1 };
-    [#"../final_borrows.rs" 151 18 151 22] _shared <- ([#"../final_borrows.rs" 151 18 151 22] bor);
+    [#"../final_borrows.rs" 151 18 151 22] _shared <- bor;
     assert { [@expl:type invariant] inv2 _shared };
     assume { resolve1 _shared };
     assert { [@expl:type invariant] inv1 bor };
     assume { resolve0 bor };
     assert { [@expl:assertion] [#"../final_borrows.rs" 152 18 152 27] b1 = bor };
-    [#"../final_borrows.rs" 149 44 153 1] _0 <- ([#"../final_borrows.rs" 149 44 153 1] [#"../final_borrows.rs" 149 44 153 1] ());
+    [#"../final_borrows.rs" 149 44 153 1] _0 <- ([#"../final_borrows.rs" 149 44 153 1] ());
     return _0
   }
   
@@ -1371,12 +1371,12 @@ module FinalBorrows_InspectNoGen
       end
   }
   BB5 {
-    [#"../final_borrows.rs" 159 8 159 14] _0 <- ([#"../final_borrows.rs" 159 8 159 14] [#"../final_borrows.rs" 159 8 159 14] ());
+    [#"../final_borrows.rs" 159 8 159 14] _0 <- ([#"../final_borrows.rs" 159 8 159 14] ());
     goto BB7
   }
   BB6 {
     assert { [@expl:assertion] [#"../final_borrows.rs" 161 18 161 24] r = x };
-    [#"../final_borrows.rs" 155 44 162 1] _0 <- ([#"../final_borrows.rs" 155 44 162 1] [#"../final_borrows.rs" 155 44 162 1] ());
+    [#"../final_borrows.rs" 155 44 162 1] _0 <- ([#"../final_borrows.rs" 155 44 162 1] ());
     goto BB7
   }
   BB7 {
@@ -1430,7 +1430,7 @@ module FinalBorrows_PlaceMentionNoGen
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
     assert { [@expl:assertion] [#"../final_borrows.rs" 167 18 167 25] _r = x };
-    [#"../final_borrows.rs" 164 50 168 1] _0 <- ([#"../final_borrows.rs" 164 50 168 1] [#"../final_borrows.rs" 164 50 168 1] ());
+    [#"../final_borrows.rs" 164 50 168 1] _0 <- ([#"../final_borrows.rs" 164 50 168 1] ());
     return _0
   }
   
@@ -1467,16 +1467,16 @@ module FinalBorrows_ShallowBorrowNoGen
       end
   }
   BB1 {
-    [#"../final_borrows.rs" 177 13 177 15] _0 <- ([#"../final_borrows.rs" 177 13 177 15] [#"../final_borrows.rs" 177 13 177 15] ());
+    [#"../final_borrows.rs" 177 13 177 15] _0 <- ([#"../final_borrows.rs" 177 13 177 15] ());
     goto BB6
   }
   BB2 {
     goto BB3
   }
   BB3 {
-    [#"../final_borrows.rs" 174 13 174 22] inner <- ([#"../final_borrows.rs" 174 13 174 22] Core_Option_Option_Type.some_0 ( * x));
-    [#"../final_borrows.rs" 174 13 174 22] inner1 <- ([#"../final_borrows.rs" 174 13 174 22] inner);
-    [#"../final_borrows.rs" 174 27 174 38] _8 <- ([#"../final_borrows.rs" 174 27 174 38] inner1 = ([#"../final_borrows.rs" 174 37 174 38] (2 : int32)));
+    [#"../final_borrows.rs" 174 13 174 22] inner <- Core_Option_Option_Type.some_0 ( * x);
+    [#"../final_borrows.rs" 174 13 174 22] inner1 <- inner;
+    [#"../final_borrows.rs" 174 27 174 38] _8 <- inner1 = ([#"../final_borrows.rs" 174 37 174 38] (2 : int32));
     switch (_8)
       | False -> goto BB5
       | True -> goto BB4
@@ -1485,7 +1485,7 @@ module FinalBorrows_ShallowBorrowNoGen
   BB4 {
     assume { resolve0 x };
     assert { [@expl:assertion] [#"../final_borrows.rs" 175 26 175 33] _r = x };
-    [#"../final_borrows.rs" 174 42 176 9] _0 <- ([#"../final_borrows.rs" 174 42 176 9] [#"../final_borrows.rs" 174 42 176 9] ());
+    [#"../final_borrows.rs" 174 42 176 9] _0 <- ([#"../final_borrows.rs" 174 42 176 9] ());
     goto BB6
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
index 397bfc7dc5..be93d0ef42 100644
--- a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
+++ b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg
@@ -10,7 +10,7 @@ module MinusAssoc_F
     goto BB0
   }
   BB0 {
-    [#"../minus_assoc.rs" 6 11 6 13] _0 <- ([#"../minus_assoc.rs" 6 11 6 13] [#"../minus_assoc.rs" 6 11 6 13] ());
+    [#"../minus_assoc.rs" 6 11 6 13] _0 <- ([#"../minus_assoc.rs" 6 11 6 13] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg
index 4f55c628db..ba27a6c998 100644
--- a/creusot/tests/should_succeed/bug/two_phase.mlcfg
+++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg
@@ -167,7 +167,7 @@ module TwoPhase_Test
   }
   BB2 {
     assume { resolve0 v };
-    [#"../two_phase.rs" 6 32 8 1] _0 <- ([#"../two_phase.rs" 6 32 8 1] [#"../two_phase.rs" 6 32 8 1] ());
+    [#"../two_phase.rs" 6 32 8 1] _0 <- ([#"../two_phase.rs" 6 32 8 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/cell/01.mlcfg b/creusot/tests/should_succeed/cell/01.mlcfg
index 9029454c1c..ca534c658f 100644
--- a/creusot/tests/should_succeed/cell/01.mlcfg
+++ b/creusot/tests/should_succeed/cell/01.mlcfg
@@ -86,20 +86,20 @@ module C01_AddsTwo
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 43 7 43 17] _4 <- ([#"../01.rs" 43 7 43 17] v < ([#"../01.rs" 43 11 43 17] (100000 : uint32)));
+    [#"../01.rs" 43 7 43 17] _4 <- v < ([#"../01.rs" 43 11 43 17] (100000 : uint32));
     switch (_4)
       | False -> goto BB4
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../01.rs" 44 14 44 19] _8 <- ([#"../01.rs" 44 14 44 19] v + ([#"../01.rs" 44 18 44 19] (2 : uint32)));
+    [#"../01.rs" 44 14 44 19] _8 <- v + ([#"../01.rs" 44 18 44 19] (2 : uint32));
     [#"../01.rs" 44 8 44 20] _6 <- ([#"../01.rs" 44 8 44 20] set0 c _8);
     _8 <- any uint32;
     goto BB3
   }
   BB3 {
-    [#"../01.rs" 43 18 45 5] _0 <- ([#"../01.rs" 43 18 45 5] [#"../01.rs" 43 18 45 5] ());
+    [#"../01.rs" 43 18 45 5] _0 <- ([#"../01.rs" 43 18 45 5] ());
     goto BB6
   }
   BB4 {
@@ -107,7 +107,7 @@ module C01_AddsTwo
     goto BB5
   }
   BB5 {
-    [#"../01.rs" 45 11 47 5] _0 <- ([#"../01.rs" 45 11 47 5] [#"../01.rs" 45 11 47 5] ());
+    [#"../01.rs" 45 11 47 5] _0 <- ([#"../01.rs" 45 11 47 5] ());
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index 29baa985e3..da3c5b19a9 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -344,7 +344,7 @@ module C02_FibMemo
       end
   }
   BB3 {
-    [#"../02.rs" 99 27 99 33] _15 <- ([#"../02.rs" 99 27 99 33] i = ([#"../02.rs" 99 32 99 33] (0 : usize)));
+    [#"../02.rs" 99 27 99 33] _15 <- i = ([#"../02.rs" 99 32 99 33] (0 : usize));
     switch (_15)
       | False -> goto BB8
       | True -> goto BB7
@@ -358,23 +358,23 @@ module C02_FibMemo
     absurd
   }
   BB6 {
-    [#"../02.rs" 97 13 97 14] v <- ([#"../02.rs" 97 13 97 14] Core_Option_Option_Type.some_0 _7);
-    [#"../02.rs" 97 19 97 20] _0 <- ([#"../02.rs" 97 19 97 20] v);
+    [#"../02.rs" 97 13 97 14] v <- Core_Option_Option_Type.some_0 _7;
+    [#"../02.rs" 97 19 97 20] _0 <- v;
     goto BB19
   }
   BB7 {
-    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] [#"../02.rs" 100 16 100 17] (0 : usize));
+    [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] (0 : usize));
     goto BB16
   }
   BB8 {
-    [#"../02.rs" 101 22 101 28] _17 <- ([#"../02.rs" 101 22 101 28] i = ([#"../02.rs" 101 27 101 28] (1 : usize)));
+    [#"../02.rs" 101 22 101 28] _17 <- i = ([#"../02.rs" 101 27 101 28] (1 : usize));
     switch (_17)
       | False -> goto BB10
       | True -> goto BB9
       end
   }
   BB9 {
-    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] [#"../02.rs" 102 16 102 17] (1 : usize));
+    [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] (1 : usize));
     goto BB15
   }
   BB10 {
@@ -386,19 +386,19 @@ module C02_FibMemo
     goto BB12
   }
   BB12 {
-    [#"../02.rs" 106 30 106 35] _25 <- ([#"../02.rs" 106 30 106 35] i - ([#"../02.rs" 106 34 106 35] (1 : usize)));
+    [#"../02.rs" 106 30 106 35] _25 <- i - ([#"../02.rs" 106 34 106 35] (1 : usize));
     [#"../02.rs" 106 16 106 36] _23 <- ([#"../02.rs" 106 16 106 36] fib_memo mem _25);
     _25 <- any usize;
     goto BB13
   }
   BB13 {
-    [#"../02.rs" 106 53 106 58] _29 <- ([#"../02.rs" 106 53 106 58] i - ([#"../02.rs" 106 57 106 58] (2 : usize)));
+    [#"../02.rs" 106 53 106 58] _29 <- i - ([#"../02.rs" 106 57 106 58] (2 : usize));
     [#"../02.rs" 106 39 106 59] _27 <- ([#"../02.rs" 106 39 106 59] fib_memo mem _29);
     _29 <- any usize;
     goto BB14
   }
   BB14 {
-    [#"../02.rs" 106 16 106 59] fib_i <- ([#"../02.rs" 106 16 106 59] _23 + _27);
+    [#"../02.rs" 106 16 106 59] fib_i <- _23 + _27;
     _23 <- any usize;
     _27 <- any usize;
     goto BB15
@@ -412,13 +412,13 @@ module C02_FibMemo
     goto BB17
   }
   BB17 {
-    [#"../02.rs" 109 23 109 34] _38 <- ([#"../02.rs" 109 23 109 34] Core_Option_Option_Type.C_Some fib_i);
+    [#"../02.rs" 109 23 109 34] _38 <- Core_Option_Option_Type.C_Some fib_i;
     [#"../02.rs" 109 12 109 35] _33 <- ([#"../02.rs" 109 12 109 35] set0 _35 _38);
     _38 <- any Core_Option_Option_Type.t_option usize;
     goto BB18
   }
   BB18 {
-    [#"../02.rs" 110 12 110 17] _0 <- ([#"../02.rs" 110 12 110 17] fib_i);
+    [#"../02.rs" 110 12 110 17] _0 <- fib_i;
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/cell/02/why3session.xml b/creusot/tests/should_succeed/cell/02/why3session.xml
index faf61b46b4..d74c9b57c2 100644
--- a/creusot/tests/should_succeed/cell/02/why3session.xml
+++ b/creusot/tests/should_succeed/cell/02/why3session.xml
@@ -21,15 +21,14 @@
  <goal name="fib_memo&#39;vc" expl="VC for fib_memo" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="fib_memo&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.011911" steps="6896"/></proof>
-  <proof prover="5"><result status="valid" time="0.028068" steps="10"/></proof>
+  <proof prover="5"><result status="valid" time="0.008535" steps="10"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.029642" steps="22"/></proof>
+  <proof prover="5"><result status="valid" time="0.009702" steps="22"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.064765" steps="73203"/></proof>
-  <proof prover="5"><result status="valid" time="0.015501" steps="23"/></proof>
+  <proof prover="1"><result status="valid" time="0.068972" steps="10739"/></proof>
+  <proof prover="5"><result status="valid" time="0.029729" steps="23"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.3" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.005338" steps="14"/></proof>
@@ -38,7 +37,7 @@
   <proof prover="5"><result status="valid" time="0.010993" steps="53"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009451" steps="38"/></proof>
+  <proof prover="5"><result status="valid" time="0.009887" steps="38"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.6" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.009296" steps="38"/></proof>
@@ -50,7 +49,7 @@
   <proof prover="5"><result status="valid" time="0.011951" steps="78"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009887" steps="42"/></proof>
+  <proof prover="5"><result status="valid" time="0.009451" steps="42"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.10" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.009582" steps="42"/></proof>
@@ -59,12 +58,12 @@
   <proof prover="5"><result status="valid" time="0.009606" steps="43"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.12" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.103941" steps="1041"/></proof>
+  <proof prover="5"><result status="valid" time="0.049109" steps="1040"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.13" expl="assertion" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="fib_memo&#39;vc.13.0" expl="assertion" proved="true">
-   <proof prover="0"><result status="valid" time="0.027155" steps="95086"/></proof>
+   <proof prover="1"><result status="valid" time="0.042383" steps="13098"/></proof>
    </goal>
    <goal name="fib_memo&#39;vc.13.1" expl="assertion" proved="true">
    <transf name="split_vc" proved="true" >
@@ -73,10 +72,10 @@
      <goal name="fib_memo&#39;vc.13.1.0.0" expl="assertion" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="fib_memo&#39;vc.13.1.0.0.0" expl="assertion" proved="true">
-      <proof prover="5"><result status="valid" time="0.023083" steps="251"/></proof>
+      <proof prover="5"><result status="valid" time="0.019073" steps="251"/></proof>
       </goal>
       <goal name="fib_memo&#39;vc.13.1.0.0.1" expl="assertion" proved="true">
-      <proof prover="5"><result status="valid" time="0.123145" steps="1848"/></proof>
+      <proof prover="0"><result status="valid" time="0.022081" steps="95459"/></proof>
       </goal>
      </transf>
      </goal>
@@ -87,14 +86,15 @@
   </transf>
   </goal>
   <goal name="fib_memo&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.008535" steps="18"/></proof>
+  <proof prover="0"><result status="valid" time="0.011911" steps="9569"/></proof>
+  <proof prover="5"><result status="valid" time="0.028068" steps="18"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.009702" steps="55"/></proof>
+  <proof prover="5"><result status="valid" time="0.029642" steps="55"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.068972" steps="14515"/></proof>
-  <proof prover="5"><result status="valid" time="0.029729" steps="56"/></proof>
+  <proof prover="0"><result status="valid" time="0.064765" steps="84668"/></proof>
+  <proof prover="5"><result status="valid" time="0.015501" steps="56"/></proof>
   </goal>
   <goal name="fib_memo&#39;vc.17" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.008697" steps="339"/></proof>
diff --git a/creusot/tests/should_succeed/checked_ops.mlcfg b/creusot/tests/should_succeed/checked_ops.mlcfg
index 3b574e107b..a2123e93ae 100644
--- a/creusot/tests/should_succeed/checked_ops.mlcfg
+++ b/creusot/tests/should_succeed/checked_ops.mlcfg
@@ -145,7 +145,7 @@ module CheckedOps_TestU8AddExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 6 12 6 46] _2 <- ([#"../checked_ops.rs" 6 12 6 46] _3 = ([#"../checked_ops.rs" 6 44 6 46] (15 : uint8)));
+    [#"../checked_ops.rs" 6 12 6 46] _2 <- _3 = ([#"../checked_ops.rs" 6 44 6 46] (15 : uint8));
     _3 <- any uint8;
     switch (_2)
       | False -> goto BB4
@@ -179,7 +179,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 9 12 9 38] _12 <- ([#"../checked_ops.rs" 9 12 9 38] _13 = ([#"../checked_ops.rs" 9 36 9 38] (15 : uint8)));
+    [#"../checked_ops.rs" 9 12 9 38] _12 <- _13 = ([#"../checked_ops.rs" 9 36 9 38] (15 : uint8));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -195,7 +195,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 10 12 10 39] _16 <- ([#"../checked_ops.rs" 10 12 10 39] _17 = ([#"../checked_ops.rs" 10 38 10 39] (4 : uint8)));
+    [#"../checked_ops.rs" 10 12 10 39] _16 <- _17 = ([#"../checked_ops.rs" 10 38 10 39] (4 : uint8));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -211,7 +211,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 12 12 12 40] _20 <- ([#"../checked_ops.rs" 12 12 12 40] _21 = ([#"../checked_ops.rs" 12 38 12 40] (15 : uint8)));
+    [#"../checked_ops.rs" 12 12 12 40] _20 <- _21 = ([#"../checked_ops.rs" 12 38 12 40] (15 : uint8));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -227,7 +227,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 13 12 13 43] _24 <- ([#"../checked_ops.rs" 13 12 13 43] _25 = ([#"../checked_ops.rs" 13 40 13 43] (255 : uint8)));
+    [#"../checked_ops.rs" 13 12 13 43] _24 <- _25 = ([#"../checked_ops.rs" 13 40 13 43] (255 : uint8));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -243,7 +243,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 16 12 16 23] _29 <- ([#"../checked_ops.rs" 16 12 16 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 16 21 16 23] (15 : uint8)));
+    [#"../checked_ops.rs" 16 12 16 23] _29 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 16 21 16 23] (15 : uint8));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -251,7 +251,7 @@ module CheckedOps_TestU8AddExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 16 27 16 41] _31 <- ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 16 36 16 41] false));
+    [#"../checked_ops.rs" 16 27 16 41] _31 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 16 36 16 41] false);
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
@@ -273,7 +273,7 @@ module CheckedOps_TestU8AddExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 18 12 18 22] _36 <- ([#"../checked_ops.rs" 18 12 18 22] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 18 21 18 22] (4 : uint8)));
+    [#"../checked_ops.rs" 18 12 18 22] _36 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 18 21 18 22] (4 : uint8));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -281,14 +281,14 @@ module CheckedOps_TestU8AddExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 18 26 18 39] _38 <- ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 18 35 18 39] true));
+    [#"../checked_ops.rs" 18 26 18 39] _38 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 18 35 18 39] true);
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 5 29 19 1] _0 <- ([#"../checked_ops.rs" 5 29 19 1] [#"../checked_ops.rs" 5 29 19 1] ());
+    [#"../checked_ops.rs" 5 29 19 1] _0 <- ([#"../checked_ops.rs" 5 29 19 1] ());
     return _0
   }
   BB30 {
@@ -425,8 +425,8 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 25 37 25 42] _13 <- ([#"../checked_ops.rs" 25 37 25 42] a - ([#"../checked_ops.rs" 25 41 25 42] (1 : uint8)));
-    [#"../checked_ops.rs" 25 12 25 42] _10 <- ([#"../checked_ops.rs" 25 12 25 42] _11 = _13);
+    [#"../checked_ops.rs" 25 37 25 42] _13 <- a - ([#"../checked_ops.rs" 25 41 25 42] (1 : uint8));
+    [#"../checked_ops.rs" 25 12 25 42] _10 <- _11 = _13;
     _11 <- any uint8;
     _13 <- any uint8;
     switch (_10)
@@ -443,7 +443,7 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 26 12 26 42] _17 <- ([#"../checked_ops.rs" 26 12 26 42] _18 = ([#"../checked_ops.rs" 26 39 26 42] (255 : uint8)));
+    [#"../checked_ops.rs" 26 12 26 42] _17 <- _18 = ([#"../checked_ops.rs" 26 39 26 42] (255 : uint8));
     _18 <- any uint8;
     switch (_17)
       | False -> goto BB10
@@ -459,8 +459,8 @@ module CheckedOps_TestU8AddOverflow
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 28 21 28 26] _26 <- ([#"../checked_ops.rs" 28 21 28 26] a - ([#"../checked_ops.rs" 28 25 28 26] (1 : uint8)));
-    [#"../checked_ops.rs" 28 12 28 26] _24 <- ([#"../checked_ops.rs" 28 12 28 26] (let (a, _) = res in a) = _26);
+    [#"../checked_ops.rs" 28 21 28 26] _26 <- a - ([#"../checked_ops.rs" 28 25 28 26] (1 : uint8));
+    [#"../checked_ops.rs" 28 12 28 26] _24 <- (let (a, _) = res in a) = _26;
     _26 <- any uint8;
     switch (_24)
       | False -> goto BB15
@@ -469,14 +469,14 @@ module CheckedOps_TestU8AddOverflow
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 28 30 28 43] _28 <- ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 28 39 28 43] true));
+    [#"../checked_ops.rs" 28 30 28 43] _28 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 28 39 28 43] true);
     switch (_28)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 23 35 29 1] _0 <- ([#"../checked_ops.rs" 23 35 29 1] [#"../checked_ops.rs" 23 35 29 1] ());
+    [#"../checked_ops.rs" 23 35 29 1] _0 <- ([#"../checked_ops.rs" 23 35 29 1] ());
     return _0
   }
   BB14 {
@@ -630,7 +630,7 @@ module CheckedOps_TestU8OverflowingAdd
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 40 12 40 55] _4 <- ([#"../checked_ops.rs" 40 12 40 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 40 12 40 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any uint8;
     switch (_4)
       | False -> goto BB4
@@ -655,7 +655,7 @@ module CheckedOps_TestU8OverflowingAdd
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 41 12 41 64] _14 <- ([#"../checked_ops.rs" 41 12 41 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 41 12 41 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -663,7 +663,7 @@ module CheckedOps_TestU8OverflowingAdd
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 39 45 42 1] _0 <- ([#"../checked_ops.rs" 39 45 42 1] [#"../checked_ops.rs" 39 45 42 1] ());
+    [#"../checked_ops.rs" 39 45 42 1] _0 <- ([#"../checked_ops.rs" 39 45 42 1] ());
     return _0
   }
   BB9 {
@@ -830,7 +830,7 @@ module CheckedOps_TestU8SubExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 47 12 47 49] _7 <- ([#"../checked_ops.rs" 47 12 47 49] _8 = ([#"../checked_ops.rs" 47 46 47 49] (240 : uint8)));
+    [#"../checked_ops.rs" 47 12 47 49] _7 <- _8 = ([#"../checked_ops.rs" 47 46 47 49] (240 : uint8));
     _8 <- any uint8;
     switch (_7)
       | False -> goto BB8
@@ -846,7 +846,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 49 12 49 39] _12 <- ([#"../checked_ops.rs" 49 12 49 39] _13 = ([#"../checked_ops.rs" 49 36 49 39] (251 : uint8)));
+    [#"../checked_ops.rs" 49 12 49 39] _12 <- _13 = ([#"../checked_ops.rs" 49 36 49 39] (251 : uint8));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -862,7 +862,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 50 12 50 41] _16 <- ([#"../checked_ops.rs" 50 12 50 41] _17 = ([#"../checked_ops.rs" 50 38 50 41] (240 : uint8)));
+    [#"../checked_ops.rs" 50 12 50 41] _16 <- _17 = ([#"../checked_ops.rs" 50 38 50 41] (240 : uint8));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -878,7 +878,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 52 12 52 39] _20 <- ([#"../checked_ops.rs" 52 12 52 39] _21 = ([#"../checked_ops.rs" 52 38 52 39] (0 : uint8)));
+    [#"../checked_ops.rs" 52 12 52 39] _20 <- _21 = ([#"../checked_ops.rs" 52 38 52 39] (0 : uint8));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -894,7 +894,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 53 12 53 43] _24 <- ([#"../checked_ops.rs" 53 12 53 43] _25 = ([#"../checked_ops.rs" 53 40 53 43] (240 : uint8)));
+    [#"../checked_ops.rs" 53 12 53 43] _24 <- _25 = ([#"../checked_ops.rs" 53 40 53 43] (240 : uint8));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -910,7 +910,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 56 12 56 24] _29 <- ([#"../checked_ops.rs" 56 12 56 24] (let (a, _) = res in a) = ([#"../checked_ops.rs" 56 21 56 24] (251 : uint8)));
+    [#"../checked_ops.rs" 56 12 56 24] _29 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 56 21 56 24] (251 : uint8));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -918,7 +918,7 @@ module CheckedOps_TestU8SubExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 56 28 56 41] _31 <- ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 56 37 56 41] true));
+    [#"../checked_ops.rs" 56 28 56 41] _31 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 56 37 56 41] true);
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
@@ -940,7 +940,7 @@ module CheckedOps_TestU8SubExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 58 12 58 24] _36 <- ([#"../checked_ops.rs" 58 12 58 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 58 21 58 24] (240 : uint8)));
+    [#"../checked_ops.rs" 58 12 58 24] _36 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 58 21 58 24] (240 : uint8));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -948,14 +948,14 @@ module CheckedOps_TestU8SubExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 58 28 58 42] _38 <- ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 58 37 58 42] false));
+    [#"../checked_ops.rs" 58 28 58 42] _38 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 58 37 58 42] false);
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 45 29 59 1] _0 <- ([#"../checked_ops.rs" 45 29 59 1] [#"../checked_ops.rs" 45 29 59 1] ());
+    [#"../checked_ops.rs" 45 29 59 1] _0 <- ([#"../checked_ops.rs" 45 29 59 1] ());
     return _0
   }
   BB30 {
@@ -1094,10 +1094,10 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 42] ([#"../checked_ops.rs" 65 35 65 38] (255 : uint8)) - a);
-    [#"../checked_ops.rs" 65 35 65 46] _13 <- ([#"../checked_ops.rs" 65 35 65 46] _14 + ([#"../checked_ops.rs" 65 45 65 46] (1 : uint8)));
+    [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 38] (255 : uint8)) - a;
+    [#"../checked_ops.rs" 65 35 65 46] _13 <- _14 + ([#"../checked_ops.rs" 65 45 65 46] (1 : uint8));
     _14 <- any uint8;
-    [#"../checked_ops.rs" 65 12 65 46] _10 <- ([#"../checked_ops.rs" 65 12 65 46] _11 = _13);
+    [#"../checked_ops.rs" 65 12 65 46] _10 <- _11 = _13;
     _11 <- any uint8;
     _13 <- any uint8;
     switch (_10)
@@ -1114,7 +1114,7 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 66 12 66 38] _18 <- ([#"../checked_ops.rs" 66 12 66 38] _19 = ([#"../checked_ops.rs" 66 37 66 38] (0 : uint8)));
+    [#"../checked_ops.rs" 66 12 66 38] _18 <- _19 = ([#"../checked_ops.rs" 66 37 66 38] (0 : uint8));
     _19 <- any uint8;
     switch (_18)
       | False -> goto BB10
@@ -1130,10 +1130,10 @@ module CheckedOps_TestU8SubOverflow
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 28] ([#"../checked_ops.rs" 68 21 68 24] (255 : uint8)) - a);
-    [#"../checked_ops.rs" 68 21 68 32] _27 <- ([#"../checked_ops.rs" 68 21 68 32] _28 + ([#"../checked_ops.rs" 68 31 68 32] (1 : uint8)));
+    [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 24] (255 : uint8)) - a;
+    [#"../checked_ops.rs" 68 21 68 32] _27 <- _28 + ([#"../checked_ops.rs" 68 31 68 32] (1 : uint8));
     _28 <- any uint8;
-    [#"../checked_ops.rs" 68 12 68 32] _25 <- ([#"../checked_ops.rs" 68 12 68 32] (let (a, _) = res in a) = _27);
+    [#"../checked_ops.rs" 68 12 68 32] _25 <- (let (a, _) = res in a) = _27;
     _27 <- any uint8;
     switch (_25)
       | False -> goto BB15
@@ -1142,14 +1142,14 @@ module CheckedOps_TestU8SubOverflow
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 68 36 68 49] _30 <- ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 68 45 68 49] true));
+    [#"../checked_ops.rs" 68 36 68 49] _30 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 68 45 68 49] true);
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 63 35 69 1] _0 <- ([#"../checked_ops.rs" 63 35 69 1] [#"../checked_ops.rs" 63 35 69 1] ());
+    [#"../checked_ops.rs" 63 35 69 1] _0 <- ([#"../checked_ops.rs" 63 35 69 1] ());
     return _0
   }
   BB14 {
@@ -1303,7 +1303,7 @@ module CheckedOps_TestU8OverflowingSub
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 80 12 80 55] _4 <- ([#"../checked_ops.rs" 80 12 80 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 80 12 80 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any uint8;
     switch (_4)
       | False -> goto BB4
@@ -1328,7 +1328,7 @@ module CheckedOps_TestU8OverflowingSub
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 81 12 81 64] _14 <- ([#"../checked_ops.rs" 81 12 81 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 81 12 81 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -1336,7 +1336,7 @@ module CheckedOps_TestU8OverflowingSub
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 79 45 82 1] _0 <- ([#"../checked_ops.rs" 79 45 82 1] [#"../checked_ops.rs" 79 45 82 1] ());
+    [#"../checked_ops.rs" 79 45 82 1] _0 <- ([#"../checked_ops.rs" 79 45 82 1] ());
     return _0
   }
   BB9 {
@@ -1485,7 +1485,7 @@ module CheckedOps_TestU8MulExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 86 12 86 46] _2 <- ([#"../checked_ops.rs" 86 12 86 46] _3 = ([#"../checked_ops.rs" 86 44 86 46] (50 : uint8)));
+    [#"../checked_ops.rs" 86 12 86 46] _2 <- _3 = ([#"../checked_ops.rs" 86 44 86 46] (50 : uint8));
     _3 <- any uint8;
     switch (_2)
       | False -> goto BB4
@@ -1519,7 +1519,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 89 12 89 38] _12 <- ([#"../checked_ops.rs" 89 12 89 38] _13 = ([#"../checked_ops.rs" 89 36 89 38] (50 : uint8)));
+    [#"../checked_ops.rs" 89 12 89 38] _12 <- _13 = ([#"../checked_ops.rs" 89 36 89 38] (50 : uint8));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -1535,7 +1535,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 90 12 90 40] _16 <- ([#"../checked_ops.rs" 90 12 90 40] _17 = ([#"../checked_ops.rs" 90 37 90 40] (244 : uint8)));
+    [#"../checked_ops.rs" 90 12 90 40] _16 <- _17 = ([#"../checked_ops.rs" 90 37 90 40] (244 : uint8));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -1551,7 +1551,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 92 12 92 40] _20 <- ([#"../checked_ops.rs" 92 12 92 40] _21 = ([#"../checked_ops.rs" 92 38 92 40] (50 : uint8)));
+    [#"../checked_ops.rs" 92 12 92 40] _20 <- _21 = ([#"../checked_ops.rs" 92 38 92 40] (50 : uint8));
     _21 <- any uint8;
     switch (_20)
       | False -> goto BB17
@@ -1567,7 +1567,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB18 {
-    [#"../checked_ops.rs" 93 12 93 42] _24 <- ([#"../checked_ops.rs" 93 12 93 42] _25 = ([#"../checked_ops.rs" 93 39 93 42] (255 : uint8)));
+    [#"../checked_ops.rs" 93 12 93 42] _24 <- _25 = ([#"../checked_ops.rs" 93 39 93 42] (255 : uint8));
     _25 <- any uint8;
     switch (_24)
       | False -> goto BB20
@@ -1583,7 +1583,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB21 {
-    [#"../checked_ops.rs" 96 12 96 23] _29 <- ([#"../checked_ops.rs" 96 12 96 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 96 21 96 23] (50 : uint8)));
+    [#"../checked_ops.rs" 96 12 96 23] _29 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 96 21 96 23] (50 : uint8));
     switch (_29)
       | False -> goto BB25
       | True -> goto BB22
@@ -1591,7 +1591,7 @@ module CheckedOps_TestU8MulExample
   }
   BB22 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 96 27 96 41] _31 <- ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 96 36 96 41] false));
+    [#"../checked_ops.rs" 96 27 96 41] _31 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 96 36 96 41] false);
     switch (_31)
       | False -> goto BB24
       | True -> goto BB23
@@ -1613,7 +1613,7 @@ module CheckedOps_TestU8MulExample
     absurd
   }
   BB27 {
-    [#"../checked_ops.rs" 98 12 98 24] _36 <- ([#"../checked_ops.rs" 98 12 98 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 98 21 98 24] (244 : uint8)));
+    [#"../checked_ops.rs" 98 12 98 24] _36 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 98 21 98 24] (244 : uint8));
     switch (_36)
       | False -> goto BB31
       | True -> goto BB28
@@ -1621,14 +1621,14 @@ module CheckedOps_TestU8MulExample
   }
   BB28 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 98 28 98 41] _38 <- ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 98 37 98 41] true));
+    [#"../checked_ops.rs" 98 28 98 41] _38 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 98 37 98 41] true);
     switch (_38)
       | False -> goto BB30
       | True -> goto BB29
       end
   }
   BB29 {
-    [#"../checked_ops.rs" 85 29 99 1] _0 <- ([#"../checked_ops.rs" 85 29 99 1] [#"../checked_ops.rs" 85 29 99 1] ());
+    [#"../checked_ops.rs" 85 29 99 1] _0 <- ([#"../checked_ops.rs" 85 29 99 1] ());
     return _0
   }
   BB30 {
@@ -1761,7 +1761,7 @@ module CheckedOps_TestU8MulZero
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 103 12 103 44] _3 <- ([#"../checked_ops.rs" 103 12 103 44] _4 = ([#"../checked_ops.rs" 103 43 103 44] (0 : uint8)));
+    [#"../checked_ops.rs" 103 12 103 44] _3 <- _4 = ([#"../checked_ops.rs" 103 43 103 44] (0 : uint8));
     _4 <- any uint8;
     switch (_3)
       | False -> goto BB4
@@ -1777,7 +1777,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 104 12 104 36] _9 <- ([#"../checked_ops.rs" 104 12 104 36] _10 = ([#"../checked_ops.rs" 104 35 104 36] (0 : uint8)));
+    [#"../checked_ops.rs" 104 12 104 36] _9 <- _10 = ([#"../checked_ops.rs" 104 35 104 36] (0 : uint8));
     _10 <- any uint8;
     switch (_9)
       | False -> goto BB7
@@ -1793,7 +1793,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 105 12 105 38] _14 <- ([#"../checked_ops.rs" 105 12 105 38] _15 = ([#"../checked_ops.rs" 105 37 105 38] (0 : uint8)));
+    [#"../checked_ops.rs" 105 12 105 38] _14 <- _15 = ([#"../checked_ops.rs" 105 37 105 38] (0 : uint8));
     _15 <- any uint8;
     switch (_14)
       | False -> goto BB10
@@ -1809,7 +1809,7 @@ module CheckedOps_TestU8MulZero
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 107 12 107 22] _21 <- ([#"../checked_ops.rs" 107 12 107 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 107 21 107 22] (0 : uint8)));
+    [#"../checked_ops.rs" 107 12 107 22] _21 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 107 21 107 22] (0 : uint8));
     switch (_21)
       | False -> goto BB15
       | True -> goto BB12
@@ -1817,14 +1817,14 @@ module CheckedOps_TestU8MulZero
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 107 26 107 40] _23 <- ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 107 35 107 40] false));
+    [#"../checked_ops.rs" 107 26 107 40] _23 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 107 35 107 40] false);
     switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 102 31 108 1] _0 <- ([#"../checked_ops.rs" 102 31 108 1] [#"../checked_ops.rs" 102 31 108 1] ());
+    [#"../checked_ops.rs" 102 31 108 1] _0 <- ([#"../checked_ops.rs" 102 31 108 1] ());
     return _0
   }
   BB14 {
@@ -1936,7 +1936,7 @@ module CheckedOps_TestU8OverflowingMul
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 112 12 112 55] _4 <- ([#"../checked_ops.rs" 112 12 112 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 112 12 112 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any uint8;
     switch (_4)
       | False -> goto BB4
@@ -1961,7 +1961,7 @@ module CheckedOps_TestU8OverflowingMul
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 113 12 113 64] _14 <- ([#"../checked_ops.rs" 113 12 113 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 113 12 113 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -1969,7 +1969,7 @@ module CheckedOps_TestU8OverflowingMul
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 111 45 114 1] _0 <- ([#"../checked_ops.rs" 111 45 114 1] [#"../checked_ops.rs" 111 45 114 1] ());
+    [#"../checked_ops.rs" 111 45 114 1] _0 <- ([#"../checked_ops.rs" 111 45 114 1] ());
     return _0
   }
   BB9 {
@@ -2113,7 +2113,7 @@ module CheckedOps_TestU8DivExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 119 12 119 44] _7 <- ([#"../checked_ops.rs" 119 12 119 44] _8 = ([#"../checked_ops.rs" 119 43 119 44] (2 : uint8)));
+    [#"../checked_ops.rs" 119 12 119 44] _7 <- _8 = ([#"../checked_ops.rs" 119 43 119 44] (2 : uint8));
     _8 <- any uint8;
     switch (_7)
       | False -> goto BB8
@@ -2129,7 +2129,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB9 {
-    [#"../checked_ops.rs" 120 12 120 36] _12 <- ([#"../checked_ops.rs" 120 12 120 36] _13 = ([#"../checked_ops.rs" 120 35 120 36] (2 : uint8)));
+    [#"../checked_ops.rs" 120 12 120 36] _12 <- _13 = ([#"../checked_ops.rs" 120 35 120 36] (2 : uint8));
     _13 <- any uint8;
     switch (_12)
       | False -> goto BB11
@@ -2145,7 +2145,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 121 12 121 38] _16 <- ([#"../checked_ops.rs" 121 12 121 38] _17 = ([#"../checked_ops.rs" 121 37 121 38] (2 : uint8)));
+    [#"../checked_ops.rs" 121 12 121 38] _16 <- _17 = ([#"../checked_ops.rs" 121 37 121 38] (2 : uint8));
     _17 <- any uint8;
     switch (_16)
       | False -> goto BB14
@@ -2161,7 +2161,7 @@ module CheckedOps_TestU8DivExample
     absurd
   }
   BB15 {
-    [#"../checked_ops.rs" 123 12 123 22] _21 <- ([#"../checked_ops.rs" 123 12 123 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 123 21 123 22] (2 : uint8)));
+    [#"../checked_ops.rs" 123 12 123 22] _21 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 123 21 123 22] (2 : uint8));
     switch (_21)
       | False -> goto BB19
       | True -> goto BB16
@@ -2169,14 +2169,14 @@ module CheckedOps_TestU8DivExample
   }
   BB16 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 123 26 123 40] _23 <- ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 123 35 123 40] false));
+    [#"../checked_ops.rs" 123 26 123 40] _23 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 123 35 123 40] false);
     switch (_23)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 117 29 124 1] _0 <- ([#"../checked_ops.rs" 117 29 124 1] [#"../checked_ops.rs" 117 29 124 1] ());
+    [#"../checked_ops.rs" 117 29 124 1] _0 <- ([#"../checked_ops.rs" 117 29 124 1] ());
     return _0
   }
   BB18 {
@@ -2307,15 +2307,15 @@ module CheckedOps_TestU8DivNoOverflow
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 129 45 129 46] _12 <- ([#"../checked_ops.rs" 129 45 129 46] b);
-    [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = ([#"../checked_ops.rs" 129 41 129 46] (0 : uint8)));
+    [#"../checked_ops.rs" 129 45 129 46] _12 <- b;
+    [#"../checked_ops.rs" 129 41 129 46] _13 <- _12 = ([#"../checked_ops.rs" 129 41 129 46] (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 129 41 129 46] not _13 };
     goto BB3
   }
   BB3 {
-    [#"../checked_ops.rs" 129 41 129 46] _10 <- ([#"../checked_ops.rs" 129 41 129 46] a / _12);
+    [#"../checked_ops.rs" 129 41 129 46] _10 <- a / _12;
     _12 <- any uint8;
-    [#"../checked_ops.rs" 129 12 129 46] _5 <- ([#"../checked_ops.rs" 129 12 129 46] _6 = _10);
+    [#"../checked_ops.rs" 129 12 129 46] _5 <- _6 = _10;
     _6 <- any uint8;
     _10 <- any uint8;
     switch (_5)
@@ -2332,15 +2332,15 @@ module CheckedOps_TestU8DivNoOverflow
     absurd
   }
   BB6 {
-    [#"../checked_ops.rs" 130 37 130 38] _22 <- ([#"../checked_ops.rs" 130 37 130 38] b);
-    [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = ([#"../checked_ops.rs" 130 33 130 38] (0 : uint8)));
+    [#"../checked_ops.rs" 130 37 130 38] _22 <- b;
+    [#"../checked_ops.rs" 130 33 130 38] _23 <- _22 = ([#"../checked_ops.rs" 130 33 130 38] (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 130 33 130 38] not _23 };
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 130 33 130 38] _20 <- ([#"../checked_ops.rs" 130 33 130 38] a / _22);
+    [#"../checked_ops.rs" 130 33 130 38] _20 <- a / _22;
     _22 <- any uint8;
-    [#"../checked_ops.rs" 130 12 130 38] _16 <- ([#"../checked_ops.rs" 130 12 130 38] _17 = _20);
+    [#"../checked_ops.rs" 130 12 130 38] _16 <- _17 = _20;
     _17 <- any uint8;
     _20 <- any uint8;
     switch (_16)
@@ -2357,15 +2357,15 @@ module CheckedOps_TestU8DivNoOverflow
     absurd
   }
   BB10 {
-    [#"../checked_ops.rs" 131 39 131 40] _32 <- ([#"../checked_ops.rs" 131 39 131 40] b);
-    [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = ([#"../checked_ops.rs" 131 35 131 40] (0 : uint8)));
+    [#"../checked_ops.rs" 131 39 131 40] _32 <- b;
+    [#"../checked_ops.rs" 131 35 131 40] _33 <- _32 = ([#"../checked_ops.rs" 131 35 131 40] (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 131 35 131 40] not _33 };
     goto BB11
   }
   BB11 {
-    [#"../checked_ops.rs" 131 35 131 40] _30 <- ([#"../checked_ops.rs" 131 35 131 40] a / _32);
+    [#"../checked_ops.rs" 131 35 131 40] _30 <- a / _32;
     _32 <- any uint8;
-    [#"../checked_ops.rs" 131 12 131 40] _26 <- ([#"../checked_ops.rs" 131 12 131 40] _27 = _30);
+    [#"../checked_ops.rs" 131 12 131 40] _26 <- _27 = _30;
     _27 <- any uint8;
     _30 <- any uint8;
     switch (_26)
@@ -2382,15 +2382,15 @@ module CheckedOps_TestU8DivNoOverflow
     absurd
   }
   BB14 {
-    [#"../checked_ops.rs" 133 25 133 26] _43 <- ([#"../checked_ops.rs" 133 25 133 26] b);
-    [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = ([#"../checked_ops.rs" 133 21 133 26] (0 : uint8)));
+    [#"../checked_ops.rs" 133 25 133 26] _43 <- b;
+    [#"../checked_ops.rs" 133 21 133 26] _44 <- _43 = ([#"../checked_ops.rs" 133 21 133 26] (0 : uint8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 133 21 133 26] not _44 };
     goto BB15
   }
   BB15 {
-    [#"../checked_ops.rs" 133 21 133 26] _41 <- ([#"../checked_ops.rs" 133 21 133 26] a / _43);
+    [#"../checked_ops.rs" 133 21 133 26] _41 <- a / _43;
     _43 <- any uint8;
-    [#"../checked_ops.rs" 133 12 133 26] _39 <- ([#"../checked_ops.rs" 133 12 133 26] (let (a, _) = res in a) = _41);
+    [#"../checked_ops.rs" 133 12 133 26] _39 <- (let (a, _) = res in a) = _41;
     _41 <- any uint8;
     switch (_39)
       | False -> goto BB19
@@ -2399,14 +2399,14 @@ module CheckedOps_TestU8DivNoOverflow
   }
   BB16 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 133 30 133 44] _45 <- ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 133 39 133 44] false));
+    [#"../checked_ops.rs" 133 30 133 44] _45 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 133 39 133 44] false);
     switch (_45)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../checked_ops.rs" 128 45 134 1] _0 <- ([#"../checked_ops.rs" 128 45 134 1] [#"../checked_ops.rs" 128 45 134 1] ());
+    [#"../checked_ops.rs" 128 45 134 1] _0 <- ([#"../checked_ops.rs" 128 45 134 1] ());
     return _0
   }
   BB18 {
@@ -2474,7 +2474,7 @@ module CheckedOps_TestU8DivZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 137 31 139 1] _0 <- ([#"../checked_ops.rs" 137 31 139 1] [#"../checked_ops.rs" 137 31 139 1] ());
+    [#"../checked_ops.rs" 137 31 139 1] _0 <- ([#"../checked_ops.rs" 137 31 139 1] ());
     return _0
   }
   BB4 {
@@ -2632,7 +2632,7 @@ module CheckedOps_TestI8AddExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 143 12 143 46] _2 <- ([#"../checked_ops.rs" 143 12 143 46] _3 = ([#"../checked_ops.rs" 143 44 143 46] (15 : int8)));
+    [#"../checked_ops.rs" 143 12 143 46] _2 <- _3 = ([#"../checked_ops.rs" 143 44 143 46] (15 : int8));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -2684,7 +2684,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 147 12 147 38] _17 <- ([#"../checked_ops.rs" 147 12 147 38] _18 = ([#"../checked_ops.rs" 147 36 147 38] (15 : int8)));
+    [#"../checked_ops.rs" 147 12 147 38] _17 <- _18 = ([#"../checked_ops.rs" 147 36 147 38] (15 : int8));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -2700,7 +2700,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 148 12 148 42] _21 <- ([#"../checked_ops.rs" 148 12 148 42] _22 = ([#"../checked_ops.rs" 148 38 148 42] (-126 : int8)));
+    [#"../checked_ops.rs" 148 12 148 42] _21 <- _22 = ([#"../checked_ops.rs" 148 38 148 42] (-126 : int8));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -2716,7 +2716,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 149 12 149 45] _25 <- ([#"../checked_ops.rs" 149 12 149 45] _26 = ([#"../checked_ops.rs" 149 42 149 45] (126 : int8)));
+    [#"../checked_ops.rs" 149 12 149 45] _25 <- _26 = ([#"../checked_ops.rs" 149 42 149 45] (126 : int8));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -2732,7 +2732,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 151 12 151 40] _29 <- ([#"../checked_ops.rs" 151 12 151 40] _30 = ([#"../checked_ops.rs" 151 38 151 40] (15 : int8)));
+    [#"../checked_ops.rs" 151 12 151 40] _29 <- _30 = ([#"../checked_ops.rs" 151 38 151 40] (15 : int8));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -2748,7 +2748,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 152 12 152 43] _33 <- ([#"../checked_ops.rs" 152 12 152 43] _34 = ([#"../checked_ops.rs" 152 40 152 43] (127 : int8)));
+    [#"../checked_ops.rs" 152 12 152 43] _33 <- _34 = ([#"../checked_ops.rs" 152 40 152 43] (127 : int8));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -2764,7 +2764,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 153 12 153 48] _37 <- ([#"../checked_ops.rs" 153 12 153 48] _38 = ([#"../checked_ops.rs" 153 44 153 48] (-128 : int8)));
+    [#"../checked_ops.rs" 153 12 153 48] _37 <- _38 = ([#"../checked_ops.rs" 153 44 153 48] (-128 : int8));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -2780,7 +2780,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 156 12 156 23] _42 <- ([#"../checked_ops.rs" 156 12 156 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 156 21 156 23] (15 : int8)));
+    [#"../checked_ops.rs" 156 12 156 23] _42 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 156 21 156 23] (15 : int8));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -2788,7 +2788,7 @@ module CheckedOps_TestI8AddExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 156 27 156 41] _44 <- ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 156 36 156 41] false));
+    [#"../checked_ops.rs" 156 27 156 41] _44 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 156 36 156 41] false);
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
@@ -2810,7 +2810,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 158 12 158 25] _49 <- ([#"../checked_ops.rs" 158 12 158 25] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 158 21 158 25] (-126 : int8)));
+    [#"../checked_ops.rs" 158 12 158 25] _49 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 158 21 158 25] (-126 : int8));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -2818,7 +2818,7 @@ module CheckedOps_TestI8AddExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 158 29 158 42] _51 <- ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 158 38 158 42] true));
+    [#"../checked_ops.rs" 158 29 158 42] _51 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 158 38 158 42] true);
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
@@ -2840,7 +2840,7 @@ module CheckedOps_TestI8AddExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 160 12 160 24] _56 <- ([#"../checked_ops.rs" 160 12 160 24] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 160 21 160 24] (126 : int8)));
+    [#"../checked_ops.rs" 160 12 160 24] _56 <- (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 160 21 160 24] (126 : int8));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -2848,14 +2848,14 @@ module CheckedOps_TestI8AddExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 160 28 160 41] _58 <- ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 160 37 160 41] true));
+    [#"../checked_ops.rs" 160 28 160 41] _58 <- Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 160 37 160 41] true);
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 142 29 161 1] _0 <- ([#"../checked_ops.rs" 142 29 161 1] [#"../checked_ops.rs" 142 29 161 1] ());
+    [#"../checked_ops.rs" 142 29 161 1] _0 <- ([#"../checked_ops.rs" 142 29 161 1] ());
     return _0
   }
   BB46 {
@@ -2994,10 +2994,10 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 167 37 167 44] _14 <- ([#"../checked_ops.rs" 167 37 167 44] a - ([#"../checked_ops.rs" 167 41 167 44] (127 : int8)));
-    [#"../checked_ops.rs" 167 37 167 48] _13 <- ([#"../checked_ops.rs" 167 37 167 48] _14 - ([#"../checked_ops.rs" 167 47 167 48] (2 : int8)));
+    [#"../checked_ops.rs" 167 37 167 44] _14 <- a - ([#"../checked_ops.rs" 167 41 167 44] (127 : int8));
+    [#"../checked_ops.rs" 167 37 167 48] _13 <- _14 - ([#"../checked_ops.rs" 167 47 167 48] (2 : int8));
     _14 <- any int8;
-    [#"../checked_ops.rs" 167 12 167 48] _10 <- ([#"../checked_ops.rs" 167 12 167 48] _11 = _13);
+    [#"../checked_ops.rs" 167 12 167 48] _10 <- _11 = _13;
     _11 <- any int8;
     _13 <- any int8;
     switch (_10)
@@ -3014,7 +3014,7 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 168 12 168 42] _18 <- ([#"../checked_ops.rs" 168 12 168 42] _19 = ([#"../checked_ops.rs" 168 39 168 42] (127 : int8)));
+    [#"../checked_ops.rs" 168 12 168 42] _18 <- _19 = ([#"../checked_ops.rs" 168 39 168 42] (127 : int8));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -3030,10 +3030,10 @@ module CheckedOps_TestI8AddOverflowPos
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 170 21 170 28] _28 <- ([#"../checked_ops.rs" 170 21 170 28] a - ([#"../checked_ops.rs" 170 25 170 28] (127 : int8)));
-    [#"../checked_ops.rs" 170 21 170 32] _27 <- ([#"../checked_ops.rs" 170 21 170 32] _28 - ([#"../checked_ops.rs" 170 31 170 32] (2 : int8)));
+    [#"../checked_ops.rs" 170 21 170 28] _28 <- a - ([#"../checked_ops.rs" 170 25 170 28] (127 : int8));
+    [#"../checked_ops.rs" 170 21 170 32] _27 <- _28 - ([#"../checked_ops.rs" 170 31 170 32] (2 : int8));
     _28 <- any int8;
-    [#"../checked_ops.rs" 170 12 170 32] _25 <- ([#"../checked_ops.rs" 170 12 170 32] (let (a, _) = res in a) = _27);
+    [#"../checked_ops.rs" 170 12 170 32] _25 <- (let (a, _) = res in a) = _27;
     _27 <- any int8;
     switch (_25)
       | False -> goto BB15
@@ -3042,14 +3042,14 @@ module CheckedOps_TestI8AddOverflowPos
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 170 36 170 49] _30 <- ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 170 45 170 49] true));
+    [#"../checked_ops.rs" 170 36 170 49] _30 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 170 45 170 49] true);
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 165 39 171 1] _0 <- ([#"../checked_ops.rs" 165 39 171 1] [#"../checked_ops.rs" 165 39 171 1] ());
+    [#"../checked_ops.rs" 165 39 171 1] _0 <- ([#"../checked_ops.rs" 165 39 171 1] ());
     return _0
   }
   BB14 {
@@ -3188,10 +3188,10 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 177 40 177 47] _14 <- ([#"../checked_ops.rs" 177 40 177 47] a + ([#"../checked_ops.rs" 177 44 177 47] (127 : int8)));
-    [#"../checked_ops.rs" 177 40 177 51] _13 <- ([#"../checked_ops.rs" 177 40 177 51] _14 + ([#"../checked_ops.rs" 177 50 177 51] (1 : int8)));
+    [#"../checked_ops.rs" 177 40 177 47] _14 <- a + ([#"../checked_ops.rs" 177 44 177 47] (127 : int8));
+    [#"../checked_ops.rs" 177 40 177 51] _13 <- _14 + ([#"../checked_ops.rs" 177 50 177 51] (1 : int8));
     _14 <- any int8;
-    [#"../checked_ops.rs" 177 12 177 51] _10 <- ([#"../checked_ops.rs" 177 12 177 51] _11 = _13);
+    [#"../checked_ops.rs" 177 12 177 51] _10 <- _11 = _13;
     _11 <- any int8;
     _13 <- any int8;
     switch (_10)
@@ -3208,7 +3208,7 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 178 12 178 46] _18 <- ([#"../checked_ops.rs" 178 12 178 46] _19 = ([#"../checked_ops.rs" 178 42 178 46] (-128 : int8)));
+    [#"../checked_ops.rs" 178 12 178 46] _18 <- _19 = ([#"../checked_ops.rs" 178 42 178 46] (-128 : int8));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -3224,10 +3224,10 @@ module CheckedOps_TestI8AddOverflowNeg
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 180 21 180 28] _28 <- ([#"../checked_ops.rs" 180 21 180 28] a + ([#"../checked_ops.rs" 180 25 180 28] (127 : int8)));
-    [#"../checked_ops.rs" 180 21 180 32] _27 <- ([#"../checked_ops.rs" 180 21 180 32] _28 + ([#"../checked_ops.rs" 180 31 180 32] (1 : int8)));
+    [#"../checked_ops.rs" 180 21 180 28] _28 <- a + ([#"../checked_ops.rs" 180 25 180 28] (127 : int8));
+    [#"../checked_ops.rs" 180 21 180 32] _27 <- _28 + ([#"../checked_ops.rs" 180 31 180 32] (1 : int8));
     _28 <- any int8;
-    [#"../checked_ops.rs" 180 12 180 32] _25 <- ([#"../checked_ops.rs" 180 12 180 32] (let (a, _) = res in a) = _27);
+    [#"../checked_ops.rs" 180 12 180 32] _25 <- (let (a, _) = res in a) = _27;
     _27 <- any int8;
     switch (_25)
       | False -> goto BB15
@@ -3236,14 +3236,14 @@ module CheckedOps_TestI8AddOverflowNeg
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 180 36 180 49] _30 <- ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 180 45 180 49] true));
+    [#"../checked_ops.rs" 180 36 180 49] _30 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 180 45 180 49] true);
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 175 39 181 1] _0 <- ([#"../checked_ops.rs" 175 39 181 1] [#"../checked_ops.rs" 175 39 181 1] ());
+    [#"../checked_ops.rs" 175 39 181 1] _0 <- ([#"../checked_ops.rs" 175 39 181 1] ());
     return _0
   }
   BB14 {
@@ -3397,7 +3397,7 @@ module CheckedOps_TestI8OverflowingAdd
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 192 12 192 55] _4 <- ([#"../checked_ops.rs" 192 12 192 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 192 12 192 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any int8;
     switch (_4)
       | False -> goto BB4
@@ -3422,7 +3422,7 @@ module CheckedOps_TestI8OverflowingAdd
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 193 12 193 64] _14 <- ([#"../checked_ops.rs" 193 12 193 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 193 12 193 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -3430,7 +3430,7 @@ module CheckedOps_TestI8OverflowingAdd
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 191 45 194 1] _0 <- ([#"../checked_ops.rs" 191 45 194 1] [#"../checked_ops.rs" 191 45 194 1] ());
+    [#"../checked_ops.rs" 191 45 194 1] _0 <- ([#"../checked_ops.rs" 191 45 194 1] ());
     return _0
   }
   BB9 {
@@ -3589,7 +3589,7 @@ module CheckedOps_TestI8SubExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 198 12 198 46] _2 <- ([#"../checked_ops.rs" 198 12 198 46] _3 = ([#"../checked_ops.rs" 198 44 198 46] (-5 : int8)));
+    [#"../checked_ops.rs" 198 12 198 46] _2 <- _3 = ([#"../checked_ops.rs" 198 44 198 46] (-5 : int8));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -3610,7 +3610,7 @@ module CheckedOps_TestI8SubExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 199 12 199 49] _7 <- ([#"../checked_ops.rs" 199 12 199 49] _8 = ([#"../checked_ops.rs" 199 46 199 49] (110 : int8)));
+    [#"../checked_ops.rs" 199 12 199 49] _7 <- _8 = ([#"../checked_ops.rs" 199 46 199 49] (110 : int8));
     _8 <- any int8;
     switch (_7)
       | False -> goto BB8
@@ -3644,7 +3644,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 202 12 202 38] _17 <- ([#"../checked_ops.rs" 202 12 202 38] _18 = ([#"../checked_ops.rs" 202 36 202 38] (-5 : int8)));
+    [#"../checked_ops.rs" 202 12 202 38] _17 <- _18 = ([#"../checked_ops.rs" 202 36 202 38] (-5 : int8));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -3660,7 +3660,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 203 12 203 41] _21 <- ([#"../checked_ops.rs" 203 12 203 41] _22 = ([#"../checked_ops.rs" 203 38 203 41] (110 : int8)));
+    [#"../checked_ops.rs" 203 12 203 41] _21 <- _22 = ([#"../checked_ops.rs" 203 38 203 41] (110 : int8));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -3676,7 +3676,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 204 12 204 44] _25 <- ([#"../checked_ops.rs" 204 12 204 44] _26 = ([#"../checked_ops.rs" 204 41 204 44] (126 : int8)));
+    [#"../checked_ops.rs" 204 12 204 44] _25 <- _26 = ([#"../checked_ops.rs" 204 41 204 44] (126 : int8));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -3692,7 +3692,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 206 12 206 40] _29 <- ([#"../checked_ops.rs" 206 12 206 40] _30 = ([#"../checked_ops.rs" 206 38 206 40] (-5 : int8)));
+    [#"../checked_ops.rs" 206 12 206 40] _29 <- _30 = ([#"../checked_ops.rs" 206 38 206 40] (-5 : int8));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -3708,7 +3708,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 207 12 207 43] _33 <- ([#"../checked_ops.rs" 207 12 207 43] _34 = ([#"../checked_ops.rs" 207 40 207 43] (110 : int8)));
+    [#"../checked_ops.rs" 207 12 207 43] _33 <- _34 = ([#"../checked_ops.rs" 207 40 207 43] (110 : int8));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -3724,7 +3724,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 208 12 208 47] _37 <- ([#"../checked_ops.rs" 208 12 208 47] _38 = ([#"../checked_ops.rs" 208 43 208 47] (-128 : int8)));
+    [#"../checked_ops.rs" 208 12 208 47] _37 <- _38 = ([#"../checked_ops.rs" 208 43 208 47] (-128 : int8));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -3740,7 +3740,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 211 12 211 23] _42 <- ([#"../checked_ops.rs" 211 12 211 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 211 21 211 23] (-5 : int8)));
+    [#"../checked_ops.rs" 211 12 211 23] _42 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 211 21 211 23] (-5 : int8));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -3748,7 +3748,7 @@ module CheckedOps_TestI8SubExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 211 27 211 41] _44 <- ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 211 36 211 41] false));
+    [#"../checked_ops.rs" 211 27 211 41] _44 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 211 36 211 41] false);
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
@@ -3770,7 +3770,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 213 12 213 24] _49 <- ([#"../checked_ops.rs" 213 12 213 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 213 21 213 24] (110 : int8)));
+    [#"../checked_ops.rs" 213 12 213 24] _49 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 213 21 213 24] (110 : int8));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -3778,7 +3778,7 @@ module CheckedOps_TestI8SubExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 213 28 213 42] _51 <- ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 213 37 213 42] false));
+    [#"../checked_ops.rs" 213 28 213 42] _51 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 213 37 213 42] false);
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
@@ -3800,7 +3800,7 @@ module CheckedOps_TestI8SubExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 215 12 215 24] _56 <- ([#"../checked_ops.rs" 215 12 215 24] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 215 21 215 24] (126 : int8)));
+    [#"../checked_ops.rs" 215 12 215 24] _56 <- (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 215 21 215 24] (126 : int8));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -3808,14 +3808,14 @@ module CheckedOps_TestI8SubExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 215 28 215 41] _58 <- ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 215 37 215 41] true));
+    [#"../checked_ops.rs" 215 28 215 41] _58 <- Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 215 37 215 41] true);
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 197 29 216 1] _0 <- ([#"../checked_ops.rs" 197 29 216 1] [#"../checked_ops.rs" 197 29 216 1] ());
+    [#"../checked_ops.rs" 197 29 216 1] _0 <- ([#"../checked_ops.rs" 197 29 216 1] ());
     return _0
   }
   BB46 {
@@ -3954,10 +3954,10 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 47] ([#"../checked_ops.rs" 222 40 222 43] (127 : int8)) - a);
-    [#"../checked_ops.rs" 222 40 222 51] _13 <- ([#"../checked_ops.rs" 222 40 222 51] _14 + ([#"../checked_ops.rs" 222 50 222 51] (1 : int8)));
+    [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 43] (127 : int8)) - a;
+    [#"../checked_ops.rs" 222 40 222 51] _13 <- _14 + ([#"../checked_ops.rs" 222 50 222 51] (1 : int8));
     _14 <- any int8;
-    [#"../checked_ops.rs" 222 12 222 51] _10 <- ([#"../checked_ops.rs" 222 12 222 51] _11 = _13);
+    [#"../checked_ops.rs" 222 12 222 51] _10 <- _11 = _13;
     _11 <- any int8;
     _13 <- any int8;
     switch (_10)
@@ -3974,7 +3974,7 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 223 12 223 46] _18 <- ([#"../checked_ops.rs" 223 12 223 46] _19 = ([#"../checked_ops.rs" 223 42 223 46] (-128 : int8)));
+    [#"../checked_ops.rs" 223 12 223 46] _18 <- _19 = ([#"../checked_ops.rs" 223 42 223 46] (-128 : int8));
     _19 <- any int8;
     switch (_18)
       | False -> goto BB10
@@ -3990,10 +3990,10 @@ module CheckedOps_TestI8SubOverflowPos
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 28] ([#"../checked_ops.rs" 225 21 225 24] (127 : int8)) - a);
-    [#"../checked_ops.rs" 225 21 225 32] _27 <- ([#"../checked_ops.rs" 225 21 225 32] _28 + ([#"../checked_ops.rs" 225 31 225 32] (1 : int8)));
+    [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 24] (127 : int8)) - a;
+    [#"../checked_ops.rs" 225 21 225 32] _27 <- _28 + ([#"../checked_ops.rs" 225 31 225 32] (1 : int8));
     _28 <- any int8;
-    [#"../checked_ops.rs" 225 12 225 32] _25 <- ([#"../checked_ops.rs" 225 12 225 32] (let (a, _) = res in a) = _27);
+    [#"../checked_ops.rs" 225 12 225 32] _25 <- (let (a, _) = res in a) = _27;
     _27 <- any int8;
     switch (_25)
       | False -> goto BB15
@@ -4002,14 +4002,14 @@ module CheckedOps_TestI8SubOverflowPos
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 225 36 225 49] _30 <- ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 225 45 225 49] true));
+    [#"../checked_ops.rs" 225 36 225 49] _30 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 225 45 225 49] true);
     switch (_30)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 220 39 226 1] _0 <- ([#"../checked_ops.rs" 220 39 226 1] [#"../checked_ops.rs" 220 39 226 1] ());
+    [#"../checked_ops.rs" 220 39 226 1] _0 <- ([#"../checked_ops.rs" 220 39 226 1] ());
     return _0
   }
   BB14 {
@@ -4150,12 +4150,12 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 38 232 45] ([#"../checked_ops.rs" 232 39 232 40] (2 : int8)) + a);
-    [#"../checked_ops.rs" 232 37 232 45] _14 <- ([#"../checked_ops.rs" 232 37 232 45] - _15);
+    [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 39 232 40] (2 : int8)) + a;
+    [#"../checked_ops.rs" 232 37 232 45] _14 <- - _15;
     _15 <- any int8;
-    [#"../checked_ops.rs" 232 37 232 51] _13 <- ([#"../checked_ops.rs" 232 37 232 51] _14 - ([#"../checked_ops.rs" 232 48 232 51] (127 : int8)));
+    [#"../checked_ops.rs" 232 37 232 51] _13 <- _14 - ([#"../checked_ops.rs" 232 48 232 51] (127 : int8));
     _14 <- any int8;
-    [#"../checked_ops.rs" 232 12 232 51] _10 <- ([#"../checked_ops.rs" 232 12 232 51] _11 = _13);
+    [#"../checked_ops.rs" 232 12 232 51] _10 <- _11 = _13;
     _11 <- any int8;
     _13 <- any int8;
     switch (_10)
@@ -4172,7 +4172,7 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 233 12 233 42] _19 <- ([#"../checked_ops.rs" 233 12 233 42] _20 = ([#"../checked_ops.rs" 233 39 233 42] (127 : int8)));
+    [#"../checked_ops.rs" 233 12 233 42] _19 <- _20 = ([#"../checked_ops.rs" 233 39 233 42] (127 : int8));
     _20 <- any int8;
     switch (_19)
       | False -> goto BB10
@@ -4188,12 +4188,12 @@ module CheckedOps_TestI8SubOverflowNeg
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 22 235 29] ([#"../checked_ops.rs" 235 23 235 24] (2 : int8)) + a);
-    [#"../checked_ops.rs" 235 21 235 29] _29 <- ([#"../checked_ops.rs" 235 21 235 29] - _30);
+    [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 23 235 24] (2 : int8)) + a;
+    [#"../checked_ops.rs" 235 21 235 29] _29 <- - _30;
     _30 <- any int8;
-    [#"../checked_ops.rs" 235 21 235 35] _28 <- ([#"../checked_ops.rs" 235 21 235 35] _29 - ([#"../checked_ops.rs" 235 32 235 35] (127 : int8)));
+    [#"../checked_ops.rs" 235 21 235 35] _28 <- _29 - ([#"../checked_ops.rs" 235 32 235 35] (127 : int8));
     _29 <- any int8;
-    [#"../checked_ops.rs" 235 12 235 35] _26 <- ([#"../checked_ops.rs" 235 12 235 35] (let (a, _) = res in a) = _28);
+    [#"../checked_ops.rs" 235 12 235 35] _26 <- (let (a, _) = res in a) = _28;
     _28 <- any int8;
     switch (_26)
       | False -> goto BB15
@@ -4202,14 +4202,14 @@ module CheckedOps_TestI8SubOverflowNeg
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 235 39 235 52] _32 <- ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 235 48 235 52] true));
+    [#"../checked_ops.rs" 235 39 235 52] _32 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 235 48 235 52] true);
     switch (_32)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 230 39 236 1] _0 <- ([#"../checked_ops.rs" 230 39 236 1] [#"../checked_ops.rs" 230 39 236 1] ());
+    [#"../checked_ops.rs" 230 39 236 1] _0 <- ([#"../checked_ops.rs" 230 39 236 1] ());
     return _0
   }
   BB14 {
@@ -4363,7 +4363,7 @@ module CheckedOps_TestI8OverflowingSub
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 247 12 247 55] _4 <- ([#"../checked_ops.rs" 247 12 247 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 247 12 247 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any int8;
     switch (_4)
       | False -> goto BB4
@@ -4388,7 +4388,7 @@ module CheckedOps_TestI8OverflowingSub
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 248 12 248 64] _14 <- ([#"../checked_ops.rs" 248 12 248 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 248 12 248 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -4396,7 +4396,7 @@ module CheckedOps_TestI8OverflowingSub
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 246 45 249 1] _0 <- ([#"../checked_ops.rs" 246 45 249 1] [#"../checked_ops.rs" 246 45 249 1] ());
+    [#"../checked_ops.rs" 246 45 249 1] _0 <- ([#"../checked_ops.rs" 246 45 249 1] ());
     return _0
   }
   BB9 {
@@ -4554,7 +4554,7 @@ module CheckedOps_TestI8MulExample
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 253 12 253 46] _2 <- ([#"../checked_ops.rs" 253 12 253 46] _3 = ([#"../checked_ops.rs" 253 44 253 46] (50 : int8)));
+    [#"../checked_ops.rs" 253 12 253 46] _2 <- _3 = ([#"../checked_ops.rs" 253 44 253 46] (50 : int8));
     _3 <- any int8;
     switch (_2)
       | False -> goto BB4
@@ -4606,7 +4606,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB13 {
-    [#"../checked_ops.rs" 257 12 257 38] _17 <- ([#"../checked_ops.rs" 257 12 257 38] _18 = ([#"../checked_ops.rs" 257 36 257 38] (50 : int8)));
+    [#"../checked_ops.rs" 257 12 257 38] _17 <- _18 = ([#"../checked_ops.rs" 257 36 257 38] (50 : int8));
     _18 <- any int8;
     switch (_17)
       | False -> goto BB15
@@ -4622,7 +4622,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB16 {
-    [#"../checked_ops.rs" 258 12 258 40] _21 <- ([#"../checked_ops.rs" 258 12 258 40] _22 = ([#"../checked_ops.rs" 258 37 258 40] (-12 : int8)));
+    [#"../checked_ops.rs" 258 12 258 40] _21 <- _22 = ([#"../checked_ops.rs" 258 37 258 40] (-12 : int8));
     _22 <- any int8;
     switch (_21)
       | False -> goto BB18
@@ -4638,7 +4638,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB19 {
-    [#"../checked_ops.rs" 259 12 259 40] _25 <- ([#"../checked_ops.rs" 259 12 259 40] _26 = ([#"../checked_ops.rs" 259 38 259 40] (12 : int8)));
+    [#"../checked_ops.rs" 259 12 259 40] _25 <- _26 = ([#"../checked_ops.rs" 259 38 259 40] (12 : int8));
     _26 <- any int8;
     switch (_25)
       | False -> goto BB21
@@ -4654,7 +4654,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB22 {
-    [#"../checked_ops.rs" 261 12 261 40] _29 <- ([#"../checked_ops.rs" 261 12 261 40] _30 = ([#"../checked_ops.rs" 261 38 261 40] (50 : int8)));
+    [#"../checked_ops.rs" 261 12 261 40] _29 <- _30 = ([#"../checked_ops.rs" 261 38 261 40] (50 : int8));
     _30 <- any int8;
     switch (_29)
       | False -> goto BB24
@@ -4670,7 +4670,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB25 {
-    [#"../checked_ops.rs" 262 12 262 42] _33 <- ([#"../checked_ops.rs" 262 12 262 42] _34 = ([#"../checked_ops.rs" 262 39 262 42] (127 : int8)));
+    [#"../checked_ops.rs" 262 12 262 42] _33 <- _34 = ([#"../checked_ops.rs" 262 39 262 42] (127 : int8));
     _34 <- any int8;
     switch (_33)
       | False -> goto BB27
@@ -4686,7 +4686,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB28 {
-    [#"../checked_ops.rs" 263 12 263 44] _37 <- ([#"../checked_ops.rs" 263 12 263 44] _38 = ([#"../checked_ops.rs" 263 40 263 44] (-128 : int8)));
+    [#"../checked_ops.rs" 263 12 263 44] _37 <- _38 = ([#"../checked_ops.rs" 263 40 263 44] (-128 : int8));
     _38 <- any int8;
     switch (_37)
       | False -> goto BB30
@@ -4702,7 +4702,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB31 {
-    [#"../checked_ops.rs" 266 12 266 23] _42 <- ([#"../checked_ops.rs" 266 12 266 23] (let (a, _) = res in a) = ([#"../checked_ops.rs" 266 21 266 23] (50 : int8)));
+    [#"../checked_ops.rs" 266 12 266 23] _42 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 266 21 266 23] (50 : int8));
     switch (_42)
       | False -> goto BB35
       | True -> goto BB32
@@ -4710,7 +4710,7 @@ module CheckedOps_TestI8MulExample
   }
   BB32 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 266 27 266 41] _44 <- ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 266 36 266 41] false));
+    [#"../checked_ops.rs" 266 27 266 41] _44 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 266 36 266 41] false);
     switch (_44)
       | False -> goto BB34
       | True -> goto BB33
@@ -4732,7 +4732,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB37 {
-    [#"../checked_ops.rs" 268 12 268 24] _49 <- ([#"../checked_ops.rs" 268 12 268 24] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 268 21 268 24] (-12 : int8)));
+    [#"../checked_ops.rs" 268 12 268 24] _49 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 268 21 268 24] (-12 : int8));
     switch (_49)
       | False -> goto BB41
       | True -> goto BB38
@@ -4740,7 +4740,7 @@ module CheckedOps_TestI8MulExample
   }
   BB38 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 268 28 268 41] _51 <- ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 268 37 268 41] true));
+    [#"../checked_ops.rs" 268 28 268 41] _51 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 268 37 268 41] true);
     switch (_51)
       | False -> goto BB40
       | True -> goto BB39
@@ -4762,7 +4762,7 @@ module CheckedOps_TestI8MulExample
     absurd
   }
   BB43 {
-    [#"../checked_ops.rs" 270 12 270 23] _56 <- ([#"../checked_ops.rs" 270 12 270 23] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 270 21 270 23] (12 : int8)));
+    [#"../checked_ops.rs" 270 12 270 23] _56 <- (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 270 21 270 23] (12 : int8));
     switch (_56)
       | False -> goto BB47
       | True -> goto BB44
@@ -4770,14 +4770,14 @@ module CheckedOps_TestI8MulExample
   }
   BB44 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 270 27 270 40] _58 <- ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 270 36 270 40] true));
+    [#"../checked_ops.rs" 270 27 270 40] _58 <- Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 270 36 270 40] true);
     switch (_58)
       | False -> goto BB46
       | True -> goto BB45
       end
   }
   BB45 {
-    [#"../checked_ops.rs" 252 29 271 1] _0 <- ([#"../checked_ops.rs" 252 29 271 1] [#"../checked_ops.rs" 252 29 271 1] ());
+    [#"../checked_ops.rs" 252 29 271 1] _0 <- ([#"../checked_ops.rs" 252 29 271 1] ());
     return _0
   }
   BB46 {
@@ -4910,7 +4910,7 @@ module CheckedOps_TestI8MulZero
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 275 12 275 44] _3 <- ([#"../checked_ops.rs" 275 12 275 44] _4 = ([#"../checked_ops.rs" 275 43 275 44] (0 : int8)));
+    [#"../checked_ops.rs" 275 12 275 44] _3 <- _4 = ([#"../checked_ops.rs" 275 43 275 44] (0 : int8));
     _4 <- any int8;
     switch (_3)
       | False -> goto BB4
@@ -4926,7 +4926,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB5 {
-    [#"../checked_ops.rs" 276 12 276 36] _9 <- ([#"../checked_ops.rs" 276 12 276 36] _10 = ([#"../checked_ops.rs" 276 35 276 36] (0 : int8)));
+    [#"../checked_ops.rs" 276 12 276 36] _9 <- _10 = ([#"../checked_ops.rs" 276 35 276 36] (0 : int8));
     _10 <- any int8;
     switch (_9)
       | False -> goto BB7
@@ -4942,7 +4942,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB8 {
-    [#"../checked_ops.rs" 277 12 277 38] _14 <- ([#"../checked_ops.rs" 277 12 277 38] _15 = ([#"../checked_ops.rs" 277 37 277 38] (0 : int8)));
+    [#"../checked_ops.rs" 277 12 277 38] _14 <- _15 = ([#"../checked_ops.rs" 277 37 277 38] (0 : int8));
     _15 <- any int8;
     switch (_14)
       | False -> goto BB10
@@ -4958,7 +4958,7 @@ module CheckedOps_TestI8MulZero
     absurd
   }
   BB11 {
-    [#"../checked_ops.rs" 279 12 279 22] _21 <- ([#"../checked_ops.rs" 279 12 279 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 279 21 279 22] (0 : int8)));
+    [#"../checked_ops.rs" 279 12 279 22] _21 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 279 21 279 22] (0 : int8));
     switch (_21)
       | False -> goto BB15
       | True -> goto BB12
@@ -4966,14 +4966,14 @@ module CheckedOps_TestI8MulZero
   }
   BB12 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 279 26 279 40] _23 <- ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 279 35 279 40] false));
+    [#"../checked_ops.rs" 279 26 279 40] _23 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 279 35 279 40] false);
     switch (_23)
       | False -> goto BB14
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../checked_ops.rs" 274 31 280 1] _0 <- ([#"../checked_ops.rs" 274 31 280 1] [#"../checked_ops.rs" 274 31 280 1] ());
+    [#"../checked_ops.rs" 274 31 280 1] _0 <- ([#"../checked_ops.rs" 274 31 280 1] ());
     return _0
   }
   BB14 {
@@ -5085,7 +5085,7 @@ module CheckedOps_TestI8OverflowingMul
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 284 12 284 55] _4 <- ([#"../checked_ops.rs" 284 12 284 55] (let (a, _) = _6 in a) = _9);
+    [#"../checked_ops.rs" 284 12 284 55] _4 <- (let (a, _) = _6 in a) = _9;
     _9 <- any int8;
     switch (_4)
       | False -> goto BB4
@@ -5110,7 +5110,7 @@ module CheckedOps_TestI8OverflowingMul
     goto BB7
   }
   BB7 {
-    [#"../checked_ops.rs" 285 12 285 64] _14 <- ([#"../checked_ops.rs" 285 12 285 64] Bool.eqb (let (_, a) = _16 in a) _19);
+    [#"../checked_ops.rs" 285 12 285 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19;
     _19 <- any bool;
     switch (_14)
       | False -> goto BB9
@@ -5118,7 +5118,7 @@ module CheckedOps_TestI8OverflowingMul
       end
   }
   BB8 {
-    [#"../checked_ops.rs" 283 45 286 1] _0 <- ([#"../checked_ops.rs" 283 45 286 1] [#"../checked_ops.rs" 283 45 286 1] ());
+    [#"../checked_ops.rs" 283 45 286 1] _0 <- ([#"../checked_ops.rs" 283 45 286 1] ());
     return _0
   }
   BB9 {
@@ -5281,7 +5281,7 @@ module CheckedOps_TestI8DivExample
     goto BB6
   }
   BB6 {
-    [#"../checked_ops.rs" 291 12 291 44] _7 <- ([#"../checked_ops.rs" 291 12 291 44] _8 = ([#"../checked_ops.rs" 291 43 291 44] (2 : int8)));
+    [#"../checked_ops.rs" 291 12 291 44] _7 <- _8 = ([#"../checked_ops.rs" 291 43 291 44] (2 : int8));
     _8 <- any int8;
     switch (_7)
       | False -> goto BB8
@@ -5302,7 +5302,7 @@ module CheckedOps_TestI8DivExample
     goto BB10
   }
   BB10 {
-    [#"../checked_ops.rs" 292 12 292 46] _12 <- ([#"../checked_ops.rs" 292 12 292 46] _13 = ([#"../checked_ops.rs" 292 44 292 46] (-2 : int8)));
+    [#"../checked_ops.rs" 292 12 292 46] _12 <- _13 = ([#"../checked_ops.rs" 292 44 292 46] (-2 : int8));
     _13 <- any int8;
     switch (_12)
       | False -> goto BB12
@@ -5336,7 +5336,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB17 {
-    [#"../checked_ops.rs" 295 12 295 36] _22 <- ([#"../checked_ops.rs" 295 12 295 36] _23 = ([#"../checked_ops.rs" 295 35 295 36] (2 : int8)));
+    [#"../checked_ops.rs" 295 12 295 36] _22 <- _23 = ([#"../checked_ops.rs" 295 35 295 36] (2 : int8));
     _23 <- any int8;
     switch (_22)
       | False -> goto BB19
@@ -5352,7 +5352,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB20 {
-    [#"../checked_ops.rs" 296 12 296 38] _26 <- ([#"../checked_ops.rs" 296 12 296 38] _27 = ([#"../checked_ops.rs" 296 36 296 38] (-2 : int8)));
+    [#"../checked_ops.rs" 296 12 296 38] _26 <- _27 = ([#"../checked_ops.rs" 296 36 296 38] (-2 : int8));
     _27 <- any int8;
     switch (_26)
       | False -> goto BB22
@@ -5368,7 +5368,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB23 {
-    [#"../checked_ops.rs" 297 12 297 45] _30 <- ([#"../checked_ops.rs" 297 12 297 45] _31 = ([#"../checked_ops.rs" 297 41 297 45] (-128 : int8)));
+    [#"../checked_ops.rs" 297 12 297 45] _30 <- _31 = ([#"../checked_ops.rs" 297 41 297 45] (-128 : int8));
     _31 <- any int8;
     switch (_30)
       | False -> goto BB25
@@ -5384,7 +5384,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB26 {
-    [#"../checked_ops.rs" 299 12 299 38] _34 <- ([#"../checked_ops.rs" 299 12 299 38] _35 = ([#"../checked_ops.rs" 299 37 299 38] (2 : int8)));
+    [#"../checked_ops.rs" 299 12 299 38] _34 <- _35 = ([#"../checked_ops.rs" 299 37 299 38] (2 : int8));
     _35 <- any int8;
     switch (_34)
       | False -> goto BB28
@@ -5400,7 +5400,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB29 {
-    [#"../checked_ops.rs" 300 12 300 40] _38 <- ([#"../checked_ops.rs" 300 12 300 40] _39 = ([#"../checked_ops.rs" 300 38 300 40] (-2 : int8)));
+    [#"../checked_ops.rs" 300 12 300 40] _38 <- _39 = ([#"../checked_ops.rs" 300 38 300 40] (-2 : int8));
     _39 <- any int8;
     switch (_38)
       | False -> goto BB31
@@ -5416,7 +5416,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB32 {
-    [#"../checked_ops.rs" 301 12 301 47] _42 <- ([#"../checked_ops.rs" 301 12 301 47] _43 = ([#"../checked_ops.rs" 301 43 301 47] (-128 : int8)));
+    [#"../checked_ops.rs" 301 12 301 47] _42 <- _43 = ([#"../checked_ops.rs" 301 43 301 47] (-128 : int8));
     _43 <- any int8;
     switch (_42)
       | False -> goto BB34
@@ -5432,7 +5432,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB35 {
-    [#"../checked_ops.rs" 304 12 304 22] _47 <- ([#"../checked_ops.rs" 304 12 304 22] (let (a, _) = res in a) = ([#"../checked_ops.rs" 304 21 304 22] (2 : int8)));
+    [#"../checked_ops.rs" 304 12 304 22] _47 <- (let (a, _) = res in a) = ([#"../checked_ops.rs" 304 21 304 22] (2 : int8));
     switch (_47)
       | False -> goto BB39
       | True -> goto BB36
@@ -5440,7 +5440,7 @@ module CheckedOps_TestI8DivExample
   }
   BB36 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 304 26 304 40] _49 <- ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 304 35 304 40] false));
+    [#"../checked_ops.rs" 304 26 304 40] _49 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 304 35 304 40] false);
     switch (_49)
       | False -> goto BB38
       | True -> goto BB37
@@ -5462,7 +5462,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB41 {
-    [#"../checked_ops.rs" 306 12 306 23] _54 <- ([#"../checked_ops.rs" 306 12 306 23] (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 306 21 306 23] (-2 : int8)));
+    [#"../checked_ops.rs" 306 12 306 23] _54 <- (let (a, _) = res1 in a) = ([#"../checked_ops.rs" 306 21 306 23] (-2 : int8));
     switch (_54)
       | False -> goto BB45
       | True -> goto BB42
@@ -5470,7 +5470,7 @@ module CheckedOps_TestI8DivExample
   }
   BB42 {
     assume { resolve0 res1 };
-    [#"../checked_ops.rs" 306 27 306 41] _56 <- ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 306 36 306 41] false));
+    [#"../checked_ops.rs" 306 27 306 41] _56 <- Bool.eqb (let (_, a) = res1 in a) ([#"../checked_ops.rs" 306 36 306 41] false);
     switch (_56)
       | False -> goto BB44
       | True -> goto BB43
@@ -5492,7 +5492,7 @@ module CheckedOps_TestI8DivExample
     absurd
   }
   BB47 {
-    [#"../checked_ops.rs" 308 12 308 25] _61 <- ([#"../checked_ops.rs" 308 12 308 25] (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 308 21 308 25] (-128 : int8)));
+    [#"../checked_ops.rs" 308 12 308 25] _61 <- (let (a, _) = res2 in a) = ([#"../checked_ops.rs" 308 21 308 25] (-128 : int8));
     switch (_61)
       | False -> goto BB51
       | True -> goto BB48
@@ -5500,14 +5500,14 @@ module CheckedOps_TestI8DivExample
   }
   BB48 {
     assume { resolve0 res2 };
-    [#"../checked_ops.rs" 308 29 308 42] _63 <- ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 308 38 308 42] true));
+    [#"../checked_ops.rs" 308 29 308 42] _63 <- Bool.eqb (let (_, a) = res2 in a) ([#"../checked_ops.rs" 308 38 308 42] true);
     switch (_63)
       | False -> goto BB50
       | True -> goto BB49
       end
   }
   BB49 {
-    [#"../checked_ops.rs" 289 29 309 1] _0 <- ([#"../checked_ops.rs" 289 29 309 1] [#"../checked_ops.rs" 289 29 309 1] ());
+    [#"../checked_ops.rs" 289 29 309 1] _0 <- ([#"../checked_ops.rs" 289 29 309 1] ());
     return _0
   }
   BB50 {
@@ -5654,26 +5654,26 @@ module CheckedOps_TestI8DivNoOverflow
     goto BB2
   }
   BB2 {
-    [#"../checked_ops.rs" 314 41 314 42] _11 <- ([#"../checked_ops.rs" 314 41 314 42] a);
-    [#"../checked_ops.rs" 314 45 314 46] _12 <- ([#"../checked_ops.rs" 314 45 314 46] b);
-    [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] (0 : int8)));
+    [#"../checked_ops.rs" 314 41 314 42] _11 <- a;
+    [#"../checked_ops.rs" 314 45 314 46] _12 <- b;
+    [#"../checked_ops.rs" 314 41 314 46] _13 <- _12 = ([#"../checked_ops.rs" 314 41 314 46] (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 314 41 314 46] not _13 };
     goto BB3
   }
   BB3 {
-    [#"../checked_ops.rs" 314 41 314 46] _14 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = ([#"../checked_ops.rs" 314 41 314 46] (-1 : int8)));
-    [#"../checked_ops.rs" 314 41 314 46] _15 <- ([#"../checked_ops.rs" 314 41 314 46] _11 = ([#"../checked_ops.rs" 314 41 314 46] (-128 : int8)));
-    [#"../checked_ops.rs" 314 41 314 46] _16 <- ([#"../checked_ops.rs" 314 41 314 46] _14 && _15);
+    [#"../checked_ops.rs" 314 41 314 46] _14 <- _12 = ([#"../checked_ops.rs" 314 41 314 46] (-1 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _15 <- _11 = ([#"../checked_ops.rs" 314 41 314 46] (-128 : int8));
+    [#"../checked_ops.rs" 314 41 314 46] _16 <- _14 && _15;
     _14 <- any bool;
     _15 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 314 41 314 46] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../checked_ops.rs" 314 41 314 46] _10 <- ([#"../checked_ops.rs" 314 41 314 46] _11 / _12);
+    [#"../checked_ops.rs" 314 41 314 46] _10 <- _11 / _12;
     _11 <- any int8;
     _12 <- any int8;
-    [#"../checked_ops.rs" 314 12 314 46] _5 <- ([#"../checked_ops.rs" 314 12 314 46] _6 = _10);
+    [#"../checked_ops.rs" 314 12 314 46] _5 <- _6 = _10;
     _6 <- any int8;
     _10 <- any int8;
     switch (_5)
@@ -5690,26 +5690,26 @@ module CheckedOps_TestI8DivNoOverflow
     absurd
   }
   BB7 {
-    [#"../checked_ops.rs" 315 33 315 34] _24 <- ([#"../checked_ops.rs" 315 33 315 34] a);
-    [#"../checked_ops.rs" 315 37 315 38] _25 <- ([#"../checked_ops.rs" 315 37 315 38] b);
-    [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] (0 : int8)));
+    [#"../checked_ops.rs" 315 33 315 34] _24 <- a;
+    [#"../checked_ops.rs" 315 37 315 38] _25 <- b;
+    [#"../checked_ops.rs" 315 33 315 38] _26 <- _25 = ([#"../checked_ops.rs" 315 33 315 38] (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 315 33 315 38] not _26 };
     goto BB8
   }
   BB8 {
-    [#"../checked_ops.rs" 315 33 315 38] _27 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = ([#"../checked_ops.rs" 315 33 315 38] (-1 : int8)));
-    [#"../checked_ops.rs" 315 33 315 38] _28 <- ([#"../checked_ops.rs" 315 33 315 38] _24 = ([#"../checked_ops.rs" 315 33 315 38] (-128 : int8)));
-    [#"../checked_ops.rs" 315 33 315 38] _29 <- ([#"../checked_ops.rs" 315 33 315 38] _27 && _28);
+    [#"../checked_ops.rs" 315 33 315 38] _27 <- _25 = ([#"../checked_ops.rs" 315 33 315 38] (-1 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _28 <- _24 = ([#"../checked_ops.rs" 315 33 315 38] (-128 : int8));
+    [#"../checked_ops.rs" 315 33 315 38] _29 <- _27 && _28;
     _27 <- any bool;
     _28 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 315 33 315 38] not _29 };
     goto BB9
   }
   BB9 {
-    [#"../checked_ops.rs" 315 33 315 38] _23 <- ([#"../checked_ops.rs" 315 33 315 38] _24 / _25);
+    [#"../checked_ops.rs" 315 33 315 38] _23 <- _24 / _25;
     _24 <- any int8;
     _25 <- any int8;
-    [#"../checked_ops.rs" 315 12 315 38] _19 <- ([#"../checked_ops.rs" 315 12 315 38] _20 = _23);
+    [#"../checked_ops.rs" 315 12 315 38] _19 <- _20 = _23;
     _20 <- any int8;
     _23 <- any int8;
     switch (_19)
@@ -5726,26 +5726,26 @@ module CheckedOps_TestI8DivNoOverflow
     absurd
   }
   BB12 {
-    [#"../checked_ops.rs" 316 35 316 36] _37 <- ([#"../checked_ops.rs" 316 35 316 36] a);
-    [#"../checked_ops.rs" 316 39 316 40] _38 <- ([#"../checked_ops.rs" 316 39 316 40] b);
-    [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] (0 : int8)));
+    [#"../checked_ops.rs" 316 35 316 36] _37 <- a;
+    [#"../checked_ops.rs" 316 39 316 40] _38 <- b;
+    [#"../checked_ops.rs" 316 35 316 40] _39 <- _38 = ([#"../checked_ops.rs" 316 35 316 40] (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 316 35 316 40] not _39 };
     goto BB13
   }
   BB13 {
-    [#"../checked_ops.rs" 316 35 316 40] _40 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = ([#"../checked_ops.rs" 316 35 316 40] (-1 : int8)));
-    [#"../checked_ops.rs" 316 35 316 40] _41 <- ([#"../checked_ops.rs" 316 35 316 40] _37 = ([#"../checked_ops.rs" 316 35 316 40] (-128 : int8)));
-    [#"../checked_ops.rs" 316 35 316 40] _42 <- ([#"../checked_ops.rs" 316 35 316 40] _40 && _41);
+    [#"../checked_ops.rs" 316 35 316 40] _40 <- _38 = ([#"../checked_ops.rs" 316 35 316 40] (-1 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _41 <- _37 = ([#"../checked_ops.rs" 316 35 316 40] (-128 : int8));
+    [#"../checked_ops.rs" 316 35 316 40] _42 <- _40 && _41;
     _40 <- any bool;
     _41 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 316 35 316 40] not _42 };
     goto BB14
   }
   BB14 {
-    [#"../checked_ops.rs" 316 35 316 40] _36 <- ([#"../checked_ops.rs" 316 35 316 40] _37 / _38);
+    [#"../checked_ops.rs" 316 35 316 40] _36 <- _37 / _38;
     _37 <- any int8;
     _38 <- any int8;
-    [#"../checked_ops.rs" 316 12 316 40] _32 <- ([#"../checked_ops.rs" 316 12 316 40] _33 = _36);
+    [#"../checked_ops.rs" 316 12 316 40] _32 <- _33 = _36;
     _33 <- any int8;
     _36 <- any int8;
     switch (_32)
@@ -5762,26 +5762,26 @@ module CheckedOps_TestI8DivNoOverflow
     absurd
   }
   BB17 {
-    [#"../checked_ops.rs" 318 21 318 22] _51 <- ([#"../checked_ops.rs" 318 21 318 22] a);
-    [#"../checked_ops.rs" 318 25 318 26] _52 <- ([#"../checked_ops.rs" 318 25 318 26] b);
-    [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] (0 : int8)));
+    [#"../checked_ops.rs" 318 21 318 22] _51 <- a;
+    [#"../checked_ops.rs" 318 25 318 26] _52 <- b;
+    [#"../checked_ops.rs" 318 21 318 26] _53 <- _52 = ([#"../checked_ops.rs" 318 21 318 26] (0 : int8));
     assert { [@expl:division by zero] [#"../checked_ops.rs" 318 21 318 26] not _53 };
     goto BB18
   }
   BB18 {
-    [#"../checked_ops.rs" 318 21 318 26] _54 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = ([#"../checked_ops.rs" 318 21 318 26] (-1 : int8)));
-    [#"../checked_ops.rs" 318 21 318 26] _55 <- ([#"../checked_ops.rs" 318 21 318 26] _51 = ([#"../checked_ops.rs" 318 21 318 26] (-128 : int8)));
-    [#"../checked_ops.rs" 318 21 318 26] _56 <- ([#"../checked_ops.rs" 318 21 318 26] _54 && _55);
+    [#"../checked_ops.rs" 318 21 318 26] _54 <- _52 = ([#"../checked_ops.rs" 318 21 318 26] (-1 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _55 <- _51 = ([#"../checked_ops.rs" 318 21 318 26] (-128 : int8));
+    [#"../checked_ops.rs" 318 21 318 26] _56 <- _54 && _55;
     _54 <- any bool;
     _55 <- any bool;
     assert { [@expl:Div overflow] [#"../checked_ops.rs" 318 21 318 26] not _56 };
     goto BB19
   }
   BB19 {
-    [#"../checked_ops.rs" 318 21 318 26] _50 <- ([#"../checked_ops.rs" 318 21 318 26] _51 / _52);
+    [#"../checked_ops.rs" 318 21 318 26] _50 <- _51 / _52;
     _51 <- any int8;
     _52 <- any int8;
-    [#"../checked_ops.rs" 318 12 318 26] _48 <- ([#"../checked_ops.rs" 318 12 318 26] (let (a, _) = res in a) = _50);
+    [#"../checked_ops.rs" 318 12 318 26] _48 <- (let (a, _) = res in a) = _50;
     _50 <- any int8;
     switch (_48)
       | False -> goto BB23
@@ -5790,14 +5790,14 @@ module CheckedOps_TestI8DivNoOverflow
   }
   BB20 {
     assume { resolve0 res };
-    [#"../checked_ops.rs" 318 30 318 44] _57 <- ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 318 39 318 44] false));
+    [#"../checked_ops.rs" 318 30 318 44] _57 <- Bool.eqb (let (_, a) = res in a) ([#"../checked_ops.rs" 318 39 318 44] false);
     switch (_57)
       | False -> goto BB22
       | True -> goto BB21
       end
   }
   BB21 {
-    [#"../checked_ops.rs" 313 45 319 1] _0 <- ([#"../checked_ops.rs" 313 45 319 1] [#"../checked_ops.rs" 313 45 319 1] ());
+    [#"../checked_ops.rs" 313 45 319 1] _0 <- ([#"../checked_ops.rs" 313 45 319 1] ());
     return _0
   }
   BB22 {
@@ -5865,7 +5865,7 @@ module CheckedOps_TestI8DivZero
       end
   }
   BB3 {
-    [#"../checked_ops.rs" 322 31 324 1] _0 <- ([#"../checked_ops.rs" 322 31 324 1] [#"../checked_ops.rs" 322 31 324 1] ());
+    [#"../checked_ops.rs" 322 31 324 1] _0 <- ([#"../checked_ops.rs" 322 31 324 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/clones/01.mlcfg b/creusot/tests/should_succeed/clones/01.mlcfg
index a70fee1e4c..3467d37415 100644
--- a/creusot/tests/should_succeed/clones/01.mlcfg
+++ b/creusot/tests/should_succeed/clones/01.mlcfg
@@ -7,7 +7,7 @@ module C01_Func1
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 6 11 6 13] _0 <- ([#"../01.rs" 6 11 6 13] [#"../01.rs" 6 11 6 13] ());
+    [#"../01.rs" 6 11 6 13] _0 <- ([#"../01.rs" 6 11 6 13] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/clones/02.mlcfg b/creusot/tests/should_succeed/clones/02.mlcfg
index 6e247c4b82..0562b05b45 100644
--- a/creusot/tests/should_succeed/clones/02.mlcfg
+++ b/creusot/tests/should_succeed/clones/02.mlcfg
@@ -20,7 +20,7 @@ module C02_Program
     goto BB0
   }
   BB0 {
-    [#"../02.rs" 20 17 20 19] _0 <- ([#"../02.rs" 20 17 20 19] [#"../02.rs" 20 17 20 19] ());
+    [#"../02.rs" 20 17 20 19] _0 <- ([#"../02.rs" 20 17 20 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/clones/03.mlcfg b/creusot/tests/should_succeed/clones/03.mlcfg
index 08767dbdb7..1c1aa6f0a5 100644
--- a/creusot/tests/should_succeed/clones/03.mlcfg
+++ b/creusot/tests/should_succeed/clones/03.mlcfg
@@ -35,7 +35,7 @@ module C03_Prog
     goto BB1
   }
   BB1 {
-    [#"../03.rs" 11 17 11 19] _0 <- ([#"../03.rs" 11 17 11 19] [#"../03.rs" 11 17 11 19] ());
+    [#"../03.rs" 11 17 11 19] _0 <- ([#"../03.rs" 11 17 11 19] ());
     goto BB2
   }
   BB2 {
@@ -85,7 +85,7 @@ module C03_Prog2
     goto BB1
   }
   BB1 {
-    [#"../03.rs" 14 15 16 1] _0 <- ([#"../03.rs" 14 15 16 1] [#"../03.rs" 14 15 16 1] ());
+    [#"../03.rs" 14 15 16 1] _0 <- ([#"../03.rs" 14 15 16 1] ());
     return _0
   }
   
@@ -106,7 +106,7 @@ module C03_Prog3
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 19 15 19 17] _0 <- ([#"../03.rs" 19 15 19 17] [#"../03.rs" 19 15 19 17] ());
+    [#"../03.rs" 19 15 19 17] _0 <- ([#"../03.rs" 19 15 19 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/clones/04.mlcfg b/creusot/tests/should_succeed/clones/04.mlcfg
index cc351488ad..ddc9b27915 100644
--- a/creusot/tests/should_succeed/clones/04.mlcfg
+++ b/creusot/tests/should_succeed/clones/04.mlcfg
@@ -26,7 +26,7 @@ module C04_F
     goto BB0
   }
   BB0 {
-    [#"../04.rs" 21 17 21 19] _0 <- ([#"../04.rs" 21 17 21 19] [#"../04.rs" 21 17 21 19] ());
+    [#"../04.rs" 21 17 21 19] _0 <- ([#"../04.rs" 21 17 21 19] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/01_basic.mlcfg b/creusot/tests/should_succeed/closures/01_basic.mlcfg
index 586adb364a..02a97a1b46 100644
--- a/creusot/tests/should_succeed/closures/01_basic.mlcfg
+++ b/creusot/tests/should_succeed/closures/01_basic.mlcfg
@@ -26,7 +26,7 @@ module C01Basic_UsesClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 6 17 6 18] _0 <- ([#"../01_basic.rs" 6 17 6 18] field_00 _1);
+    [#"../01_basic.rs" 6 17 6 18] _0 <- field_00 _1;
     return _0
   }
   
@@ -56,16 +56,16 @@ module C01Basic_UsesClosure
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] [#"../01_basic.rs" 5 12 5 16] true);
-    [#"../01_basic.rs" 6 13 6 19] _4 <- ([#"../01_basic.rs" 6 13 6 19] C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y);
-    [#"../01_basic.rs" 6 13 6 21] _6 <- ([#"../01_basic.rs" 6 13 6 21] ());
+    [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] true);
+    [#"../01_basic.rs" 6 13 6 19] _4 <- C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y;
+    [#"../01_basic.rs" 6 13 6 21] _6 <- ();
     [#"../01_basic.rs" 6 13 6 21] _x <- ([#"../01_basic.rs" 6 13 6 21] let () = _6 in closure00 _4);
     _6 <- any ();
     goto BB1
   }
   BB1 {
     assume { resolve0 _4 };
-    [#"../01_basic.rs" 4 22 7 1] _0 <- ([#"../01_basic.rs" 4 22 7 1] [#"../01_basic.rs" 4 22 7 1] ());
+    [#"../01_basic.rs" 4 22 7 1] _0 <- ([#"../01_basic.rs" 4 22 7 1] ());
     return _0
   }
   
@@ -93,7 +93,7 @@ module C01Basic_MultiArg_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 10 19 10 24] _0 <- ([#"../01_basic.rs" 10 19 10 24] a + b);
+    [#"../01_basic.rs" 10 19 10 24] _0 <- a + b;
     return _0
   }
   
@@ -118,15 +118,15 @@ module C01Basic_MultiArg
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 10 12 10 24] x <- ([#"../01_basic.rs" 10 12 10 24] C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0);
-    [#"../01_basic.rs" 11 13 11 22] _4 <- ([#"../01_basic.rs" 11 13 11 22] (([#"../01_basic.rs" 11 17 11 18] (0 : int32)), ([#"../01_basic.rs" 11 20 11 21] (3 : int32))));
+    [#"../01_basic.rs" 10 12 10 24] x <- C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0;
+    [#"../01_basic.rs" 11 13 11 22] _4 <- (([#"../01_basic.rs" 11 17 11 18] (0 : int32)), ([#"../01_basic.rs" 11 20 11 21] (3 : int32)));
     [#"../01_basic.rs" 11 13 11 22] _a <- ([#"../01_basic.rs" 11 13 11 22] let (a, b) = _4 in closure00 x a b);
     _4 <- any (int32, int32);
     goto BB1
   }
   BB1 {
     assume { resolve0 x };
-    [#"../01_basic.rs" 9 19 12 1] _0 <- ([#"../01_basic.rs" 9 19 12 1] [#"../01_basic.rs" 9 19 12 1] ());
+    [#"../01_basic.rs" 9 19 12 1] _0 <- ([#"../01_basic.rs" 9 19 12 1] ());
     return _0
   }
   
@@ -172,9 +172,9 @@ module C01Basic_MoveClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15]  * field_00 ( * _1) + ([#"../01_basic.rs" 20 14 20 15] (1 : int32))) ; })) ; };
+    [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 =  * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + ([#"../01_basic.rs" 20 14 20 15] (1 : int32))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] [#"../01_basic.rs" 19 24 21 5] ());
+    [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] ());
     return _0
   }
   
@@ -228,14 +228,14 @@ module C01Basic_MoveClosure
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] [#"../01_basic.rs" 17 17 17 21] (0 : int32));
+    [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] (0 : int32));
     [#"../01_basic.rs" 17 12 17 21] a <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 17 12 17 21] _2 <-  ^ a;
-    [#"../01_basic.rs" 19 16 21 5] x <- ([#"../01_basic.rs" 19 16 21 5] C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a);
+    [#"../01_basic.rs" 19 16 21 5] x <- C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a;
     a <- any borrowed int32;
     [#"../01_basic.rs" 23 4 23 7] _5 <- Borrow.borrow_mut x;
     [#"../01_basic.rs" 23 4 23 7] x <-  ^ _5;
-    [#"../01_basic.rs" 23 4 23 9] _6 <- ([#"../01_basic.rs" 23 4 23 9] ());
+    [#"../01_basic.rs" 23 4 23 9] _6 <- ();
     [#"../01_basic.rs" 23 4 23 9] _4 <- ([#"../01_basic.rs" 23 4 23 9] let () = _6 in closure00 _5);
     _5 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
     _6 <- any ();
@@ -244,7 +244,7 @@ module C01Basic_MoveClosure
   BB1 {
     [#"../01_basic.rs" 24 4 24 7] _8 <- Borrow.borrow_mut x;
     [#"../01_basic.rs" 24 4 24 7] x <-  ^ _8;
-    [#"../01_basic.rs" 24 4 24 9] _9 <- ([#"../01_basic.rs" 24 4 24 9] ());
+    [#"../01_basic.rs" 24 4 24 9] _9 <- ();
     [#"../01_basic.rs" 24 4 24 9] _7 <- ([#"../01_basic.rs" 24 4 24 9] let () = _9 in closure00 _8);
     _8 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0;
     _9 <- any ();
@@ -252,7 +252,7 @@ module C01Basic_MoveClosure
   }
   BB2 {
     assume { resolve0 x };
-    [#"../01_basic.rs" 16 22 25 1] _0 <- ([#"../01_basic.rs" 16 22 25 1] [#"../01_basic.rs" 16 22 25 1] ());
+    [#"../01_basic.rs" 16 22 25 1] _0 <- ([#"../01_basic.rs" 16 22 25 1] ());
     return _0
   }
   
@@ -324,12 +324,12 @@ module C01Basic_MoveMut_Closure0
   BB1 {
     [#"../01_basic.rs" 36 12 36 21] _2 <- Borrow.borrow_final ( * _3) (Borrow.get_id _3);
     [#"../01_basic.rs" 36 12 36 21] _3 <- { _3 with current = ( ^ _2) ; };
-    [#"../01_basic.rs" 36 8 36 21] _1 <- { _1 with current = (let C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x0 =  * _1 in C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 ([#"../01_basic.rs" 36 8 36 21] _2)) ; };
+    [#"../01_basic.rs" 36 8 36 21] _1 <- { _1 with current = (let C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x0 =  * _1 in C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 _2) ; };
     _2 <- any borrowed uint32;
     assume { resolve0 (field_00 ( * _1)) };
     assume { resolve1 _1 };
     assume { resolve0 _3 };
-    [#"../01_basic.rs" 35 24 37 5] _0 <- ([#"../01_basic.rs" 35 24 37 5] [#"../01_basic.rs" 35 24 37 5] ());
+    [#"../01_basic.rs" 35 24 37 5] _0 <- ([#"../01_basic.rs" 35 24 37 5] ());
     return _0
   }
   
@@ -395,14 +395,14 @@ module C01Basic_MoveMut
     goto BB0
   }
   BB0 {
-    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] [#"../01_basic.rs" 33 21 33 25] (0 : uint32));
+    [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] (0 : uint32));
     [#"../01_basic.rs" 33 16 33 25] x <- Borrow.borrow_mut _2;
     [#"../01_basic.rs" 33 16 33 25] _2 <-  ^ x;
-    [#"../01_basic.rs" 35 16 37 5] a <- ([#"../01_basic.rs" 35 16 37 5] C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x);
+    [#"../01_basic.rs" 35 16 37 5] a <- C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x;
     x <- any borrowed uint32;
     [#"../01_basic.rs" 38 4 38 7] _5 <- Borrow.borrow_mut a;
     [#"../01_basic.rs" 38 4 38 7] a <-  ^ _5;
-    [#"../01_basic.rs" 38 4 38 9] _6 <- ([#"../01_basic.rs" 38 4 38 9] ());
+    [#"../01_basic.rs" 38 4 38 9] _6 <- ();
     [#"../01_basic.rs" 38 4 38 9] _4 <- ([#"../01_basic.rs" 38 4 38 9] let () = _6 in closure00 _5);
     _5 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
     _6 <- any ();
@@ -411,7 +411,7 @@ module C01Basic_MoveMut
   BB1 {
     [#"../01_basic.rs" 39 4 39 7] _8 <- Borrow.borrow_mut a;
     [#"../01_basic.rs" 39 4 39 7] a <-  ^ _8;
-    [#"../01_basic.rs" 39 4 39 9] _9 <- ([#"../01_basic.rs" 39 4 39 9] ());
+    [#"../01_basic.rs" 39 4 39 9] _9 <- ();
     [#"../01_basic.rs" 39 4 39 9] _7 <- ([#"../01_basic.rs" 39 4 39 9] let () = _9 in closure00 _8);
     _8 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0;
     _9 <- any ();
@@ -419,7 +419,7 @@ module C01Basic_MoveMut
   }
   BB2 {
     assume { resolve0 a };
-    [#"../01_basic.rs" 32 18 40 1] _0 <- ([#"../01_basic.rs" 32 18 40 1] [#"../01_basic.rs" 32 18 40 1] ());
+    [#"../01_basic.rs" 32 18 40 1] _0 <- ([#"../01_basic.rs" 32 18 40 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/02_nested.mlcfg b/creusot/tests/should_succeed/closures/02_nested.mlcfg
index 1dd5c80699..0c2417e6dc 100644
--- a/creusot/tests/should_succeed/closures/02_nested.mlcfg
+++ b/creusot/tests/should_succeed/closures/02_nested.mlcfg
@@ -26,7 +26,7 @@ module C02Nested_NestedClosure_Closure0_Closure0
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 6 21 6 22] _0 <- ([#"../02_nested.rs" 6 21 6 22] field_00 _1);
+    [#"../02_nested.rs" 6 21 6 22] _0 <- field_00 _1;
     return _0
   }
   
@@ -74,8 +74,8 @@ module C02Nested_NestedClosure_Closure0
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 6 18 6 22] omg <- ([#"../02_nested.rs" 6 18 6 22] C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 (field_00 _1));
-    [#"../02_nested.rs" 7 8 7 15] _5 <- ([#"../02_nested.rs" 7 8 7 15] ());
+    [#"../02_nested.rs" 6 18 6 22] omg <- C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 (field_00 _1);
+    [#"../02_nested.rs" 7 8 7 15] _5 <- ();
     [#"../02_nested.rs" 7 8 7 15] _0 <- ([#"../02_nested.rs" 7 8 7 15] let () = _5 in closure00 omg);
     _5 <- any ();
     goto BB1
@@ -128,16 +128,16 @@ module C02Nested_NestedClosure
     goto BB0
   }
   BB0 {
-    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] [#"../02_nested.rs" 4 12 4 16] true);
-    [#"../02_nested.rs" 5 13 8 6] _4 <- ([#"../02_nested.rs" 5 13 8 6] C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a);
-    [#"../02_nested.rs" 5 13 8 8] _6 <- ([#"../02_nested.rs" 5 13 8 8] ());
+    [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] true);
+    [#"../02_nested.rs" 5 13 8 6] _4 <- C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a;
+    [#"../02_nested.rs" 5 13 8 8] _6 <- ();
     [#"../02_nested.rs" 5 13 8 8] _a <- ([#"../02_nested.rs" 5 13 8 8] let () = _6 in closure00 _4);
     _6 <- any ();
     goto BB1
   }
   BB1 {
     assume { resolve0 _4 };
-    [#"../02_nested.rs" 3 24 9 1] _0 <- ([#"../02_nested.rs" 3 24 9 1] [#"../02_nested.rs" 3 24 9 1] ());
+    [#"../02_nested.rs" 3 24 9 1] _0 <- ([#"../02_nested.rs" 3 24 9 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
index 9a25790a9a..6ae226856b 100644
--- a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
+++ b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg
@@ -166,7 +166,7 @@ module C03GenericBound_ClosureParam
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ([#"../03_generic_bound.rs" 4 4 4 10] (([#"../03_generic_bound.rs" 4 8 4 9] (0 : uint32))));
+    [#"../03_generic_bound.rs" 4 4 4 10] _3 <- (([#"../03_generic_bound.rs" 4 8 4 9] (0 : uint32)));
     [#"../03_generic_bound.rs" 4 4 4 10] _0 <- ([#"../03_generic_bound.rs" 4 4 4 10] call0 f _3);
     _3 <- any uint32;
     goto BB1
@@ -202,7 +202,7 @@ module C03GenericBound_Caller_Closure0
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 8 28 8 30] _0 <- ([#"../03_generic_bound.rs" 8 28 8 30] ());
+    [#"../03_generic_bound.rs" 8 28 8 30] _0 <- ();
     return _0
   }
   
@@ -232,7 +232,7 @@ module C03GenericBound_Caller
     goto BB0
   }
   BB0 {
-    [#"../03_generic_bound.rs" 8 18 8 30] _1 <- ([#"../03_generic_bound.rs" 8 18 8 30] C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0);
+    [#"../03_generic_bound.rs" 8 18 8 30] _1 <- C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0;
     [#"../03_generic_bound.rs" 8 4 8 31] _0 <- ([#"../03_generic_bound.rs" 8 4 8 31] closure_param0 _1);
     _1 <- any C03GenericBound_Caller_Closure0.c03genericbound_caller_closure0;
     goto BB1
diff --git a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
index 3521e7b2ab..3ef740ef66 100644
--- a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
+++ b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg
@@ -176,7 +176,7 @@ module C04GenericClosure_GenericClosure
     goto BB0
   }
   BB0 {
-    [#"../04_generic_closure.rs" 4 4 4 8] _4 <- ([#"../04_generic_closure.rs" 4 4 4 8] (a));
+    [#"../04_generic_closure.rs" 4 4 4 8] _4 <- (a);
     a <- any a;
     [#"../04_generic_closure.rs" 4 4 4 8] _0 <- ([#"../04_generic_closure.rs" 4 4 4 8] call0 f _4);
     _4 <- any a;
@@ -237,7 +237,7 @@ module C04GenericClosure_Mapper_Closure0
     goto BB0
   }
   BB0 {
-    [#"../04_generic_closure.rs" 8 33 8 35] _0 <- ([#"../04_generic_closure.rs" 8 33 8 35] ());
+    [#"../04_generic_closure.rs" 8 33 8 35] _0 <- ();
     assert { [@expl:type invariant] inv0 _a };
     assume { resolve0 _a };
     assume { resolve1 _1 };
@@ -297,14 +297,14 @@ module C04GenericClosure_Mapper
     goto BB0
   }
   BB0 {
-    [#"../04_generic_closure.rs" 8 28 8 35] _3 <- ([#"../04_generic_closure.rs" 8 28 8 35] C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0);
+    [#"../04_generic_closure.rs" 8 28 8 35] _3 <- C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0;
     [#"../04_generic_closure.rs" 8 12 8 39] _2 <- ([#"../04_generic_closure.rs" 8 12 8 39] generic_closure0 _3 x);
     _3 <- any C04GenericClosure_Mapper_Closure0.c04genericclosure_mapper_closure0 a;
     x <- any a;
     goto BB1
   }
   BB1 {
-    [#"../04_generic_closure.rs" 7 23 9 1] _0 <- ([#"../04_generic_closure.rs" 7 23 9 1] [#"../04_generic_closure.rs" 7 23 9 1] ());
+    [#"../04_generic_closure.rs" 7 23 9 1] _0 <- ([#"../04_generic_closure.rs" 7 23 9 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/closures/05_map.mlcfg b/creusot/tests/should_succeed/closures/05_map.mlcfg
index 7f7f2d2c1f..1df63b3c67 100644
--- a/creusot/tests/should_succeed/closures/05_map.mlcfg
+++ b/creusot/tests/should_succeed/closures/05_map.mlcfg
@@ -271,11 +271,11 @@ module C05Map_Impl0_Next
     goto BB5
   }
   BB3 {
-    [#"../05_map.rs" 20 17 20 18] e <- ([#"../05_map.rs" 20 17 20 18] Core_Option_Option_Type.some_0 _2);
+    [#"../05_map.rs" 20 17 20 18] e <- Core_Option_Option_Type.some_0 _2;
     _2 <- (let Core_Option_Option_Type.C_Some x0 = _2 in Core_Option_Option_Type.C_Some (any a));
     assert { [@expl:type invariant] inv1 _2 };
     assume { resolve0 _2 };
-    [#"../05_map.rs" 20 28 20 42] _8 <- ([#"../05_map.rs" 20 28 20 42] (e));
+    [#"../05_map.rs" 20 28 20 42] _8 <- (e);
     e <- any a;
     [#"../05_map.rs" 20 28 20 42] _6 <- ([#"../05_map.rs" 20 28 20 42] call0 (C05Map_Map_Type.map_func ( * self)) _8);
     _8 <- any a;
@@ -294,7 +294,7 @@ module C05Map_Impl0_Next
     assume { resolve0 _2 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../05_map.rs" 19 20 19 24] _0 <- ([#"../05_map.rs" 19 20 19 24] Core_Option_Option_Type.C_None);
+    [#"../05_map.rs" 19 20 19 24] _0 <- Core_Option_Option_Type.C_None;
     goto BB10
   }
   BB6 {
@@ -303,7 +303,7 @@ module C05Map_Impl0_Next
   BB7 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../05_map.rs" 20 23 20 43] _0 <- ([#"../05_map.rs" 20 23 20 43] Core_Option_Option_Type.C_Some _6);
+    [#"../05_map.rs" 20 23 20 43] _0 <- Core_Option_Option_Type.C_Some _6;
     _6 <- any b;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
index 6583bbed11..495a27c7e3 100644
--- a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
+++ b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg
@@ -894,7 +894,7 @@ module C06FnSpecs_FnOnceUser
     goto BB1
   }
   BB1 {
-    [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ([#"../06_fn_specs.rs" 45 4 45 8] (([#"../06_fn_specs.rs" 45 6 45 7] (0 : usize))));
+    [#"../06_fn_specs.rs" 45 4 45 8] _4 <- (([#"../06_fn_specs.rs" 45 6 45 7] (0 : usize)));
     [#"../06_fn_specs.rs" 45 4 45 8] _0 <- ([#"../06_fn_specs.rs" 45 4 45 8] call_once0 f _4);
     f <- any f;
     _4 <- any usize;
@@ -931,7 +931,7 @@ module C06FnSpecs_Caller_Closure0
     goto BB0
   }
   BB0 {
-    [#"../06_fn_specs.rs" 49 21 49 23] _0 <- ([#"../06_fn_specs.rs" 49 21 49 23] ());
+    [#"../06_fn_specs.rs" 49 21 49 23] _0 <- ();
     assume { resolve0 _1 };
     return _0
   }
@@ -968,7 +968,7 @@ module C06FnSpecs_Caller
     goto BB0
   }
   BB0 {
-    [#"../06_fn_specs.rs" 49 17 49 23] _1 <- ([#"../06_fn_specs.rs" 49 17 49 23] C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0);
+    [#"../06_fn_specs.rs" 49 17 49 23] _1 <- C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0;
     [#"../06_fn_specs.rs" 49 4 49 24] _0 <- ([#"../06_fn_specs.rs" 49 4 49 24] fn_once_user0 _1);
     _1 <- any C06FnSpecs_Caller_Closure0.c06fnspecs_caller_closure0;
     goto BB1
diff --git a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
index 5626ec403b..58ef0f5aec 100644
--- a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
+++ b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg
@@ -47,11 +47,11 @@ module C07MutableCapture_TestFnmut_Closure1
     goto BB0
   }
   BB0 {
-    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18]  * field_00 ( * _1) + ([#"../07_mutable_capture.rs" 10 17 10 18] (1 : uint32))) ; })) ; };
+    [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 =  * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + ([#"../07_mutable_capture.rs" 10 17 10 18] (1 : uint32))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] [#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
-    [#"../07_mutable_capture.rs" 7 8 7 35] res <- ([#"../07_mutable_capture.rs" 7 8 7 35] res1);
-    [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- ([#"../07_mutable_capture.rs" 8 8 8 37] res);
+    [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32));
+    [#"../07_mutable_capture.rs" 7 8 7 35] res <- res1;
+    [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- res;
     return _0
   }
   
@@ -114,11 +114,11 @@ module C07MutableCapture_TestFnmut
   BB0 {
     [#"../07_mutable_capture.rs" 8 8 8 37] _4 <- Borrow.borrow_mut x;
     [#"../07_mutable_capture.rs" 8 8 8 37] x <-  ^ _4;
-    [#"../07_mutable_capture.rs" 8 8 8 37] c <- ([#"../07_mutable_capture.rs" 8 8 8 37] C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 _4);
+    [#"../07_mutable_capture.rs" 8 8 8 37] c <- C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 _4;
     _4 <- any borrowed uint32;
     [#"../07_mutable_capture.rs" 14 4 14 5] _6 <- Borrow.borrow_mut c;
     [#"../07_mutable_capture.rs" 14 4 14 5] c <-  ^ _6;
-    [#"../07_mutable_capture.rs" 14 4 14 7] _7 <- ([#"../07_mutable_capture.rs" 14 4 14 7] ());
+    [#"../07_mutable_capture.rs" 14 4 14 7] _7 <- ();
     [#"../07_mutable_capture.rs" 14 4 14 7] _5 <- ([#"../07_mutable_capture.rs" 14 4 14 7] let () = _7 in closure10 _6);
     _6 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
     _7 <- any ();
@@ -127,7 +127,7 @@ module C07MutableCapture_TestFnmut
   BB1 {
     [#"../07_mutable_capture.rs" 15 4 15 5] _9 <- Borrow.borrow_mut c;
     [#"../07_mutable_capture.rs" 15 4 15 5] c <-  ^ _9;
-    [#"../07_mutable_capture.rs" 15 4 15 7] _10 <- ([#"../07_mutable_capture.rs" 15 4 15 7] ());
+    [#"../07_mutable_capture.rs" 15 4 15 7] _10 <- ();
     [#"../07_mutable_capture.rs" 15 4 15 7] _8 <- ([#"../07_mutable_capture.rs" 15 4 15 7] let () = _10 in closure10 _9);
     _9 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1;
     _10 <- any ();
@@ -136,7 +136,7 @@ module C07MutableCapture_TestFnmut
   BB2 {
     assume { resolve0 c };
     assert { [@expl:assertion] [#"../07_mutable_capture.rs" 17 20 17 33] UInt32.to_int x = 100002 };
-    [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- ([#"../07_mutable_capture.rs" 5 30 18 1] [#"../07_mutable_capture.rs" 5 30 18 1] ());
+    [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- ([#"../07_mutable_capture.rs" 5 30 18 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
index 9aedfae435..834bfee044 100644
--- a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
+++ b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg
@@ -37,8 +37,8 @@ module C08MultipleCalls_MultiUse_Closure0
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] [#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
-    [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- ([#"../08_multiple_calls.rs" 5 12 5 31] res);
+    [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32));
+    [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- res;
     return _0
   }
   
@@ -121,7 +121,7 @@ module C08MultipleCalls_MultiUse
     goto BB0
   }
   BB0 {
-    [#"../08_multiple_calls.rs" 5 12 5 31] c <- ([#"../08_multiple_calls.rs" 5 12 5 31] C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 x);
+    [#"../08_multiple_calls.rs" 5 12 5 31] c <- C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 x;
     assume { resolve0 c };
     [#"../08_multiple_calls.rs" 11 4 11 14] _4 <- ([#"../08_multiple_calls.rs" 11 4 11 14] uses_fn0 c);
     goto BB1
@@ -129,7 +129,7 @@ module C08MultipleCalls_MultiUse
   BB1 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- ([#"../08_multiple_calls.rs" 4 27 14 1] [#"../08_multiple_calls.rs" 4 27 14 1] ());
+    [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- ([#"../08_multiple_calls.rs" 4 27 14 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/drop_pair.mlcfg b/creusot/tests/should_succeed/drop_pair.mlcfg
index cf64fb8fea..e2877cad28 100644
--- a/creusot/tests/should_succeed/drop_pair.mlcfg
+++ b/creusot/tests/should_succeed/drop_pair.mlcfg
@@ -26,7 +26,7 @@ module DropPair_DropPair
   }
   BB0 {
     assume { resolve0 _x };
-    [#"../drop_pair.rs" 7 43 7 45] _0 <- ([#"../drop_pair.rs" 7 43 7 45] [#"../drop_pair.rs" 7 43 7 45] ());
+    [#"../drop_pair.rs" 7 43 7 45] _0 <- ([#"../drop_pair.rs" 7 43 7 45] ());
     return _0
   }
   
@@ -55,7 +55,7 @@ module DropPair_DropPair2
   }
   BB0 {
     assume { resolve0 x };
-    [#"../drop_pair.rs" 9 43 11 1] _0 <- ([#"../drop_pair.rs" 9 43 11 1] [#"../drop_pair.rs" 9 43 11 1] ());
+    [#"../drop_pair.rs" 9 43 11 1] _0 <- ([#"../drop_pair.rs" 9 43 11 1] ());
     return _0
   }
   
@@ -83,10 +83,10 @@ module DropPair_Drop
     assume { resolve0 _x };
     [#"../drop_pair.rs" 16 9 16 10] _3 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../drop_pair.rs" 16 9 16 10] y <- { y with current = ( ^ _3) ; };
-    [#"../drop_pair.rs" 16 4 16 10] _x <- ([#"../drop_pair.rs" 16 4 16 10] _3);
+    [#"../drop_pair.rs" 16 4 16 10] _x <- _3;
     _3 <- any borrowed uint32;
     assume { resolve0 _x };
-    [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] [#"../drop_pair.rs" 15 53 17 1] ());
+    [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] ());
     assume { resolve0 y };
     return _0
   }
diff --git a/creusot/tests/should_succeed/duration.mlcfg b/creusot/tests/should_succeed/duration.mlcfg
index 520273912b..8760b7768c 100644
--- a/creusot/tests/should_succeed/duration.mlcfg
+++ b/creusot/tests/should_succeed/duration.mlcfg
@@ -235,7 +235,7 @@ module Duration_TestDuration
     goto BB2
   }
   BB2 {
-    [#"../duration.rs" 10 12 10 32] _5 <- ([#"../duration.rs" 10 12 10 32] _6 = ([#"../duration.rs" 10 31 10 32] (0 : uint128)));
+    [#"../duration.rs" 10 12 10 32] _5 <- _6 = ([#"../duration.rs" 10 31 10 32] (0 : uint128));
     _6 <- any uint128;
     switch (_5)
       | False -> goto BB4
@@ -303,7 +303,7 @@ module Duration_TestDuration
     goto BB16
   }
   BB16 {
-    [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 33] ([#"../duration.rs" 29 12 29 13] (1 : uint64)) = _32);
+    [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 13] (1 : uint64)) = _32;
     _32 <- any uint64;
     switch (_31)
       | False -> goto BB18
@@ -319,7 +319,7 @@ module Duration_TestDuration
     absurd
   }
   BB19 {
-    [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 39] ([#"../duration.rs" 30 12 30 13] (0 : uint32)) = _37);
+    [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 13] (0 : uint32)) = _37;
     _37 <- any uint32;
     switch (_36)
       | False -> goto BB21
@@ -335,7 +335,7 @@ module Duration_TestDuration
     absurd
   }
   BB22 {
-    [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 39] ([#"../duration.rs" 31 12 31 13] (0 : uint32)) = _42);
+    [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 13] (0 : uint32)) = _42;
     _42 <- any uint32;
     switch (_41)
       | False -> goto BB24
@@ -351,7 +351,7 @@ module Duration_TestDuration
     absurd
   }
   BB25 {
-    [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 38] ([#"../duration.rs" 32 12 32 13] (0 : uint32)) = _47);
+    [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 13] (0 : uint32)) = _47;
     _47 <- any uint32;
     switch (_46)
       | False -> goto BB27
@@ -367,13 +367,13 @@ module Duration_TestDuration
     absurd
   }
   BB28 {
-    [#"../duration.rs" 34 12 34 44] _52 <- ([#"../duration.rs" 34 12 34 44] UInt128.of_int (UInt32.to_int _53));
+    [#"../duration.rs" 34 12 34 44] _52 <- UInt128.of_int (UInt32.to_int _53);
     _53 <- any uint32;
     [#"../duration.rs" 34 48 34 68] _55 <- ([#"../duration.rs" 34 48 34 68] as_millis0 d_millis);
     goto BB29
   }
   BB29 {
-    [#"../duration.rs" 34 12 34 68] _51 <- ([#"../duration.rs" 34 12 34 68] _52 = _55);
+    [#"../duration.rs" 34 12 34 68] _51 <- _52 = _55;
     _52 <- any uint128;
     _55 <- any uint128;
     switch (_51)
@@ -390,13 +390,13 @@ module Duration_TestDuration
     absurd
   }
   BB32 {
-    [#"../duration.rs" 35 12 35 44] _60 <- ([#"../duration.rs" 35 12 35 44] UInt128.of_int (UInt32.to_int _61));
+    [#"../duration.rs" 35 12 35 44] _60 <- UInt128.of_int (UInt32.to_int _61);
     _61 <- any uint32;
     [#"../duration.rs" 35 48 35 68] _63 <- ([#"../duration.rs" 35 48 35 68] as_micros0 d_micros);
     goto BB33
   }
   BB33 {
-    [#"../duration.rs" 35 12 35 68] _59 <- ([#"../duration.rs" 35 12 35 68] _60 = _63);
+    [#"../duration.rs" 35 12 35 68] _59 <- _60 = _63;
     _60 <- any uint128;
     _63 <- any uint128;
     switch (_59)
@@ -413,13 +413,13 @@ module Duration_TestDuration
     absurd
   }
   BB36 {
-    [#"../duration.rs" 36 12 36 42] _68 <- ([#"../duration.rs" 36 12 36 42] UInt128.of_int (UInt32.to_int _69));
+    [#"../duration.rs" 36 12 36 42] _68 <- UInt128.of_int (UInt32.to_int _69);
     _69 <- any uint32;
     [#"../duration.rs" 36 46 36 64] _71 <- ([#"../duration.rs" 36 46 36 64] as_nanos0 d_nanos);
     goto BB37
   }
   BB37 {
-    [#"../duration.rs" 36 12 36 64] _67 <- ([#"../duration.rs" 36 12 36 64] _68 = _71);
+    [#"../duration.rs" 36 12 36 64] _67 <- _68 = _71;
     _68 <- any uint128;
     _71 <- any uint128;
     switch (_67)
@@ -586,7 +586,7 @@ module Duration_TestDuration
   BB73 {
     assert { [@expl:assertion] [#"../duration.rs" 52 18 52 35] shallow_model0 sum = 1001000 };
     assert { [@expl:assertion] [#"../duration.rs" 53 18 53 39] shallow_model0 difference = 999000 };
-    [#"../duration.rs" 7 23 54 1] _0 <- ([#"../duration.rs" 7 23 54 1] [#"../duration.rs" 7 23 54 1] ());
+    [#"../duration.rs" 7 23 54 1] _0 <- ([#"../duration.rs" 7 23 54 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index 75528e23e2..1d6f0c122e 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -348,8 +348,8 @@ module FilterPositive_M
     goto BB0
   }
   BB0 {
-    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] [#"../filter_positive.rs" 83 27 83 28] (0 : usize));
-    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] [#"../filter_positive.rs" 84 23 84 24] (0 : usize));
+    [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] (0 : usize));
+    [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] (0 : usize));
     goto BB1
   }
   BB1 {
@@ -369,7 +369,7 @@ module FilterPositive_M
     goto BB5
   }
   BB5 {
-    [#"../filter_positive.rs" 89 10 89 21] _10 <- ([#"../filter_positive.rs" 89 10 89 21] i < _12);
+    [#"../filter_positive.rs" 89 10 89 21] _10 <- i < _12;
     _12 <- any usize;
     switch (_10)
       | False -> goto BB11
@@ -381,24 +381,24 @@ module FilterPositive_M
     goto BB7
   }
   BB7 {
-    [#"../filter_positive.rs" 90 11 90 19] _15 <- ([#"../filter_positive.rs" 90 11 90 19] _17 > ([#"../filter_positive.rs" 90 18 90 19] (0 : int32)));
+    [#"../filter_positive.rs" 90 11 90 19] _15 <- _17 > ([#"../filter_positive.rs" 90 18 90 19] (0 : int32));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + ([#"../filter_positive.rs" 91 21 91 22] (1 : usize)));
-    [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] [#"../filter_positive.rs" 91 12 91 22] ());
+    [#"../filter_positive.rs" 91 12 91 22] count <- count + ([#"../filter_positive.rs" 91 21 91 22] (1 : usize));
+    [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] ());
     goto BB10
   }
   BB9 {
-    [#"../filter_positive.rs" 92 9 92 9] _14 <- ([#"../filter_positive.rs" 92 9 92 9] [#"../filter_positive.rs" 92 9 92 9] ());
+    [#"../filter_positive.rs" 92 9 92 9] _14 <- ([#"../filter_positive.rs" 92 9 92 9] ());
     goto BB10
   }
   BB10 {
-    [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + ([#"../filter_positive.rs" 93 13 93 14] (1 : usize)));
-    [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] [#"../filter_positive.rs" 89 22 94 5] ());
+    [#"../filter_positive.rs" 93 8 93 14] i <- i + ([#"../filter_positive.rs" 93 13 93 14] (1 : usize));
+    [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] ());
     goto BB3
   }
   BB11 {
@@ -406,8 +406,8 @@ module FilterPositive_M
     goto BB12
   }
   BB12 {
-    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] [#"../filter_positive.rs" 96 12 96 13] (0 : usize));
-    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] [#"../filter_positive.rs" 98 8 98 9] (0 : usize));
+    [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 12 96 13] (0 : usize));
+    [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 8 98 9] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -426,7 +426,7 @@ module FilterPositive_M
     goto BB17
   }
   BB17 {
-    [#"../filter_positive.rs" 102 10 102 21] _28 <- ([#"../filter_positive.rs" 102 10 102 21] i < _30);
+    [#"../filter_positive.rs" 102 10 102 21] _28 <- i < _30;
     _30 <- any usize;
     switch (_28)
       | False -> goto BB27
@@ -438,7 +438,7 @@ module FilterPositive_M
     goto BB19
   }
   BB19 {
-    [#"../filter_positive.rs" 103 11 103 19] _33 <- ([#"../filter_positive.rs" 103 11 103 19] _35 > ([#"../filter_positive.rs" 103 18 103 19] (0 : int32)));
+    [#"../filter_positive.rs" 103 11 103 19] _33 <- _35 > ([#"../filter_positive.rs" 103 18 103 19] (0 : int32));
     switch (_33)
       | False -> goto BB25
       | True -> goto BB20
@@ -464,24 +464,24 @@ module FilterPositive_M
     goto BB24
   }
   BB24 {
-    [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = ([#"../filter_positive.rs" 113 12 113 27] _43) ; };
+    [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = _43 ; };
     assume { resolve1 _46 };
-    [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + ([#"../filter_positive.rs" 114 21 114 22] (1 : usize)));
-    [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] [#"../filter_positive.rs" 103 20 115 9] ());
+    [#"../filter_positive.rs" 114 12 114 22] count <- count + ([#"../filter_positive.rs" 114 21 114 22] (1 : usize));
+    [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] ());
     goto BB26
   }
   BB25 {
-    [#"../filter_positive.rs" 115 9 115 9] _32 <- ([#"../filter_positive.rs" 115 9 115 9] [#"../filter_positive.rs" 115 9 115 9] ());
+    [#"../filter_positive.rs" 115 9 115 9] _32 <- ([#"../filter_positive.rs" 115 9 115 9] ());
     goto BB26
   }
   BB26 {
-    [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + ([#"../filter_positive.rs" 116 13 116 14] (1 : usize)));
-    [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] [#"../filter_positive.rs" 102 22 117 5] ());
+    [#"../filter_positive.rs" 116 8 116 14] i <- i + ([#"../filter_positive.rs" 116 13 116 14] (1 : usize));
+    [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] ());
     goto BB15
   }
   BB27 {
     assume { resolve0 t };
-    [#"../filter_positive.rs" 118 11 118 12] _0 <- ([#"../filter_positive.rs" 118 11 118 12] u);
+    [#"../filter_positive.rs" 118 11 118 12] _0 <- u;
     u <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB28
   }
diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
index 5e668e0e8f..ddaae83526 100644
--- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
+++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg
@@ -316,13 +316,13 @@ module GhostPtrToken_Test
     ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () }
     
   let constant promoted0 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0
   let constant promoted1 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0
   let constant promoted2 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0
   let constant promoted3 [#"../ghost_ptr_token.rs" 3 0 3 13]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
+    let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0
   let rec cfg test [#"../ghost_ptr_token.rs" 3 0 3 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -515,7 +515,7 @@ module GhostPtrToken_Test
       end
   }
   BB18 {
-    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] [#"../ghost_ptr_token.rs" 3 14 18 1] ());
+    [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ());
     return _0
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index 9e997d3136..80e8169fbe 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -54,7 +54,7 @@ module Hashmap_Impl2_Hash
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 60 8 60 20] _0 <- ([#"../hashmap.rs" 60 8 60 20] UInt64.of_int (UIntSize.to_int self));
+    [#"../hashmap.rs" 60 8 60 20] _0 <- UInt64.of_int (UIntSize.to_int self);
     return _0
   }
   
@@ -295,18 +295,18 @@ module Hashmap_Impl5_New
     goto BB0
   }
   BB0 {
-    [#"../hashmap.rs" 99 44 99 53] _7 <- ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil);
+    [#"../hashmap.rs" 99 44 99 53] _7 <- Hashmap_List_Type.C_Nil;
     [#"../hashmap.rs" 99 39 99 60] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 _7 size);
     _7 <- any Hashmap_List_Type.t_list (k, v);
     goto BB1
   }
   BB1 {
-    [#"../hashmap.rs" 99 18 99 62] res <- ([#"../hashmap.rs" 99 18 99 62] Hashmap_MyHashMap_Type.C_MyHashMap _6);
+    [#"../hashmap.rs" 99 18 99 62] res <- Hashmap_MyHashMap_Type.C_MyHashMap _6;
     _6 <- any Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global);
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 100 8 100 11] _0 <- ([#"../hashmap.rs" 100 8 100 11] res);
+    [#"../hashmap.rs" 100 8 100 11] _0 <- res;
     res <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
     goto BB3
   }
@@ -773,15 +773,15 @@ module Hashmap_Impl5_Add
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 110 27 110 46] _12 <- ([#"../hashmap.rs" 110 27 110 46] UIntSize.of_int (UInt64.to_int _13));
+    [#"../hashmap.rs" 110 27 110 46] _12 <- UIntSize.of_int (UInt64.to_int _13);
     _13 <- any uint64;
-    [#"../hashmap.rs" 110 49 110 55] _15 <- ([#"../hashmap.rs" 110 49 110 55] length);
-    [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = ([#"../hashmap.rs" 110 27 110 55] (0 : usize)));
+    [#"../hashmap.rs" 110 49 110 55] _15 <- length;
+    [#"../hashmap.rs" 110 27 110 55] _16 <- _15 = ([#"../hashmap.rs" 110 27 110 55] (0 : usize));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 110 27 110 55] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../hashmap.rs" 110 27 110 55] index <- ([#"../hashmap.rs" 110 27 110 55] _12 % _15);
+    [#"../hashmap.rs" 110 27 110 55] index <- _12 % _15;
     _12 <- any usize;
     _15 <- any usize;
     [#"../hashmap.rs" 111 39 111 51] _20 <- Borrow.borrow_final (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
@@ -841,7 +841,7 @@ module Hashmap_Impl5_Add
     [#"../hashmap.rs" 121 31 121 33] tl <- Borrow.borrow_final (Hashmap_List_Type.cons_1 ( * l)) (Borrow.inherit_id (Borrow.get_id l) 2);
     [#"../hashmap.rs" 121 31 121 33] l <- { l with current = (let Hashmap_List_Type.C_Cons x0 x1 =  * l in Hashmap_List_Type.C_Cons x0 ( ^ tl)) ; };
     assume { inv8 ( ^ tl) };
-    [#"../hashmap.rs" 122 21 122 23] tl1 <- ([#"../hashmap.rs" 122 21 122 23] tl);
+    [#"../hashmap.rs" 122 21 122 23] tl1 <- tl;
     tl <- any borrowed (Hashmap_List_Type.t_list (k, v));
     [#"../hashmap.rs" 123 15 123 24] _38 <- ([#"../hashmap.rs" 123 15 123 24] eq0 ( * k) key);
     goto BB11
@@ -861,7 +861,7 @@ module Hashmap_Impl5_Add
     assume { resolve6 key };
     assert { [@expl:type invariant] inv7 val' };
     assume { resolve7 val' };
-    [#"../hashmap.rs" 124 16 124 24] v <- { v with current = ([#"../hashmap.rs" 124 16 124 24] val') ; };
+    [#"../hashmap.rs" 124 16 124 24] v <- { v with current = val' ; };
     assert { [@expl:type invariant] inv7 ( * v) };
     assume { resolve7 ( * v) };
     assert { [@expl:type invariant] inv9 v };
@@ -873,7 +873,7 @@ module Hashmap_Impl5_Add
     assert { [@expl:type invariant] inv12 self };
     assume { resolve8 self };
     assert { [@expl:assertion] [#"../hashmap.rs" 125 32 125 52] hashmap_inv0 ( * self) };
-    [#"../hashmap.rs" 126 16 126 22] _0 <- ([#"../hashmap.rs" 126 16 126 22] [#"../hashmap.rs" 126 16 126 22] ());
+    [#"../hashmap.rs" 126 16 126 22] _0 <- ([#"../hashmap.rs" 126 16 126 22] ());
     goto BB20
   }
   BB13 {
@@ -889,7 +889,7 @@ module Hashmap_Impl5_Add
     assume { inv2 ( ^ _45) };
     assert { [@expl:type invariant] inv3 l };
     assume { resolve1 l };
-    [#"../hashmap.rs" 128 12 128 25] l <- ([#"../hashmap.rs" 128 12 128 25] _45);
+    [#"../hashmap.rs" 128 12 128 25] l <- _45;
     _45 <- any borrowed (Hashmap_List_Type.t_list (k, v));
     assert { [@expl:type invariant] inv3 _46 };
     assume { resolve1 _46 };
@@ -902,12 +902,12 @@ module Hashmap_Impl5_Add
     assume { resolve6 key };
     assert { [@expl:type invariant] inv7 val' };
     assume { resolve7 val' };
-    [#"../hashmap.rs" 131 18 131 28] _51 <- ([#"../hashmap.rs" 131 18 131 28] (key, val'));
-    [#"../hashmap.rs" 131 39 131 42] _55 <- ([#"../hashmap.rs" 131 39 131 42] Hashmap_List_Type.C_Nil);
+    [#"../hashmap.rs" 131 18 131 28] _51 <- (key, val');
+    [#"../hashmap.rs" 131 39 131 42] _55 <- Hashmap_List_Type.C_Nil;
     goto BB15
   }
   BB15 {
-    [#"../hashmap.rs" 131 13 131 44] _50 <- ([#"../hashmap.rs" 131 13 131 44] Hashmap_List_Type.C_Cons _51 _55);
+    [#"../hashmap.rs" 131 13 131 44] _50 <- Hashmap_List_Type.C_Cons _51 _55;
     _51 <- any (k, v);
     _55 <- any Hashmap_List_Type.t_list (k, v);
     goto BB16
@@ -916,7 +916,7 @@ module Hashmap_Impl5_Add
     goto BB17
   }
   BB17 {
-    [#"../hashmap.rs" 131 8 131 10] l <- { l with current = ([#"../hashmap.rs" 131 8 131 10] _50) ; };
+    [#"../hashmap.rs" 131 8 131 10] l <- { l with current = _50 ; };
     _50 <- any Hashmap_List_Type.t_list (k, v);
     assert { [@expl:type invariant] inv2 ( * l) };
     assume { resolve9 ( * l) };
@@ -930,7 +930,7 @@ module Hashmap_Impl5_Add
     assert { [@expl:type invariant] inv12 self };
     assume { resolve8 self };
     assert { [@expl:assertion] [#"../hashmap.rs" 133 24 133 44] hashmap_inv0 ( * self) };
-    [#"../hashmap.rs" 106 42 134 5] _0 <- ([#"../hashmap.rs" 106 42 134 5] [#"../hashmap.rs" 106 42 134 5] ());
+    [#"../hashmap.rs" 106 42 134 5] _0 <- ([#"../hashmap.rs" 106 42 134 5] ());
     goto BB20
   }
   BB20 {
@@ -1274,18 +1274,18 @@ module Hashmap_Impl5_Get
     goto BB1
   }
   BB1 {
-    [#"../hashmap.rs" 142 27 142 46] _7 <- ([#"../hashmap.rs" 142 27 142 46] UIntSize.of_int (UInt64.to_int _8));
+    [#"../hashmap.rs" 142 27 142 46] _7 <- UIntSize.of_int (UInt64.to_int _8);
     _8 <- any uint64;
     [#"../hashmap.rs" 142 49 142 67] _10 <- ([#"../hashmap.rs" 142 49 142 67] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets self));
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = ([#"../hashmap.rs" 142 27 142 67] (0 : usize)));
+    [#"../hashmap.rs" 142 27 142 67] _12 <- _10 = ([#"../hashmap.rs" 142 27 142 67] (0 : usize));
     assert { [@expl:remainder by zero] [#"../hashmap.rs" 142 27 142 67] not _12 };
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 142 27 142 67] index <- ([#"../hashmap.rs" 142 27 142 67] _7 % _10);
+    [#"../hashmap.rs" 142 27 142 67] index <- _7 % _10;
     _7 <- any usize;
     _10 <- any usize;
     assert { [@expl:type invariant] inv0 self };
@@ -1294,7 +1294,7 @@ module Hashmap_Impl5_Get
     goto BB4
   }
   BB4 {
-    [#"../hashmap.rs" 143 20 143 40] l <- ([#"../hashmap.rs" 143 20 143 40] _14);
+    [#"../hashmap.rs" 143 20 143 40] l <- _14;
     assert { [@expl:type invariant] inv1 _14 };
     assume { resolve1 _14 };
     goto BB5
@@ -1313,9 +1313,9 @@ module Hashmap_Impl5_Get
     goto BB8
   }
   BB8 {
-    [#"../hashmap.rs" 146 30 146 31] k <- ([#"../hashmap.rs" 146 30 146 31] let (a, _) = Hashmap_List_Type.cons_0 l in a);
-    [#"../hashmap.rs" 146 33 146 34] v <- ([#"../hashmap.rs" 146 33 146 34] let (_, a) = Hashmap_List_Type.cons_0 l in a);
-    [#"../hashmap.rs" 146 37 146 39] tl <- ([#"../hashmap.rs" 146 37 146 39] Hashmap_List_Type.cons_1 l);
+    [#"../hashmap.rs" 146 30 146 31] k <- (let (a, _) = Hashmap_List_Type.cons_0 l in a);
+    [#"../hashmap.rs" 146 33 146 34] v <- (let (_, a) = Hashmap_List_Type.cons_0 l in a);
+    [#"../hashmap.rs" 146 37 146 39] tl <- Hashmap_List_Type.cons_1 l;
     assert { [@expl:type invariant] inv1 l };
     assume { resolve1 l };
     assert { [@expl:type invariant] inv2 k };
@@ -1336,18 +1336,18 @@ module Hashmap_Impl5_Get
     assume { resolve5 key };
     assert { [@expl:type invariant] inv3 v };
     assume { resolve3 v };
-    [#"../hashmap.rs" 148 23 148 30] _0 <- ([#"../hashmap.rs" 148 23 148 30] Core_Option_Option_Type.C_Some v);
+    [#"../hashmap.rs" 148 23 148 30] _0 <- Core_Option_Option_Type.C_Some v;
     goto BB13
   }
   BB11 {
     assert { [@expl:type invariant] inv3 v };
     assume { resolve3 v };
-    [#"../hashmap.rs" 150 16 150 21] _31 <- ([#"../hashmap.rs" 150 16 150 21] tl);
+    [#"../hashmap.rs" 150 16 150 21] _31 <- tl;
     assert { [@expl:type invariant] inv4 tl };
     assume { resolve4 tl };
     assert { [@expl:type invariant] inv1 _31 };
     assume { resolve1 _31 };
-    [#"../hashmap.rs" 150 12 150 21] l <- ([#"../hashmap.rs" 150 12 150 21] _31);
+    [#"../hashmap.rs" 150 12 150 21] l <- _31;
     goto BB5
   }
   BB12 {
@@ -1355,7 +1355,7 @@ module Hashmap_Impl5_Get
     assume { resolve1 l };
     assert { [@expl:type invariant] inv5 key };
     assume { resolve5 key };
-    [#"../hashmap.rs" 152 15 152 19] _0 <- ([#"../hashmap.rs" 152 15 152 19] Core_Option_Option_Type.C_None);
+    [#"../hashmap.rs" 152 15 152 19] _0 <- Core_Option_Option_Type.C_None;
     goto BB13
   }
   BB13 {
@@ -1778,14 +1778,14 @@ module Hashmap_Impl5_Resize
     goto BB2
   }
   BB2 {
-    [#"../hashmap.rs" 163 32 163 54] _9 <- ([#"../hashmap.rs" 163 32 163 54] _10 * ([#"../hashmap.rs" 163 53 163 54] (2 : usize)));
+    [#"../hashmap.rs" 163 32 163 54] _9 <- _10 * ([#"../hashmap.rs" 163 53 163 54] (2 : usize));
     _10 <- any usize;
     [#"../hashmap.rs" 163 22 163 55] new <- ([#"../hashmap.rs" 163 22 163 55] new1 _9);
     _9 <- any usize;
     goto BB3
   }
   BB3 {
-    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] [#"../hashmap.rs" 165 27 165 28] (0 : usize));
+    [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -1814,7 +1814,7 @@ module Hashmap_Impl5_Resize
     goto BB8
   }
   BB8 {
-    [#"../hashmap.rs" 176 14 176 36] _22 <- ([#"../hashmap.rs" 176 14 176 36] i < _24);
+    [#"../hashmap.rs" 176 14 176 36] _22 <- i < _24;
     _24 <- any usize;
     switch (_22)
       | False -> goto BB29
@@ -1836,7 +1836,7 @@ module Hashmap_Impl5_Resize
     [#"../hashmap.rs" 177 51 177 71] _27 <- Borrow.borrow_final ( * _28) (Borrow.get_id _28);
     [#"../hashmap.rs" 177 51 177 71] _28 <- { _28 with current = ( ^ _27) ; };
     assume { inv5 ( ^ _27) };
-    [#"../hashmap.rs" 177 73 177 82] _32 <- ([#"../hashmap.rs" 177 73 177 82] Hashmap_List_Type.C_Nil);
+    [#"../hashmap.rs" 177 73 177 82] _32 <- Hashmap_List_Type.C_Nil;
     [#"../hashmap.rs" 177 33 177 83] l <- ([#"../hashmap.rs" 177 33 177 83] replace0 _27 _32);
     _27 <- any borrowed (Hashmap_List_Type.t_list (k, v));
     _32 <- any Hashmap_List_Type.t_list (k, v);
@@ -1892,9 +1892,9 @@ module Hashmap_Impl5_Resize
     goto BB20
   }
   BB20 {
-    [#"../hashmap.rs" 188 34 188 35] k <- ([#"../hashmap.rs" 188 34 188 35] let (a, _) = Hashmap_List_Type.cons_0 l in a);
-    [#"../hashmap.rs" 188 37 188 38] v <- ([#"../hashmap.rs" 188 37 188 38] let (_, a) = Hashmap_List_Type.cons_0 l in a);
-    [#"../hashmap.rs" 188 41 188 43] tl <- ([#"../hashmap.rs" 188 41 188 43] Hashmap_List_Type.cons_1 l);
+    [#"../hashmap.rs" 188 34 188 35] k <- (let (a, _) = Hashmap_List_Type.cons_0 l in a);
+    [#"../hashmap.rs" 188 37 188 38] v <- (let (_, a) = Hashmap_List_Type.cons_0 l in a);
+    [#"../hashmap.rs" 188 41 188 43] tl <- Hashmap_List_Type.cons_1 l;
     l <- (let Hashmap_List_Type.C_Cons x0 x1 = l in Hashmap_List_Type.C_Cons x0 (any Hashmap_List_Type.t_list (k, v)));
     assert { [@expl:type invariant] inv5 l };
     assume { resolve4 l };
@@ -1915,12 +1915,12 @@ module Hashmap_Impl5_Resize
     goto BB22
   }
   BB22 {
-    [#"../hashmap.rs" 190 16 190 17] l <- ([#"../hashmap.rs" 190 16 190 17] tl);
+    [#"../hashmap.rs" 190 16 190 17] l <- tl;
     tl <- any Hashmap_List_Type.t_list (k, v);
     goto BB24
   }
   BB24 {
-    [#"../hashmap.rs" 188 49 191 13] _21 <- ([#"../hashmap.rs" 188 49 191 13] [#"../hashmap.rs" 188 49 191 13] ());
+    [#"../hashmap.rs" 188 49 191 13] _21 <- ([#"../hashmap.rs" 188 49 191 13] ());
     goto BB26
   }
   BB25 {
@@ -1935,8 +1935,8 @@ module Hashmap_Impl5_Resize
     goto BB17
   }
   BB27 {
-    [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + ([#"../hashmap.rs" 193 17 193 18] (1 : usize)));
-    [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] [#"../hashmap.rs" 176 37 194 9] ());
+    [#"../hashmap.rs" 193 12 193 18] i <- i + ([#"../hashmap.rs" 193 17 193 18] (1 : usize));
+    [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] ());
     goto BB28
   }
   BB28 {
@@ -1946,7 +1946,7 @@ module Hashmap_Impl5_Resize
     goto BB30
   }
   BB30 {
-    [#"../hashmap.rs" 196 8 196 13] self <- { self with current = ([#"../hashmap.rs" 196 8 196 13] new) ; };
+    [#"../hashmap.rs" 196 8 196 13] self <- { self with current = new ; };
     new <- any Hashmap_MyHashMap_Type.t_myhashmap k v;
     assert { [@expl:type invariant] inv2 ( * self) };
     assume { resolve1 ( * self) };
@@ -1955,7 +1955,7 @@ module Hashmap_Impl5_Resize
     goto BB32
   }
   BB32 {
-    [#"../hashmap.rs" 161 25 197 5] _0 <- ([#"../hashmap.rs" 161 25 197 5] [#"../hashmap.rs" 161 25 197 5] ());
+    [#"../hashmap.rs" 161 25 197 5] _0 <- ([#"../hashmap.rs" 161 25 197 5] ());
     goto BB33
   }
   BB33 {
@@ -2263,25 +2263,25 @@ module Hashmap_Main
     goto BB8
   }
   BB8 {
-    [#"../hashmap.rs" 234 4 234 18] _x <- ([#"../hashmap.rs" 234 4 234 18] _13);
+    [#"../hashmap.rs" 234 4 234 18] _x <- _13;
     _13 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 h1 ([#"../hashmap.rs" 235 16 235 17] (2 : usize)));
     goto BB9
   }
   BB9 {
-    [#"../hashmap.rs" 235 4 235 18] _y <- ([#"../hashmap.rs" 235 4 235 18] _15);
+    [#"../hashmap.rs" 235 4 235 18] _y <- _15;
     _15 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 h2 ([#"../hashmap.rs" 236 16 236 17] (1 : usize)));
     goto BB10
   }
   BB10 {
-    [#"../hashmap.rs" 236 4 236 18] _z <- ([#"../hashmap.rs" 236 4 236 18] _17);
+    [#"../hashmap.rs" 236 4 236 18] _z <- _17;
     _17 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 h2 ([#"../hashmap.rs" 237 16 237 17] (2 : usize)));
     goto BB11
   }
   BB11 {
-    [#"../hashmap.rs" 237 4 237 18] _t <- ([#"../hashmap.rs" 237 4 237 18] _19);
+    [#"../hashmap.rs" 237 4 237 18] _t <- _19;
     _19 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 240 4 240 6] _22 <- Borrow.borrow_mut h2;
     [#"../hashmap.rs" 240 4 240 6] h2 <-  ^ _22;
@@ -2294,27 +2294,27 @@ module Hashmap_Main
     goto BB13
   }
   BB13 {
-    [#"../hashmap.rs" 241 4 241 18] _x <- ([#"../hashmap.rs" 241 4 241 18] _23);
+    [#"../hashmap.rs" 241 4 241 18] _x <- _23;
     _23 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 h1 ([#"../hashmap.rs" 242 16 242 17] (2 : usize)));
     goto BB14
   }
   BB14 {
-    [#"../hashmap.rs" 242 4 242 18] _y <- ([#"../hashmap.rs" 242 4 242 18] _25);
+    [#"../hashmap.rs" 242 4 242 18] _y <- _25;
     _25 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 h2 ([#"../hashmap.rs" 243 16 243 17] (1 : usize)));
     goto BB15
   }
   BB15 {
-    [#"../hashmap.rs" 243 4 243 18] _z <- ([#"../hashmap.rs" 243 4 243 18] _27);
+    [#"../hashmap.rs" 243 4 243 18] _z <- _27;
     _27 <- any Core_Option_Option_Type.t_option isize;
     [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 h2 ([#"../hashmap.rs" 244 16 244 17] (2 : usize)));
     goto BB16
   }
   BB16 {
-    [#"../hashmap.rs" 244 4 244 18] _t <- ([#"../hashmap.rs" 244 4 244 18] _29);
+    [#"../hashmap.rs" 244 4 244 18] _t <- _29;
     _29 <- any Core_Option_Option_Type.t_option isize;
-    [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] [#"../hashmap.rs" 217 14 247 1] ());
+    [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] ());
     goto BB17
   }
   BB17 {
diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index 1902e99d20..19e26134ea 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -637,7 +637,7 @@ module HeapsortGeneric_SiftDown
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../heapsort_generic.rs" 46 16 46 21] i <- ([#"../heapsort_generic.rs" 46 16 46 21] start);
+    [#"../heapsort_generic.rs" 46 16 46 21] i <- start;
     goto BB2
   }
   BB2 {
@@ -659,13 +659,13 @@ module HeapsortGeneric_SiftDown
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)) = ([#"../heapsort_generic.rs" 60 16 60 23] (0 : usize)));
+    [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)) = ([#"../heapsort_generic.rs" 60 16 60 23] (0 : usize));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 60 16 60 23] not _28 };
     goto BB4
   }
   BB4 {
-    [#"../heapsort_generic.rs" 60 16 60 23] _26 <- ([#"../heapsort_generic.rs" 60 16 60 23] end' / ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize)));
-    [#"../heapsort_generic.rs" 60 11 60 23] _24 <- ([#"../heapsort_generic.rs" 60 11 60 23] i >= _26);
+    [#"../heapsort_generic.rs" 60 16 60 23] _26 <- end' / ([#"../heapsort_generic.rs" 60 22 60 23] (2 : usize));
+    [#"../heapsort_generic.rs" 60 11 60 23] _24 <- i >= _26;
     _26 <- any usize;
     switch (_24)
       | False -> goto BB6
@@ -675,15 +675,15 @@ module HeapsortGeneric_SiftDown
   BB5 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve3 v };
-    [#"../heapsort_generic.rs" 61 12 61 18] _0 <- ([#"../heapsort_generic.rs" 61 12 61 18] [#"../heapsort_generic.rs" 61 12 61 18] ());
+    [#"../heapsort_generic.rs" 61 12 61 18] _0 <- ([#"../heapsort_generic.rs" 61 12 61 18] ());
     goto BB23
   }
   BB6 {
-    [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 29] ([#"../heapsort_generic.rs" 64 24 64 25] (2 : usize)) * i);
-    [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] _31 + ([#"../heapsort_generic.rs" 64 32 64 33] (1 : usize)));
+    [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 25] (2 : usize)) * i;
+    [#"../heapsort_generic.rs" 64 24 64 33] child <- _31 + ([#"../heapsort_generic.rs" 64 32 64 33] (1 : usize));
     _31 <- any usize;
-    [#"../heapsort_generic.rs" 65 11 65 20] _35 <- ([#"../heapsort_generic.rs" 65 11 65 20] child + ([#"../heapsort_generic.rs" 65 19 65 20] (1 : usize)));
-    [#"../heapsort_generic.rs" 65 11 65 26] _34 <- ([#"../heapsort_generic.rs" 65 11 65 26] _35 < end');
+    [#"../heapsort_generic.rs" 65 11 65 20] _35 <- child + ([#"../heapsort_generic.rs" 65 19 65 20] (1 : usize));
+    [#"../heapsort_generic.rs" 65 11 65 26] _34 <- _35 < end';
     _35 <- any usize;
     switch (_34)
       | False -> goto BB8
@@ -700,7 +700,7 @@ module HeapsortGeneric_SiftDown
   BB9 {
     assert { [@expl:type invariant] inv2 _40 };
     assume { resolve1 _40 };
-    [#"../heapsort_generic.rs" 65 43 65 52] _46 <- ([#"../heapsort_generic.rs" 65 43 65 52] child + ([#"../heapsort_generic.rs" 65 51 65 52] (1 : usize)));
+    [#"../heapsort_generic.rs" 65 43 65 52] _46 <- child + ([#"../heapsort_generic.rs" 65 51 65 52] (1 : usize));
     [#"../heapsort_generic.rs" 65 42 65 53] _44 <- ([#"../heapsort_generic.rs" 65 42 65 53] index0 ( * v) _46);
     _46 <- any usize;
     goto BB10
@@ -718,15 +718,15 @@ module HeapsortGeneric_SiftDown
       end
   }
   BB12 {
-    [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + ([#"../heapsort_generic.rs" 66 21 66 22] (1 : usize)));
-    [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] [#"../heapsort_generic.rs" 66 12 66 22] ());
+    [#"../heapsort_generic.rs" 66 12 66 22] child <- child + ([#"../heapsort_generic.rs" 66 21 66 22] (1 : usize));
+    [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] ());
     goto BB15
   }
   BB13 {
     goto BB14
   }
   BB14 {
-    [#"../heapsort_generic.rs" 67 9 67 9] _33 <- ([#"../heapsort_generic.rs" 67 9 67 9] [#"../heapsort_generic.rs" 67 9 67 9] ());
+    [#"../heapsort_generic.rs" 67 9 67 9] _33 <- ([#"../heapsort_generic.rs" 67 9 67 9] ());
     goto BB15
   }
   BB15 {
@@ -754,7 +754,7 @@ module HeapsortGeneric_SiftDown
   BB19 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve3 v };
-    [#"../heapsort_generic.rs" 69 12 69 18] _0 <- ([#"../heapsort_generic.rs" 69 12 69 18] [#"../heapsort_generic.rs" 69 12 69 18] ());
+    [#"../heapsort_generic.rs" 69 12 69 18] _0 <- ([#"../heapsort_generic.rs" 69 12 69 18] ());
     goto BB23
   }
   BB20 {
@@ -776,7 +776,7 @@ module HeapsortGeneric_SiftDown
   BB22 {
     assert { [@expl:type invariant] inv5 _61 };
     assume { resolve2 _61 };
-    [#"../heapsort_generic.rs" 72 8 72 17] i <- ([#"../heapsort_generic.rs" 72 8 72 17] child);
+    [#"../heapsort_generic.rs" 72 8 72 17] i <- child;
     goto BB2
   }
   BB23 {
@@ -1202,12 +1202,12 @@ module HeapsortGeneric_HeapSort
     goto BB2
   }
   BB2 {
-    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)) = ([#"../heapsort_generic.rs" 99 20 99 31] (0 : usize)));
+    [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)) = ([#"../heapsort_generic.rs" 99 20 99 31] (0 : usize));
     assert { [@expl:division by zero] [#"../heapsort_generic.rs" 99 20 99 31] not _10 };
     goto BB3
   }
   BB3 {
-    [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize)));
+    [#"../heapsort_generic.rs" 99 20 99 31] start <- _8 / ([#"../heapsort_generic.rs" 99 30 99 31] (2 : usize));
     _8 <- any usize;
     goto BB4
   }
@@ -1218,14 +1218,14 @@ module HeapsortGeneric_HeapSort
     goto BB5
   }
   BB5 {
-    [#"../heapsort_generic.rs" 103 10 103 19] _16 <- ([#"../heapsort_generic.rs" 103 10 103 19] start > ([#"../heapsort_generic.rs" 103 18 103 19] (0 : usize)));
+    [#"../heapsort_generic.rs" 103 10 103 19] _16 <- start > ([#"../heapsort_generic.rs" 103 18 103 19] (0 : usize));
     switch (_16)
       | False -> goto BB9
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - ([#"../heapsort_generic.rs" 104 17 104 18] (1 : usize)));
+    [#"../heapsort_generic.rs" 104 8 104 18] start <- start - ([#"../heapsort_generic.rs" 104 17 104 18] (1 : usize));
     [#"../heapsort_generic.rs" 105 18 105 19] _19 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 105 18 105 19] v <- { v with current = ( ^ _19) ; };
     assume { inv2 ( ^ _19) };
@@ -1239,7 +1239,7 @@ module HeapsortGeneric_HeapSort
     goto BB8
   }
   BB8 {
-    [#"../heapsort_generic.rs" 103 20 106 5] _15 <- ([#"../heapsort_generic.rs" 103 20 106 5] [#"../heapsort_generic.rs" 103 20 106 5] ());
+    [#"../heapsort_generic.rs" 103 20 106 5] _15 <- ([#"../heapsort_generic.rs" 103 20 106 5] ());
     goto BB4
   }
   BB9 {
@@ -1259,14 +1259,14 @@ module HeapsortGeneric_HeapSort
     goto BB12
   }
   BB12 {
-    [#"../heapsort_generic.rs" 115 10 115 17] _33 <- ([#"../heapsort_generic.rs" 115 10 115 17] end' > ([#"../heapsort_generic.rs" 115 16 115 17] (1 : usize)));
+    [#"../heapsort_generic.rs" 115 10 115 17] _33 <- end' > ([#"../heapsort_generic.rs" 115 16 115 17] (1 : usize));
     switch (_33)
       | False -> goto BB17
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - ([#"../heapsort_generic.rs" 116 15 116 16] (1 : usize)));
+    [#"../heapsort_generic.rs" 116 8 116 16] end' <- end' - ([#"../heapsort_generic.rs" 116 15 116 16] (1 : usize));
     [#"../heapsort_generic.rs" 117 8 117 9] _38 <- Borrow.borrow_mut ( * v);
     [#"../heapsort_generic.rs" 117 8 117 9] v <- { v with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
@@ -1295,13 +1295,13 @@ module HeapsortGeneric_HeapSort
     goto BB16
   }
   BB16 {
-    [#"../heapsort_generic.rs" 115 18 124 5] _15 <- ([#"../heapsort_generic.rs" 115 18 124 5] [#"../heapsort_generic.rs" 115 18 124 5] ());
+    [#"../heapsort_generic.rs" 115 18 124 5] _15 <- ([#"../heapsort_generic.rs" 115 18 124 5] ());
     goto BB11
   }
   BB17 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve1 v };
-    [#"../heapsort_generic.rs" 115 4 124 5] _0 <- ([#"../heapsort_generic.rs" 115 4 124 5] [#"../heapsort_generic.rs" 115 4 124 5] ());
+    [#"../heapsort_generic.rs" 115 4 124 5] _0 <- ([#"../heapsort_generic.rs" 115 4 124 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index 393f7ab249..7778b45d1b 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -225,7 +225,7 @@ module Hillel_RightPad
     goto BB4
   }
   BB4 {
-    [#"../hillel.rs" 24 10 24 25] _18 <- ([#"../hillel.rs" 24 10 24 25] _19 < len);
+    [#"../hillel.rs" 24 10 24 25] _18 <- _19 < len;
     _19 <- any usize;
     switch (_18)
       | False -> goto BB7
@@ -248,7 +248,7 @@ module Hillel_RightPad
     assume { resolve1 pad };
     assert { [@expl:type invariant] inv2 str };
     assume { resolve2 str };
-    [#"../hillel.rs" 24 4 26 5] _0 <- ([#"../hillel.rs" 24 4 26 5] [#"../hillel.rs" 24 4 26 5] ());
+    [#"../hillel.rs" 24 4 26 5] _0 <- ([#"../hillel.rs" 24 4 26 5] ());
     return _0
   }
   
@@ -460,7 +460,7 @@ module Hillel_LeftPad
     goto BB5
   }
   BB5 {
-    [#"../hillel.rs" 43 10 43 25] _19 <- ([#"../hillel.rs" 43 10 43 25] _20 < len);
+    [#"../hillel.rs" 43 10 43 25] _19 <- _20 < len;
     _20 <- any usize;
     switch (_19)
       | False -> goto BB9
@@ -480,7 +480,7 @@ module Hillel_LeftPad
     goto BB8
   }
   BB8 {
-    [#"../hillel.rs" 45 8 45 37] c <- ([#"../hillel.rs" 45 8 45 37] _26);
+    [#"../hillel.rs" 45 8 45 37] c <- _26;
     _26 <- any Snapshot.snap_ty usize;
     goto BB3
   }
@@ -489,7 +489,7 @@ module Hillel_LeftPad
     assume { resolve1 pad };
     assert { [@expl:type invariant] inv2 str };
     assume { resolve2 str };
-    [#"../hillel.rs" 43 4 46 5] _0 <- ([#"../hillel.rs" 43 4 46 5] [#"../hillel.rs" 43 4 46 5] ());
+    [#"../hillel.rs" 43 4 46 5] _0 <- ([#"../hillel.rs" 43 4 46 5] ());
     return _0
   }
   
@@ -1108,22 +1108,22 @@ module Hillel_InsertUnique
     absurd
   }
   BB18 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _28;
     assert { [@expl:type invariant] inv4 _28 };
     assume { resolve6 _28 };
     [#"../hillel.rs" 84 4 84 111] _33 <- ([#"../hillel.rs" 84 4 84 111] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB19
   }
   BB19 {
-    [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] _33);
+    [#"../hillel.rs" 84 4 84 111] produced <- _33;
     _33 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve4 produced };
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- __creusot_proc_iter_elem;
     assert { [@expl:type invariant] inv5 __creusot_proc_iter_elem };
     assume { resolve7 __creusot_proc_iter_elem };
     assert { [@expl:assertion] [#"../hillel.rs" 86 24 86 57] e = index_logic1 (Snapshot.inner ghost_vec) (Seq.length (Snapshot.inner produced) - 1) };
-    [#"../hillel.rs" 87 16 87 21] _41 <- ([#"../hillel.rs" 87 16 87 21] elem);
+    [#"../hillel.rs" 87 16 87 21] _41 <- elem;
     [#"../hillel.rs" 87 11 87 21] _38 <- ([#"../hillel.rs" 87 11 87 21] eq0 e _41);
     goto BB20
   }
@@ -1147,7 +1147,7 @@ module Hillel_InsertUnique
     goto BB22
   }
   BB22 {
-    [#"../hillel.rs" 89 12 89 18] _0 <- ([#"../hillel.rs" 89 12 89 18] [#"../hillel.rs" 89 12 89 18] ());
+    [#"../hillel.rs" 89 12 89 18] _0 <- ([#"../hillel.rs" 89 12 89 18] ());
     goto BB26
   }
   BB23 {
@@ -1169,7 +1169,7 @@ module Hillel_InsertUnique
   BB25 {
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve10 vec };
-    [#"../hillel.rs" 79 63 95 1] _0 <- ([#"../hillel.rs" 79 63 95 1] [#"../hillel.rs" 79 63 95 1] ());
+    [#"../hillel.rs" 79 63 95 1] _0 <- ([#"../hillel.rs" 79 63 95 1] ());
     goto BB26
   }
   BB26 {
@@ -1587,7 +1587,7 @@ module Hillel_Unique
     goto BB3
   }
   BB3 {
-    [#"../hillel.rs" 107 13 107 25] _10 <- ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 107 13 107 14] (0 : usize)) _11);
+    [#"../hillel.rs" 107 13 107 25] _10 <- Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 107 13 107 14] (0 : usize)) _11;
     _11 <- any usize;
     [#"../hillel.rs" 104 4 104 48] iter <- ([#"../hillel.rs" 104 4 104 48] into_iter0 _10);
     _10 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -1655,22 +1655,22 @@ module Hillel_Unique
     absurd
   }
   BB16 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _23);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _23;
     [#"../hillel.rs" 104 4 104 48] _28 <- ([#"../hillel.rs" 104 4 104 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB17
   }
   BB17 {
-    [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] _28);
+    [#"../hillel.rs" 104 4 104 48] produced <- _28;
     _28 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../hillel.rs" 108 26 108 27] _32 <- ([#"../hillel.rs" 108 26 108 27] i);
-    [#"../hillel.rs" 108 22 108 28] _33 <- ([#"../hillel.rs" 108 22 108 28] Slice.length str);
-    [#"../hillel.rs" 108 22 108 28] _34 <- ([#"../hillel.rs" 108 22 108 28] _32 < _33);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
+    [#"../hillel.rs" 108 26 108 27] _32 <- i;
+    [#"../hillel.rs" 108 22 108 28] _33 <- Slice.length str;
+    [#"../hillel.rs" 108 22 108 28] _34 <- _32 < _33;
     assert { [@expl:index in bounds] [#"../hillel.rs" 108 22 108 28] _34 };
     goto BB18
   }
   BB18 {
-    [#"../hillel.rs" 108 22 108 28] elem <- ([#"../hillel.rs" 108 22 108 28] Slice.get str _32);
+    [#"../hillel.rs" 108 22 108 28] elem <- Slice.get str _32;
     [#"../hillel.rs" 109 22 109 33] _37 <- Borrow.borrow_mut unique;
     [#"../hillel.rs" 109 22 109 33] unique <-  ^ _37;
     assume { inv2 ( ^ _37) };
@@ -1690,7 +1690,7 @@ module Hillel_Unique
     goto BB20
   }
   BB20 {
-    [#"../hillel.rs" 110 8 110 50] sub_str <- ([#"../hillel.rs" 110 8 110 50] _39);
+    [#"../hillel.rs" 110 8 110 50] sub_str <- _39;
     _39 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv0 sub_str };
     assume { resolve0 sub_str };
@@ -1698,7 +1698,7 @@ module Hillel_Unique
   }
   BB21 {
     assert { [@expl:assertion] [#"../hillel.rs" 114 20 114 88] Seq.(==) (SeqExt.subsequence (deep_model1 str) 0 (Seq.length (shallow_model0 str))) (deep_model1 str) };
-    [#"../hillel.rs" 115 4 115 10] _0 <- ([#"../hillel.rs" 115 4 115 10] unique);
+    [#"../hillel.rs" 115 4 115 10] _0 <- unique;
     unique <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     goto BB22
   }
@@ -2207,7 +2207,7 @@ module Hillel_Fulcrum
     goto BB0
   }
   BB0 {
-    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] [#"../hillel.rs" 157 25 157 26] (0 : uint32));
+    [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] (0 : uint32));
     [#"../hillel.rs" 159 4 159 60] iter <- ([#"../hillel.rs" 159 4 159 60] into_iter0 s);
     goto BB1
   }
@@ -2247,9 +2247,9 @@ module Hillel_Fulcrum
   }
   BB7 {
     assert { [@expl:assertion] [#"../hillel.rs" 165 20 165 56] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) };
-    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] [#"../hillel.rs" 167 27 167 28] (0 : usize));
-    [#"../hillel.rs" 168 28 168 33] min_dist <- ([#"../hillel.rs" 168 28 168 33] total);
-    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] [#"../hillel.rs" 170 23 170 24] (0 : uint32));
+    [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] (0 : usize));
+    [#"../hillel.rs" 168 28 168 33] min_dist <- total;
+    [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] (0 : uint32));
     [#"../hillel.rs" 176 16 176 23] _37 <- ([#"../hillel.rs" 176 16 176 23] len2 s);
     goto BB12
   }
@@ -2261,20 +2261,20 @@ module Hillel_Fulcrum
     absurd
   }
   BB10 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _19;
     [#"../hillel.rs" 159 4 159 60] _24 <- ([#"../hillel.rs" 159 4 159 60] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] _24);
+    [#"../hillel.rs" 159 4 159 60] produced <- _24;
     _24 <- any Snapshot.snap_ty (Seq.seq uint32);
-    [#"../hillel.rs" 161 9 161 10] x <- ([#"../hillel.rs" 161 9 161 10] __creusot_proc_iter_elem);
-    [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + x);
-    [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] [#"../hillel.rs" 161 16 163 5] ());
+    [#"../hillel.rs" 161 9 161 10] x <- __creusot_proc_iter_elem;
+    [#"../hillel.rs" 162 8 162 18] total <- total + x;
+    [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] ());
     goto BB4
   }
   BB12 {
-    [#"../hillel.rs" 176 13 176 23] _36 <- ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 176 13 176 14] (0 : usize)) _37);
+    [#"../hillel.rs" 176 13 176 23] _36 <- Core_Ops_Range_Range_Type.C_Range ([#"../hillel.rs" 176 13 176 14] (0 : usize)) _37;
     _37 <- any usize;
     [#"../hillel.rs" 171 4 171 58] iter1 <- ([#"../hillel.rs" 171 4 171 58] into_iter1 _36);
     _36 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -2319,53 +2319,53 @@ module Hillel_Fulcrum
       end
   }
   BB19 {
-    [#"../hillel.rs" 186 4 186 9] _0 <- ([#"../hillel.rs" 186 4 186 9] min_i);
+    [#"../hillel.rs" 186 4 186 9] _0 <- min_i;
     return _0
   }
   BB20 {
     goto BB21
   }
   BB21 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _50);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _50;
     [#"../hillel.rs" 171 4 171 58] _55 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB22
   }
   BB22 {
-    [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] _55);
+    [#"../hillel.rs" 171 4 171 58] produced1 <- _55;
     _55 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    [#"../hillel.rs" 177 32 177 43] _60 <- ([#"../hillel.rs" 177 32 177 43] total - sum);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem1;
+    [#"../hillel.rs" 177 32 177 43] _60 <- total - sum;
     [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 sum _60);
     _60 <- any uint32;
     goto BB23
   }
   BB23 {
-    [#"../hillel.rs" 178 11 178 26] _64 <- ([#"../hillel.rs" 178 11 178 26] dist < min_dist);
+    [#"../hillel.rs" 178 11 178 26] _64 <- dist < min_dist;
     switch (_64)
       | False -> goto BB25
       | True -> goto BB24
       end
   }
   BB24 {
-    [#"../hillel.rs" 179 12 179 21] min_i <- ([#"../hillel.rs" 179 12 179 21] i);
-    [#"../hillel.rs" 180 12 180 27] min_dist <- ([#"../hillel.rs" 180 12 180 27] dist);
-    [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] [#"../hillel.rs" 178 27 181 9] ());
+    [#"../hillel.rs" 179 12 179 21] min_i <- i;
+    [#"../hillel.rs" 180 12 180 27] min_dist <- dist;
+    [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] ());
     goto BB26
   }
   BB25 {
-    [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] [#"../hillel.rs" 181 9 181 9] ());
+    [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] ());
     goto BB26
   }
   BB26 {
-    [#"../hillel.rs" 183 17 183 18] _70 <- ([#"../hillel.rs" 183 17 183 18] i);
-    [#"../hillel.rs" 183 15 183 19] _71 <- ([#"../hillel.rs" 183 15 183 19] Slice.length s);
-    [#"../hillel.rs" 183 15 183 19] _72 <- ([#"../hillel.rs" 183 15 183 19] _70 < _71);
+    [#"../hillel.rs" 183 17 183 18] _70 <- i;
+    [#"../hillel.rs" 183 15 183 19] _71 <- Slice.length s;
+    [#"../hillel.rs" 183 15 183 19] _72 <- _70 < _71;
     assert { [@expl:index in bounds] [#"../hillel.rs" 183 15 183 19] _72 };
     goto BB27
   }
   BB27 {
-    [#"../hillel.rs" 183 8 183 19] sum <- ([#"../hillel.rs" 183 8 183 19] sum + Slice.get s _70);
-    [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] [#"../hillel.rs" 176 24 184 5] ());
+    [#"../hillel.rs" 183 8 183 19] sum <- sum + Slice.get s _70;
+    [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] ());
     goto BB16
   }
   BB29 {
diff --git a/creusot/tests/should_succeed/immut.mlcfg b/creusot/tests/should_succeed/immut.mlcfg
index ff8a0d5922..8a989d3f06 100644
--- a/creusot/tests/should_succeed/immut.mlcfg
+++ b/creusot/tests/should_succeed/immut.mlcfg
@@ -18,11 +18,11 @@ module Immut_F
     goto BB0
   }
   BB0 {
-    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] [#"../immut.rs" 4 16 4 18] (10 : uint32));
+    [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] (10 : uint32));
     [#"../immut.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../immut.rs" 5 12 5 18] a <-  ^ b;
-    [#"../immut.rs" 6 19 6 20] _c <- ([#"../immut.rs" 6 19 6 20]  * b);
-    [#"../immut.rs" 3 11 7 1] _0 <- ([#"../immut.rs" 3 11 7 1] [#"../immut.rs" 3 11 7 1] ());
+    [#"../immut.rs" 6 19 6 20] _c <-  * b;
+    [#"../immut.rs" 3 11 7 1] _0 <- ([#"../immut.rs" 3 11 7 1] ());
     assume { resolve0 b };
     return _0
   }
diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg
index 462f0884b0..173769d29d 100644
--- a/creusot/tests/should_succeed/index_range.mlcfg
+++ b/creusot/tests/should_succeed/index_range.mlcfg
@@ -182,7 +182,7 @@ module IndexRange_CreateArr
     goto BB6
   }
   BB6 {
-    [#"../index_range.rs" 23 4 23 7] _0 <- ([#"../index_range.rs" 23 4 23 7] arr);
+    [#"../index_range.rs" 23 4 23 7] _0 <- arr;
     arr <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global);
     goto BB7
   }
@@ -573,18 +573,18 @@ module IndexRange_TestRange
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 34 17 34 21] _5 <- ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 34 17 34 18] (0 : usize)) ([#"../index_range.rs" 34 20 34 21] (2 : usize)));
+    [#"../index_range.rs" 34 17 34 21] _5 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 34 17 34 18] (0 : usize)) ([#"../index_range.rs" 34 20 34 21] (2 : usize));
     [#"../index_range.rs" 34 16 34 22] _3 <- ([#"../index_range.rs" 34 16 34 22] index0 arr _5);
     _5 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB2
   }
   BB2 {
-    [#"../index_range.rs" 34 12 34 22] s <- ([#"../index_range.rs" 34 12 34 22] _3);
+    [#"../index_range.rs" 34 12 34 22] s <- _3;
     [#"../index_range.rs" 35 12 35 19] _8 <- ([#"../index_range.rs" 35 12 35 19] len0 s);
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 35 12 35 24] _7 <- ([#"../index_range.rs" 35 12 35 24] _8 = ([#"../index_range.rs" 35 23 35 24] (2 : usize)));
+    [#"../index_range.rs" 35 12 35 24] _7 <- _8 = ([#"../index_range.rs" 35 23 35 24] (2 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -592,35 +592,35 @@ module IndexRange_TestRange
       end
   }
   BB4 {
-    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] [#"../index_range.rs" 35 30 35 31] (0 : usize));
-    [#"../index_range.rs" 35 28 35 32] _13 <- ([#"../index_range.rs" 35 28 35 32] Slice.length s);
-    [#"../index_range.rs" 35 28 35 32] _14 <- ([#"../index_range.rs" 35 28 35 32] _12 < _13);
+    [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] (0 : usize));
+    [#"../index_range.rs" 35 28 35 32] _13 <- Slice.length s;
+    [#"../index_range.rs" 35 28 35 32] _14 <- _12 < _13;
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 28 35 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 35 28 35 37] _10 <- ([#"../index_range.rs" 35 28 35 37] Slice.get s _12 = ([#"../index_range.rs" 35 36 35 37] (0 : int32)));
+    [#"../index_range.rs" 35 28 35 37] _10 <- Slice.get s _12 = ([#"../index_range.rs" 35 36 35 37] (0 : int32));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] [#"../index_range.rs" 35 43 35 44] (1 : usize));
-    [#"../index_range.rs" 35 41 35 45] _18 <- ([#"../index_range.rs" 35 41 35 45] Slice.length s);
-    [#"../index_range.rs" 35 41 35 45] _19 <- ([#"../index_range.rs" 35 41 35 45] _17 < _18);
+    [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] (1 : usize));
+    [#"../index_range.rs" 35 41 35 45] _18 <- Slice.length s;
+    [#"../index_range.rs" 35 41 35 45] _19 <- _17 < _18;
     assert { [@expl:index in bounds] [#"../index_range.rs" 35 41 35 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 35 41 35 50] _15 <- ([#"../index_range.rs" 35 41 35 50] Slice.get s _17 = ([#"../index_range.rs" 35 49 35 50] (1 : int32)));
+    [#"../index_range.rs" 35 41 35 50] _15 <- Slice.get s _17 = ([#"../index_range.rs" 35 49 35 50] (1 : int32));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 37 17 37 21] _24 <- ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 37 17 37 18] (3 : usize)) ([#"../index_range.rs" 37 20 37 21] (5 : usize)));
+    [#"../index_range.rs" 37 17 37 21] _24 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 37 17 37 18] (3 : usize)) ([#"../index_range.rs" 37 20 37 21] (5 : usize));
     [#"../index_range.rs" 37 16 37 22] _22 <- ([#"../index_range.rs" 37 16 37 22] index0 arr _24);
     _24 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB13
@@ -642,12 +642,12 @@ module IndexRange_TestRange
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 37 12 37 22] s1 <- ([#"../index_range.rs" 37 12 37 22] _22);
+    [#"../index_range.rs" 37 12 37 22] s1 <- _22;
     [#"../index_range.rs" 38 12 38 19] _27 <- ([#"../index_range.rs" 38 12 38 19] len0 s1);
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 38 12 38 24] _26 <- ([#"../index_range.rs" 38 12 38 24] _27 = ([#"../index_range.rs" 38 23 38 24] (2 : usize)));
+    [#"../index_range.rs" 38 12 38 24] _26 <- _27 = ([#"../index_range.rs" 38 23 38 24] (2 : usize));
     _27 <- any usize;
     switch (_26)
       | False -> goto BB22
@@ -655,35 +655,35 @@ module IndexRange_TestRange
       end
   }
   BB15 {
-    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] [#"../index_range.rs" 38 30 38 31] (0 : usize));
-    [#"../index_range.rs" 38 28 38 32] _32 <- ([#"../index_range.rs" 38 28 38 32] Slice.length s1);
-    [#"../index_range.rs" 38 28 38 32] _33 <- ([#"../index_range.rs" 38 28 38 32] _31 < _32);
+    [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] (0 : usize));
+    [#"../index_range.rs" 38 28 38 32] _32 <- Slice.length s1;
+    [#"../index_range.rs" 38 28 38 32] _33 <- _31 < _32;
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 28 38 32] _33 };
     goto BB16
   }
   BB16 {
-    [#"../index_range.rs" 38 28 38 37] _29 <- ([#"../index_range.rs" 38 28 38 37] Slice.get s1 _31 = ([#"../index_range.rs" 38 36 38 37] (3 : int32)));
+    [#"../index_range.rs" 38 28 38 37] _29 <- Slice.get s1 _31 = ([#"../index_range.rs" 38 36 38 37] (3 : int32));
     switch (_29)
       | False -> goto BB21
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] [#"../index_range.rs" 38 43 38 44] (1 : usize));
-    [#"../index_range.rs" 38 41 38 45] _37 <- ([#"../index_range.rs" 38 41 38 45] Slice.length s1);
-    [#"../index_range.rs" 38 41 38 45] _38 <- ([#"../index_range.rs" 38 41 38 45] _36 < _37);
+    [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] (1 : usize));
+    [#"../index_range.rs" 38 41 38 45] _37 <- Slice.length s1;
+    [#"../index_range.rs" 38 41 38 45] _38 <- _36 < _37;
     assert { [@expl:index in bounds] [#"../index_range.rs" 38 41 38 45] _38 };
     goto BB18
   }
   BB18 {
-    [#"../index_range.rs" 38 41 38 50] _34 <- ([#"../index_range.rs" 38 41 38 50] Slice.get s1 _36 = ([#"../index_range.rs" 38 49 38 50] (4 : int32)));
+    [#"../index_range.rs" 38 41 38 50] _34 <- Slice.get s1 _36 = ([#"../index_range.rs" 38 49 38 50] (4 : int32));
     switch (_34)
       | False -> goto BB20
       | True -> goto BB19
       end
   }
   BB19 {
-    [#"../index_range.rs" 43 16 43 20] _46 <- ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 43 16 43 17] (2 : usize)) ([#"../index_range.rs" 43 19 43 20] (2 : usize)));
+    [#"../index_range.rs" 43 16 43 20] _46 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 43 16 43 17] (2 : usize)) ([#"../index_range.rs" 43 19 43 20] (2 : usize));
     [#"../index_range.rs" 43 15 43 21] _44 <- ([#"../index_range.rs" 43 15 43 21] index0 arr _46);
     _46 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB24
@@ -709,7 +709,7 @@ module IndexRange_TestRange
     goto BB25
   }
   BB25 {
-    [#"../index_range.rs" 43 12 43 32] _41 <- ([#"../index_range.rs" 43 12 43 32] _42 = ([#"../index_range.rs" 43 31 43 32] (0 : usize)));
+    [#"../index_range.rs" 43 12 43 32] _41 <- _42 = ([#"../index_range.rs" 43 31 43 32] (0 : usize));
     _42 <- any usize;
     switch (_41)
       | False -> goto BB27
@@ -717,7 +717,7 @@ module IndexRange_TestRange
       end
   }
   BB26 {
-    [#"../index_range.rs" 45 16 45 20] _54 <- ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 45 16 45 17] (5 : usize)) ([#"../index_range.rs" 45 19 45 20] (5 : usize)));
+    [#"../index_range.rs" 45 16 45 20] _54 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 45 16 45 17] (5 : usize)) ([#"../index_range.rs" 45 19 45 20] (5 : usize));
     [#"../index_range.rs" 45 15 45 21] _52 <- ([#"../index_range.rs" 45 15 45 21] index0 arr _54);
     _54 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB28
@@ -732,7 +732,7 @@ module IndexRange_TestRange
     goto BB29
   }
   BB29 {
-    [#"../index_range.rs" 45 12 45 32] _49 <- ([#"../index_range.rs" 45 12 45 32] _50 = ([#"../index_range.rs" 45 31 45 32] (0 : usize)));
+    [#"../index_range.rs" 45 12 45 32] _49 <- _50 = ([#"../index_range.rs" 45 31 45 32] (0 : usize));
     _50 <- any usize;
     switch (_49)
       | False -> goto BB31
@@ -749,7 +749,7 @@ module IndexRange_TestRange
     absurd
   }
   BB32 {
-    [#"../index_range.rs" 50 20 50 24] _63 <- ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 50 20 50 21] (2 : usize)) ([#"../index_range.rs" 50 23 50 24] (6 : usize)));
+    [#"../index_range.rs" 50 20 50 24] _63 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 50 20 50 21] (2 : usize)) ([#"../index_range.rs" 50 23 50 24] (6 : usize));
     [#"../index_range.rs" 50 12 50 25] _59 <- ([#"../index_range.rs" 50 12 50 25] get0 _61 _63);
     _63 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB33
@@ -774,7 +774,7 @@ module IndexRange_TestRange
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 52 20 52 24] _72 <- ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 52 20 52 21] (2 : usize)) ([#"../index_range.rs" 52 23 52 24] (1 : usize)));
+    [#"../index_range.rs" 52 20 52 24] _72 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 52 20 52 21] (2 : usize)) ([#"../index_range.rs" 52 23 52 24] (1 : usize));
     [#"../index_range.rs" 52 12 52 25] _68 <- ([#"../index_range.rs" 52 12 52 25] get0 _70 _72);
     _72 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB38
@@ -799,7 +799,7 @@ module IndexRange_TestRange
     absurd
   }
   BB42 {
-    [#"../index_range.rs" 54 20 54 24] _81 <- ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 54 20 54 21] (6 : usize)) ([#"../index_range.rs" 54 23 54 24] (6 : usize)));
+    [#"../index_range.rs" 54 20 54 24] _81 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 54 20 54 21] (6 : usize)) ([#"../index_range.rs" 54 23 54 24] (6 : usize));
     [#"../index_range.rs" 54 12 54 25] _77 <- ([#"../index_range.rs" 54 12 54 25] get0 _79 _81);
     _81 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB43
@@ -824,7 +824,7 @@ module IndexRange_TestRange
     absurd
   }
   BB47 {
-    [#"../index_range.rs" 56 20 56 26] _90 <- ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 56 20 56 22] (10 : usize)) ([#"../index_range.rs" 56 24 56 26] (10 : usize)));
+    [#"../index_range.rs" 56 20 56 26] _90 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 56 20 56 22] (10 : usize)) ([#"../index_range.rs" 56 24 56 26] (10 : usize));
     [#"../index_range.rs" 56 12 56 27] _86 <- ([#"../index_range.rs" 56 12 56 27] get0 _88 _90);
     _90 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB48
@@ -842,7 +842,7 @@ module IndexRange_TestRange
   BB50 {
     [#"../index_range.rs" 59 17 59 20] _94 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 59 17 59 20] arr <-  ^ _94;
-    [#"../index_range.rs" 59 21 59 25] _95 <- ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 59 21 59 22] (1 : usize)) ([#"../index_range.rs" 59 24 59 25] (4 : usize)));
+    [#"../index_range.rs" 59 21 59 25] _95 <- Core_Ops_Range_Range_Type.C_Range ([#"../index_range.rs" 59 21 59 22] (1 : usize)) ([#"../index_range.rs" 59 24 59 25] (4 : usize));
     [#"../index_range.rs" 59 20 59 26] _93 <- ([#"../index_range.rs" 59 20 59 26] index_mut0 _94 _95);
     _94 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _95 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -860,7 +860,7 @@ module IndexRange_TestRange
     goto BB53
   }
   BB53 {
-    [#"../index_range.rs" 60 12 60 24] _97 <- ([#"../index_range.rs" 60 12 60 24] _98 = ([#"../index_range.rs" 60 23 60 24] (3 : usize)));
+    [#"../index_range.rs" 60 12 60 24] _97 <- _98 = ([#"../index_range.rs" 60 23 60 24] (3 : usize));
     _98 <- any usize;
     switch (_97)
       | False -> goto BB55
@@ -868,9 +868,9 @@ module IndexRange_TestRange
       end
   }
   BB54 {
-    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] [#"../index_range.rs" 61 6 61 7] (0 : usize));
-    [#"../index_range.rs" 61 4 61 8] _102 <- ([#"../index_range.rs" 61 4 61 8] Slice.length ( * s2));
-    [#"../index_range.rs" 61 4 61 8] _103 <- ([#"../index_range.rs" 61 4 61 8] _101 < _102);
+    [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] (0 : usize));
+    [#"../index_range.rs" 61 4 61 8] _102 <- Slice.length ( * s2);
+    [#"../index_range.rs" 61 4 61 8] _103 <- _101 < _102;
     assert { [@expl:index in bounds] [#"../index_range.rs" 61 4 61 8] _103 };
     goto BB56
   }
@@ -882,24 +882,24 @@ module IndexRange_TestRange
     absurd
   }
   BB56 {
-    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] [#"../index_range.rs" 61 11 61 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] [#"../index_range.rs" 62 6 62 7] (1 : usize));
-    [#"../index_range.rs" 62 4 62 8] _105 <- ([#"../index_range.rs" 62 4 62 8] Slice.length ( * s2));
-    [#"../index_range.rs" 62 4 62 8] _106 <- ([#"../index_range.rs" 62 4 62 8] _104 < _105);
+    [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 11 61 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] (1 : usize));
+    [#"../index_range.rs" 62 4 62 8] _105 <- Slice.length ( * s2);
+    [#"../index_range.rs" 62 4 62 8] _106 <- _104 < _105;
     assert { [@expl:index in bounds] [#"../index_range.rs" 62 4 62 8] _106 };
     goto BB57
   }
   BB57 {
-    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] [#"../index_range.rs" 62 11 62 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] [#"../index_range.rs" 67 14 67 15] (2 : usize));
-    [#"../index_range.rs" 67 12 67 16] _111 <- ([#"../index_range.rs" 67 12 67 16] Slice.length ( * s2));
-    [#"../index_range.rs" 67 12 67 16] _112 <- ([#"../index_range.rs" 67 12 67 16] _110 < _111);
+    [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 11 62 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] (2 : usize));
+    [#"../index_range.rs" 67 12 67 16] _111 <- Slice.length ( * s2);
+    [#"../index_range.rs" 67 12 67 16] _112 <- _110 < _111;
     assert { [@expl:index in bounds] [#"../index_range.rs" 67 12 67 16] _112 };
     goto BB58
   }
   BB58 {
     assume { resolve1 s2 };
-    [#"../index_range.rs" 67 12 67 21] _108 <- ([#"../index_range.rs" 67 12 67 21] Slice.get ( * s2) _110 = ([#"../index_range.rs" 67 20 67 21] (3 : int32)));
+    [#"../index_range.rs" 67 12 67 21] _108 <- Slice.get ( * s2) _110 = ([#"../index_range.rs" 67 20 67 21] (3 : int32));
     assume { resolve1 _93 };
     switch (_108)
       | False -> goto BB60
@@ -916,7 +916,7 @@ module IndexRange_TestRange
     absurd
   }
   BB61 {
-    [#"../index_range.rs" 69 12 69 26] _115 <- ([#"../index_range.rs" 69 12 69 26] _116 = ([#"../index_range.rs" 69 25 69 26] (5 : usize)));
+    [#"../index_range.rs" 69 12 69 26] _115 <- _116 = ([#"../index_range.rs" 69 25 69 26] (5 : usize));
     _116 <- any usize;
     switch (_115)
       | False -> goto BB63
@@ -933,7 +933,7 @@ module IndexRange_TestRange
     absurd
   }
   BB64 {
-    [#"../index_range.rs" 70 12 70 23] _120 <- ([#"../index_range.rs" 70 12 70 23] _122 = ([#"../index_range.rs" 70 22 70 23] (0 : int32)));
+    [#"../index_range.rs" 70 12 70 23] _120 <- _122 = ([#"../index_range.rs" 70 22 70 23] (0 : int32));
     switch (_120)
       | False -> goto BB66
       | True -> goto BB65
@@ -949,7 +949,7 @@ module IndexRange_TestRange
     absurd
   }
   BB67 {
-    [#"../index_range.rs" 71 12 71 24] _126 <- ([#"../index_range.rs" 71 12 71 24] _128 = ([#"../index_range.rs" 71 22 71 24] (-1 : int32)));
+    [#"../index_range.rs" 71 12 71 24] _126 <- _128 = ([#"../index_range.rs" 71 22 71 24] (-1 : int32));
     switch (_126)
       | False -> goto BB69
       | True -> goto BB68
@@ -965,7 +965,7 @@ module IndexRange_TestRange
     absurd
   }
   BB70 {
-    [#"../index_range.rs" 72 12 72 24] _132 <- ([#"../index_range.rs" 72 12 72 24] _134 = ([#"../index_range.rs" 72 22 72 24] (-1 : int32)));
+    [#"../index_range.rs" 72 12 72 24] _132 <- _134 = ([#"../index_range.rs" 72 22 72 24] (-1 : int32));
     switch (_132)
       | False -> goto BB72
       | True -> goto BB71
@@ -981,7 +981,7 @@ module IndexRange_TestRange
     absurd
   }
   BB73 {
-    [#"../index_range.rs" 73 12 73 23] _138 <- ([#"../index_range.rs" 73 12 73 23] _140 = ([#"../index_range.rs" 73 22 73 23] (3 : int32)));
+    [#"../index_range.rs" 73 12 73 23] _138 <- _140 = ([#"../index_range.rs" 73 22 73 23] (3 : int32));
     switch (_138)
       | False -> goto BB75
       | True -> goto BB74
@@ -998,14 +998,14 @@ module IndexRange_TestRange
   }
   BB76 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 74 12 74 23] _144 <- ([#"../index_range.rs" 74 12 74 23] _146 = ([#"../index_range.rs" 74 22 74 23] (4 : int32)));
+    [#"../index_range.rs" 74 12 74 23] _144 <- _146 = ([#"../index_range.rs" 74 22 74 23] (4 : int32));
     switch (_144)
       | False -> goto BB78
       | True -> goto BB77
       end
   }
   BB77 {
-    [#"../index_range.rs" 27 20 75 1] _0 <- ([#"../index_range.rs" 27 20 75 1] [#"../index_range.rs" 27 20 75 1] ());
+    [#"../index_range.rs" 27 20 75 1] _0 <- ([#"../index_range.rs" 27 20 75 1] ());
     goto BB79
   }
   BB78 {
@@ -1360,18 +1360,18 @@ module IndexRange_TestRangeTo
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 85 17 85 20] _5 <- ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 85 19 85 20] (2 : usize)));
+    [#"../index_range.rs" 85 17 85 20] _5 <- Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 85 19 85 20] (2 : usize));
     [#"../index_range.rs" 85 16 85 21] _3 <- ([#"../index_range.rs" 85 16 85 21] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB2
   }
   BB2 {
-    [#"../index_range.rs" 85 12 85 21] s <- ([#"../index_range.rs" 85 12 85 21] _3);
+    [#"../index_range.rs" 85 12 85 21] s <- _3;
     [#"../index_range.rs" 86 12 86 19] _8 <- ([#"../index_range.rs" 86 12 86 19] len0 s);
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 86 12 86 24] _7 <- ([#"../index_range.rs" 86 12 86 24] _8 = ([#"../index_range.rs" 86 23 86 24] (2 : usize)));
+    [#"../index_range.rs" 86 12 86 24] _7 <- _8 = ([#"../index_range.rs" 86 23 86 24] (2 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -1379,35 +1379,35 @@ module IndexRange_TestRangeTo
       end
   }
   BB4 {
-    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] [#"../index_range.rs" 86 30 86 31] (0 : usize));
-    [#"../index_range.rs" 86 28 86 32] _13 <- ([#"../index_range.rs" 86 28 86 32] Slice.length s);
-    [#"../index_range.rs" 86 28 86 32] _14 <- ([#"../index_range.rs" 86 28 86 32] _12 < _13);
+    [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] (0 : usize));
+    [#"../index_range.rs" 86 28 86 32] _13 <- Slice.length s;
+    [#"../index_range.rs" 86 28 86 32] _14 <- _12 < _13;
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 28 86 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 86 28 86 37] _10 <- ([#"../index_range.rs" 86 28 86 37] Slice.get s _12 = ([#"../index_range.rs" 86 36 86 37] (0 : int32)));
+    [#"../index_range.rs" 86 28 86 37] _10 <- Slice.get s _12 = ([#"../index_range.rs" 86 36 86 37] (0 : int32));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] [#"../index_range.rs" 86 43 86 44] (1 : usize));
-    [#"../index_range.rs" 86 41 86 45] _18 <- ([#"../index_range.rs" 86 41 86 45] Slice.length s);
-    [#"../index_range.rs" 86 41 86 45] _19 <- ([#"../index_range.rs" 86 41 86 45] _17 < _18);
+    [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] (1 : usize));
+    [#"../index_range.rs" 86 41 86 45] _18 <- Slice.length s;
+    [#"../index_range.rs" 86 41 86 45] _19 <- _17 < _18;
     assert { [@expl:index in bounds] [#"../index_range.rs" 86 41 86 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 86 41 86 50] _15 <- ([#"../index_range.rs" 86 41 86 50] Slice.get s _17 = ([#"../index_range.rs" 86 49 86 50] (1 : int32)));
+    [#"../index_range.rs" 86 41 86 50] _15 <- Slice.get s _17 = ([#"../index_range.rs" 86 49 86 50] (1 : int32));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 91 16 91 19] _27 <- ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 91 18 91 19] (0 : usize)));
+    [#"../index_range.rs" 91 16 91 19] _27 <- Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 91 18 91 19] (0 : usize));
     [#"../index_range.rs" 91 15 91 20] _25 <- ([#"../index_range.rs" 91 15 91 20] index0 arr _27);
     _27 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB13
@@ -1433,7 +1433,7 @@ module IndexRange_TestRangeTo
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 91 12 91 31] _22 <- ([#"../index_range.rs" 91 12 91 31] _23 = ([#"../index_range.rs" 91 30 91 31] (0 : usize)));
+    [#"../index_range.rs" 91 12 91 31] _22 <- _23 = ([#"../index_range.rs" 91 30 91 31] (0 : usize));
     _23 <- any usize;
     switch (_22)
       | False -> goto BB16
@@ -1450,7 +1450,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 96 20 96 23] _36 <- ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 96 22 96 23] (6 : usize)));
+    [#"../index_range.rs" 96 20 96 23] _36 <- Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 96 22 96 23] (6 : usize));
     [#"../index_range.rs" 96 12 96 24] _32 <- ([#"../index_range.rs" 96 12 96 24] get0 _34 _36);
     _36 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
     goto BB18
@@ -1468,7 +1468,7 @@ module IndexRange_TestRangeTo
   BB20 {
     [#"../index_range.rs" 99 17 99 20] _40 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 99 17 99 20] arr <-  ^ _40;
-    [#"../index_range.rs" 99 21 99 24] _41 <- ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 99 23 99 24] (3 : usize)));
+    [#"../index_range.rs" 99 21 99 24] _41 <- Core_Ops_Range_RangeTo_Type.C_RangeTo ([#"../index_range.rs" 99 23 99 24] (3 : usize));
     [#"../index_range.rs" 99 20 99 25] _39 <- ([#"../index_range.rs" 99 20 99 25] index_mut0 _40 _41);
     _40 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _41 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize;
@@ -1486,7 +1486,7 @@ module IndexRange_TestRangeTo
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 100 12 100 24] _43 <- ([#"../index_range.rs" 100 12 100 24] _44 = ([#"../index_range.rs" 100 23 100 24] (3 : usize)));
+    [#"../index_range.rs" 100 12 100 24] _43 <- _44 = ([#"../index_range.rs" 100 23 100 24] (3 : usize));
     _44 <- any usize;
     switch (_43)
       | False -> goto BB25
@@ -1494,9 +1494,9 @@ module IndexRange_TestRangeTo
       end
   }
   BB24 {
-    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] [#"../index_range.rs" 101 6 101 7] (0 : usize));
-    [#"../index_range.rs" 101 4 101 8] _48 <- ([#"../index_range.rs" 101 4 101 8] Slice.length ( * s1));
-    [#"../index_range.rs" 101 4 101 8] _49 <- ([#"../index_range.rs" 101 4 101 8] _47 < _48);
+    [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] (0 : usize));
+    [#"../index_range.rs" 101 4 101 8] _48 <- Slice.length ( * s1);
+    [#"../index_range.rs" 101 4 101 8] _49 <- _47 < _48;
     assert { [@expl:index in bounds] [#"../index_range.rs" 101 4 101 8] _49 };
     goto BB26
   }
@@ -1508,24 +1508,24 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] [#"../index_range.rs" 101 11 101 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] [#"../index_range.rs" 102 6 102 7] (2 : usize));
-    [#"../index_range.rs" 102 4 102 8] _51 <- ([#"../index_range.rs" 102 4 102 8] Slice.length ( * s1));
-    [#"../index_range.rs" 102 4 102 8] _52 <- ([#"../index_range.rs" 102 4 102 8] _50 < _51);
+    [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 11 101 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] (2 : usize));
+    [#"../index_range.rs" 102 4 102 8] _51 <- Slice.length ( * s1);
+    [#"../index_range.rs" 102 4 102 8] _52 <- _50 < _51;
     assert { [@expl:index in bounds] [#"../index_range.rs" 102 4 102 8] _52 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] [#"../index_range.rs" 102 11 102 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] [#"../index_range.rs" 104 14 104 15] (1 : usize));
-    [#"../index_range.rs" 104 12 104 16] _57 <- ([#"../index_range.rs" 104 12 104 16] Slice.length ( * s1));
-    [#"../index_range.rs" 104 12 104 16] _58 <- ([#"../index_range.rs" 104 12 104 16] _56 < _57);
+    [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 11 102 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] (1 : usize));
+    [#"../index_range.rs" 104 12 104 16] _57 <- Slice.length ( * s1);
+    [#"../index_range.rs" 104 12 104 16] _58 <- _56 < _57;
     assert { [@expl:index in bounds] [#"../index_range.rs" 104 12 104 16] _58 };
     goto BB28
   }
   BB28 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 104 12 104 21] _54 <- ([#"../index_range.rs" 104 12 104 21] Slice.get ( * s1) _56 = ([#"../index_range.rs" 104 20 104 21] (1 : int32)));
+    [#"../index_range.rs" 104 12 104 21] _54 <- Slice.get ( * s1) _56 = ([#"../index_range.rs" 104 20 104 21] (1 : int32));
     assume { resolve1 _39 };
     switch (_54)
       | False -> goto BB30
@@ -1542,7 +1542,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 106 12 106 26] _61 <- ([#"../index_range.rs" 106 12 106 26] _62 = ([#"../index_range.rs" 106 25 106 26] (5 : usize)));
+    [#"../index_range.rs" 106 12 106 26] _61 <- _62 = ([#"../index_range.rs" 106 25 106 26] (5 : usize));
     _62 <- any usize;
     switch (_61)
       | False -> goto BB33
@@ -1559,7 +1559,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB34 {
-    [#"../index_range.rs" 107 12 107 24] _66 <- ([#"../index_range.rs" 107 12 107 24] _68 = ([#"../index_range.rs" 107 22 107 24] (-1 : int32)));
+    [#"../index_range.rs" 107 12 107 24] _66 <- _68 = ([#"../index_range.rs" 107 22 107 24] (-1 : int32));
     switch (_66)
       | False -> goto BB36
       | True -> goto BB35
@@ -1575,7 +1575,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 108 12 108 23] _72 <- ([#"../index_range.rs" 108 12 108 23] _74 = ([#"../index_range.rs" 108 22 108 23] (1 : int32)));
+    [#"../index_range.rs" 108 12 108 23] _72 <- _74 = ([#"../index_range.rs" 108 22 108 23] (1 : int32));
     switch (_72)
       | False -> goto BB39
       | True -> goto BB38
@@ -1591,7 +1591,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB40 {
-    [#"../index_range.rs" 109 12 109 24] _78 <- ([#"../index_range.rs" 109 12 109 24] _80 = ([#"../index_range.rs" 109 22 109 24] (-1 : int32)));
+    [#"../index_range.rs" 109 12 109 24] _78 <- _80 = ([#"../index_range.rs" 109 22 109 24] (-1 : int32));
     switch (_78)
       | False -> goto BB42
       | True -> goto BB41
@@ -1607,7 +1607,7 @@ module IndexRange_TestRangeTo
     absurd
   }
   BB43 {
-    [#"../index_range.rs" 110 12 110 23] _84 <- ([#"../index_range.rs" 110 12 110 23] _86 = ([#"../index_range.rs" 110 22 110 23] (3 : int32)));
+    [#"../index_range.rs" 110 12 110 23] _84 <- _86 = ([#"../index_range.rs" 110 22 110 23] (3 : int32));
     switch (_84)
       | False -> goto BB45
       | True -> goto BB44
@@ -1624,14 +1624,14 @@ module IndexRange_TestRangeTo
   }
   BB46 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 111 12 111 23] _90 <- ([#"../index_range.rs" 111 12 111 23] _92 = ([#"../index_range.rs" 111 22 111 23] (4 : int32)));
+    [#"../index_range.rs" 111 12 111 23] _90 <- _92 = ([#"../index_range.rs" 111 22 111 23] (4 : int32));
     switch (_90)
       | False -> goto BB48
       | True -> goto BB47
       end
   }
   BB47 {
-    [#"../index_range.rs" 78 23 112 1] _0 <- ([#"../index_range.rs" 78 23 112 1] [#"../index_range.rs" 78 23 112 1] ());
+    [#"../index_range.rs" 78 23 112 1] _0 <- ([#"../index_range.rs" 78 23 112 1] ());
     goto BB49
   }
   BB48 {
@@ -1993,18 +1993,18 @@ module IndexRange_TestRangeFrom
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 122 17 122 20] _5 <- ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 122 17 122 18] (3 : usize)));
+    [#"../index_range.rs" 122 17 122 20] _5 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 122 17 122 18] (3 : usize));
     [#"../index_range.rs" 122 16 122 21] _3 <- ([#"../index_range.rs" 122 16 122 21] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB2
   }
   BB2 {
-    [#"../index_range.rs" 122 12 122 21] s <- ([#"../index_range.rs" 122 12 122 21] _3);
+    [#"../index_range.rs" 122 12 122 21] s <- _3;
     [#"../index_range.rs" 123 12 123 19] _8 <- ([#"../index_range.rs" 123 12 123 19] len0 s);
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 123 12 123 24] _7 <- ([#"../index_range.rs" 123 12 123 24] _8 = ([#"../index_range.rs" 123 23 123 24] (2 : usize)));
+    [#"../index_range.rs" 123 12 123 24] _7 <- _8 = ([#"../index_range.rs" 123 23 123 24] (2 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -2012,35 +2012,35 @@ module IndexRange_TestRangeFrom
       end
   }
   BB4 {
-    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] [#"../index_range.rs" 123 30 123 31] (0 : usize));
-    [#"../index_range.rs" 123 28 123 32] _13 <- ([#"../index_range.rs" 123 28 123 32] Slice.length s);
-    [#"../index_range.rs" 123 28 123 32] _14 <- ([#"../index_range.rs" 123 28 123 32] _12 < _13);
+    [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] (0 : usize));
+    [#"../index_range.rs" 123 28 123 32] _13 <- Slice.length s;
+    [#"../index_range.rs" 123 28 123 32] _14 <- _12 < _13;
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 28 123 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 123 28 123 37] _10 <- ([#"../index_range.rs" 123 28 123 37] Slice.get s _12 = ([#"../index_range.rs" 123 36 123 37] (3 : int32)));
+    [#"../index_range.rs" 123 28 123 37] _10 <- Slice.get s _12 = ([#"../index_range.rs" 123 36 123 37] (3 : int32));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] [#"../index_range.rs" 123 43 123 44] (1 : usize));
-    [#"../index_range.rs" 123 41 123 45] _18 <- ([#"../index_range.rs" 123 41 123 45] Slice.length s);
-    [#"../index_range.rs" 123 41 123 45] _19 <- ([#"../index_range.rs" 123 41 123 45] _17 < _18);
+    [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] (1 : usize));
+    [#"../index_range.rs" 123 41 123 45] _18 <- Slice.length s;
+    [#"../index_range.rs" 123 41 123 45] _19 <- _17 < _18;
     assert { [@expl:index in bounds] [#"../index_range.rs" 123 41 123 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 123 41 123 50] _15 <- ([#"../index_range.rs" 123 41 123 50] Slice.get s _17 = ([#"../index_range.rs" 123 49 123 50] (4 : int32)));
+    [#"../index_range.rs" 123 41 123 50] _15 <- Slice.get s _17 = ([#"../index_range.rs" 123 49 123 50] (4 : int32));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 128 16 128 19] _27 <- ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 128 16 128 17] (5 : usize)));
+    [#"../index_range.rs" 128 16 128 19] _27 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 128 16 128 17] (5 : usize));
     [#"../index_range.rs" 128 15 128 20] _25 <- ([#"../index_range.rs" 128 15 128 20] index0 arr _27);
     _27 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB13
@@ -2066,7 +2066,7 @@ module IndexRange_TestRangeFrom
     goto BB14
   }
   BB14 {
-    [#"../index_range.rs" 128 12 128 31] _22 <- ([#"../index_range.rs" 128 12 128 31] _23 = ([#"../index_range.rs" 128 30 128 31] (0 : usize)));
+    [#"../index_range.rs" 128 12 128 31] _22 <- _23 = ([#"../index_range.rs" 128 30 128 31] (0 : usize));
     _23 <- any usize;
     switch (_22)
       | False -> goto BB16
@@ -2083,7 +2083,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB17 {
-    [#"../index_range.rs" 133 20 133 23] _36 <- ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 133 20 133 21] (6 : usize)));
+    [#"../index_range.rs" 133 20 133 23] _36 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 133 20 133 21] (6 : usize));
     [#"../index_range.rs" 133 12 133 24] _32 <- ([#"../index_range.rs" 133 12 133 24] get0 _34 _36);
     _36 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB18
@@ -2108,7 +2108,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 135 20 135 24] _45 <- ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 135 20 135 22] (10 : usize)));
+    [#"../index_range.rs" 135 20 135 24] _45 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 135 20 135 22] (10 : usize));
     [#"../index_range.rs" 135 12 135 25] _41 <- ([#"../index_range.rs" 135 12 135 25] get0 _43 _45);
     _45 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
     goto BB23
@@ -2126,7 +2126,7 @@ module IndexRange_TestRangeFrom
   BB25 {
     [#"../index_range.rs" 138 17 138 20] _49 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 138 17 138 20] arr <-  ^ _49;
-    [#"../index_range.rs" 138 21 138 24] _50 <- ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 138 21 138 22] (2 : usize)));
+    [#"../index_range.rs" 138 21 138 24] _50 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom ([#"../index_range.rs" 138 21 138 22] (2 : usize));
     [#"../index_range.rs" 138 20 138 25] _48 <- ([#"../index_range.rs" 138 20 138 25] index_mut0 _49 _50);
     _49 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _50 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize;
@@ -2144,7 +2144,7 @@ module IndexRange_TestRangeFrom
     goto BB28
   }
   BB28 {
-    [#"../index_range.rs" 139 12 139 24] _52 <- ([#"../index_range.rs" 139 12 139 24] _53 = ([#"../index_range.rs" 139 23 139 24] (3 : usize)));
+    [#"../index_range.rs" 139 12 139 24] _52 <- _53 = ([#"../index_range.rs" 139 23 139 24] (3 : usize));
     _53 <- any usize;
     switch (_52)
       | False -> goto BB30
@@ -2152,9 +2152,9 @@ module IndexRange_TestRangeFrom
       end
   }
   BB29 {
-    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] [#"../index_range.rs" 140 6 140 7] (0 : usize));
-    [#"../index_range.rs" 140 4 140 8] _57 <- ([#"../index_range.rs" 140 4 140 8] Slice.length ( * s1));
-    [#"../index_range.rs" 140 4 140 8] _58 <- ([#"../index_range.rs" 140 4 140 8] _56 < _57);
+    [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] (0 : usize));
+    [#"../index_range.rs" 140 4 140 8] _57 <- Slice.length ( * s1);
+    [#"../index_range.rs" 140 4 140 8] _58 <- _56 < _57;
     assert { [@expl:index in bounds] [#"../index_range.rs" 140 4 140 8] _58 };
     goto BB31
   }
@@ -2166,24 +2166,24 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] [#"../index_range.rs" 140 11 140 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] [#"../index_range.rs" 141 6 141 7] (1 : usize));
-    [#"../index_range.rs" 141 4 141 8] _60 <- ([#"../index_range.rs" 141 4 141 8] Slice.length ( * s1));
-    [#"../index_range.rs" 141 4 141 8] _61 <- ([#"../index_range.rs" 141 4 141 8] _59 < _60);
+    [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 11 140 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] (1 : usize));
+    [#"../index_range.rs" 141 4 141 8] _60 <- Slice.length ( * s1);
+    [#"../index_range.rs" 141 4 141 8] _61 <- _59 < _60;
     assert { [@expl:index in bounds] [#"../index_range.rs" 141 4 141 8] _61 };
     goto BB32
   }
   BB32 {
-    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] [#"../index_range.rs" 141 11 141 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] [#"../index_range.rs" 143 14 143 15] (2 : usize));
-    [#"../index_range.rs" 143 12 143 16] _66 <- ([#"../index_range.rs" 143 12 143 16] Slice.length ( * s1));
-    [#"../index_range.rs" 143 12 143 16] _67 <- ([#"../index_range.rs" 143 12 143 16] _65 < _66);
+    [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 11 141 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] (2 : usize));
+    [#"../index_range.rs" 143 12 143 16] _66 <- Slice.length ( * s1);
+    [#"../index_range.rs" 143 12 143 16] _67 <- _65 < _66;
     assert { [@expl:index in bounds] [#"../index_range.rs" 143 12 143 16] _67 };
     goto BB33
   }
   BB33 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 143 12 143 21] _63 <- ([#"../index_range.rs" 143 12 143 21] Slice.get ( * s1) _65 = ([#"../index_range.rs" 143 20 143 21] (4 : int32)));
+    [#"../index_range.rs" 143 12 143 21] _63 <- Slice.get ( * s1) _65 = ([#"../index_range.rs" 143 20 143 21] (4 : int32));
     assume { resolve1 _48 };
     switch (_63)
       | False -> goto BB35
@@ -2200,7 +2200,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB36 {
-    [#"../index_range.rs" 145 12 145 26] _70 <- ([#"../index_range.rs" 145 12 145 26] _71 = ([#"../index_range.rs" 145 25 145 26] (5 : usize)));
+    [#"../index_range.rs" 145 12 145 26] _70 <- _71 = ([#"../index_range.rs" 145 25 145 26] (5 : usize));
     _71 <- any usize;
     switch (_70)
       | False -> goto BB38
@@ -2217,7 +2217,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB39 {
-    [#"../index_range.rs" 146 12 146 23] _75 <- ([#"../index_range.rs" 146 12 146 23] _77 = ([#"../index_range.rs" 146 22 146 23] (0 : int32)));
+    [#"../index_range.rs" 146 12 146 23] _75 <- _77 = ([#"../index_range.rs" 146 22 146 23] (0 : int32));
     switch (_75)
       | False -> goto BB41
       | True -> goto BB40
@@ -2233,7 +2233,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB42 {
-    [#"../index_range.rs" 147 12 147 23] _81 <- ([#"../index_range.rs" 147 12 147 23] _83 = ([#"../index_range.rs" 147 22 147 23] (1 : int32)));
+    [#"../index_range.rs" 147 12 147 23] _81 <- _83 = ([#"../index_range.rs" 147 22 147 23] (1 : int32));
     switch (_81)
       | False -> goto BB44
       | True -> goto BB43
@@ -2249,7 +2249,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB45 {
-    [#"../index_range.rs" 148 12 148 24] _87 <- ([#"../index_range.rs" 148 12 148 24] _89 = ([#"../index_range.rs" 148 22 148 24] (-1 : int32)));
+    [#"../index_range.rs" 148 12 148 24] _87 <- _89 = ([#"../index_range.rs" 148 22 148 24] (-1 : int32));
     switch (_87)
       | False -> goto BB47
       | True -> goto BB46
@@ -2265,7 +2265,7 @@ module IndexRange_TestRangeFrom
     absurd
   }
   BB48 {
-    [#"../index_range.rs" 149 12 149 24] _93 <- ([#"../index_range.rs" 149 12 149 24] _95 = ([#"../index_range.rs" 149 22 149 24] (-1 : int32)));
+    [#"../index_range.rs" 149 12 149 24] _93 <- _95 = ([#"../index_range.rs" 149 22 149 24] (-1 : int32));
     switch (_93)
       | False -> goto BB50
       | True -> goto BB49
@@ -2282,14 +2282,14 @@ module IndexRange_TestRangeFrom
   }
   BB51 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 150 12 150 23] _99 <- ([#"../index_range.rs" 150 12 150 23] _101 = ([#"../index_range.rs" 150 22 150 23] (4 : int32)));
+    [#"../index_range.rs" 150 12 150 23] _99 <- _101 = ([#"../index_range.rs" 150 22 150 23] (4 : int32));
     switch (_99)
       | False -> goto BB53
       | True -> goto BB52
       end
   }
   BB52 {
-    [#"../index_range.rs" 115 25 151 1] _0 <- ([#"../index_range.rs" 115 25 151 1] [#"../index_range.rs" 115 25 151 1] ());
+    [#"../index_range.rs" 115 25 151 1] _0 <- ([#"../index_range.rs" 115 25 151 1] ());
     goto BB54
   }
   BB53 {
@@ -2601,18 +2601,18 @@ module IndexRange_TestRangeFull
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 161 17 161 19] _5 <- ([#"../index_range.rs" 161 17 161 19] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../index_range.rs" 161 17 161 19] _5 <- Core_Ops_Range_RangeFull_Type.C_RangeFull;
     [#"../index_range.rs" 161 16 161 20] _3 <- ([#"../index_range.rs" 161 16 161 20] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
     goto BB2
   }
   BB2 {
-    [#"../index_range.rs" 161 12 161 20] s <- ([#"../index_range.rs" 161 12 161 20] _3);
+    [#"../index_range.rs" 161 12 161 20] s <- _3;
     [#"../index_range.rs" 162 12 162 19] _8 <- ([#"../index_range.rs" 162 12 162 19] len0 s);
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 162 12 162 24] _7 <- ([#"../index_range.rs" 162 12 162 24] _8 = ([#"../index_range.rs" 162 23 162 24] (5 : usize)));
+    [#"../index_range.rs" 162 12 162 24] _7 <- _8 = ([#"../index_range.rs" 162 23 162 24] (5 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB20
@@ -2620,70 +2620,70 @@ module IndexRange_TestRangeFull
       end
   }
   BB4 {
-    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] [#"../index_range.rs" 162 30 162 31] (0 : usize));
-    [#"../index_range.rs" 162 28 162 32] _13 <- ([#"../index_range.rs" 162 28 162 32] Slice.length s);
-    [#"../index_range.rs" 162 28 162 32] _14 <- ([#"../index_range.rs" 162 28 162 32] _12 < _13);
+    [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] (0 : usize));
+    [#"../index_range.rs" 162 28 162 32] _13 <- Slice.length s;
+    [#"../index_range.rs" 162 28 162 32] _14 <- _12 < _13;
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 28 162 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 162 28 162 37] _10 <- ([#"../index_range.rs" 162 28 162 37] Slice.get s _12 = ([#"../index_range.rs" 162 36 162 37] (0 : int32)));
+    [#"../index_range.rs" 162 28 162 37] _10 <- Slice.get s _12 = ([#"../index_range.rs" 162 36 162 37] (0 : int32));
     switch (_10)
       | False -> goto BB19
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] [#"../index_range.rs" 162 43 162 44] (1 : usize));
-    [#"../index_range.rs" 162 41 162 45] _18 <- ([#"../index_range.rs" 162 41 162 45] Slice.length s);
-    [#"../index_range.rs" 162 41 162 45] _19 <- ([#"../index_range.rs" 162 41 162 45] _17 < _18);
+    [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] (1 : usize));
+    [#"../index_range.rs" 162 41 162 45] _18 <- Slice.length s;
+    [#"../index_range.rs" 162 41 162 45] _19 <- _17 < _18;
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 41 162 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 162 41 162 50] _15 <- ([#"../index_range.rs" 162 41 162 50] Slice.get s _17 = ([#"../index_range.rs" 162 49 162 50] (1 : int32)));
+    [#"../index_range.rs" 162 41 162 50] _15 <- Slice.get s _17 = ([#"../index_range.rs" 162 49 162 50] (1 : int32));
     switch (_15)
       | False -> goto BB18
       | True -> goto BB8
       end
   }
   BB8 {
-    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] [#"../index_range.rs" 162 56 162 57] (2 : usize));
-    [#"../index_range.rs" 162 54 162 58] _23 <- ([#"../index_range.rs" 162 54 162 58] Slice.length s);
-    [#"../index_range.rs" 162 54 162 58] _24 <- ([#"../index_range.rs" 162 54 162 58] _22 < _23);
+    [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] (2 : usize));
+    [#"../index_range.rs" 162 54 162 58] _23 <- Slice.length s;
+    [#"../index_range.rs" 162 54 162 58] _24 <- _22 < _23;
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 54 162 58] _24 };
     goto BB9
   }
   BB9 {
-    [#"../index_range.rs" 162 54 162 63] _20 <- ([#"../index_range.rs" 162 54 162 63] Slice.get s _22 = ([#"../index_range.rs" 162 62 162 63] (2 : int32)));
+    [#"../index_range.rs" 162 54 162 63] _20 <- Slice.get s _22 = ([#"../index_range.rs" 162 62 162 63] (2 : int32));
     switch (_20)
       | False -> goto BB17
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] [#"../index_range.rs" 162 69 162 70] (3 : usize));
-    [#"../index_range.rs" 162 67 162 71] _28 <- ([#"../index_range.rs" 162 67 162 71] Slice.length s);
-    [#"../index_range.rs" 162 67 162 71] _29 <- ([#"../index_range.rs" 162 67 162 71] _27 < _28);
+    [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] (3 : usize));
+    [#"../index_range.rs" 162 67 162 71] _28 <- Slice.length s;
+    [#"../index_range.rs" 162 67 162 71] _29 <- _27 < _28;
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 67 162 71] _29 };
     goto BB11
   }
   BB11 {
-    [#"../index_range.rs" 162 67 162 76] _25 <- ([#"../index_range.rs" 162 67 162 76] Slice.get s _27 = ([#"../index_range.rs" 162 75 162 76] (3 : int32)));
+    [#"../index_range.rs" 162 67 162 76] _25 <- Slice.get s _27 = ([#"../index_range.rs" 162 75 162 76] (3 : int32));
     switch (_25)
       | False -> goto BB16
       | True -> goto BB12
       end
   }
   BB12 {
-    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] [#"../index_range.rs" 162 82 162 83] (4 : usize));
-    [#"../index_range.rs" 162 80 162 84] _33 <- ([#"../index_range.rs" 162 80 162 84] Slice.length s);
-    [#"../index_range.rs" 162 80 162 84] _34 <- ([#"../index_range.rs" 162 80 162 84] _32 < _33);
+    [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] (4 : usize));
+    [#"../index_range.rs" 162 80 162 84] _33 <- Slice.length s;
+    [#"../index_range.rs" 162 80 162 84] _34 <- _32 < _33;
     assert { [@expl:index in bounds] [#"../index_range.rs" 162 80 162 84] _34 };
     goto BB13
   }
   BB13 {
-    [#"../index_range.rs" 162 80 162 89] _30 <- ([#"../index_range.rs" 162 80 162 89] Slice.get s _32 = ([#"../index_range.rs" 162 88 162 89] (4 : int32)));
+    [#"../index_range.rs" 162 80 162 89] _30 <- Slice.get s _32 = ([#"../index_range.rs" 162 88 162 89] (4 : int32));
     switch (_30)
       | False -> goto BB15
       | True -> goto BB14
@@ -2692,7 +2692,7 @@ module IndexRange_TestRangeFull
   BB14 {
     [#"../index_range.rs" 165 17 165 20] _38 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 165 17 165 20] arr <-  ^ _38;
-    [#"../index_range.rs" 165 21 165 23] _39 <- ([#"../index_range.rs" 165 21 165 23] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../index_range.rs" 165 21 165 23] _39 <- Core_Ops_Range_RangeFull_Type.C_RangeFull;
     [#"../index_range.rs" 165 20 165 24] _37 <- ([#"../index_range.rs" 165 20 165 24] index_mut0 _38 _39);
     _38 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _39 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
@@ -2733,7 +2733,7 @@ module IndexRange_TestRangeFull
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 166 12 166 24] _41 <- ([#"../index_range.rs" 166 12 166 24] _42 = ([#"../index_range.rs" 166 23 166 24] (5 : usize)));
+    [#"../index_range.rs" 166 12 166 24] _41 <- _42 = ([#"../index_range.rs" 166 23 166 24] (5 : usize));
     _42 <- any usize;
     switch (_41)
       | False -> goto BB25
@@ -2741,9 +2741,9 @@ module IndexRange_TestRangeFull
       end
   }
   BB24 {
-    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] [#"../index_range.rs" 167 6 167 7] (1 : usize));
-    [#"../index_range.rs" 167 4 167 8] _46 <- ([#"../index_range.rs" 167 4 167 8] Slice.length ( * s1));
-    [#"../index_range.rs" 167 4 167 8] _47 <- ([#"../index_range.rs" 167 4 167 8] _45 < _46);
+    [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] (1 : usize));
+    [#"../index_range.rs" 167 4 167 8] _46 <- Slice.length ( * s1);
+    [#"../index_range.rs" 167 4 167 8] _47 <- _45 < _46;
     assert { [@expl:index in bounds] [#"../index_range.rs" 167 4 167 8] _47 };
     goto BB26
   }
@@ -2755,22 +2755,22 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB26 {
-    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] [#"../index_range.rs" 167 11 167 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] [#"../index_range.rs" 168 6 168 7] (3 : usize));
-    [#"../index_range.rs" 168 4 168 8] _49 <- ([#"../index_range.rs" 168 4 168 8] Slice.length ( * s1));
-    [#"../index_range.rs" 168 4 168 8] _50 <- ([#"../index_range.rs" 168 4 168 8] _48 < _49);
+    [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 11 167 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] (3 : usize));
+    [#"../index_range.rs" 168 4 168 8] _49 <- Slice.length ( * s1);
+    [#"../index_range.rs" 168 4 168 8] _50 <- _48 < _49;
     assert { [@expl:index in bounds] [#"../index_range.rs" 168 4 168 8] _50 };
     goto BB27
   }
   BB27 {
-    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] [#"../index_range.rs" 168 11 168 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 11 168 13] (-1 : int32)) ; };
     assume { resolve1 s1 };
     assume { resolve1 _37 };
     [#"../index_range.rs" 170 12 170 21] _53 <- ([#"../index_range.rs" 170 12 170 21] len1 arr);
     goto BB28
   }
   BB28 {
-    [#"../index_range.rs" 170 12 170 26] _52 <- ([#"../index_range.rs" 170 12 170 26] _53 = ([#"../index_range.rs" 170 25 170 26] (5 : usize)));
+    [#"../index_range.rs" 170 12 170 26] _52 <- _53 = ([#"../index_range.rs" 170 25 170 26] (5 : usize));
     _53 <- any usize;
     switch (_52)
       | False -> goto BB30
@@ -2787,7 +2787,7 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB31 {
-    [#"../index_range.rs" 171 12 171 23] _57 <- ([#"../index_range.rs" 171 12 171 23] _59 = ([#"../index_range.rs" 171 22 171 23] (0 : int32)));
+    [#"../index_range.rs" 171 12 171 23] _57 <- _59 = ([#"../index_range.rs" 171 22 171 23] (0 : int32));
     switch (_57)
       | False -> goto BB33
       | True -> goto BB32
@@ -2803,7 +2803,7 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB34 {
-    [#"../index_range.rs" 172 12 172 24] _63 <- ([#"../index_range.rs" 172 12 172 24] _65 = ([#"../index_range.rs" 172 22 172 24] (-1 : int32)));
+    [#"../index_range.rs" 172 12 172 24] _63 <- _65 = ([#"../index_range.rs" 172 22 172 24] (-1 : int32));
     switch (_63)
       | False -> goto BB36
       | True -> goto BB35
@@ -2819,7 +2819,7 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB37 {
-    [#"../index_range.rs" 173 12 173 23] _69 <- ([#"../index_range.rs" 173 12 173 23] _71 = ([#"../index_range.rs" 173 22 173 23] (2 : int32)));
+    [#"../index_range.rs" 173 12 173 23] _69 <- _71 = ([#"../index_range.rs" 173 22 173 23] (2 : int32));
     switch (_69)
       | False -> goto BB39
       | True -> goto BB38
@@ -2835,7 +2835,7 @@ module IndexRange_TestRangeFull
     absurd
   }
   BB40 {
-    [#"../index_range.rs" 174 12 174 24] _75 <- ([#"../index_range.rs" 174 12 174 24] _77 = ([#"../index_range.rs" 174 22 174 24] (-1 : int32)));
+    [#"../index_range.rs" 174 12 174 24] _75 <- _77 = ([#"../index_range.rs" 174 22 174 24] (-1 : int32));
     switch (_75)
       | False -> goto BB42
       | True -> goto BB41
@@ -2852,14 +2852,14 @@ module IndexRange_TestRangeFull
   }
   BB43 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 175 12 175 23] _81 <- ([#"../index_range.rs" 175 12 175 23] _83 = ([#"../index_range.rs" 175 22 175 23] (4 : int32)));
+    [#"../index_range.rs" 175 12 175 23] _81 <- _83 = ([#"../index_range.rs" 175 22 175 23] (4 : int32));
     switch (_81)
       | False -> goto BB45
       | True -> goto BB44
       end
   }
   BB44 {
-    [#"../index_range.rs" 154 25 176 1] _0 <- ([#"../index_range.rs" 154 25 176 1] [#"../index_range.rs" 154 25 176 1] ());
+    [#"../index_range.rs" 154 25 176 1] _0 <- ([#"../index_range.rs" 154 25 176 1] ());
     goto BB46
   }
   BB45 {
@@ -3213,18 +3213,18 @@ module IndexRange_TestRangeToInclusive
     goto BB1
   }
   BB1 {
-    [#"../index_range.rs" 186 17 186 21] _5 <- ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 186 20 186 21] (1 : usize)));
+    [#"../index_range.rs" 186 17 186 21] _5 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 186 20 186 21] (1 : usize));
     [#"../index_range.rs" 186 16 186 22] _3 <- ([#"../index_range.rs" 186 16 186 22] index0 arr _5);
     _5 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB2
   }
   BB2 {
-    [#"../index_range.rs" 186 12 186 22] s <- ([#"../index_range.rs" 186 12 186 22] _3);
+    [#"../index_range.rs" 186 12 186 22] s <- _3;
     [#"../index_range.rs" 187 12 187 19] _8 <- ([#"../index_range.rs" 187 12 187 19] len0 s);
     goto BB3
   }
   BB3 {
-    [#"../index_range.rs" 187 12 187 24] _7 <- ([#"../index_range.rs" 187 12 187 24] _8 = ([#"../index_range.rs" 187 23 187 24] (2 : usize)));
+    [#"../index_range.rs" 187 12 187 24] _7 <- _8 = ([#"../index_range.rs" 187 23 187 24] (2 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB11
@@ -3232,28 +3232,28 @@ module IndexRange_TestRangeToInclusive
       end
   }
   BB4 {
-    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] [#"../index_range.rs" 187 30 187 31] (0 : usize));
-    [#"../index_range.rs" 187 28 187 32] _13 <- ([#"../index_range.rs" 187 28 187 32] Slice.length s);
-    [#"../index_range.rs" 187 28 187 32] _14 <- ([#"../index_range.rs" 187 28 187 32] _12 < _13);
+    [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] (0 : usize));
+    [#"../index_range.rs" 187 28 187 32] _13 <- Slice.length s;
+    [#"../index_range.rs" 187 28 187 32] _14 <- _12 < _13;
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 28 187 32] _14 };
     goto BB5
   }
   BB5 {
-    [#"../index_range.rs" 187 28 187 37] _10 <- ([#"../index_range.rs" 187 28 187 37] Slice.get s _12 = ([#"../index_range.rs" 187 36 187 37] (0 : int32)));
+    [#"../index_range.rs" 187 28 187 37] _10 <- Slice.get s _12 = ([#"../index_range.rs" 187 36 187 37] (0 : int32));
     switch (_10)
       | False -> goto BB10
       | True -> goto BB6
       end
   }
   BB6 {
-    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] [#"../index_range.rs" 187 43 187 44] (1 : usize));
-    [#"../index_range.rs" 187 41 187 45] _18 <- ([#"../index_range.rs" 187 41 187 45] Slice.length s);
-    [#"../index_range.rs" 187 41 187 45] _19 <- ([#"../index_range.rs" 187 41 187 45] _17 < _18);
+    [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] (1 : usize));
+    [#"../index_range.rs" 187 41 187 45] _18 <- Slice.length s;
+    [#"../index_range.rs" 187 41 187 45] _19 <- _17 < _18;
     assert { [@expl:index in bounds] [#"../index_range.rs" 187 41 187 45] _19 };
     goto BB7
   }
   BB7 {
-    [#"../index_range.rs" 187 41 187 50] _15 <- ([#"../index_range.rs" 187 41 187 50] Slice.get s _17 = ([#"../index_range.rs" 187 49 187 50] (1 : int32)));
+    [#"../index_range.rs" 187 41 187 50] _15 <- Slice.get s _17 = ([#"../index_range.rs" 187 49 187 50] (1 : int32));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB8
@@ -3280,7 +3280,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB13 {
-    [#"../index_range.rs" 192 20 192 24] _28 <- ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 192 23 192 24] (5 : usize)));
+    [#"../index_range.rs" 192 20 192 24] _28 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 192 23 192 24] (5 : usize));
     [#"../index_range.rs" 192 12 192 25] _24 <- ([#"../index_range.rs" 192 12 192 25] get0 _26 _28);
     _28 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
     goto BB14
@@ -3298,7 +3298,7 @@ module IndexRange_TestRangeToInclusive
   BB16 {
     [#"../index_range.rs" 195 17 195 20] _32 <- Borrow.borrow_mut arr;
     [#"../index_range.rs" 195 17 195 20] arr <-  ^ _32;
-    [#"../index_range.rs" 195 21 195 25] _33 <- ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 195 24 195 25] (2 : usize)));
+    [#"../index_range.rs" 195 21 195 25] _33 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive ([#"../index_range.rs" 195 24 195 25] (2 : usize));
     [#"../index_range.rs" 195 20 195 26] _31 <- ([#"../index_range.rs" 195 20 195 26] index_mut0 _32 _33);
     _32 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global));
     _33 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize;
@@ -3316,7 +3316,7 @@ module IndexRange_TestRangeToInclusive
     goto BB19
   }
   BB19 {
-    [#"../index_range.rs" 196 12 196 24] _35 <- ([#"../index_range.rs" 196 12 196 24] _36 = ([#"../index_range.rs" 196 23 196 24] (3 : usize)));
+    [#"../index_range.rs" 196 12 196 24] _35 <- _36 = ([#"../index_range.rs" 196 23 196 24] (3 : usize));
     _36 <- any usize;
     switch (_35)
       | False -> goto BB21
@@ -3324,9 +3324,9 @@ module IndexRange_TestRangeToInclusive
       end
   }
   BB20 {
-    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] [#"../index_range.rs" 197 6 197 7] (0 : usize));
-    [#"../index_range.rs" 197 4 197 8] _40 <- ([#"../index_range.rs" 197 4 197 8] Slice.length ( * s1));
-    [#"../index_range.rs" 197 4 197 8] _41 <- ([#"../index_range.rs" 197 4 197 8] _39 < _40);
+    [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] (0 : usize));
+    [#"../index_range.rs" 197 4 197 8] _40 <- Slice.length ( * s1);
+    [#"../index_range.rs" 197 4 197 8] _41 <- _39 < _40;
     assert { [@expl:index in bounds] [#"../index_range.rs" 197 4 197 8] _41 };
     goto BB22
   }
@@ -3338,24 +3338,24 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB22 {
-    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] [#"../index_range.rs" 197 11 197 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] [#"../index_range.rs" 198 6 198 7] (2 : usize));
-    [#"../index_range.rs" 198 4 198 8] _43 <- ([#"../index_range.rs" 198 4 198 8] Slice.length ( * s1));
-    [#"../index_range.rs" 198 4 198 8] _44 <- ([#"../index_range.rs" 198 4 198 8] _42 < _43);
+    [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 11 197 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] (2 : usize));
+    [#"../index_range.rs" 198 4 198 8] _43 <- Slice.length ( * s1);
+    [#"../index_range.rs" 198 4 198 8] _44 <- _42 < _43;
     assert { [@expl:index in bounds] [#"../index_range.rs" 198 4 198 8] _44 };
     goto BB23
   }
   BB23 {
-    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] [#"../index_range.rs" 198 11 198 13] (-1 : int32)) ; };
-    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] [#"../index_range.rs" 200 14 200 15] (1 : usize));
-    [#"../index_range.rs" 200 12 200 16] _49 <- ([#"../index_range.rs" 200 12 200 16] Slice.length ( * s1));
-    [#"../index_range.rs" 200 12 200 16] _50 <- ([#"../index_range.rs" 200 12 200 16] _48 < _49);
+    [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 11 198 13] (-1 : int32)) ; };
+    [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] (1 : usize));
+    [#"../index_range.rs" 200 12 200 16] _49 <- Slice.length ( * s1);
+    [#"../index_range.rs" 200 12 200 16] _50 <- _48 < _49;
     assert { [@expl:index in bounds] [#"../index_range.rs" 200 12 200 16] _50 };
     goto BB24
   }
   BB24 {
     assume { resolve1 s1 };
-    [#"../index_range.rs" 200 12 200 21] _46 <- ([#"../index_range.rs" 200 12 200 21] Slice.get ( * s1) _48 = ([#"../index_range.rs" 200 20 200 21] (1 : int32)));
+    [#"../index_range.rs" 200 12 200 21] _46 <- Slice.get ( * s1) _48 = ([#"../index_range.rs" 200 20 200 21] (1 : int32));
     assume { resolve1 _31 };
     switch (_46)
       | False -> goto BB26
@@ -3372,7 +3372,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB27 {
-    [#"../index_range.rs" 202 12 202 26] _53 <- ([#"../index_range.rs" 202 12 202 26] _54 = ([#"../index_range.rs" 202 25 202 26] (5 : usize)));
+    [#"../index_range.rs" 202 12 202 26] _53 <- _54 = ([#"../index_range.rs" 202 25 202 26] (5 : usize));
     _54 <- any usize;
     switch (_53)
       | False -> goto BB29
@@ -3389,7 +3389,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB30 {
-    [#"../index_range.rs" 203 12 203 24] _58 <- ([#"../index_range.rs" 203 12 203 24] _60 = ([#"../index_range.rs" 203 22 203 24] (-1 : int32)));
+    [#"../index_range.rs" 203 12 203 24] _58 <- _60 = ([#"../index_range.rs" 203 22 203 24] (-1 : int32));
     switch (_58)
       | False -> goto BB32
       | True -> goto BB31
@@ -3405,7 +3405,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB33 {
-    [#"../index_range.rs" 204 12 204 23] _64 <- ([#"../index_range.rs" 204 12 204 23] _66 = ([#"../index_range.rs" 204 22 204 23] (1 : int32)));
+    [#"../index_range.rs" 204 12 204 23] _64 <- _66 = ([#"../index_range.rs" 204 22 204 23] (1 : int32));
     switch (_64)
       | False -> goto BB35
       | True -> goto BB34
@@ -3421,7 +3421,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB36 {
-    [#"../index_range.rs" 205 12 205 24] _70 <- ([#"../index_range.rs" 205 12 205 24] _72 = ([#"../index_range.rs" 205 22 205 24] (-1 : int32)));
+    [#"../index_range.rs" 205 12 205 24] _70 <- _72 = ([#"../index_range.rs" 205 22 205 24] (-1 : int32));
     switch (_70)
       | False -> goto BB38
       | True -> goto BB37
@@ -3437,7 +3437,7 @@ module IndexRange_TestRangeToInclusive
     absurd
   }
   BB39 {
-    [#"../index_range.rs" 206 12 206 23] _76 <- ([#"../index_range.rs" 206 12 206 23] _78 = ([#"../index_range.rs" 206 22 206 23] (3 : int32)));
+    [#"../index_range.rs" 206 12 206 23] _76 <- _78 = ([#"../index_range.rs" 206 22 206 23] (3 : int32));
     switch (_76)
       | False -> goto BB41
       | True -> goto BB40
@@ -3454,14 +3454,14 @@ module IndexRange_TestRangeToInclusive
   }
   BB42 {
     assume { resolve0 arr };
-    [#"../index_range.rs" 207 12 207 23] _82 <- ([#"../index_range.rs" 207 12 207 23] _84 = ([#"../index_range.rs" 207 22 207 23] (4 : int32)));
+    [#"../index_range.rs" 207 12 207 23] _82 <- _84 = ([#"../index_range.rs" 207 22 207 23] (4 : int32));
     switch (_82)
       | False -> goto BB44
       | True -> goto BB43
       end
   }
   BB43 {
-    [#"../index_range.rs" 179 33 208 1] _0 <- ([#"../index_range.rs" 179 33 208 1] [#"../index_range.rs" 179 33 208 1] ());
+    [#"../index_range.rs" 179 33 208 1] _0 <- ([#"../index_range.rs" 179 33 208 1] ());
     goto BB45
   }
   BB44 {
diff --git a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
index 1faa54ed21..2efc3a8bb0 100644
--- a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
+++ b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg
@@ -99,11 +99,11 @@ module InplaceListReversal_Rev
   BB1 {
     assert { [@expl:type invariant] inv0 old_l };
     assume { resolve0 old_l };
-    [#"../inplace_list_reversal.rs" 26 19 26 22] prev <- ([#"../inplace_list_reversal.rs" 26 19 26 22] InplaceListReversal_List_Type.C_Nil);
+    [#"../inplace_list_reversal.rs" 26 19 26 22] prev <- InplaceListReversal_List_Type.C_Nil;
     [#"../inplace_list_reversal.rs" 27 27 27 28] _7 <- Borrow.borrow_final ( * l) (Borrow.get_id l);
     [#"../inplace_list_reversal.rs" 27 27 27 28] l <- { l with current = ( ^ _7) ; };
     assume { inv1 ( ^ _7) };
-    [#"../inplace_list_reversal.rs" 27 30 27 33] _8 <- ([#"../inplace_list_reversal.rs" 27 30 27 33] InplaceListReversal_List_Type.C_Nil);
+    [#"../inplace_list_reversal.rs" 27 30 27 33] _8 <- InplaceListReversal_List_Type.C_Nil;
     [#"../inplace_list_reversal.rs" 27 19 27 34] head <- ([#"../inplace_list_reversal.rs" 27 19 27 34] replace0 _7 _8);
     _7 <- any borrowed (InplaceListReversal_List_Type.t_list t);
     _8 <- any InplaceListReversal_List_Type.t_list t;
@@ -129,21 +129,21 @@ module InplaceListReversal_Rev
     goto BB7
   }
   BB7 {
-    [#"../inplace_list_reversal.rs" 29 19 29 27] curr <- ([#"../inplace_list_reversal.rs" 29 19 29 27] InplaceListReversal_List_Type.cons_0 head);
+    [#"../inplace_list_reversal.rs" 29 19 29 27] curr <- InplaceListReversal_List_Type.cons_0 head;
     head <- (let InplaceListReversal_List_Type.C_Cons x0 = head in InplaceListReversal_List_Type.C_Cons (any (t, InplaceListReversal_List_Type.t_list t)));
     assert { [@expl:type invariant] inv1 head };
     assume { resolve1 head };
-    [#"../inplace_list_reversal.rs" 30 19 30 25] next <- ([#"../inplace_list_reversal.rs" 30 19 30 25] let (_, a) = curr in a);
+    [#"../inplace_list_reversal.rs" 30 19 30 25] next <- (let (_, a) = curr in a);
     curr <- (let (x0, x1) = curr in (x0, any InplaceListReversal_List_Type.t_list t));
     goto BB8
   }
   BB8 {
-    [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, ([#"../inplace_list_reversal.rs" 31 8 31 14] prev)));
+    [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, prev));
     prev <- any InplaceListReversal_List_Type.t_list t;
     goto BB10
   }
   BB10 {
-    [#"../inplace_list_reversal.rs" 32 15 32 25] _16 <- ([#"../inplace_list_reversal.rs" 32 15 32 25] InplaceListReversal_List_Type.C_Cons curr);
+    [#"../inplace_list_reversal.rs" 32 15 32 25] _16 <- InplaceListReversal_List_Type.C_Cons curr;
     curr <- any (t, InplaceListReversal_List_Type.t_list t);
     goto BB11
   }
@@ -151,7 +151,7 @@ module InplaceListReversal_Rev
     goto BB12
   }
   BB12 {
-    [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- ([#"../inplace_list_reversal.rs" 32 8 32 12] _16);
+    [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- _16;
     _16 <- any InplaceListReversal_List_Type.t_list t;
     goto BB14
   }
@@ -159,7 +159,7 @@ module InplaceListReversal_Rev
     goto BB15
   }
   BB15 {
-    [#"../inplace_list_reversal.rs" 33 8 33 12] head <- ([#"../inplace_list_reversal.rs" 33 8 33 12] next);
+    [#"../inplace_list_reversal.rs" 33 8 33 12] head <- next;
     next <- any InplaceListReversal_List_Type.t_list t;
     goto BB17
   }
@@ -178,7 +178,7 @@ module InplaceListReversal_Rev
     goto BB4
   }
   BB21 {
-    [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = ([#"../inplace_list_reversal.rs" 35 4 35 6] prev) ; };
+    [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = prev ; };
     prev <- any InplaceListReversal_List_Type.t_list t;
     assert { [@expl:type invariant] inv1 ( * l) };
     assume { resolve1 ( * l) };
@@ -187,7 +187,7 @@ module InplaceListReversal_Rev
     goto BB23
   }
   BB23 {
-    [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- ([#"../inplace_list_reversal.rs" 24 31 36 1] [#"../inplace_list_reversal.rs" 24 31 36 1] ());
+    [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- ([#"../inplace_list_reversal.rs" 24 31 36 1] ());
     goto BB24
   }
   BB24 {
diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg
index ce4b8c6105..8fe5cb9827 100644
--- a/creusot/tests/should_succeed/instant.mlcfg
+++ b/creusot/tests/should_succeed/instant.mlcfg
@@ -786,7 +786,7 @@ module Instant_TestInstant
       end
   }
   BB63 {
-    [#"../instant.rs" 7 22 34 1] _0 <- ([#"../instant.rs" 7 22 34 1] [#"../instant.rs" 7 22 34 1] ());
+    [#"../instant.rs" 7 22 34 1] _0 <- ([#"../instant.rs" 7 22 34 1] ());
     return _0
   }
   BB64 {
diff --git a/creusot/tests/should_succeed/invariant_moves.mlcfg b/creusot/tests/should_succeed/invariant_moves.mlcfg
index e8632bd56b..a259216d05 100644
--- a/creusot/tests/should_succeed/invariant_moves.mlcfg
+++ b/creusot/tests/should_succeed/invariant_moves.mlcfg
@@ -190,7 +190,7 @@ module InvariantMoves_TestInvariantMove
   }
   BB7 {
     assume { resolve1 x };
-    [#"../invariant_moves.rs" 7 4 7 45] _0 <- ([#"../invariant_moves.rs" 7 4 7 45] [#"../invariant_moves.rs" 7 4 7 45] ());
+    [#"../invariant_moves.rs" 7 4 7 45] _0 <- ([#"../invariant_moves.rs" 7 4 7 45] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/ite_normalize.mlcfg b/creusot/tests/should_succeed/ite_normalize.mlcfg
index bc16d1b8af..de52e6b9b5 100644
--- a/creusot/tests/should_succeed/ite_normalize.mlcfg
+++ b/creusot/tests/should_succeed/ite_normalize.mlcfg
@@ -153,7 +153,7 @@ module IteNormalize_Impl6_Clone
     goto BB15
   }
   BB4 {
-    [#"../ite_normalize.rs" 56 9 60 9] _0 <- ([#"../ite_normalize.rs" 56 9 60 9] IteNormalize_Expr_Type.C_False);
+    [#"../ite_normalize.rs" 56 9 60 9] _0 <- IteNormalize_Expr_Type.C_False;
     goto BB16
   }
   BB5 {
@@ -161,25 +161,25 @@ module IteNormalize_Impl6_Clone
     absurd
   }
   BB6 {
-    [#"../ite_normalize.rs" 57 17 57 18] c_1 <- ([#"../ite_normalize.rs" 57 17 57 18] IteNormalize_Expr_Type.ifthenelse_c self);
-    [#"../ite_normalize.rs" 57 31 57 32] t_1 <- ([#"../ite_normalize.rs" 57 31 57 32] IteNormalize_Expr_Type.ifthenelse_t self);
-    [#"../ite_normalize.rs" 57 45 57 46] e_1 <- ([#"../ite_normalize.rs" 57 45 57 46] IteNormalize_Expr_Type.ifthenelse_e self);
-    [#"../ite_normalize.rs" 55 9 55 14] _9 <- ([#"../ite_normalize.rs" 55 9 55 14] c_1);
+    [#"../ite_normalize.rs" 57 17 57 18] c_1 <- IteNormalize_Expr_Type.ifthenelse_c self;
+    [#"../ite_normalize.rs" 57 31 57 32] t_1 <- IteNormalize_Expr_Type.ifthenelse_t self;
+    [#"../ite_normalize.rs" 57 45 57 46] e_1 <- IteNormalize_Expr_Type.ifthenelse_e self;
+    [#"../ite_normalize.rs" 55 9 55 14] _9 <- c_1;
     [#"../ite_normalize.rs" 55 9 55 14] _7 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _9);
     goto BB7
   }
   BB7 {
-    [#"../ite_normalize.rs" 55 9 55 14] _12 <- ([#"../ite_normalize.rs" 55 9 55 14] t_1);
+    [#"../ite_normalize.rs" 55 9 55 14] _12 <- t_1;
     [#"../ite_normalize.rs" 55 9 55 14] _10 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _12);
     goto BB8
   }
   BB8 {
-    [#"../ite_normalize.rs" 55 9 55 14] _15 <- ([#"../ite_normalize.rs" 55 9 55 14] e_1);
+    [#"../ite_normalize.rs" 55 9 55 14] _15 <- e_1;
     [#"../ite_normalize.rs" 55 9 55 14] _13 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _15);
     goto BB9
   }
   BB9 {
-    [#"../ite_normalize.rs" 55 9 55 14] _0 <- ([#"../ite_normalize.rs" 55 9 55 14] IteNormalize_Expr_Type.C_IfThenElse _7 _10 _13);
+    [#"../ite_normalize.rs" 55 9 55 14] _0 <- IteNormalize_Expr_Type.C_IfThenElse _7 _10 _13;
     _7 <- any IteNormalize_Expr_Type.t_expr;
     _10 <- any IteNormalize_Expr_Type.t_expr;
     _13 <- any IteNormalize_Expr_Type.t_expr;
@@ -195,18 +195,18 @@ module IteNormalize_Impl6_Clone
     goto BB16
   }
   BB13 {
-    [#"../ite_normalize.rs" 58 10 58 11] v_1 <- ([#"../ite_normalize.rs" 58 10 58 11] IteNormalize_Expr_Type.var_v self);
-    [#"../ite_normalize.rs" 55 9 55 14] _19 <- ([#"../ite_normalize.rs" 55 9 55 14] v_1);
+    [#"../ite_normalize.rs" 58 10 58 11] v_1 <- IteNormalize_Expr_Type.var_v self;
+    [#"../ite_normalize.rs" 55 9 55 14] _19 <- v_1;
     [#"../ite_normalize.rs" 55 9 55 14] _17 <- ([#"../ite_normalize.rs" 55 9 55 14] clone1 _19);
     goto BB14
   }
   BB14 {
-    [#"../ite_normalize.rs" 55 9 55 14] _0 <- ([#"../ite_normalize.rs" 55 9 55 14] IteNormalize_Expr_Type.C_Var _17);
+    [#"../ite_normalize.rs" 55 9 55 14] _0 <- IteNormalize_Expr_Type.C_Var _17;
     _17 <- any usize;
     goto BB16
   }
   BB15 {
-    [#"../ite_normalize.rs" 56 9 59 8] _0 <- ([#"../ite_normalize.rs" 56 9 59 8] IteNormalize_Expr_Type.C_True);
+    [#"../ite_normalize.rs" 56 9 59 8] _0 <- IteNormalize_Expr_Type.C_True;
     goto BB16
   }
   BB16 {
@@ -230,7 +230,7 @@ module IteNormalize_Impl5_Variable
     goto BB0
   }
   BB0 {
-    [#"../ite_normalize.rs" 102 8 102 23] _0 <- ([#"../ite_normalize.rs" 102 8 102 23] IteNormalize_Expr_Type.C_Var v);
+    [#"../ite_normalize.rs" 102 8 102 23] _0 <- IteNormalize_Expr_Type.C_Var v;
     return _0
   }
   
@@ -274,11 +274,11 @@ module IteNormalize_Impl4_From
       end
   }
   BB1 {
-    [#"../ite_normalize.rs" 88 12 88 22] _0 <- ([#"../ite_normalize.rs" 88 12 88 22] IteNormalize_Expr_Type.C_True);
+    [#"../ite_normalize.rs" 88 12 88 22] _0 <- IteNormalize_Expr_Type.C_True;
     goto BB3
   }
   BB2 {
-    [#"../ite_normalize.rs" 90 12 90 23] _0 <- ([#"../ite_normalize.rs" 90 12 90 23] IteNormalize_Expr_Type.C_False);
+    [#"../ite_normalize.rs" 90 12 90 23] _0 <- IteNormalize_Expr_Type.C_False;
     goto BB3
   }
   BB3 {
@@ -312,7 +312,7 @@ module IteNormalize_Impl5_Ite
     goto BB4
   }
   BB4 {
-    [#"../ite_normalize.rs" 98 8 98 75] _0 <- ([#"../ite_normalize.rs" 98 8 98 75] IteNormalize_Expr_Type.C_IfThenElse c t e);
+    [#"../ite_normalize.rs" 98 8 98 75] _0 <- IteNormalize_Expr_Type.C_IfThenElse c t e;
     c <- any IteNormalize_Expr_Type.t_expr;
     t <- any IteNormalize_Expr_Type.t_expr;
     e <- any IteNormalize_Expr_Type.t_expr;
@@ -419,7 +419,7 @@ module IteNormalize_Impl5_Transpose
     goto BB30
   }
   BB8 {
-    [#"../ite_normalize.rs" 121 27 121 28] _0 <- ([#"../ite_normalize.rs" 121 27 121 28] b);
+    [#"../ite_normalize.rs" 121 27 121 28] _0 <- b;
     b <- any IteNormalize_Expr_Type.t_expr;
     goto BB31
   }
@@ -428,11 +428,11 @@ module IteNormalize_Impl5_Transpose
     absurd
   }
   BB10 {
-    [#"../ite_normalize.rs" 112 31 112 32] c <- ([#"../ite_normalize.rs" 112 31 112 32] IteNormalize_Expr_Type.ifthenelse_c self);
+    [#"../ite_normalize.rs" 112 31 112 32] c <- IteNormalize_Expr_Type.ifthenelse_c self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
-    [#"../ite_normalize.rs" 112 34 112 35] t <- ([#"../ite_normalize.rs" 112 34 112 35] IteNormalize_Expr_Type.ifthenelse_t self);
+    [#"../ite_normalize.rs" 112 34 112 35] t <- IteNormalize_Expr_Type.ifthenelse_t self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
-    [#"../ite_normalize.rs" 112 37 112 38] e <- ([#"../ite_normalize.rs" 112 37 112 38] IteNormalize_Expr_Type.ifthenelse_e self);
+    [#"../ite_normalize.rs" 112 37 112 38] e <- IteNormalize_Expr_Type.ifthenelse_e self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
     assume { resolve0 t };
     [#"../ite_normalize.rs" 114 40 114 49] _17 <- ([#"../ite_normalize.rs" 114 40 114 49] clone0 a);
@@ -464,7 +464,7 @@ module IteNormalize_Impl5_Transpose
     goto BB16
   }
   BB16 {
-    [#"../ite_normalize.rs" 112 44 116 13] _0 <- ([#"../ite_normalize.rs" 112 44 116 13] IteNormalize_Expr_Type.C_IfThenElse c _15 _22);
+    [#"../ite_normalize.rs" 112 44 116 13] _0 <- IteNormalize_Expr_Type.C_IfThenElse c _15 _22;
     c <- any IteNormalize_Expr_Type.t_expr;
     _15 <- any IteNormalize_Expr_Type.t_expr;
     _22 <- any IteNormalize_Expr_Type.t_expr;
@@ -498,7 +498,7 @@ module IteNormalize_Impl5_Transpose
     goto BB26
   }
   BB26 {
-    [#"../ite_normalize.rs" 118 16 118 86] _0 <- ([#"../ite_normalize.rs" 118 16 118 86] IteNormalize_Expr_Type.C_IfThenElse self a b);
+    [#"../ite_normalize.rs" 118 16 118 86] _0 <- IteNormalize_Expr_Type.C_IfThenElse self a b;
     self <- any IteNormalize_Expr_Type.t_expr;
     a <- any IteNormalize_Expr_Type.t_expr;
     b <- any IteNormalize_Expr_Type.t_expr;
@@ -514,7 +514,7 @@ module IteNormalize_Impl5_Transpose
     goto BB31
   }
   BB30 {
-    [#"../ite_normalize.rs" 120 26 120 27] _0 <- ([#"../ite_normalize.rs" 120 26 120 27] a);
+    [#"../ite_normalize.rs" 120 26 120 27] _0 <- a;
     a <- any IteNormalize_Expr_Type.t_expr;
     goto BB31
   }
@@ -590,14 +590,14 @@ module IteNormalize_Impl5_Normalize
     goto BB3
   }
   BB2 {
-    [#"../ite_normalize.rs" 153 12 153 13] e1 <- ([#"../ite_normalize.rs" 153 12 153 13] self);
+    [#"../ite_normalize.rs" 153 12 153 13] e1 <- self;
     [#"../ite_normalize.rs" 153 17 153 26] _0 <- ([#"../ite_normalize.rs" 153 17 153 26] clone0 e1);
     goto BB11
   }
   BB3 {
-    [#"../ite_normalize.rs" 147 31 147 32] c <- ([#"../ite_normalize.rs" 147 31 147 32] IteNormalize_Expr_Type.ifthenelse_c self);
-    [#"../ite_normalize.rs" 147 34 147 35] t <- ([#"../ite_normalize.rs" 147 34 147 35] IteNormalize_Expr_Type.ifthenelse_t self);
-    [#"../ite_normalize.rs" 147 37 147 38] e <- ([#"../ite_normalize.rs" 147 37 147 38] IteNormalize_Expr_Type.ifthenelse_e self);
+    [#"../ite_normalize.rs" 147 31 147 32] c <- IteNormalize_Expr_Type.ifthenelse_c self;
+    [#"../ite_normalize.rs" 147 34 147 35] t <- IteNormalize_Expr_Type.ifthenelse_t self;
+    [#"../ite_normalize.rs" 147 37 147 38] e <- IteNormalize_Expr_Type.ifthenelse_e self;
     [#"../ite_normalize.rs" 148 25 148 38] cp <- ([#"../ite_normalize.rs" 148 25 148 38] normalize c);
     goto BB4
   }
@@ -871,18 +871,18 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB42
   }
   BB6 {
-    [#"../ite_normalize.rs" 229 12 229 13] c2 <- ([#"../ite_normalize.rs" 229 12 229 13] self);
+    [#"../ite_normalize.rs" 229 12 229 13] c2 <- self;
     self <- any IteNormalize_Expr_Type.t_expr;
-    [#"../ite_normalize.rs" 229 17 229 18] _0 <- ([#"../ite_normalize.rs" 229 17 229 18] c2);
+    [#"../ite_normalize.rs" 229 17 229 18] _0 <- c2;
     c2 <- any IteNormalize_Expr_Type.t_expr;
     goto BB51
   }
   BB7 {
-    [#"../ite_normalize.rs" 191 31 191 32] c <- ([#"../ite_normalize.rs" 191 31 191 32] IteNormalize_Expr_Type.ifthenelse_c self);
+    [#"../ite_normalize.rs" 191 31 191 32] c <- IteNormalize_Expr_Type.ifthenelse_c self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2);
-    [#"../ite_normalize.rs" 191 34 191 35] t <- ([#"../ite_normalize.rs" 191 34 191 35] IteNormalize_Expr_Type.ifthenelse_t self);
+    [#"../ite_normalize.rs" 191 34 191 35] t <- IteNormalize_Expr_Type.ifthenelse_t self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2);
-    [#"../ite_normalize.rs" 191 37 191 38] e <- ([#"../ite_normalize.rs" 191 37 191 38] IteNormalize_Expr_Type.ifthenelse_e self);
+    [#"../ite_normalize.rs" 191 37 191 38] e <- IteNormalize_Expr_Type.ifthenelse_e self;
     self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr));
     switch (c)
       | IteNormalize_Expr_Type.C_Var _ -> goto BB9
@@ -892,7 +892,7 @@ module IteNormalize_Impl5_SimplifyHelper
   BB8 {
     assume { resolve0 e };
     assume { resolve0 t };
-    [#"../ite_normalize.rs" 215 20 215 21] c1 <- ([#"../ite_normalize.rs" 215 20 215 21] c);
+    [#"../ite_normalize.rs" 215 20 215 21] c1 <- c;
     c <- any IteNormalize_Expr_Type.t_expr;
     assume { resolve0 c };
     [#"../ite_normalize.rs" 215 25 215 49] _0 <- ([#"../ite_normalize.rs" 215 25 215 49] simplify_helper c1 state);
@@ -904,8 +904,8 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB10
   }
   BB10 {
-    [#"../ite_normalize.rs" 193 32 193 33] v <- ([#"../ite_normalize.rs" 193 32 193 33] IteNormalize_Expr_Type.var_v c);
-    [#"../ite_normalize.rs" 194 51 194 53] _16 <- ([#"../ite_normalize.rs" 194 51 194 53] v);
+    [#"../ite_normalize.rs" 193 32 193 33] v <- IteNormalize_Expr_Type.var_v c;
+    [#"../ite_normalize.rs" 194 51 194 53] _16 <- v;
     [#"../ite_normalize.rs" 194 41 194 54] _13 <- ([#"../ite_normalize.rs" 194 41 194 54] get0 state _16);
     goto BB11
   }
@@ -920,7 +920,7 @@ module IteNormalize_Impl5_SimplifyHelper
   }
   BB13 {
     assume { resolve0 c };
-    [#"../ite_normalize.rs" 194 36 194 37] b <- ([#"../ite_normalize.rs" 194 36 194 37] Core_Option_Option_Type.some_0 _13);
+    [#"../ite_normalize.rs" 194 36 194 37] b <- Core_Option_Option_Type.some_0 _13;
     switch (b)
       | False -> goto BB16
       | True -> goto BB14
@@ -994,7 +994,7 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB27
   }
   BB27 {
-    [#"../ite_normalize.rs" 212 28 212 84] _0 <- ([#"../ite_normalize.rs" 212 28 212 84] IteNormalize_Expr_Type.C_IfThenElse c tp ep);
+    [#"../ite_normalize.rs" 212 28 212 84] _0 <- IteNormalize_Expr_Type.C_IfThenElse c tp ep;
     c <- any IteNormalize_Expr_Type.t_expr;
     tp <- any IteNormalize_Expr_Type.t_expr;
     ep <- any IteNormalize_Expr_Type.t_expr;
@@ -1043,8 +1043,8 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB52
   }
   BB42 {
-    [#"../ite_normalize.rs" 218 24 218 25] v1 <- ([#"../ite_normalize.rs" 218 24 218 25] IteNormalize_Expr_Type.var_v self);
-    [#"../ite_normalize.rs" 219 43 219 45] _52 <- ([#"../ite_normalize.rs" 219 43 219 45] v1);
+    [#"../ite_normalize.rs" 218 24 218 25] v1 <- IteNormalize_Expr_Type.var_v self;
+    [#"../ite_normalize.rs" 219 43 219 45] _52 <- v1;
     [#"../ite_normalize.rs" 219 33 219 46] _49 <- ([#"../ite_normalize.rs" 219 33 219 46] get0 state _52);
     goto BB43
   }
@@ -1058,25 +1058,25 @@ module IteNormalize_Impl5_SimplifyHelper
     goto BB45
   }
   BB45 {
-    [#"../ite_normalize.rs" 219 28 219 29] b1 <- ([#"../ite_normalize.rs" 219 28 219 29] Core_Option_Option_Type.some_0 _49);
+    [#"../ite_normalize.rs" 219 28 219 29] b1 <- Core_Option_Option_Type.some_0 _49;
     switch (b1)
       | False -> goto BB47
       | True -> goto BB46
       end
   }
   BB46 {
-    [#"../ite_normalize.rs" 221 24 221 34] _0 <- ([#"../ite_normalize.rs" 221 24 221 34] IteNormalize_Expr_Type.C_True);
+    [#"../ite_normalize.rs" 221 24 221 34] _0 <- IteNormalize_Expr_Type.C_True;
     goto BB48
   }
   BB47 {
-    [#"../ite_normalize.rs" 223 24 223 35] _0 <- ([#"../ite_normalize.rs" 223 24 223 35] IteNormalize_Expr_Type.C_False);
+    [#"../ite_normalize.rs" 223 24 223 35] _0 <- IteNormalize_Expr_Type.C_False;
     goto BB48
   }
   BB48 {
     goto BB50
   }
   BB49 {
-    [#"../ite_normalize.rs" 226 20 226 35] _0 <- ([#"../ite_normalize.rs" 226 20 226 35] IteNormalize_Expr_Type.C_Var v1);
+    [#"../ite_normalize.rs" 226 20 226 35] _0 <- IteNormalize_Expr_Type.C_Var v1;
     goto BB50
   }
   BB50 {
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index cbd437911f..1b7d68ae79 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -121,7 +121,7 @@ module C01Range_Impl0_Next
     goto BB0
   }
   BB0 {
-    [#"../01_range.rs" 58 11 58 33] _3 <- ([#"../01_range.rs" 58 11 58 33] C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self));
+    [#"../01_range.rs" 58 11 58 33] _3 <- C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self);
     switch (_3)
       | False -> goto BB2
       | True -> goto BB1
@@ -129,14 +129,14 @@ module C01Range_Impl0_Next
   }
   BB1 {
     assume { resolve0 self };
-    [#"../01_range.rs" 59 12 59 16] _0 <- ([#"../01_range.rs" 59 12 59 16] Core_Option_Option_Type.C_None);
+    [#"../01_range.rs" 59 12 59 16] _0 <- Core_Option_Option_Type.C_None;
     goto BB3
   }
   BB2 {
-    [#"../01_range.rs" 61 20 61 30] r <- ([#"../01_range.rs" 61 20 61 30] C01Range_Range_Type.range_start ( * self));
-    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + ([#"../01_range.rs" 62 26 62 27] (1 : isize))) x1) ; };
+    [#"../01_range.rs" 61 20 61 30] r <- C01Range_Range_Type.range_start ( * self);
+    [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 =  * self in C01Range_Range_Type.C_Range (C01Range_Range_Type.range_start ( * self) + ([#"../01_range.rs" 62 26 62 27] (1 : isize))) x1) ; };
     assume { resolve0 self };
-    [#"../01_range.rs" 63 12 63 19] _0 <- ([#"../01_range.rs" 63 12 63 19] Core_Option_Option_Type.C_Some r);
+    [#"../01_range.rs" 63 12 63 19] _0 <- Core_Option_Option_Type.C_Some r;
     goto BB3
   }
   BB3 {
@@ -156,7 +156,7 @@ module C01Range_Impl1_IntoIter
     goto BB0
   }
   BB0 {
-    [#"../01_range.rs" 71 8 71 12] _0 <- ([#"../01_range.rs" 71 8 71 12] self);
+    [#"../01_range.rs" 71 8 71 12] _0 <- self;
     self <- any C01Range_Range_Type.t_range;
     return _0
   }
@@ -257,8 +257,8 @@ module C01Range_SumRange
     goto BB0
   }
   BB0 {
-    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] [#"../01_range.rs" 78 16 78 17] (0 : isize));
-    [#"../01_range.rs" 79 17 79 43] _6 <- ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range ([#"../01_range.rs" 79 32 79 33] (0 : isize)) n);
+    [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] (0 : isize));
+    [#"../01_range.rs" 79 17 79 43] _6 <- C01Range_Range_Type.C_Range ([#"../01_range.rs" 79 32 79 33] (0 : isize)) n;
     [#"../01_range.rs" 79 17 79 55] it <- ([#"../01_range.rs" 79 17 79 55] into_iter0 _6);
     _6 <- any C01Range_Range_Type.t_range;
     goto BB1
@@ -294,7 +294,7 @@ module C01Range_SumRange
       end
   }
   BB7 {
-    [#"../01_range.rs" 94 4 94 5] _0 <- ([#"../01_range.rs" 94 4 94 5] i);
+    [#"../01_range.rs" 94 4 94 5] _0 <- i;
     return _0
   }
   BB8 {
@@ -305,14 +305,14 @@ module C01Range_SumRange
     absurd
   }
   BB10 {
-    [#"../01_range.rs" 87 17 87 18] x <- ([#"../01_range.rs" 87 17 87 18] Core_Option_Option_Type.some_0 _17);
+    [#"../01_range.rs" 87 17 87 18] x <- Core_Option_Option_Type.some_0 _17;
     [#"../01_range.rs" 88 27 88 75] _21 <- ([#"../01_range.rs" 88 27 88 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x)));
     goto BB11
   }
   BB11 {
-    [#"../01_range.rs" 88 16 88 75] produced <- ([#"../01_range.rs" 88 16 88 75] _21);
+    [#"../01_range.rs" 88 16 88 75] produced <- _21;
     _21 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + ([#"../01_range.rs" 89 21 89 22] (1 : isize)));
+    [#"../01_range.rs" 89 16 89 22] i <- i + ([#"../01_range.rs" 89 21 89 22] (1 : isize));
     goto BB4
   }
   
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index 06bbe2d2b1..1e4507a389 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -501,7 +501,7 @@ module C02IterMut_Impl2_IntoIter
     goto BB0
   }
   BB0 {
-    [#"../02_iter_mut.rs" 71 8 71 12] _0 <- ([#"../02_iter_mut.rs" 71 8 71 12] self);
+    [#"../02_iter_mut.rs" 71 8 71 12] _0 <- self;
     self <- any C02IterMut_IterMut_Type.t_itermut t;
     return _0
   }
@@ -717,7 +717,7 @@ module C02IterMut_IterMut
     [#"../02_iter_mut.rs" 79 26 79 27] _8 <- Borrow.borrow_final ( * v) (Borrow.get_id v);
     [#"../02_iter_mut.rs" 79 26 79 27] v <- { v with current = ( ^ _8) ; };
     assume { inv0 ( ^ _8) };
-    [#"../02_iter_mut.rs" 79 28 79 30] _9 <- ([#"../02_iter_mut.rs" 79 28 79 30] Core_Ops_Range_RangeFull_Type.C_RangeFull);
+    [#"../02_iter_mut.rs" 79 28 79 30] _9 <- Core_Ops_Range_RangeFull_Type.C_RangeFull;
     [#"../02_iter_mut.rs" 79 27 79 31] _7 <- ([#"../02_iter_mut.rs" 79 27 79 31] index_mut0 _8 _9);
     _8 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
     _9 <- any Core_Ops_Range_RangeFull_Type.t_rangefull;
@@ -730,7 +730,7 @@ module C02IterMut_IterMut
     [#"../02_iter_mut.rs" 79 21 79 31] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
     [#"../02_iter_mut.rs" 79 21 79 31] _6 <- { _6 with current = ( ^ _5) ; };
     assume { inv1 ( ^ _5) };
-    [#"../02_iter_mut.rs" 79 4 79 33] _0 <- ([#"../02_iter_mut.rs" 79 4 79 33] C02IterMut_IterMut_Type.C_IterMut _5);
+    [#"../02_iter_mut.rs" 79 4 79 33] _0 <- C02IterMut_IterMut_Type.C_IterMut _5;
     _5 <- any borrowed (slice t);
     assert { [@expl:type invariant] inv2 _7 };
     assume { resolve0 _7 };
@@ -1060,7 +1060,7 @@ module C02IterMut_AllZero
       end
   }
   BB8 {
-    [#"../02_iter_mut.rs" 97 20 97 25] _0 <- ([#"../02_iter_mut.rs" 97 20 97 25] [#"../02_iter_mut.rs" 97 20 97 25] ());
+    [#"../02_iter_mut.rs" 97 20 97 25] _0 <- ([#"../02_iter_mut.rs" 97 20 97 25] ());
     assume { resolve1 v };
     return _0
   }
@@ -1073,15 +1073,15 @@ module C02IterMut_AllZero
     absurd
   }
   BB11 {
-    [#"../02_iter_mut.rs" 93 17 93 18] x <- ([#"../02_iter_mut.rs" 93 17 93 18] Core_Option_Option_Type.some_0 _15);
+    [#"../02_iter_mut.rs" 93 17 93 18] x <- Core_Option_Option_Type.some_0 _15;
     _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any borrowed usize));
     [#"../02_iter_mut.rs" 94 27 94 75] _19 <- ([#"../02_iter_mut.rs" 94 27 94 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x)));
     goto BB12
   }
   BB12 {
-    [#"../02_iter_mut.rs" 94 16 94 75] produced <- ([#"../02_iter_mut.rs" 94 16 94 75] _19);
+    [#"../02_iter_mut.rs" 94 16 94 75] produced <- _19;
     _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
-    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] [#"../02_iter_mut.rs" 95 21 95 22] (0 : usize)) ; };
+    [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 21 95 22] (0 : usize)) ; };
     assume { resolve0 x };
     goto BB5
   }
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index 738bfa46eb..5149049415 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -275,7 +275,7 @@ module C03StdIterators_SliceIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] [#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
+    [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] (0 : usize));
     assert { [@expl:type invariant] inv0 slice };
     assume { resolve0 slice };
     [#"../03_std_iterators.rs" 9 13 9 25] _7 <- ([#"../03_std_iterators.rs" 9 13 9 25] iter0 slice);
@@ -326,7 +326,7 @@ module C03StdIterators_SliceIter
     assert { [@expl:type invariant] inv3 _17 };
     assume { resolve4 _17 };
     assume { resolve6 iter };
-    [#"../03_std_iterators.rs" 12 4 12 5] _0 <- ([#"../03_std_iterators.rs" 12 4 12 5] i);
+    [#"../03_std_iterators.rs" 12 4 12 5] _0 <- i;
     return _0
   }
   BB9 {
@@ -340,20 +340,20 @@ module C03StdIterators_SliceIter
     absurd
   }
   BB11 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     assert { [@expl:type invariant] inv3 _17 };
     assume { resolve4 _17 };
     [#"../03_std_iterators.rs" 8 4 8 38] _22 <- ([#"../03_std_iterators.rs" 8 4 8 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
-    [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] _22);
+    [#"../03_std_iterators.rs" 8 4 8 38] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + ([#"../03_std_iterators.rs" 10 13 10 14] (1 : usize)));
+    [#"../03_std_iterators.rs" 10 8 10 14] i <- i + ([#"../03_std_iterators.rs" 10 13 10 14] (1 : usize));
     goto BB5
   }
   
@@ -660,7 +660,7 @@ module C03StdIterators_VecIter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] [#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
+    [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] (0 : usize));
     assert { [@expl:type invariant] inv0 vec };
     assume { resolve0 vec };
     [#"../03_std_iterators.rs" 19 4 19 38] iter <- ([#"../03_std_iterators.rs" 19 4 19 38] into_iter0 vec);
@@ -706,7 +706,7 @@ module C03StdIterators_VecIter
     assert { [@expl:type invariant] inv3 _16 };
     assume { resolve4 _16 };
     assume { resolve6 iter };
-    [#"../03_std_iterators.rs" 23 4 23 5] _0 <- ([#"../03_std_iterators.rs" 23 4 23 5] i);
+    [#"../03_std_iterators.rs" 23 4 23 5] _0 <- i;
     return _0
   }
   BB8 {
@@ -720,20 +720,20 @@ module C03StdIterators_VecIter
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _16);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _16;
     assert { [@expl:type invariant] inv3 _16 };
     assume { resolve4 _16 };
     [#"../03_std_iterators.rs" 19 4 19 38] _21 <- ([#"../03_std_iterators.rs" 19 4 19 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] _21);
+    [#"../03_std_iterators.rs" 19 4 19 38] produced <- _21;
     _21 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve2 produced };
     assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem };
     assume { resolve5 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + ([#"../03_std_iterators.rs" 21 13 21 14] (1 : usize)));
+    [#"../03_std_iterators.rs" 21 8 21 14] i <- i + ([#"../03_std_iterators.rs" 21 13 21 14] (1 : usize));
     goto BB4
   }
   
@@ -1093,7 +1093,7 @@ module C03StdIterators_AllZero
   }
   BB9 {
     assume { resolve3 iter };
-    [#"../03_std_iterators.rs" 29 4 29 87] _0 <- ([#"../03_std_iterators.rs" 29 4 29 87] [#"../03_std_iterators.rs" 29 4 29 87] ());
+    [#"../03_std_iterators.rs" 29 4 29 87] _0 <- ([#"../03_std_iterators.rs" 29 4 29 87] ());
     assume { resolve4 v };
     return _0
   }
@@ -1107,17 +1107,17 @@ module C03StdIterators_AllZero
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize));
     [#"../03_std_iterators.rs" 29 4 29 87] _22 <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
-    [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] _22);
+    [#"../03_std_iterators.rs" 29 4 29 87] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem;
     __creusot_proc_iter_elem <- any borrowed usize;
-    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] [#"../03_std_iterators.rs" 31 13 31 14] (0 : usize)) ; };
+    [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 13 31 14] (0 : usize)) ; };
     assume { resolve2 x };
     goto BB6
   }
@@ -1464,7 +1464,7 @@ module C03StdIterators_SkipTake
     goto BB5
   }
   BB5 {
-    [#"../03_std_iterators.rs" 35 49 39 1] _0 <- ([#"../03_std_iterators.rs" 35 49 39 1] [#"../03_std_iterators.rs" 35 49 39 1] ());
+    [#"../03_std_iterators.rs" 35 49 39 1] _0 <- ([#"../03_std_iterators.rs" 35 49 39 1] ());
     goto BB6
   }
   BB6 {
@@ -1532,11 +1532,11 @@ module C03StdIterators_Counter_Closure0
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24]  * field_00 ( * _1) + ([#"../03_std_iterators.rs" 50 23 50 24] (1 : usize))) ; })) ; };
+    [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 =  * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + ([#"../03_std_iterators.rs" 50 23 50 24] (1 : usize))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../03_std_iterators.rs" 51 16 51 18] res1 <- ([#"../03_std_iterators.rs" 51 16 51 18] x);
-    [#"../03_std_iterators.rs" 47 12 47 67] res <- ([#"../03_std_iterators.rs" 47 12 47 67] res1);
-    [#"../03_std_iterators.rs" 48 12 48 91] _0 <- ([#"../03_std_iterators.rs" 48 12 48 91] res);
+    [#"../03_std_iterators.rs" 51 16 51 18] res1 <- x;
+    [#"../03_std_iterators.rs" 47 12 47 67] res <- res1;
+    [#"../03_std_iterators.rs" 48 12 48 91] _0 <- res;
     return _0
   }
   
@@ -2071,7 +2071,7 @@ module C03StdIterators_Counter
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] [#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
+    [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] (0 : usize));
     [#"../03_std_iterators.rs" 44 22 45 15] _7 <- ([#"../03_std_iterators.rs" 44 22 45 15] deref0 v);
     goto BB1
   }
@@ -2082,7 +2082,7 @@ module C03StdIterators_Counter
   BB2 {
     [#"../03_std_iterators.rs" 48 12 48 91] _10 <- Borrow.borrow_mut cnt;
     [#"../03_std_iterators.rs" 48 12 48 91] cnt <-  ^ _10;
-    [#"../03_std_iterators.rs" 48 12 48 91] _9 <- ([#"../03_std_iterators.rs" 48 12 48 91] C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10);
+    [#"../03_std_iterators.rs" 48 12 48 91] _9 <- C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10;
     _10 <- any borrowed usize;
     [#"../03_std_iterators.rs" 44 22 53 9] _4 <- ([#"../03_std_iterators.rs" 44 22 53 9] map_inv0 _5 _9);
     _5 <- any Core_Slice_Iter_Iter_Type.t_iter uint32;
@@ -2109,7 +2109,7 @@ module C03StdIterators_Counter
     goto BB7
   }
   BB7 {
-    [#"../03_std_iterators.rs" 41 28 59 1] _0 <- ([#"../03_std_iterators.rs" 41 28 59 1] [#"../03_std_iterators.rs" 41 28 59 1] ());
+    [#"../03_std_iterators.rs" 41 28 59 1] _0 <- ([#"../03_std_iterators.rs" 41 28 59 1] ());
     goto BB8
   }
   BB8 {
@@ -2291,8 +2291,8 @@ module C03StdIterators_SumRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] [#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
-    [#"../03_std_iterators.rs" 66 13 66 17] _7 <- ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 66 13 66 14] (0 : isize)) n);
+    [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] (0 : isize));
+    [#"../03_std_iterators.rs" 66 13 66 17] _7 <- Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 66 13 66 14] (0 : isize)) n;
     [#"../03_std_iterators.rs" 65 4 65 48] iter <- ([#"../03_std_iterators.rs" 65 4 65 48] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range isize;
     goto BB1
@@ -2331,7 +2331,7 @@ module C03StdIterators_SumRange
       end
   }
   BB7 {
-    [#"../03_std_iterators.rs" 69 4 69 5] _0 <- ([#"../03_std_iterators.rs" 69 4 69 5] i);
+    [#"../03_std_iterators.rs" 69 4 69 5] _0 <- i;
     return _0
   }
   BB8 {
@@ -2342,14 +2342,14 @@ module C03StdIterators_SumRange
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     [#"../03_std_iterators.rs" 65 4 65 48] _22 <- ([#"../03_std_iterators.rs" 65 4 65 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] _22);
+    [#"../03_std_iterators.rs" 65 4 65 48] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq isize);
-    [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + ([#"../03_std_iterators.rs" 67 13 67 14] (1 : isize)));
+    [#"../03_std_iterators.rs" 67 8 67 14] i <- i + ([#"../03_std_iterators.rs" 67 13 67 14] (1 : isize));
     goto BB4
   }
   
@@ -2657,7 +2657,7 @@ module C03StdIterators_EnumerateRange
     goto BB0
   }
   BB0 {
-    [#"../03_std_iterators.rs" 74 19 74 26] _3 <- ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 74 20 74 21] (0 : usize)) ([#"../03_std_iterators.rs" 74 23 74 25] (10 : usize)));
+    [#"../03_std_iterators.rs" 74 19 74 26] _3 <- Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 74 20 74 21] (0 : usize)) ([#"../03_std_iterators.rs" 74 23 74 25] (10 : usize));
     [#"../03_std_iterators.rs" 74 19 74 38] _2 <- ([#"../03_std_iterators.rs" 74 19 74 38] enumerate0 _3);
     _3 <- any Core_Ops_Range_Range_Type.t_range usize;
     goto BB1
@@ -2707,7 +2707,7 @@ module C03StdIterators_EnumerateRange
   BB8 {
     assert { [@expl:type invariant] inv0 iter };
     assume { resolve2 iter };
-    [#"../03_std_iterators.rs" 73 4 73 96] _0 <- ([#"../03_std_iterators.rs" 73 4 73 96] [#"../03_std_iterators.rs" 73 4 73 96] ());
+    [#"../03_std_iterators.rs" 73 4 73 96] _0 <- ([#"../03_std_iterators.rs" 73 4 73 96] ());
     return _0
   }
   BB9 {
@@ -2720,17 +2720,17 @@ module C03StdIterators_EnumerateRange
     absurd
   }
   BB11 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _12;
     [#"../03_std_iterators.rs" 73 4 73 96] _17 <- ([#"../03_std_iterators.rs" 73 4 73 96] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
-    [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] _17);
+    [#"../03_std_iterators.rs" 73 4 73 96] produced <- _17;
     _17 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
-    [#"../03_std_iterators.rs" 74 9 74 11] ix <- ([#"../03_std_iterators.rs" 74 9 74 11] let (a, _) = __creusot_proc_iter_elem in a);
-    [#"../03_std_iterators.rs" 74 13 74 14] x <- ([#"../03_std_iterators.rs" 74 13 74 14] let (_, a) = __creusot_proc_iter_elem in a);
+    [#"../03_std_iterators.rs" 74 9 74 11] ix <- (let (a, _) = __creusot_proc_iter_elem in a);
+    [#"../03_std_iterators.rs" 74 13 74 14] x <- (let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve1 __creusot_proc_iter_elem };
-    [#"../03_std_iterators.rs" 75 16 75 23] _21 <- ([#"../03_std_iterators.rs" 75 16 75 23] (ix, x));
+    [#"../03_std_iterators.rs" 75 16 75 23] _21 <- (ix, x);
     assume { resolve1 _21 };
     goto BB5
   }
@@ -3183,21 +3183,21 @@ module C03StdIterators_MyReverse
   BB2 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)) = ([#"../03_std_iterators.rs" 101 22 101 27] (0 : usize)));
+    [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)) = ([#"../03_std_iterators.rs" 101 22 101 27] (0 : usize));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 22 101 27] not _12 };
     goto BB3
   }
   BB3 {
-    [#"../03_std_iterators.rs" 101 22 101 27] _10 <- ([#"../03_std_iterators.rs" 101 22 101 27] n / ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize)));
-    [#"../03_std_iterators.rs" 101 18 101 28] _9 <- ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 19 101 20] (0 : usize)) _10);
+    [#"../03_std_iterators.rs" 101 22 101 27] _10 <- n / ([#"../03_std_iterators.rs" 101 26 101 27] (2 : usize));
+    [#"../03_std_iterators.rs" 101 18 101 28] _9 <- Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 19 101 20] (0 : usize)) _10;
     _10 <- any usize;
-    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)) = ([#"../03_std_iterators.rs" 101 36 101 41] (0 : usize)));
+    [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)) = ([#"../03_std_iterators.rs" 101 36 101 41] (0 : usize));
     assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 36 101 41] not _16 };
     goto BB4
   }
   BB4 {
-    [#"../03_std_iterators.rs" 101 36 101 41] _14 <- ([#"../03_std_iterators.rs" 101 36 101 41] n / ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize)));
-    [#"../03_std_iterators.rs" 101 33 101 41] _13 <- ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 33 101 34] (0 : usize)) _14);
+    [#"../03_std_iterators.rs" 101 36 101 41] _14 <- n / ([#"../03_std_iterators.rs" 101 40 101 41] (2 : usize));
+    [#"../03_std_iterators.rs" 101 33 101 41] _13 <- Core_Ops_Range_Range_Type.C_Range ([#"../03_std_iterators.rs" 101 33 101 34] (0 : usize)) _14;
     _14 <- any usize;
     [#"../03_std_iterators.rs" 101 18 101 42] _8 <- ([#"../03_std_iterators.rs" 101 18 101 42] zip0 _9 _13);
     _9 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -3248,7 +3248,7 @@ module C03StdIterators_MyReverse
   BB12 {
     assert { [@expl:type invariant] inv3 slice };
     assume { resolve3 slice };
-    [#"../03_std_iterators.rs" 97 4 97 36] _0 <- ([#"../03_std_iterators.rs" 97 4 97 36] [#"../03_std_iterators.rs" 97 4 97 36] ());
+    [#"../03_std_iterators.rs" 97 4 97 36] _0 <- ([#"../03_std_iterators.rs" 97 4 97 36] ());
     return _0
   }
   BB13 {
@@ -3261,21 +3261,21 @@ module C03StdIterators_MyReverse
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _28;
     [#"../03_std_iterators.rs" 97 4 97 36] _33 <- ([#"../03_std_iterators.rs" 97 4 97 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB16
   }
   BB16 {
-    [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] _33);
+    [#"../03_std_iterators.rs" 97 4 97 36] produced <- _33;
     _33 <- any Snapshot.snap_ty (Seq.seq (usize, usize));
-    [#"../03_std_iterators.rs" 101 9 101 10] i <- ([#"../03_std_iterators.rs" 101 9 101 10] let (a, _) = __creusot_proc_iter_elem in a);
-    [#"../03_std_iterators.rs" 101 12 101 13] j <- ([#"../03_std_iterators.rs" 101 12 101 13] let (_, a) = __creusot_proc_iter_elem in a);
+    [#"../03_std_iterators.rs" 101 9 101 10] i <- (let (a, _) = __creusot_proc_iter_elem in a);
+    [#"../03_std_iterators.rs" 101 12 101 13] j <- (let (_, a) = __creusot_proc_iter_elem in a);
     assume { resolve2 __creusot_proc_iter_elem };
     [#"../03_std_iterators.rs" 102 8 102 13] _38 <- Borrow.borrow_mut ( * slice);
     [#"../03_std_iterators.rs" 102 8 102 13] slice <- { slice with current = ( ^ _38) ; };
     assume { inv2 ( ^ _38) };
-    [#"../03_std_iterators.rs" 102 22 102 27] _41 <- ([#"../03_std_iterators.rs" 102 22 102 27] n - j);
-    [#"../03_std_iterators.rs" 102 22 102 31] _40 <- ([#"../03_std_iterators.rs" 102 22 102 31] _41 - ([#"../03_std_iterators.rs" 102 30 102 31] (1 : usize)));
+    [#"../03_std_iterators.rs" 102 22 102 27] _41 <- n - j;
+    [#"../03_std_iterators.rs" 102 22 102 31] _40 <- _41 - ([#"../03_std_iterators.rs" 102 30 102 31] (1 : usize));
     _41 <- any usize;
     [#"../03_std_iterators.rs" 102 8 102 32] _37 <- ([#"../03_std_iterators.rs" 102 8 102 32] swap0 _38 i _40);
     _38 <- any borrowed (slice t);
diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index 761a674266..a1dfe94650 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -484,7 +484,7 @@ module C04Skip_Impl0_Next
     goto BB6
   }
   BB6 {
-    [#"../04_skip.rs" 74 15 74 21] _20 <- ([#"../04_skip.rs" 74 15 74 21] n = ([#"../04_skip.rs" 74 20 74 21] (0 : usize)));
+    [#"../04_skip.rs" 74 15 74 21] _20 <- n = ([#"../04_skip.rs" 74 20 74 21] (0 : usize));
     switch (_20)
       | False -> goto BB8
       | True -> goto BB7
@@ -493,7 +493,7 @@ module C04Skip_Impl0_Next
   BB7 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve5 self };
-    [#"../04_skip.rs" 75 23 75 24] _0 <- ([#"../04_skip.rs" 75 23 75 24] r);
+    [#"../04_skip.rs" 75 23 75 24] _0 <- r;
     r <- any Core_Option_Option_Type.t_option item0;
     goto BB15
   }
@@ -506,7 +506,7 @@ module C04Skip_Impl0_Next
   BB9 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve5 self };
-    [#"../04_skip.rs" 81 23 81 24] _0 <- ([#"../04_skip.rs" 81 23 81 24] r);
+    [#"../04_skip.rs" 81 23 81 24] _0 <- r;
     r <- any Core_Option_Option_Type.t_option item0;
     goto BB15
   }
@@ -514,7 +514,7 @@ module C04Skip_Impl0_Next
     goto BB11
   }
   BB11 {
-    [#"../04_skip.rs" 77 24 77 25] x <- ([#"../04_skip.rs" 77 24 77 25] Core_Option_Option_Type.some_0 r);
+    [#"../04_skip.rs" 77 24 77 25] x <- Core_Option_Option_Type.some_0 r;
     r <- (let Core_Option_Option_Type.C_Some x0 = r in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv4 x };
     assume { resolve3 x };
@@ -524,11 +524,11 @@ module C04Skip_Impl0_Next
     goto BB12
   }
   BB12 {
-    [#"../04_skip.rs" 78 16 78 73] skipped <- ([#"../04_skip.rs" 78 16 78 73] _25);
+    [#"../04_skip.rs" 78 16 78 73] skipped <- _25;
     _25 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 skipped };
     assume { resolve2 skipped };
-    [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - ([#"../04_skip.rs" 79 21 79 22] (1 : usize)));
+    [#"../04_skip.rs" 79 16 79 22] n <- n - ([#"../04_skip.rs" 79 21 79 22] (1 : usize));
     goto BB13
   }
   BB13 {
diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index 1aa3b53e9d..52521644c0 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -1489,7 +1489,7 @@ module C05Map_Impl0_Next
     assume { resolve0 _3 };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve2 self };
-    [#"../05_map.rs" 67 20 67 24] _0 <- ([#"../05_map.rs" 67 20 67 24] Core_Option_Option_Type.C_None);
+    [#"../05_map.rs" 67 20 67 24] _0 <- Core_Option_Option_Type.C_None;
     goto BB12
   }
   BB3 {
@@ -1504,7 +1504,7 @@ module C05Map_Impl0_Next
     absurd
   }
   BB5 {
-    [#"../05_map.rs" 62 17 62 18] v <- ([#"../05_map.rs" 62 17 62 18] Core_Option_Option_Type.some_0 _3);
+    [#"../05_map.rs" 62 17 62 18] v <- Core_Option_Option_Type.some_0 _3;
     _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
@@ -1520,7 +1520,7 @@ module C05Map_Impl0_Next
     [#"../05_map.rs" 65 21 65 32] _12 <- Borrow.borrow_final (C05Map_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../05_map.rs" 65 21 65 32] self <- { self with current = (let C05Map_Map_Type.C_Map x0 x1 =  * self in C05Map_Map_Type.C_Map x0 ( ^ _12)) ; };
     assume { inv2 ( ^ _12) };
-    [#"../05_map.rs" 65 21 65 35] _13 <- ([#"../05_map.rs" 65 21 65 35] (v));
+    [#"../05_map.rs" 65 21 65 35] _13 <- (v);
     v <- any item0;
     [#"../05_map.rs" 65 21 65 35] _11 <- ([#"../05_map.rs" 65 21 65 35] call_mut0 _12 _13);
     _12 <- any borrowed f;
@@ -1533,7 +1533,7 @@ module C05Map_Impl0_Next
   BB9 {
     assert { [@expl:type invariant] inv3 self };
     assume { resolve2 self };
-    [#"../05_map.rs" 65 16 65 36] _0 <- ([#"../05_map.rs" 65 16 65 36] Core_Option_Option_Type.C_Some _11);
+    [#"../05_map.rs" 65 16 65 36] _0 <- Core_Option_Option_Type.C_Some _11;
     _11 <- any b;
     goto BB10
   }
@@ -1799,7 +1799,7 @@ module C05Map_Map
     goto BB3
   }
   BB3 {
-    [#"../05_map.rs" 145 4 145 22] _0 <- ([#"../05_map.rs" 145 4 145 22] C05Map_Map_Type.C_Map iter func);
+    [#"../05_map.rs" 145 4 145 22] _0 <- C05Map_Map_Type.C_Map iter func;
     iter <- any i;
     func <- any f;
     goto BB4
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index 70b63946f5..d51b3bc37c 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -1918,7 +1918,7 @@ module C06MapPrecond_Impl0_Next
     absurd
   }
   BB5 {
-    [#"../06_map_precond.rs" 65 17 65 18] v <- ([#"../06_map_precond.rs" 65 17 65 18] Core_Option_Option_Type.some_0 _3);
+    [#"../06_map_precond.rs" 65 17 65 18] v <- Core_Option_Option_Type.some_0 _3;
     _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
@@ -1933,7 +1933,7 @@ module C06MapPrecond_Impl0_Next
     [#"../06_map_precond.rs" 68 24 68 35] _12 <- Borrow.borrow_final (C06MapPrecond_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../06_map_precond.rs" 68 24 68 35] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 ( ^ _12) x2) ; };
     assume { inv2 ( ^ _12) };
-    [#"../06_map_precond.rs" 68 24 68 53] _13 <- ([#"../06_map_precond.rs" 68 24 68 53] (v, C06MapPrecond_Map_Type.map_produced ( * self)));
+    [#"../06_map_precond.rs" 68 24 68 53] _13 <- (v, C06MapPrecond_Map_Type.map_produced ( * self));
     v <- any item0;
     [#"../06_map_precond.rs" 68 24 68 53] r <- ([#"../06_map_precond.rs" 68 24 68 53] call_mut0 _12 _13);
     _12 <- any borrowed f;
@@ -1946,7 +1946,7 @@ module C06MapPrecond_Impl0_Next
   BB9 {
     assert { [@expl:type invariant] inv3 produced };
     assume { resolve1 produced };
-    [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 69 16 69 40] produced)) ; };
+    [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 produced) ; };
     assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
@@ -1956,7 +1956,7 @@ module C06MapPrecond_Impl0_Next
   }
   BB10 {
     assume { resolve3 _17 };
-    [#"../06_map_precond.rs" 71 16 71 23] _0 <- ([#"../06_map_precond.rs" 71 16 71 23] Core_Option_Option_Type.C_Some r);
+    [#"../06_map_precond.rs" 71 16 71 23] _0 <- Core_Option_Option_Type.C_Some r;
     r <- any b;
     goto BB11
   }
@@ -1970,13 +1970,13 @@ module C06MapPrecond_Impl0_Next
     goto BB15
   }
   BB14 {
-    [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 74 16 74 56] _20)) ; };
+    [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 =  * self in C06MapPrecond_Map_Type.C_Map x0 x1 _20) ; };
     _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) };
     assert { [@expl:type invariant] inv4 self };
     assume { resolve2 self };
-    [#"../06_map_precond.rs" 75 16 75 20] _0 <- ([#"../06_map_precond.rs" 75 16 75 20] Core_Option_Option_Type.C_None);
+    [#"../06_map_precond.rs" 75 16 75 20] _0 <- Core_Option_Option_Type.C_None;
     goto BB15
   }
   BB15 {
@@ -2277,7 +2277,7 @@ module C06MapPrecond_Map
     goto BB4
   }
   BB4 {
-    [#"../06_map_precond.rs" 174 4 174 56] _0 <- ([#"../06_map_precond.rs" 174 4 174 56] C06MapPrecond_Map_Type.C_Map iter func _9);
+    [#"../06_map_precond.rs" 174 4 174 56] _0 <- C06MapPrecond_Map_Type.C_Map iter func _9;
     iter <- any i;
     func <- any f;
     _9 <- any Snapshot.snap_ty (Seq.seq item0);
@@ -2411,7 +2411,7 @@ module C06MapPrecond_Identity_Closure0
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 178 21 178 22] _0 <- ([#"../06_map_precond.rs" 178 21 178 22] x);
+    [#"../06_map_precond.rs" 178 21 178 22] _0 <- x;
     x <- any item0;
     assert { [@expl:type invariant] inv0 _3 };
     assume { resolve0 _3 };
@@ -2644,7 +2644,7 @@ module C06MapPrecond_Identity
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 178 14 178 22] _4 <- ([#"../06_map_precond.rs" 178 14 178 22] C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0);
+    [#"../06_map_precond.rs" 178 14 178 22] _4 <- C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0;
     [#"../06_map_precond.rs" 178 4 178 23] _2 <- ([#"../06_map_precond.rs" 178 4 178 23] map0 iter _4);
     iter <- any i;
     _4 <- any C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i;
@@ -2656,7 +2656,7 @@ module C06MapPrecond_Identity
     goto BB2
   }
   BB2 {
-    [#"../06_map_precond.rs" 177 38 179 1] _0 <- ([#"../06_map_precond.rs" 177 38 179 1] [#"../06_map_precond.rs" 177 38 179 1] ());
+    [#"../06_map_precond.rs" 177 38 179 1] _0 <- ([#"../06_map_precond.rs" 177 38 179 1] ());
     goto BB3
   }
   BB3 {
@@ -2708,9 +2708,9 @@ module C06MapPrecond_Increment_Closure2
   }
   BB0 {
     assume { resolve0 _1 };
-    [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] x + ([#"../06_map_precond.rs" 190 24 190 25] (1 : uint32)));
-    [#"../06_map_precond.rs" 188 8 188 29] res <- ([#"../06_map_precond.rs" 188 8 188 29] res1);
-    [#"../06_map_precond.rs" 189 8 189 35] _0 <- ([#"../06_map_precond.rs" 189 8 189 35] res);
+    [#"../06_map_precond.rs" 190 20 190 25] res1 <- x + ([#"../06_map_precond.rs" 190 24 190 25] (1 : uint32));
+    [#"../06_map_precond.rs" 188 8 188 29] res <- res1;
+    [#"../06_map_precond.rs" 189 8 189 35] _0 <- res;
     return _0
   }
   
@@ -3015,7 +3015,7 @@ module C06MapPrecond_Increment
     goto BB1
   }
   BB1 {
-    [#"../06_map_precond.rs" 189 8 189 35] _6 <- ([#"../06_map_precond.rs" 189 8 189 35] C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2);
+    [#"../06_map_precond.rs" 189 8 189 35] _6 <- C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2;
     [#"../06_map_precond.rs" 186 12 191 5] i <- ([#"../06_map_precond.rs" 186 12 191 5] map0 iter _6);
     iter <- any u;
     _6 <- any C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u;
@@ -3029,7 +3029,7 @@ module C06MapPrecond_Increment
     goto BB3
   }
   BB3 {
-    [#"../06_map_precond.rs" 185 51 197 1] _0 <- ([#"../06_map_precond.rs" 185 51 197 1] [#"../06_map_precond.rs" 185 51 197 1] ());
+    [#"../06_map_precond.rs" 185 51 197 1] _0 <- ([#"../06_map_precond.rs" 185 51 197 1] ());
     goto BB4
   }
   BB4 {
@@ -3098,11 +3098,11 @@ module C06MapPrecond_Counter_Closure2
     goto BB0
   }
   BB0 {
-    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20]  * field_00 ( * _1) + ([#"../06_map_precond.rs" 208 19 208 20] (1 : usize))) ; })) ; };
+    [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 =  * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + ([#"../06_map_precond.rs" 208 19 208 20] (1 : usize))) ; })) ; };
     assume { resolve0 _1 };
-    [#"../06_map_precond.rs" 209 12 209 13] res1 <- ([#"../06_map_precond.rs" 209 12 209 13] x);
-    [#"../06_map_precond.rs" 205 8 205 63] res <- ([#"../06_map_precond.rs" 205 8 205 63] res1);
-    [#"../06_map_precond.rs" 206 8 206 41] _0 <- ([#"../06_map_precond.rs" 206 8 206 41] res);
+    [#"../06_map_precond.rs" 209 12 209 13] res1 <- x;
+    [#"../06_map_precond.rs" 205 8 205 63] res <- res1;
+    [#"../06_map_precond.rs" 206 8 206 41] _0 <- res;
     return _0
   }
   
@@ -3357,10 +3357,10 @@ module C06MapPrecond_Counter
     goto BB1
   }
   BB1 {
-    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] [#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
+    [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] (0 : usize));
     [#"../06_map_precond.rs" 206 8 206 41] _8 <- Borrow.borrow_mut cnt;
     [#"../06_map_precond.rs" 206 8 206 41] cnt <-  ^ _8;
-    [#"../06_map_precond.rs" 206 8 206 41] _7 <- ([#"../06_map_precond.rs" 206 8 206 41] C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8);
+    [#"../06_map_precond.rs" 206 8 206 41] _7 <- C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8;
     _8 <- any borrowed usize;
     [#"../06_map_precond.rs" 203 4 211 5] _5 <- ([#"../06_map_precond.rs" 203 4 211 5] map0 iter _7);
     iter <- any i;
@@ -3373,7 +3373,7 @@ module C06MapPrecond_Counter
     goto BB3
   }
   BB3 {
-    [#"../06_map_precond.rs" 201 49 212 1] _0 <- ([#"../06_map_precond.rs" 201 49 212 1] [#"../06_map_precond.rs" 201 49 212 1] ());
+    [#"../06_map_precond.rs" 201 49 212 1] _0 <- ([#"../06_map_precond.rs" 201 49 212 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index 4652e4992c..142a681ac2 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -230,7 +230,7 @@ module C07Fuse_Impl0_Next
   BB4 {
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
-    [#"../07_fuse.rs" 41 20 41 24] _0 <- ([#"../07_fuse.rs" 41 20 41 24] Core_Option_Option_Type.C_None);
+    [#"../07_fuse.rs" 41 20 41 24] _0 <- Core_Option_Option_Type.C_None;
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
     goto BB15
@@ -251,20 +251,20 @@ module C07Fuse_Impl0_Next
   BB7 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../07_fuse.rs" 47 16 47 17] x <- ([#"../07_fuse.rs" 47 16 47 17] _6);
+    [#"../07_fuse.rs" 47 16 47 17] x <- _6;
     _6 <- any Core_Option_Option_Type.t_option item0;
-    [#"../07_fuse.rs" 47 21 47 22] _0 <- ([#"../07_fuse.rs" 47 21 47 22] x);
+    [#"../07_fuse.rs" 47 21 47 22] _0 <- x;
     x <- any Core_Option_Option_Type.t_option item0;
     goto BB12
   }
   BB8 {
     assert { [@expl:type invariant] inv5 _6 };
     assume { resolve3 _6 };
-    [#"../07_fuse.rs" 44 32 44 36] _9 <- ([#"../07_fuse.rs" 44 32 44 36] Core_Option_Option_Type.C_None);
+    [#"../07_fuse.rs" 44 32 44 36] _9 <- Core_Option_Option_Type.C_None;
     goto BB9
   }
   BB9 {
-    [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 =  * self in C07Fuse_Fuse_Type.C_Fuse ([#"../07_fuse.rs" 44 20 44 29] _9)) ; };
+    [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 =  * self in C07Fuse_Fuse_Type.C_Fuse _9) ; };
     _9 <- any Core_Option_Option_Type.t_option i;
     assert { [@expl:type invariant] inv0 (C07Fuse_Fuse_Type.fuse_iter ( * self)) };
     assume { resolve4 (C07Fuse_Fuse_Type.fuse_iter ( * self)) };
@@ -273,7 +273,7 @@ module C07Fuse_Impl0_Next
     goto BB11
   }
   BB11 {
-    [#"../07_fuse.rs" 45 20 45 24] _0 <- ([#"../07_fuse.rs" 45 20 45 24] Core_Option_Option_Type.C_None);
+    [#"../07_fuse.rs" 45 20 45 24] _0 <- Core_Option_Option_Type.C_None;
     goto BB13
   }
   BB12 {
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index 74feab7bd9..dde7de6ec0 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -380,7 +380,7 @@ module C08CollectExtend_Extend
     assume { resolve5 iter1 };
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve6 vec };
-    [#"../08_collect_extend.rs" 27 4 27 35] _0 <- ([#"../08_collect_extend.rs" 27 4 27 35] [#"../08_collect_extend.rs" 27 4 27 35] ());
+    [#"../08_collect_extend.rs" 27 4 27 35] _0 <- ([#"../08_collect_extend.rs" 27 4 27 35] ());
     goto BB20
   }
   BB12 {
@@ -397,7 +397,7 @@ module C08CollectExtend_Extend
     absurd
   }
   BB14 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t));
     assert { [@expl:type invariant] inv5 _17 };
     assume { resolve4 _17 };
@@ -405,11 +405,11 @@ module C08CollectExtend_Extend
     goto BB15
   }
   BB15 {
-    [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] _22);
+    [#"../08_collect_extend.rs" 27 4 27 35] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq t);
     assert { [@expl:type invariant] inv2 produced };
     assume { resolve2 produced };
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem;
     __creusot_proc_iter_elem <- any t;
     [#"../08_collect_extend.rs" 30 8 30 11] _26 <- Borrow.borrow_mut ( * vec);
     [#"../08_collect_extend.rs" 30 8 30 11] vec <- { vec with current = ( ^ _26) ; };
@@ -774,7 +774,7 @@ module C08CollectExtend_Collect
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _15;
     _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv4 _15 };
     assume { resolve3 _15 };
@@ -782,11 +782,11 @@ module C08CollectExtend_Collect
     goto BB16
   }
   BB16 {
-    [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] _20);
+    [#"../08_collect_extend.rs" 45 4 45 40] produced <- _20;
     _20 <- any Snapshot.snap_ty (Seq.seq item0);
     assert { [@expl:type invariant] inv1 produced };
     assume { resolve1 produced };
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem;
     __creusot_proc_iter_elem <- any item0;
     [#"../08_collect_extend.rs" 47 8 47 11] _24 <- Borrow.borrow_mut res;
     [#"../08_collect_extend.rs" 47 8 47 11] res <-  ^ _24;
@@ -812,7 +812,7 @@ module C08CollectExtend_Collect
     goto BB22
   }
   BB22 {
-    [#"../08_collect_extend.rs" 49 4 49 7] _0 <- ([#"../08_collect_extend.rs" 49 4 49 7] res);
+    [#"../08_collect_extend.rs" 49 4 49 7] _0 <- res;
     res <- any Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global);
     goto BB23
   }
@@ -1141,7 +1141,7 @@ module C08CollectExtend_ExtendIndex
     goto BB5
   }
   BB5 {
-    [#"../08_collect_extend.rs" 52 52 58 1] _0 <- ([#"../08_collect_extend.rs" 52 52 58 1] [#"../08_collect_extend.rs" 52 52 58 1] ());
+    [#"../08_collect_extend.rs" 52 52 58 1] _0 <- ([#"../08_collect_extend.rs" 52 52 58 1] ());
     goto BB6
   }
   BB6 {
@@ -1299,7 +1299,7 @@ module C08CollectExtend_CollectExample
     goto BB3
   }
   BB3 {
-    [#"../08_collect_extend.rs" 61 57 65 1] _0 <- ([#"../08_collect_extend.rs" 61 57 65 1] [#"../08_collect_extend.rs" 61 57 65 1] ());
+    [#"../08_collect_extend.rs" 61 57 65 1] _0 <- ([#"../08_collect_extend.rs" 61 57 65 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index a3c74943ee..a7619981a9 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -116,7 +116,7 @@ module C09Empty_Impl0_Next
   }
   BB0 {
     assume { resolve0 self };
-    [#"../09_empty.rs" 42 8 42 12] _0 <- ([#"../09_empty.rs" 42 8 42 12] Core_Option_Option_Type.C_None);
+    [#"../09_empty.rs" 42 8 42 12] _0 <- Core_Option_Option_Type.C_None;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
index d91ac59ba6..5fec98b9d4 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
+++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
@@ -185,7 +185,7 @@ module C11Repeat_Impl0_Next
   BB1 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../11_repeat.rs" 47 8 47 34] _0 <- ([#"../11_repeat.rs" 47 8 47 34] Core_Option_Option_Type.C_Some _3);
+    [#"../11_repeat.rs" 47 8 47 34] _0 <- Core_Option_Option_Type.C_Some _3;
     _3 <- any a;
     goto BB2
   }
diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
index fc06132650..dc52d5c888 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
@@ -594,11 +594,11 @@ module C12Zip_Impl0_Next
     goto BB5
   }
   BB3 {
-    [#"../12_zip.rs" 57 17 57 18] x1 <- ([#"../12_zip.rs" 57 17 57 18] Core_Option_Option_Type.some_0 _4);
+    [#"../12_zip.rs" 57 17 57 18] x1 <- Core_Option_Option_Type.some_0 _4;
     _4 <- (let Core_Option_Option_Type.C_Some x0 = _4 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve0 _4 };
-    [#"../12_zip.rs" 57 23 57 24] x <- ([#"../12_zip.rs" 57 23 57 24] x1);
+    [#"../12_zip.rs" 57 23 57 24] x <- x1;
     x1 <- any item0;
     goto BB6
   }
@@ -611,7 +611,7 @@ module C12Zip_Impl0_Next
     assume { resolve0 _4 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../12_zip.rs" 56 27 56 31] _0 <- ([#"../12_zip.rs" 56 27 56 31] Core_Option_Option_Type.C_None);
+    [#"../12_zip.rs" 56 27 56 31] _0 <- Core_Option_Option_Type.C_None;
     goto BB20
   }
   BB6 {
@@ -637,11 +637,11 @@ module C12Zip_Impl0_Next
     goto BB11
   }
   BB10 {
-    [#"../12_zip.rs" 61 17 61 18] y1 <- ([#"../12_zip.rs" 61 17 61 18] Core_Option_Option_Type.some_0 _10);
+    [#"../12_zip.rs" 61 17 61 18] y1 <- Core_Option_Option_Type.some_0 _10;
     _10 <- (let Core_Option_Option_Type.C_Some x0 = _10 in Core_Option_Option_Type.C_Some (any item1));
     assert { [@expl:type invariant] inv4 _10 };
     assume { resolve2 _10 };
-    [#"../12_zip.rs" 61 23 61 24] y <- ([#"../12_zip.rs" 61 23 61 24] y1);
+    [#"../12_zip.rs" 61 23 61 24] y <- y1;
     y1 <- any item1;
     goto BB12
   }
@@ -650,14 +650,14 @@ module C12Zip_Impl0_Next
     assume { resolve2 _10 };
     assert { [@expl:type invariant] inv5 x };
     assume { resolve3 x };
-    [#"../12_zip.rs" 60 27 60 31] _0 <- ([#"../12_zip.rs" 60 27 60 31] Core_Option_Option_Type.C_None);
+    [#"../12_zip.rs" 60 27 60 31] _0 <- Core_Option_Option_Type.C_None;
     goto BB19
   }
   BB12 {
     goto BB13
   }
   BB13 {
-    [#"../12_zip.rs" 63 13 63 19] _15 <- ([#"../12_zip.rs" 63 13 63 19] (x, y));
+    [#"../12_zip.rs" 63 13 63 19] _15 <- (x, y);
     x <- any item0;
     y <- any item1;
     goto BB14
@@ -666,7 +666,7 @@ module C12Zip_Impl0_Next
     goto BB15
   }
   BB15 {
-    [#"../12_zip.rs" 63 8 63 20] _0 <- ([#"../12_zip.rs" 63 8 63 20] Core_Option_Option_Type.C_Some _15);
+    [#"../12_zip.rs" 63 8 63 20] _0 <- Core_Option_Option_Type.C_Some _15;
     _15 <- any (item0, item1);
     goto BB16
   }
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index 8f88f82844..f507b4d8d0 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -453,15 +453,15 @@ module C15Enumerate_Impl0_Next
     goto BB5
   }
   BB3 {
-    [#"../15_enumerate.rs" 56 17 56 18] x <- ([#"../15_enumerate.rs" 56 17 56 18] Core_Option_Option_Type.some_0 _3);
+    [#"../15_enumerate.rs" 56 17 56 18] x <- Core_Option_Option_Type.some_0 _3;
     _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0));
     assert { [@expl:type invariant] inv1 _3 };
     assume { resolve0 _3 };
-    [#"../15_enumerate.rs" 57 24 57 34] n <- ([#"../15_enumerate.rs" 57 24 57 34] C15Enumerate_Enumerate_Type.enumerate_count ( * self));
-    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + ([#"../15_enumerate.rs" 58 30 58 31] (1 : usize)))) ; };
+    [#"../15_enumerate.rs" 57 24 57 34] n <- C15Enumerate_Enumerate_Type.enumerate_count ( * self);
+    [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 =  * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 (C15Enumerate_Enumerate_Type.enumerate_count ( * self) + ([#"../15_enumerate.rs" 58 30 58 31] (1 : usize)))) ; };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../15_enumerate.rs" 59 21 59 27] _8 <- ([#"../15_enumerate.rs" 59 21 59 27] (n, x));
+    [#"../15_enumerate.rs" 59 21 59 27] _8 <- (n, x);
     x <- any item0;
     goto BB6
   }
@@ -478,11 +478,11 @@ module C15Enumerate_Impl0_Next
     assume { resolve0 _3 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../15_enumerate.rs" 55 20 55 24] _0 <- ([#"../15_enumerate.rs" 55 20 55 24] Core_Option_Option_Type.C_None);
+    [#"../15_enumerate.rs" 55 20 55 24] _0 <- Core_Option_Option_Type.C_None;
     goto BB9
   }
   BB6 {
-    [#"../15_enumerate.rs" 59 16 59 28] _0 <- ([#"../15_enumerate.rs" 59 16 59 28] Core_Option_Option_Type.C_Some _8);
+    [#"../15_enumerate.rs" 59 16 59 28] _0 <- Core_Option_Option_Type.C_Some _8;
     _8 <- any (usize, item0);
     goto BB7
   }
@@ -609,7 +609,7 @@ module C15Enumerate_Enumerate
     goto BB1
   }
   BB1 {
-    [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate iter ([#"../15_enumerate.rs" 82 29 82 30] (0 : usize)));
+    [#"../15_enumerate.rs" 82 4 82 32] _0 <- C15Enumerate_Enumerate_Type.C_Enumerate iter ([#"../15_enumerate.rs" 82 29 82 30] (0 : usize));
     iter <- any i;
     goto BB2
   }
diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg
index dd2135fe79..cf8af17094 100644
--- a/creusot/tests/should_succeed/iterators/16_take.mlcfg
+++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg
@@ -324,14 +324,14 @@ module C16Take_Impl0_Next
     goto BB0
   }
   BB0 {
-    [#"../16_take.rs" 54 11 54 22] _3 <- ([#"../16_take.rs" 54 11 54 22] C16Take_Take_Type.take_n ( * self) <> ([#"../16_take.rs" 54 21 54 22] (0 : usize)));
+    [#"../16_take.rs" 54 11 54 22] _3 <- C16Take_Take_Type.take_n ( * self) <> ([#"../16_take.rs" 54 21 54 22] (0 : usize));
     switch (_3)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - ([#"../16_take.rs" 55 22 55 23] (1 : usize)))) ; };
+    [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take x0 (C16Take_Take_Type.take_n ( * self) - ([#"../16_take.rs" 55 22 55 23] (1 : usize)))) ; };
     [#"../16_take.rs" 56 12 56 21] _5 <- Borrow.borrow_final (C16Take_Take_Type.take_iter ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../16_take.rs" 56 12 56 21] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 =  * self in C16Take_Take_Type.C_Take ( ^ _5) x1) ; };
     assume { inv1 ( ^ _5) };
@@ -347,7 +347,7 @@ module C16Take_Impl0_Next
   BB3 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../16_take.rs" 58 12 58 16] _0 <- ([#"../16_take.rs" 58 12 58 16] Core_Option_Option_Type.C_None);
+    [#"../16_take.rs" 58 12 58 16] _0 <- Core_Option_Option_Type.C_None;
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index e9e5e27054..e3d59d12e9 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -17,18 +17,18 @@ module Knapsack_Max
     goto BB0
   }
   BB0 {
-    [#"../knapsack.rs" 16 7 16 12] _5 <- ([#"../knapsack.rs" 16 7 16 12] a < b);
+    [#"../knapsack.rs" 16 7 16 12] _5 <- a < b;
     switch (_5)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../knapsack.rs" 17 8 17 9] _0 <- ([#"../knapsack.rs" 17 8 17 9] b);
+    [#"../knapsack.rs" 17 8 17 9] _0 <- b;
     goto BB3
   }
   BB2 {
-    [#"../knapsack.rs" 19 8 19 9] _0 <- ([#"../knapsack.rs" 19 8 19 9] a);
+    [#"../knapsack.rs" 19 8 19 9] _0 <- a;
     goto BB3
   }
   BB3 {
@@ -671,7 +671,7 @@ module Knapsack_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack.rs" 49 38 49 52] _8 <- ([#"../knapsack.rs" 49 38 49 52] max_weight + ([#"../knapsack.rs" 49 51 49 52] (1 : usize)));
+    [#"../knapsack.rs" 49 38 49 52] _8 <- max_weight + ([#"../knapsack.rs" 49 51 49 52] (1 : usize));
     [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 ([#"../knapsack.rs" 49 35 49 36] (0 : usize)) _8);
     _8 <- any usize;
     goto BB1
@@ -681,7 +681,7 @@ module Knapsack_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../knapsack.rs" 49 55 49 70] _10 <- ([#"../knapsack.rs" 49 55 49 70] _11 + ([#"../knapsack.rs" 49 69 49 70] (1 : usize)));
+    [#"../knapsack.rs" 49 55 49 70] _10 <- _11 + ([#"../knapsack.rs" 49 69 49 70] (1 : usize));
     _11 <- any usize;
     [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 _10);
     _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -689,7 +689,7 @@ module Knapsack_Knapsack01Dyn
     goto BB3
   }
   BB3 {
-    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] [#"../knapsack.rs" 50 16 50 17] (0 : usize));
+    [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] (0 : usize));
     goto BB4
   }
   BB4 {
@@ -719,7 +719,7 @@ module Knapsack_Knapsack01Dyn
     goto BB10
   }
   BB10 {
-    [#"../knapsack.rs" 59 10 59 25] _20 <- ([#"../knapsack.rs" 59 10 59 25] i < _22);
+    [#"../knapsack.rs" 59 10 59 25] _20 <- i < _22;
     _22 <- any usize;
     switch (_20)
       | False -> goto BB34
@@ -731,10 +731,10 @@ module Knapsack_Knapsack01Dyn
     goto BB12
   }
   BB12 {
-    [#"../knapsack.rs" 60 17 60 26] it <- ([#"../knapsack.rs" 60 17 60 26] _25);
+    [#"../knapsack.rs" 60 17 60 26] it <- _25;
     assert { [@expl:type invariant] inv1 _25 };
     assume { resolve2 _25 };
-    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] [#"../knapsack.rs" 64 20 64 21] (0 : usize));
+    [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] (0 : usize));
     goto BB13
   }
   BB13 {
@@ -765,14 +765,14 @@ module Knapsack_Knapsack01Dyn
     goto BB19
   }
   BB19 {
-    [#"../knapsack.rs" 76 14 76 29] _35 <- ([#"../knapsack.rs" 76 14 76 29] w <= max_weight);
+    [#"../knapsack.rs" 76 14 76 29] _35 <- w <= max_weight;
     switch (_35)
       | False -> goto BB33
       | True -> goto BB20
       end
   }
   BB20 {
-    [#"../knapsack.rs" 77 38 77 51] _39 <- ([#"../knapsack.rs" 77 38 77 51] Knapsack_Item_Type.item_weight it > w);
+    [#"../knapsack.rs" 77 38 77 51] _39 <- Knapsack_Item_Type.item_weight it > w;
     switch (_39)
       | False -> goto BB24
       | True -> goto BB21
@@ -787,7 +787,7 @@ module Knapsack_Knapsack01Dyn
     goto BB23
   }
   BB23 {
-    [#"../knapsack.rs" 78 16 78 32] _38 <- ([#"../knapsack.rs" 78 16 78 32] _42);
+    [#"../knapsack.rs" 78 16 78 32] _38 <- _42;
     goto BB30
   }
   BB24 {
@@ -803,13 +803,13 @@ module Knapsack_Knapsack01Dyn
     goto BB27
   }
   BB27 {
-    [#"../knapsack.rs" 80 52 80 65] _62 <- ([#"../knapsack.rs" 80 52 80 65] w - Knapsack_Item_Type.item_weight it);
+    [#"../knapsack.rs" 80 52 80 65] _62 <- w - Knapsack_Item_Type.item_weight it;
     [#"../knapsack.rs" 80 51 80 66] _57 <- ([#"../knapsack.rs" 80 51 80 66] index2 _59 _62);
     _62 <- any usize;
     goto BB28
   }
   BB28 {
-    [#"../knapsack.rs" 80 38 80 77] _55 <- ([#"../knapsack.rs" 80 38 80 77] _57 + Knapsack_Item_Type.item_value it);
+    [#"../knapsack.rs" 80 38 80 77] _55 <- _57 + Knapsack_Item_Type.item_value it;
     [#"../knapsack.rs" 80 16 80 78] _38 <- ([#"../knapsack.rs" 80 16 80 78] max0 _49 _55);
     _55 <- any usize;
     goto BB29
@@ -820,7 +820,7 @@ module Knapsack_Knapsack01Dyn
   BB30 {
     [#"../knapsack.rs" 77 12 77 22] _69 <- Borrow.borrow_mut best_value;
     [#"../knapsack.rs" 77 12 77 22] best_value <-  ^ _69;
-    [#"../knapsack.rs" 77 23 77 28] _70 <- ([#"../knapsack.rs" 77 23 77 28] i + ([#"../knapsack.rs" 77 27 77 28] (1 : usize)));
+    [#"../knapsack.rs" 77 23 77 28] _70 <- i + ([#"../knapsack.rs" 77 27 77 28] (1 : usize));
     [#"../knapsack.rs" 77 22 77 29] _68 <- ([#"../knapsack.rs" 77 22 77 29] index_mut0 _69 _70);
     _69 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _70 <- any usize;
@@ -834,19 +834,19 @@ module Knapsack_Knapsack01Dyn
     goto BB32
   }
   BB32 {
-    [#"../knapsack.rs" 77 12 81 13] _66 <- { _66 with current = ([#"../knapsack.rs" 77 12 81 13] _38) ; };
+    [#"../knapsack.rs" 77 12 81 13] _66 <- { _66 with current = _38 ; };
     _38 <- any usize;
     assume { resolve3 _66 };
     assume { resolve4 _68 };
-    [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + ([#"../knapsack.rs" 82 17 82 18] (1 : usize)));
-    [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] [#"../knapsack.rs" 82 12 82 18] ());
+    [#"../knapsack.rs" 82 12 82 18] w <- w + ([#"../knapsack.rs" 82 17 82 18] (1 : usize));
+    [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] ());
     goto BB18
   }
   BB33 {
     assert { [@expl:type invariant] inv1 it };
     assume { resolve2 it };
-    [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + ([#"../knapsack.rs" 84 13 84 14] (1 : usize)));
-    [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] [#"../knapsack.rs" 84 8 84 14] ());
+    [#"../knapsack.rs" 84 8 84 14] i <- i + ([#"../knapsack.rs" 84 13 84 14] (1 : usize));
+    [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] ());
     goto BB8
   }
   BB34 {
@@ -859,7 +859,7 @@ module Knapsack_Knapsack01Dyn
     goto BB36
   }
   BB36 {
-    [#"../knapsack.rs" 88 26 88 36] left_weight <- ([#"../knapsack.rs" 88 26 88 36] max_weight);
+    [#"../knapsack.rs" 88 26 88 36] left_weight <- max_weight;
     [#"../knapsack.rs" 90 16 90 27] j <- ([#"../knapsack.rs" 90 16 90 27] len0 items);
     goto BB37
   }
@@ -872,22 +872,22 @@ module Knapsack_Knapsack01Dyn
     goto BB39
   }
   BB39 {
-    [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 15] ([#"../knapsack.rs" 93 10 93 11] (0 : usize)) < j);
+    [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 11] (0 : usize)) < j;
     switch (_88)
       | False -> goto BB50
       | True -> goto BB40
       end
   }
   BB40 {
-    [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - ([#"../knapsack.rs" 94 13 94 14] (1 : usize)));
+    [#"../knapsack.rs" 94 8 94 14] j <- j - ([#"../knapsack.rs" 94 13 94 14] (1 : usize));
     [#"../knapsack.rs" 95 23 95 26] _91 <- ([#"../knapsack.rs" 95 23 95 26] index0 items j);
     goto BB41
   }
   BB41 {
-    [#"../knapsack.rs" 95 17 95 26] it1 <- ([#"../knapsack.rs" 95 17 95 26] _91);
+    [#"../knapsack.rs" 95 17 95 26] it1 <- _91;
     assert { [@expl:type invariant] inv1 _91 };
     assume { resolve2 _91 };
-    [#"../knapsack.rs" 96 22 96 27] _100 <- ([#"../knapsack.rs" 96 22 96 27] j + ([#"../knapsack.rs" 96 26 96 27] (1 : usize)));
+    [#"../knapsack.rs" 96 22 96 27] _100 <- j + ([#"../knapsack.rs" 96 26 96 27] (1 : usize));
     [#"../knapsack.rs" 96 21 96 28] _98 <- ([#"../knapsack.rs" 96 21 96 28] index1 best_value _100);
     _100 <- any usize;
     goto BB42
@@ -905,7 +905,7 @@ module Knapsack_Knapsack01Dyn
     goto BB45
   }
   BB45 {
-    [#"../knapsack.rs" 96 11 96 71] _94 <- ([#"../knapsack.rs" 96 11 96 71] _96 <> _104);
+    [#"../knapsack.rs" 96 11 96 71] _94 <- _96 <> _104;
     switch (_94)
       | False -> goto BB48
       | True -> goto BB46
@@ -922,14 +922,14 @@ module Knapsack_Knapsack01Dyn
   BB47 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve2 it1 };
-    [#"../knapsack.rs" 98 12 98 36] left_weight <- ([#"../knapsack.rs" 98 12 98 36] left_weight - Knapsack_Item_Type.item_weight it1);
-    [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] [#"../knapsack.rs" 96 72 99 9] ());
+    [#"../knapsack.rs" 98 12 98 36] left_weight <- left_weight - Knapsack_Item_Type.item_weight it1;
+    [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] ());
     goto BB49
   }
   BB48 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve2 it1 };
-    [#"../knapsack.rs" 99 9 99 9] _19 <- ([#"../knapsack.rs" 99 9 99 9] [#"../knapsack.rs" 99 9 99 9] ());
+    [#"../knapsack.rs" 99 9 99 9] _19 <- ([#"../knapsack.rs" 99 9 99 9] ());
     goto BB49
   }
   BB49 {
@@ -939,7 +939,7 @@ module Knapsack_Knapsack01Dyn
     assume { resolve0 best_value };
     assert { [@expl:type invariant] inv0 items };
     assume { resolve1 items };
-    [#"../knapsack.rs" 102 4 102 10] _0 <- ([#"../knapsack.rs" 102 4 102 10] result);
+    [#"../knapsack.rs" 102 4 102 10] _0 <- result;
     result <- any Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
     goto BB51
   }
diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 5d2b468df2..38603afc65 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -16,18 +16,18 @@ module KnapsackFull_Max
     goto BB0
   }
   BB0 {
-    [#"../knapsack_full.rs" 16 7 16 12] _4 <- ([#"../knapsack_full.rs" 16 7 16 12] a < b);
+    [#"../knapsack_full.rs" 16 7 16 12] _4 <- a < b;
     switch (_4)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../knapsack_full.rs" 17 8 17 9] _0 <- ([#"../knapsack_full.rs" 17 8 17 9] b);
+    [#"../knapsack_full.rs" 17 8 17 9] _0 <- b;
     goto BB3
   }
   BB2 {
-    [#"../knapsack_full.rs" 19 8 19 9] _0 <- ([#"../knapsack_full.rs" 19 8 19 9] a);
+    [#"../knapsack_full.rs" 19 8 19 9] _0 <- a;
     goto BB3
   }
   BB3 {
@@ -1172,7 +1172,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB0
   }
   BB0 {
-    [#"../knapsack_full.rs" 86 38 86 52] _11 <- ([#"../knapsack_full.rs" 86 38 86 52] max_weight + ([#"../knapsack_full.rs" 86 51 86 52] (1 : usize)));
+    [#"../knapsack_full.rs" 86 38 86 52] _11 <- max_weight + ([#"../knapsack_full.rs" 86 51 86 52] (1 : usize));
     [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 ([#"../knapsack_full.rs" 86 35 86 36] (0 : usize)) _11);
     _11 <- any usize;
     goto BB1
@@ -1182,7 +1182,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB2
   }
   BB2 {
-    [#"../knapsack_full.rs" 86 55 86 70] _13 <- ([#"../knapsack_full.rs" 86 55 86 70] _14 + ([#"../knapsack_full.rs" 86 69 86 70] (1 : usize)));
+    [#"../knapsack_full.rs" 86 55 86 70] _13 <- _14 + ([#"../knapsack_full.rs" 86 69 86 70] (1 : usize));
     _14 <- any usize;
     [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 _13);
     _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -1194,7 +1194,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB4
   }
   BB4 {
-    [#"../knapsack_full.rs" 95 13 95 27] _18 <- ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range ([#"../knapsack_full.rs" 95 13 95 14] (0 : usize)) _19);
+    [#"../knapsack_full.rs" 95 13 95 27] _18 <- Core_Ops_Range_Range_Type.C_Range ([#"../knapsack_full.rs" 95 13 95 14] (0 : usize)) _19;
     _19 <- any usize;
     [#"../knapsack_full.rs" 88 4 88 55] iter <- ([#"../knapsack_full.rs" 88 4 88 55] into_iter0 _18);
     _18 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -1263,19 +1263,19 @@ module KnapsackFull_Knapsack01Dyn
     absurd
   }
   BB18 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _32);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _32;
     [#"../knapsack_full.rs" 88 4 88 55] _37 <- ([#"../knapsack_full.rs" 88 4 88 55] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB19
   }
   BB19 {
-    [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] _37);
+    [#"../knapsack_full.rs" 88 4 88 55] produced <- _37;
     _37 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
     [#"../knapsack_full.rs" 96 23 96 26] _41 <- ([#"../knapsack_full.rs" 96 23 96 26] index0 items i);
     goto BB20
   }
   BB20 {
-    [#"../knapsack_full.rs" 96 17 96 26] it <- ([#"../knapsack_full.rs" 96 17 96 26] _41);
+    [#"../knapsack_full.rs" 96 17 96 26] it <- _41;
     assert { [@expl:type invariant] inv1 _41 };
     assume { resolve1 _41 };
     [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 ([#"../knapsack_full.rs" 110 17 110 18] (0 : usize)) max_weight);
@@ -1345,22 +1345,22 @@ module KnapsackFull_Knapsack01Dyn
   BB33 {
     assert { [@expl:type invariant] inv1 it };
     assume { resolve1 it };
-    [#"../knapsack_full.rs" 98 8 98 59] _31 <- ([#"../knapsack_full.rs" 98 8 98 59] [#"../knapsack_full.rs" 98 8 98 59] ());
+    [#"../knapsack_full.rs" 98 8 98 59] _31 <- ([#"../knapsack_full.rs" 98 8 98 59] ());
     goto BB12
   }
   BB34 {
     goto BB35
   }
   BB35 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _58);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _58;
     [#"../knapsack_full.rs" 98 8 98 59] _63 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB36
   }
   BB36 {
-    [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] _63);
+    [#"../knapsack_full.rs" 98 8 98 59] produced1 <- _63;
     _63 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
-    [#"../knapsack_full.rs" 111 38 111 51] _67 <- ([#"../knapsack_full.rs" 111 38 111 51] KnapsackFull_Item_Type.item_weight it > w);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- __creusot_proc_iter_elem1;
+    [#"../knapsack_full.rs" 111 38 111 51] _67 <- KnapsackFull_Item_Type.item_weight it > w;
     switch (_67)
       | False -> goto BB40
       | True -> goto BB37
@@ -1375,7 +1375,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB39
   }
   BB39 {
-    [#"../knapsack_full.rs" 112 16 112 32] _66 <- ([#"../knapsack_full.rs" 112 16 112 32] _70);
+    [#"../knapsack_full.rs" 112 16 112 32] _66 <- _70;
     goto BB46
   }
   BB40 {
@@ -1391,13 +1391,13 @@ module KnapsackFull_Knapsack01Dyn
     goto BB43
   }
   BB43 {
-    [#"../knapsack_full.rs" 114 52 114 65] _90 <- ([#"../knapsack_full.rs" 114 52 114 65] w - KnapsackFull_Item_Type.item_weight it);
+    [#"../knapsack_full.rs" 114 52 114 65] _90 <- w - KnapsackFull_Item_Type.item_weight it;
     [#"../knapsack_full.rs" 114 51 114 66] _85 <- ([#"../knapsack_full.rs" 114 51 114 66] index2 _87 _90);
     _90 <- any usize;
     goto BB44
   }
   BB44 {
-    [#"../knapsack_full.rs" 114 38 114 77] _83 <- ([#"../knapsack_full.rs" 114 38 114 77] _85 + KnapsackFull_Item_Type.item_value it);
+    [#"../knapsack_full.rs" 114 38 114 77] _83 <- _85 + KnapsackFull_Item_Type.item_value it;
     [#"../knapsack_full.rs" 114 16 114 78] _66 <- ([#"../knapsack_full.rs" 114 16 114 78] max0 _77 _83);
     _83 <- any usize;
     goto BB45
@@ -1408,7 +1408,7 @@ module KnapsackFull_Knapsack01Dyn
   BB46 {
     [#"../knapsack_full.rs" 111 12 111 22] _97 <- Borrow.borrow_mut best_value;
     [#"../knapsack_full.rs" 111 12 111 22] best_value <-  ^ _97;
-    [#"../knapsack_full.rs" 111 23 111 28] _98 <- ([#"../knapsack_full.rs" 111 23 111 28] i + ([#"../knapsack_full.rs" 111 27 111 28] (1 : usize)));
+    [#"../knapsack_full.rs" 111 23 111 28] _98 <- i + ([#"../knapsack_full.rs" 111 27 111 28] (1 : usize));
     [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 _98);
     _97 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _98 <- any usize;
@@ -1422,11 +1422,11 @@ module KnapsackFull_Knapsack01Dyn
     goto BB48
   }
   BB48 {
-    [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = ([#"../knapsack_full.rs" 111 12 115 13] _66) ; };
+    [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = _66 ; };
     _66 <- any usize;
     assume { resolve3 _94 };
     assume { resolve4 _96 };
-    [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] [#"../knapsack_full.rs" 110 32 116 9] ());
+    [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] ());
     goto BB30
   }
   BB49 {
@@ -1435,7 +1435,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB50
   }
   BB50 {
-    [#"../knapsack_full.rs" 120 26 120 36] left_weight <- ([#"../knapsack_full.rs" 120 26 120 36] max_weight);
+    [#"../knapsack_full.rs" 120 26 120 36] left_weight <- max_weight;
     [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 items);
     goto BB51
   }
@@ -1469,22 +1469,22 @@ module KnapsackFull_Knapsack01Dyn
     goto BB56
   }
   BB56 {
-    [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 15] ([#"../knapsack_full.rs" 140 10 140 11] (0 : usize)) < j);
+    [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 11] (0 : usize)) < j;
     switch (_115)
       | False -> goto BB67
       | True -> goto BB57
       end
   }
   BB57 {
-    [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - ([#"../knapsack_full.rs" 141 13 141 14] (1 : usize)));
+    [#"../knapsack_full.rs" 141 8 141 14] j <- j - ([#"../knapsack_full.rs" 141 13 141 14] (1 : usize));
     [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 items j);
     goto BB58
   }
   BB58 {
-    [#"../knapsack_full.rs" 142 17 142 26] it1 <- ([#"../knapsack_full.rs" 142 17 142 26] _118);
+    [#"../knapsack_full.rs" 142 17 142 26] it1 <- _118;
     assert { [@expl:type invariant] inv1 _118 };
     assume { resolve1 _118 };
-    [#"../knapsack_full.rs" 143 22 143 27] _127 <- ([#"../knapsack_full.rs" 143 22 143 27] j + ([#"../knapsack_full.rs" 143 26 143 27] (1 : usize)));
+    [#"../knapsack_full.rs" 143 22 143 27] _127 <- j + ([#"../knapsack_full.rs" 143 26 143 27] (1 : usize));
     [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 best_value _127);
     _127 <- any usize;
     goto BB59
@@ -1502,7 +1502,7 @@ module KnapsackFull_Knapsack01Dyn
     goto BB62
   }
   BB62 {
-    [#"../knapsack_full.rs" 143 11 143 71] _121 <- ([#"../knapsack_full.rs" 143 11 143 71] _123 <> _131);
+    [#"../knapsack_full.rs" 143 11 143 71] _121 <- _123 <> _131;
     switch (_121)
       | False -> goto BB65
       | True -> goto BB63
@@ -1519,14 +1519,14 @@ module KnapsackFull_Knapsack01Dyn
   BB64 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
-    [#"../knapsack_full.rs" 145 12 145 36] left_weight <- ([#"../knapsack_full.rs" 145 12 145 36] left_weight - KnapsackFull_Item_Type.item_weight it1);
-    [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] [#"../knapsack_full.rs" 143 72 146 9] ());
+    [#"../knapsack_full.rs" 145 12 145 36] left_weight <- left_weight - KnapsackFull_Item_Type.item_weight it1;
+    [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] ());
     goto BB66
   }
   BB65 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
-    [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] [#"../knapsack_full.rs" 146 9 146 9] ());
+    [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] ());
     goto BB66
   }
   BB66 {
@@ -1536,7 +1536,7 @@ module KnapsackFull_Knapsack01Dyn
     assume { resolve5 best_value };
     assert { [@expl:type invariant] inv4 items };
     assume { resolve6 items };
-    [#"../knapsack_full.rs" 149 4 149 10] _0 <- ([#"../knapsack_full.rs" 149 4 149 10] result);
+    [#"../knapsack_full.rs" 149 4 149 10] _0 <- result;
     result <- any Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
     goto BB68
   }
diff --git a/creusot/tests/should_succeed/lang/assoc_type.mlcfg b/creusot/tests/should_succeed/lang/assoc_type.mlcfg
index f559b52a9c..f46b83d21a 100644
--- a/creusot/tests/should_succeed/lang/assoc_type.mlcfg
+++ b/creusot/tests/should_succeed/lang/assoc_type.mlcfg
@@ -38,7 +38,7 @@ module AssocType_Uses3
     goto BB0
   }
   BB0 {
-    [#"../assoc_type.rs" 36 34 36 36] _0 <- ([#"../assoc_type.rs" 36 34 36 36] [#"../assoc_type.rs" 36 34 36 36] ());
+    [#"../assoc_type.rs" 36 34 36 36] _0 <- ([#"../assoc_type.rs" 36 34 36 36] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
index 22f2266587..9e1772e8de 100644
--- a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
+++ b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg
@@ -26,9 +26,9 @@ module BranchBorrow2_F
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] [#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] [#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] [#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32));
     [#"../branch_borrow_2.rs" 8 12 8 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 8 12 8 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 9 12 9 18] y <- Borrow.borrow_mut b;
@@ -50,46 +50,46 @@ module BranchBorrow2_F
     goto BB5
   }
   BB3 {
-    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] [#"../branch_borrow_2.rs" 23 17 23 18] (8 : int32)) ; };
+    [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 17 23 18] (8 : int32)) ; };
     [#"../branch_borrow_2.rs" 24 16 24 17] _12 <- Borrow.borrow_final ( * z) (Borrow.get_id z);
     [#"../branch_borrow_2.rs" 24 16 24 17] z <- { z with current = ( ^ _12) ; };
-    [#"../branch_borrow_2.rs" 24 12 24 17] w <- ([#"../branch_borrow_2.rs" 24 12 24 17] _12);
+    [#"../branch_borrow_2.rs" 24 12 24 17] w <- _12;
     _12 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] [#"../branch_borrow_2.rs" 22 13 25 9] ());
+    [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] ());
     goto BB6
   }
   BB4 {
     assume { resolve0 z };
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] [#"../branch_borrow_2.rs" 15 17 15 18] (6 : int32)) ; };
-    [#"../branch_borrow_2.rs" 16 12 16 17] w <- ([#"../branch_borrow_2.rs" 16 12 16 17] x);
+    [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 17 15 18] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 16 12 16 17] w <- x;
     x <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] [#"../branch_borrow_2.rs" 14 13 17 9] ());
+    [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] ());
     goto BB6
   }
   BB5 {
     assume { resolve0 z };
-    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] [#"../branch_borrow_2.rs" 19 17 19 18] (7 : int32)) ; };
+    [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 17 19 18] (7 : int32)) ; };
     [#"../branch_borrow_2.rs" 20 16 20 17] _11 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 20 16 20 17] y <- { y with current = ( ^ _11) ; };
-    [#"../branch_borrow_2.rs" 20 12 20 17] w <- ([#"../branch_borrow_2.rs" 20 12 20 17] _11);
+    [#"../branch_borrow_2.rs" 20 12 20 17] w <- _11;
     _11 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] [#"../branch_borrow_2.rs" 18 13 21 9] ());
+    [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] ());
     goto BB6
   }
   BB6 {
-    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] [#"../branch_borrow_2.rs" 28 9 28 10] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 9 28 10] (5 : int32)) ; };
     assume { resolve0 w };
     assume { resolve0 z };
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- ([#"../branch_borrow_2.rs" 30 12 30 18] c = ([#"../branch_borrow_2.rs" 30 17 30 18] (5 : int32)));
+    [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- c = ([#"../branch_borrow_2.rs" 30 17 30 18] (5 : int32));
     switch (_14)
       | False -> goto BB8
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- ([#"../branch_borrow_2.rs" 3 11 31 1] [#"../branch_borrow_2.rs" 3 11 31 1] ());
+    [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- ([#"../branch_borrow_2.rs" 3 11 31 1] ());
     return _0
   }
   BB8 {
@@ -160,9 +160,9 @@ module BranchBorrow2_G
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- ([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 23 36 25] (10 : usize)));
-    [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 34 36 35] (5 : usize)));
-    [#"../branch_borrow_2.rs" 36 16 36 37] a <- ([#"../branch_borrow_2.rs" 36 16 36 37] (_2, _3));
+    [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 23 36 25] (10 : usize));
+    [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- BranchBorrow2_MyInt_Type.C_MyInt ([#"../branch_borrow_2.rs" 36 34 36 35] (5 : usize));
+    [#"../branch_borrow_2.rs" 36 16 36 37] a <- (_2, _3);
     _2 <- any BranchBorrow2_MyInt_Type.t_myint;
     _3 <- any BranchBorrow2_MyInt_Type.t_myint;
     [#"../branch_borrow_2.rs" 37 12 37 18] b <- Borrow.borrow_mut a;
@@ -175,7 +175,7 @@ module BranchBorrow2_G
     assume { resolve0 d };
     assume { resolve1 b };
     assume { resolve2 a };
-    [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- ([#"../branch_borrow_2.rs" 35 11 43 1] [#"../branch_borrow_2.rs" 35 11 43 1] ());
+    [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- ([#"../branch_borrow_2.rs" 35 11 43 1] ());
     return _0
   }
   
@@ -203,8 +203,8 @@ module BranchBorrow2_H
     goto BB0
   }
   BB0 {
-    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] [#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
-    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] [#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32));
+    [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32));
     [#"../branch_borrow_2.rs" 49 12 49 18] x <- Borrow.borrow_mut a;
     [#"../branch_borrow_2.rs" 49 12 49 18] a <-  ^ x;
     [#"../branch_borrow_2.rs" 50 12 50 18] y <- Borrow.borrow_mut b;
@@ -216,25 +216,25 @@ module BranchBorrow2_H
   }
   BB1 {
     assume { resolve0 y };
-    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] [#"../branch_borrow_2.rs" 53 13 53 14] (5 : int32)) ; };
-    [#"../branch_borrow_2.rs" 54 8 54 13] w <- ([#"../branch_borrow_2.rs" 54 8 54 13] x);
+    [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 13 53 14] (5 : int32)) ; };
+    [#"../branch_borrow_2.rs" 54 8 54 13] w <- x;
     x <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] [#"../branch_borrow_2.rs" 52 12 55 5] ());
+    [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] ());
     goto BB3
   }
   BB2 {
     assume { resolve0 x };
-    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] [#"../branch_borrow_2.rs" 56 13 56 14] (6 : int32)) ; };
+    [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 13 56 14] (6 : int32)) ; };
     [#"../branch_borrow_2.rs" 57 12 57 13] _9 <- Borrow.borrow_final ( * y) (Borrow.get_id y);
     [#"../branch_borrow_2.rs" 57 12 57 13] y <- { y with current = ( ^ _9) ; };
-    [#"../branch_borrow_2.rs" 57 8 57 13] w <- ([#"../branch_borrow_2.rs" 57 8 57 13] _9);
+    [#"../branch_borrow_2.rs" 57 8 57 13] w <- _9;
     _9 <- any borrowed int32;
-    [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] [#"../branch_borrow_2.rs" 55 11 60 5] ());
+    [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] ());
     goto BB3
   }
   BB3 {
     assume { resolve0 w };
-    [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- ([#"../branch_borrow_2.rs" 45 11 68 1] [#"../branch_borrow_2.rs" 45 11 68 1] ());
+    [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- ([#"../branch_borrow_2.rs" 45 11 68 1] ());
     assume { resolve0 y };
     return _0
   }
diff --git a/creusot/tests/should_succeed/lang/const.mlcfg b/creusot/tests/should_succeed/lang/const.mlcfg
index a792facef9..f70cc9cd93 100644
--- a/creusot/tests/should_succeed/lang/const.mlcfg
+++ b/creusot/tests/should_succeed/lang/const.mlcfg
@@ -11,7 +11,7 @@ module Const_Foo
     goto BB0
   }
   BB0 {
-    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] [#"../const.rs" 9 4 9 7] (42 : usize));
+    [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] (42 : usize));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/empty.mlcfg b/creusot/tests/should_succeed/lang/empty.mlcfg
index 3bfe289397..f7c4f28c0a 100644
--- a/creusot/tests/should_succeed/lang/empty.mlcfg
+++ b/creusot/tests/should_succeed/lang/empty.mlcfg
@@ -7,7 +7,7 @@ module Empty_F
     goto BB0
   }
   BB0 {
-    [#"../empty.rs" 4 4 4 10] _0 <- ([#"../empty.rs" 4 4 4 10] [#"../empty.rs" 4 4 4 10] ());
+    [#"../empty.rs" 4 4 4 10] _0 <- ([#"../empty.rs" 4 4 4 10] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/float_ops.mlcfg b/creusot/tests/should_succeed/lang/float_ops.mlcfg
index 8837b56da2..fc4f2ba490 100644
--- a/creusot/tests/should_succeed/lang/float_ops.mlcfg
+++ b/creusot/tests/should_succeed/lang/float_ops.mlcfg
@@ -10,7 +10,7 @@ module FloatOps_Eq
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] ([#"../float_ops.rs" 6 4 6 7] (1.0 : Float64.t)) .= ([#"../float_ops.rs" 6 11 6 14] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 7] (1.0 : Float64.t)) .= ([#"../float_ops.rs" 6 11 6 14] (2.0 : Float64.t));
     return _0
   }
   
@@ -26,7 +26,7 @@ module FloatOps_Lt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] ([#"../float_ops.rs" 11 4 11 7] (1.0 : Float64.t)) .< ([#"../float_ops.rs" 11 10 11 13] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 7] (1.0 : Float64.t)) .< ([#"../float_ops.rs" 11 10 11 13] (2.0 : Float64.t));
     return _0
   }
   
@@ -42,7 +42,7 @@ module FloatOps_Le
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] ([#"../float_ops.rs" 16 4 16 7] (1.0 : Float64.t)) .<= ([#"../float_ops.rs" 16 11 16 14] (2.0 : Float64.t)));
+    [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 7] (1.0 : Float64.t)) .<= ([#"../float_ops.rs" 16 11 16 14] (2.0 : Float64.t));
     return _0
   }
   
@@ -58,7 +58,7 @@ module FloatOps_Gt
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] ([#"../float_ops.rs" 21 4 21 7] (2.0 : Float64.t)) .> ([#"../float_ops.rs" 21 10 21 13] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 7] (2.0 : Float64.t)) .> ([#"../float_ops.rs" 21 10 21 13] (1.0 : Float64.t));
     return _0
   }
   
@@ -74,7 +74,7 @@ module FloatOps_Ge
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] ([#"../float_ops.rs" 26 4 26 7] (2.0 : Float64.t)) .>= ([#"../float_ops.rs" 26 11 26 14] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 7] (2.0 : Float64.t)) .>= ([#"../float_ops.rs" 26 11 26 14] (1.0 : Float64.t));
     return _0
   }
   
@@ -90,7 +90,7 @@ module FloatOps_Neg
     goto BB0
   }
   BB0 {
-    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] ([#"../float_ops.rs" 31 4 31 8] (-2.0 : Float64.t)) .<= ([#"../float_ops.rs" 31 12 31 15] (1.0 : Float64.t)));
+    [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 8] (-2.0 : Float64.t)) .<= ([#"../float_ops.rs" 31 12 31 15] (1.0 : Float64.t));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/literals.mlcfg b/creusot/tests/should_succeed/lang/literals.mlcfg
index 8504e3c54b..1fe4e21fa5 100644
--- a/creusot/tests/should_succeed/lang/literals.mlcfg
+++ b/creusot/tests/should_succeed/lang/literals.mlcfg
@@ -12,9 +12,9 @@ module Literals_FloatOperation
     goto BB0
   }
   BB0 {
-    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] [#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
-    [#"../literals.rs" 6 7 6 17] _3 <- ([#"../literals.rs" 6 7 6 17] x .+ ([#"../literals.rs" 6 11 6 17] (0x1.020c40000000p0 : Float32.t)));
-    [#"../literals.rs" 6 7 6 24] _2 <- ([#"../literals.rs" 6 7 6 24] _3 .= ([#"../literals.rs" 6 21 6 24] (2.0 : Float32.t)));
+    [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] (0.0 : Float32.t));
+    [#"../literals.rs" 6 7 6 17] _3 <- x .+ ([#"../literals.rs" 6 11 6 17] (0x1.020c40000000p0 : Float32.t));
+    [#"../literals.rs" 6 7 6 24] _2 <- _3 .= ([#"../literals.rs" 6 21 6 24] (2.0 : Float32.t));
     _3 <- any Float32.t;
     switch (_2)
       | False -> goto BB2
@@ -22,11 +22,11 @@ module Literals_FloatOperation
       end
   }
   BB1 {
-    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] ([#"../literals.rs" 7 8 7 11] (3.0 : Float32.t)) .- ([#"../literals.rs" 7 14 7 17] (1.0 : Float32.t)));
+    [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 11] (3.0 : Float32.t)) .- ([#"../literals.rs" 7 14 7 17] (1.0 : Float32.t));
     goto BB3
   }
   BB2 {
-    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] [#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
+    [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] (0.0 : Float32.t));
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/lang/module_paths.mlcfg b/creusot/tests/should_succeed/lang/module_paths.mlcfg
index 2025c02aac..2fc2f76563 100644
--- a/creusot/tests/should_succeed/lang/module_paths.mlcfg
+++ b/creusot/tests/should_succeed/lang/module_paths.mlcfg
@@ -38,7 +38,7 @@ module ModulePaths_Test
     goto BB0
   }
   BB0 {
-    [#"../module_paths.rs" 22 52 22 54] _0 <- ([#"../module_paths.rs" 22 52 22 54] [#"../module_paths.rs" 22 52 22 54] ());
+    [#"../module_paths.rs" 22 52 22 54] _0 <- ([#"../module_paths.rs" 22 52 22 54] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/modules.mlcfg b/creusot/tests/should_succeed/lang/modules.mlcfg
index 2bd931bd74..48fb723cc2 100644
--- a/creusot/tests/should_succeed/lang/modules.mlcfg
+++ b/creusot/tests/should_succeed/lang/modules.mlcfg
@@ -23,9 +23,9 @@ module Modules_Nested_InnerFunc
     goto BB0
   }
   BB0 {
-    [#"../modules.rs" 14 16 14 28] _2 <- ([#"../modules.rs" 14 16 14 28] Modules_Nested_Nested_Type.C_Test);
+    [#"../modules.rs" 14 16 14 28] _2 <- Modules_Nested_Nested_Type.C_Test;
     assume { resolve0 _2 };
-    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] [#"../modules.rs" 15 8 15 12] true);
+    [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] true);
     return _0
   }
   
@@ -38,7 +38,7 @@ module Modules_Nested_Further_Another
     goto BB0
   }
   BB0 {
-    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] [#"../modules.rs" 20 12 20 17] false);
+    [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] false);
     return _0
   }
   
@@ -65,7 +65,7 @@ module Modules_F
     goto BB2
   }
   BB2 {
-    [#"../modules.rs" 25 11 29 1] _0 <- ([#"../modules.rs" 25 11 29 1] [#"../modules.rs" 25 11 29 1] ());
+    [#"../modules.rs" 25 11 29 1] _0 <- ([#"../modules.rs" 25 11 29 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/move_path.mlcfg b/creusot/tests/should_succeed/lang/move_path.mlcfg
index 52e93c5887..901e766591 100644
--- a/creusot/tests/should_succeed/lang/move_path.mlcfg
+++ b/creusot/tests/should_succeed/lang/move_path.mlcfg
@@ -19,16 +19,16 @@ module MovePath_F
     goto BB0
   }
   BB0 {
-    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] [#"../move_path.rs" 4 16 4 17] (1 : int32));
+    [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] (1 : int32));
     [#"../move_path.rs" 6 12 6 18] y <- Borrow.borrow_mut x;
     [#"../move_path.rs" 6 12 6 18] x <-  ^ y;
-    [#"../move_path.rs" 7 12 7 13] d <- ([#"../move_path.rs" 7 12 7 13] y);
+    [#"../move_path.rs" 7 12 7 13] d <- y;
     y <- any borrowed int32;
-    [#"../move_path.rs" 8 12 8 13] z <- ([#"../move_path.rs" 8 12 8 13] d);
+    [#"../move_path.rs" 8 12 8 13] z <- d;
     d <- any borrowed int32;
-    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] [#"../move_path.rs" 10 17 10 18] (2 : int32)) ; };
+    [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 17 10 18] (2 : int32)) ; };
     assume { resolve0 z };
-    [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] [#"../move_path.rs" 3 11 15 1] ());
+    [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
index c00be227a7..6c2c0f432b 100644
--- a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
+++ b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg
@@ -13,11 +13,11 @@ module MultipleScopes_MultipleScopes
     goto BB0
   }
   BB0 {
-    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] [#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
-    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] [#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
-    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] [#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
-    [#"../multiple_scopes.rs" 9 8 9 15] _x <- ([#"../multiple_scopes.rs" 9 8 9 15] _y1);
-    [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] [#"../multiple_scopes.rs" 7 4 10 5] ());
+    [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] (1 : int32));
+    [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] (2 : int32));
+    [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] (3 : int32));
+    [#"../multiple_scopes.rs" 9 8 9 15] _x <- _y1;
+    [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
index 7a9d692899..1d67e27da7 100644
--- a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
+++ b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
@@ -22,10 +22,10 @@ module PromotedConstants_PromotedNone
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 28 6 30] (43 : int32)) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0
+    let _1 = Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 28 6 30] (43 : int32)) in let _0 = _1 in _0
   let constant promoted1 [#"../promoted_constants.rs" 3 0 3 22]  : Core_Option_Option_Type.t_option int32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 17 6 19] (42 : int32)) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0
+    let _1 = Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 6 17 6 19] (42 : int32)) in let _0 = _1 in _0
   let rec cfg promoted_none [#"../promoted_constants.rs" 3 0 3 22] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -38,10 +38,10 @@ module PromotedConstants_PromotedNone
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 4 19 4 20] (0 : int32)));
-    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] [#"../promoted_constants.rs" 6 11 6 20] promoted1);
-    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] [#"../promoted_constants.rs" 6 22 6 31] promoted0);
-    [#"../promoted_constants.rs" 6 10 6 32] _2 <- ([#"../promoted_constants.rs" 6 10 6 32] (_11, _10));
+    [#"../promoted_constants.rs" 4 14 4 21] _ix <- Core_Option_Option_Type.C_Some ([#"../promoted_constants.rs" 4 19 4 20] (0 : int32));
+    [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] promoted1);
+    [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] promoted0);
+    [#"../promoted_constants.rs" 6 10 6 32] _2 <- (_11, _10);
     switch (let (a, _) = _2 in a)
       | Core_Option_Option_Type.C_None -> goto BB1
       | _ -> goto BB6
@@ -58,7 +58,7 @@ module PromotedConstants_PromotedNone
     goto BB4
   }
   BB3 {
-    [#"../promoted_constants.rs" 8 13 8 15] _0 <- ([#"../promoted_constants.rs" 8 13 8 15] ());
+    [#"../promoted_constants.rs" 8 13 8 15] _0 <- ();
     return _0
   }
   BB4 {
@@ -76,7 +76,7 @@ module PromotedConstants_PromotedInt
   use prelude.Int32
   use prelude.Int
   let constant promoted0 [#"../promoted_constants.rs" 12 0 12 21]  : int32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _2 = [#"../promoted_constants.rs" 13 15 13 20] ([#"../promoted_constants.rs" 13 15 13 16] (1 : int32)) + ([#"../promoted_constants.rs" 13 19 13 20] (5 : int32)) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + ([#"../promoted_constants.rs" 13 23 13 25] (10 : int32)) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0
+    let _2 = ([#"../promoted_constants.rs" 13 15 13 16] (1 : int32)) + ([#"../promoted_constants.rs" 13 19 13 20] (5 : int32)) in let _1 = _2 + ([#"../promoted_constants.rs" 13 23 13 25] (10 : int32)) in let _2 = any int32 in let _0 = _1 in _0
   let rec cfg promoted_int [#"../promoted_constants.rs" 12 0 12 21] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
     
    = [@vc:do_not_keep_trace] [@vc:sp]
@@ -88,9 +88,9 @@ module PromotedConstants_PromotedInt
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] [#"../promoted_constants.rs" 13 13 13 26] promoted0);
-    [#"../promoted_constants.rs" 13 13 13 26] ix <- ([#"../promoted_constants.rs" 13 13 13 26] _9);
-    [#"../promoted_constants.rs" 15 7 15 16] _4 <- ([#"../promoted_constants.rs" 15 7 15 16] ix <> ([#"../promoted_constants.rs" 15 14 15 16] (16 : int32)));
+    [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] promoted0);
+    [#"../promoted_constants.rs" 13 13 13 26] ix <- _9;
+    [#"../promoted_constants.rs" 15 7 15 16] _4 <- ix <> ([#"../promoted_constants.rs" 15 14 15 16] (16 : int32));
     switch (_4)
       | False -> goto BB2
       | True -> goto BB1
@@ -101,7 +101,7 @@ module PromotedConstants_PromotedInt
     absurd
   }
   BB2 {
-    [#"../promoted_constants.rs" 17 5 17 5] _0 <- ([#"../promoted_constants.rs" 17 5 17 5] [#"../promoted_constants.rs" 17 5 17 5] ());
+    [#"../promoted_constants.rs" 17 5 17 5] _0 <- ([#"../promoted_constants.rs" 17 5 17 5] ());
     return _0
   }
   
@@ -164,7 +164,7 @@ module PromotedConstants_String
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 20 26 20 28] _0 <- ([#"../promoted_constants.rs" 20 26 20 28] [#"../promoted_constants.rs" 20 26 20 28] ());
+    [#"../promoted_constants.rs" 20 26 20 28] _0 <- ([#"../promoted_constants.rs" 20 26 20 28] ());
     goto BB1
   }
   BB1 {
@@ -182,8 +182,8 @@ module PromotedConstants_Str
     goto BB0
   }
   BB0 {
-    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] [#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
-    [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] [#"../promoted_constants.rs" 22 13 24 1] ());
+    [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+    [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/unary_op.mlcfg b/creusot/tests/should_succeed/lang/unary_op.mlcfg
index f38c881546..af4775f8ec 100644
--- a/creusot/tests/should_succeed/lang/unary_op.mlcfg
+++ b/creusot/tests/should_succeed/lang/unary_op.mlcfg
@@ -17,7 +17,7 @@ module UnaryOp_F
     absurd
   }
   BB2 {
-    [#"../unary_op.rs" 4 11 6 1] _0 <- ([#"../unary_op.rs" 4 11 6 1] [#"../unary_op.rs" 4 11 6 1] ());
+    [#"../unary_op.rs" 4 11 6 1] _0 <- ([#"../unary_op.rs" 4 11 6 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/unions.mlcfg b/creusot/tests/should_succeed/lang/unions.mlcfg
index 8dbbd1ad18..55e9d71ede 100644
--- a/creusot/tests/should_succeed/lang/unions.mlcfg
+++ b/creusot/tests/should_succeed/lang/unions.mlcfg
@@ -17,7 +17,7 @@ module Unions_X
     goto BB0
   }
   BB0 {
-    [#"../unions.rs" 10 24 10 26] _0 <- ([#"../unions.rs" 10 24 10 26] [#"../unions.rs" 10 24 10 26] ());
+    [#"../unions.rs" 10 24 10 26] _0 <- ([#"../unions.rs" 10 24 10 26] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/lang/while_let.mlcfg b/creusot/tests/should_succeed/lang/while_let.mlcfg
index 2c1180b938..f9bfc916ff 100644
--- a/creusot/tests/should_succeed/lang/while_let.mlcfg
+++ b/creusot/tests/should_succeed/lang/while_let.mlcfg
@@ -25,7 +25,7 @@ module WhileLet_F
     goto BB0
   }
   BB0 {
-    [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some ([#"../while_let.rs" 5 21 5 23] (10 : int32)));
+    [#"../while_let.rs" 5 16 5 24] a <- Core_Option_Option_Type.C_Some ([#"../while_let.rs" 5 21 5 23] (10 : int32));
     [#"../while_let.rs" 6 12 6 18] b <- Borrow.borrow_mut a;
     [#"../while_let.rs" 6 12 6 18] a <-  ^ b;
     goto BB1
@@ -44,14 +44,14 @@ module WhileLet_F
     goto BB4
   }
   BB4 {
-    [#"../while_let.rs" 10 13 10 17] _6 <- ([#"../while_let.rs" 10 13 10 17] Core_Option_Option_Type.C_None);
-    [#"../while_let.rs" 10 8 10 17] b <- { b with current = ([#"../while_let.rs" 10 8 10 17] _6) ; };
+    [#"../while_let.rs" 10 13 10 17] _6 <- Core_Option_Option_Type.C_None;
+    [#"../while_let.rs" 10 8 10 17] b <- { b with current = _6 ; };
     _6 <- any Core_Option_Option_Type.t_option int32;
     goto BB1
   }
   BB5 {
     assume { resolve0 b };
-    [#"../while_let.rs" 9 4 11 5] _0 <- ([#"../while_let.rs" 9 4 11 5] [#"../while_let.rs" 9 4 11 5] ());
+    [#"../while_let.rs" 9 4 11 5] _0 <- ([#"../while_let.rs" 9 4 11 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg
index e4303a0404..aed133d19e 100644
--- a/creusot/tests/should_succeed/list_index_mut.mlcfg
+++ b/creusot/tests/should_succeed/list_index_mut.mlcfg
@@ -173,7 +173,7 @@ module ListIndexMut_IndexMut
     goto BB4
   }
   BB4 {
-    [#"../list_index_mut.rs" 49 10 49 16] _20 <- ([#"../list_index_mut.rs" 49 10 49 16] ix > ([#"../list_index_mut.rs" 49 15 49 16] (0 : usize)));
+    [#"../list_index_mut.rs" 49 10 49 16] _20 <- ix > ([#"../list_index_mut.rs" 49 15 49 16] (0 : usize));
     switch (_20)
       | False -> goto BB8
       | True -> goto BB5
@@ -195,10 +195,10 @@ module ListIndexMut_IndexMut
     [#"../list_index_mut.rs" 50 12 50 33] _22 <- Borrow.borrow_mut ( * _23);
     [#"../list_index_mut.rs" 50 12 50 33] _23 <- { _23 with current = ( ^ _22) ; };
     assume { resolve1 l };
-    [#"../list_index_mut.rs" 50 8 50 33] l <- ([#"../list_index_mut.rs" 50 8 50 33] _22);
+    [#"../list_index_mut.rs" 50 8 50 33] l <- _22;
     _22 <- any borrowed (ListIndexMut_List_Type.t_list);
     assume { resolve2 _23 };
-    [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - ([#"../list_index_mut.rs" 52 14 52 15] (1 : usize)));
+    [#"../list_index_mut.rs" 52 8 52 15] ix <- ix - ([#"../list_index_mut.rs" 52 14 52 15] (1 : usize));
     goto BB3
   }
   BB8 {
@@ -288,10 +288,10 @@ module ListIndexMut_Write
     goto BB1
   }
   BB1 {
-    [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = ([#"../list_index_mut.rs" 64 4 64 25] v) ; };
+    [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = v ; };
     assume { resolve0 _9 };
     assume { resolve1 l };
-    [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] [#"../list_index_mut.rs" 63 46 65 1] ());
+    [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] ());
     return _0
   }
   
@@ -352,8 +352,8 @@ module ListIndexMut_F
     goto BB0
   }
   BB0 {
-    [#"../list_index_mut.rs" 68 47 68 51] _5 <- ([#"../list_index_mut.rs" 68 47 68 51] Core_Option_Option_Type.C_None);
-    [#"../list_index_mut.rs" 68 38 68 52] _4 <- ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 43 68 45] (10 : uint32)) _5);
+    [#"../list_index_mut.rs" 68 47 68 51] _5 <- Core_Option_Option_Type.C_None;
+    [#"../list_index_mut.rs" 68 38 68 52] _4 <- ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 43 68 45] (10 : uint32)) _5;
     _5 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB1
   }
@@ -361,12 +361,12 @@ module ListIndexMut_F
     goto BB2
   }
   BB2 {
-    [#"../list_index_mut.rs" 68 24 68 54] _2 <- ([#"../list_index_mut.rs" 68 24 68 54] Core_Option_Option_Type.C_Some _4);
+    [#"../list_index_mut.rs" 68 24 68 54] _2 <- Core_Option_Option_Type.C_Some _4;
     _4 <- any ListIndexMut_List_Type.t_list;
     goto BB3
   }
   BB3 {
-    [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 21 68 22] (1 : uint32)) _2);
+    [#"../list_index_mut.rs" 68 16 68 55] l <- ListIndexMut_List_Type.C_List ([#"../list_index_mut.rs" 68 21 68 22] (1 : uint32)) _2;
     _2 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list);
     goto BB4
   }
@@ -381,7 +381,7 @@ module ListIndexMut_F
   }
   BB5 {
     assume { resolve0 _8 };
-    [#"../list_index_mut.rs" 67 11 72 1] _0 <- ([#"../list_index_mut.rs" 67 11 72 1] [#"../list_index_mut.rs" 67 11 72 1] ());
+    [#"../list_index_mut.rs" 67 11 72 1] _0 <- ([#"../list_index_mut.rs" 67 11 72 1] ());
     goto BB6
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index d5dac98cd6..fcb18f2ac9 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -184,8 +184,8 @@ module ListReversalLasso_Impl1_Index
     goto BB1
   }
   BB1 {
-    [#"../list_reversal_lasso.rs" 31 8 31 18] _5 <- ([#"../list_reversal_lasso.rs" 31 8 31 18] _6);
-    [#"../list_reversal_lasso.rs" 31 8 31 18] _0 <- ([#"../list_reversal_lasso.rs" 31 8 31 18] _5);
+    [#"../list_reversal_lasso.rs" 31 8 31 18] _5 <- _6;
+    [#"../list_reversal_lasso.rs" 31 8 31 18] _0 <- _5;
     return _0
   }
   
@@ -477,7 +477,7 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] [#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize));
     goto BB1
   }
   BB1 {
@@ -487,19 +487,19 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB2
   }
   BB2 {
-    [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- ([#"../list_reversal_lasso.rs" 71 14 71 23] l <> ([#"../list_reversal_lasso.rs" 71 19 71 23] (18446744073709551615 : usize)));
+    [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- l <> ([#"../list_reversal_lasso.rs" 71 19 71 23] (18446744073709551615 : usize));
     switch (_12)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 72 22 72 23] tmp <- ([#"../list_reversal_lasso.rs" 72 22 72 23] l);
+    [#"../list_reversal_lasso.rs" 72 22 72 23] tmp <- l;
     [#"../list_reversal_lasso.rs" 73 20 73 23] _16 <- ([#"../list_reversal_lasso.rs" 73 20 73 23] index0 ( * self) l);
     goto BB4
   }
   BB4 {
-    [#"../list_reversal_lasso.rs" 73 12 73 23] l <- ([#"../list_reversal_lasso.rs" 73 12 73 23] _16);
+    [#"../list_reversal_lasso.rs" 73 12 73 23] l <- _16;
     [#"../list_reversal_lasso.rs" 74 12 74 16] _21 <- Borrow.borrow_mut ( * self);
     [#"../list_reversal_lasso.rs" 74 12 74 16] self <- { self with current = ( ^ _21) ; };
     [#"../list_reversal_lasso.rs" 74 16 74 21] _20 <- ([#"../list_reversal_lasso.rs" 74 16 74 21] index_mut0 _21 tmp);
@@ -507,14 +507,14 @@ module ListReversalLasso_Impl4_ListReversalSafe
     goto BB5
   }
   BB5 {
-    [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = ([#"../list_reversal_lasso.rs" 74 12 74 25] r) ; };
+    [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = r ; };
     assume { resolve1 _20 };
-    [#"../list_reversal_lasso.rs" 75 12 75 19] r <- ([#"../list_reversal_lasso.rs" 75 12 75 19] tmp);
+    [#"../list_reversal_lasso.rs" 75 12 75 19] r <- tmp;
     goto BB1
   }
   BB6 {
     assume { resolve0 self };
-    [#"../list_reversal_lasso.rs" 77 15 77 16] _0 <- ([#"../list_reversal_lasso.rs" 77 15 77 16] r);
+    [#"../list_reversal_lasso.rs" 77 15 77 16] _0 <- r;
     return _0
   }
   
@@ -682,7 +682,7 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] [#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 101 20 101 35] n <- ([#"../list_reversal_lasso.rs" 101 20 101 35] Snapshot.new 0);
     goto BB1
   }
@@ -696,7 +696,7 @@ module ListReversalLasso_Impl4_ListReversalList
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- ([#"../list_reversal_lasso.rs" 107 14 107 23] l <> ([#"../list_reversal_lasso.rs" 107 19 107 23] (18446744073709551615 : usize)));
+    [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- l <> ([#"../list_reversal_lasso.rs" 107 19 107 23] (18446744073709551615 : usize));
     switch (_15)
       | False -> goto BB9
       | True -> goto BB4
@@ -732,19 +732,19 @@ module ListReversalLasso_Impl4_ListReversalList
   BB7 {
     assume { resolve1 _20 };
     assume { resolve1 _19 };
-    [#"../list_reversal_lasso.rs" 108 12 108 77] l <- ([#"../list_reversal_lasso.rs" 108 12 108 77] _17);
+    [#"../list_reversal_lasso.rs" 108 12 108 77] l <- _17;
     _17 <- any usize;
     [#"../list_reversal_lasso.rs" 109 16 109 36] _27 <- ([#"../list_reversal_lasso.rs" 109 16 109 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 109 12 109 36] n <- ([#"../list_reversal_lasso.rs" 109 12 109 36] _27);
+    [#"../list_reversal_lasso.rs" 109 12 109 36] n <- _27;
     _27 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
     assume { resolve0 self };
-    [#"../list_reversal_lasso.rs" 111 15 111 16] _0 <- ([#"../list_reversal_lasso.rs" 111 15 111 16] r);
+    [#"../list_reversal_lasso.rs" 111 15 111 16] _0 <- r;
     return _0
   }
   
@@ -921,7 +921,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] [#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 127 20 127 35] n <- ([#"../list_reversal_lasso.rs" 127 20 127 35] Snapshot.new 0);
     goto BB1
   }
@@ -939,7 +939,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- ([#"../list_reversal_lasso.rs" 137 14 137 23] l <> ([#"../list_reversal_lasso.rs" 137 19 137 23] (18446744073709551615 : usize)));
+    [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- l <> ([#"../list_reversal_lasso.rs" 137 19 137 23] (18446744073709551615 : usize));
     switch (_17)
       | False -> goto BB9
       | True -> goto BB4
@@ -977,13 +977,13 @@ module ListReversalLasso_Impl4_ListReversalLoop
   BB7 {
     assume { resolve1 _24 };
     assume { resolve1 _23 };
-    [#"../list_reversal_lasso.rs" 139 12 139 77] l <- ([#"../list_reversal_lasso.rs" 139 12 139 77] _21);
+    [#"../list_reversal_lasso.rs" 139 12 139 77] l <- _21;
     _21 <- any usize;
     [#"../list_reversal_lasso.rs" 140 16 140 36] _31 <- ([#"../list_reversal_lasso.rs" 140 16 140 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 140 12 140 36] n <- ([#"../list_reversal_lasso.rs" 140 12 140 36] _31);
+    [#"../list_reversal_lasso.rs" 140 12 140 36] n <- _31;
     _31 <- any Snapshot.snap_ty int;
     goto BB2
   }
@@ -995,7 +995,7 @@ module ListReversalLasso_Impl4_ListReversalLoop
     else
       Seq.get (Reverse.reverse (Snapshot.inner s)) (i - 1)
     ) };
-    [#"../list_reversal_lasso.rs" 146 15 146 16] _0 <- ([#"../list_reversal_lasso.rs" 146 15 146 16] r);
+    [#"../list_reversal_lasso.rs" 146 15 146 16] _0 <- r;
     return _0
   }
   
@@ -1174,7 +1174,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB0
   }
   BB0 {
-    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] [#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
+    [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize));
     [#"../list_reversal_lasso.rs" 170 20 170 35] n <- ([#"../list_reversal_lasso.rs" 170 20 170 35] Snapshot.new 0);
     goto BB1
   }
@@ -1200,7 +1200,7 @@ module ListReversalLasso_Impl4_ListReversalLasso
     goto BB3
   }
   BB3 {
-    [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- ([#"../list_reversal_lasso.rs" 190 14 190 23] l <> ([#"../list_reversal_lasso.rs" 190 19 190 23] (18446744073709551615 : usize)));
+    [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- l <> ([#"../list_reversal_lasso.rs" 190 19 190 23] (18446744073709551615 : usize));
     switch (_17)
       | False -> goto BB9
       | True -> goto BB4
@@ -1236,19 +1236,19 @@ module ListReversalLasso_Impl4_ListReversalLasso
   BB7 {
     assume { resolve1 _22 };
     assume { resolve1 _21 };
-    [#"../list_reversal_lasso.rs" 191 12 191 77] l <- ([#"../list_reversal_lasso.rs" 191 12 191 77] _19);
+    [#"../list_reversal_lasso.rs" 191 12 191 77] l <- _19;
     _19 <- any usize;
     [#"../list_reversal_lasso.rs" 192 16 192 36] _29 <- ([#"../list_reversal_lasso.rs" 192 16 192 36] Snapshot.new (Snapshot.inner n + 1));
     goto BB8
   }
   BB8 {
-    [#"../list_reversal_lasso.rs" 192 12 192 36] n <- ([#"../list_reversal_lasso.rs" 192 12 192 36] _29);
+    [#"../list_reversal_lasso.rs" 192 12 192 36] n <- _29;
     _29 <- any Snapshot.snap_ty int;
     goto BB2
   }
   BB9 {
     assume { resolve0 self };
-    [#"../list_reversal_lasso.rs" 194 15 194 16] _0 <- ([#"../list_reversal_lasso.rs" 194 15 194 16] r);
+    [#"../list_reversal_lasso.rs" 194 15 194 16] _0 <- r;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/loop.mlcfg b/creusot/tests/should_succeed/loop.mlcfg
index cd9f3506c4..7e32d8a238 100644
--- a/creusot/tests/should_succeed/loop.mlcfg
+++ b/creusot/tests/should_succeed/loop.mlcfg
@@ -17,10 +17,10 @@ module Loop_F
     goto BB0
   }
   BB0 {
-    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] [#"../loop.rs" 4 16 4 18] (10 : int32));
+    [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] (10 : int32));
     [#"../loop.rs" 5 12 5 18] b <- Borrow.borrow_mut a;
     [#"../loop.rs" 5 12 5 18] a <-  ^ b;
-    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] [#"../loop.rs" 6 9 6 10] (5 : int32)) ; };
+    [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 9 6 10] (5 : int32)) ; };
     assume { resolve0 b };
     goto BB1
   }
@@ -34,7 +34,7 @@ module Loop_F
       end
   }
   BB3 {
-    [#"../loop.rs" 3 11 13 1] _0 <- ([#"../loop.rs" 3 11 13 1] [#"../loop.rs" 3 11 13 1] ());
+    [#"../loop.rs" 3 11 13 1] _0 <- ([#"../loop.rs" 3 11 13 1] ());
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/mapping_test.mlcfg b/creusot/tests/should_succeed/mapping_test.mlcfg
index fdf9961b91..ac4543816b 100644
--- a/creusot/tests/should_succeed/mapping_test.mlcfg
+++ b/creusot/tests/should_succeed/mapping_test.mlcfg
@@ -69,10 +69,10 @@ module MappingTest_Incr
     goto BB1
   }
   BB1 {
-    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + ([#"../mapping_test.rs" 32 14 32 15] (1 : int32)))) ; };
+    [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 =  * t in MappingTest_T_Type.C_T (MappingTest_T_Type.t_a ( * t) + ([#"../mapping_test.rs" 32 14 32 15] (1 : int32)))) ; };
     assume { resolve0 t };
     assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Snapshot.inner old_t))) 1 };
-    [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] [#"../mapping_test.rs" 30 19 36 1] ());
+    [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] ());
     return _0
   }
   
@@ -122,7 +122,7 @@ module MappingTest_F
     goto BB0
   }
   BB0 {
-    [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T ([#"../mapping_test.rs" 39 23 39 25] (42 : int32)));
+    [#"../mapping_test.rs" 39 16 39 27] x <- MappingTest_T_Type.C_T ([#"../mapping_test.rs" 39 23 39 25] (42 : int32));
     assert { [@expl:assertion] [#"../mapping_test.rs" 40 19 40 34] Map.get (shallow_model0 x) 13 = 1 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 41 19 41 34] Map.get (shallow_model0 x) 42 = 0 };
     [#"../mapping_test.rs" 42 9 42 15] _8 <- Borrow.borrow_mut x;
@@ -137,7 +137,7 @@ module MappingTest_F
     assume { resolve0 _8 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 43 19 43 34] Map.get (shallow_model0 x) 13 = 1 };
     assert { [@expl:assertion] [#"../mapping_test.rs" 44 19 44 34] Map.get (shallow_model0 x) 42 = 1 };
-    [#"../mapping_test.rs" 38 11 45 1] _0 <- ([#"../mapping_test.rs" 38 11 45 1] [#"../mapping_test.rs" 38 11 45 1] ());
+    [#"../mapping_test.rs" 38 11 45 1] _0 <- ([#"../mapping_test.rs" 38 11 45 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/match_int.mlcfg b/creusot/tests/should_succeed/match_int.mlcfg
index 60cef044ff..3d46f62b6b 100644
--- a/creusot/tests/should_succeed/match_int.mlcfg
+++ b/creusot/tests/should_succeed/match_int.mlcfg
@@ -12,15 +12,15 @@ module MatchInt_F
     goto BB0
   }
   BB0 {
-    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] [#"../match_int.rs" 8 10 8 11] (1 : int32));
-    [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] ([#"../match_int.rs" 9 8 9 13] (0 : int32)) <= _1);
+    [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] (1 : int32));
+    [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] (0 : int32)) <= _1;
     switch (_2)
       | False -> goto BB3
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../match_int.rs" 9 8 9 13] _3 <- ([#"../match_int.rs" 9 8 9 13] _1 < ([#"../match_int.rs" 9 8 9 13] (10 : int32)));
+    [#"../match_int.rs" 9 8 9 13] _3 <- _1 < ([#"../match_int.rs" 9 8 9 13] (10 : int32));
     switch (_3)
       | False -> goto BB3
       | True -> goto BB2
@@ -61,7 +61,7 @@ module MatchInt_F
     absurd
   }
   BB9 {
-    [#"../match_int.rs" 10 25 10 25] _0 <- ([#"../match_int.rs" 10 25 10 25] [#"../match_int.rs" 10 25 10 25] ());
+    [#"../match_int.rs" 10 25 10 25] _0 <- ([#"../match_int.rs" 10 25 10 25] ());
     goto BB15
   }
   BB10 {
@@ -75,7 +75,7 @@ module MatchInt_F
     absurd
   }
   BB12 {
-    [#"../match_int.rs" 13 26 13 26] _0 <- ([#"../match_int.rs" 13 26 13 26] [#"../match_int.rs" 13 26 13 26] ());
+    [#"../match_int.rs" 13 26 13 26] _0 <- ([#"../match_int.rs" 13 26 13 26] ());
     goto BB15
   }
   BB13 {
@@ -83,7 +83,7 @@ module MatchInt_F
     absurd
   }
   BB14 {
-    [#"../match_int.rs" 16 26 16 26] _0 <- ([#"../match_int.rs" 16 26 16 26] [#"../match_int.rs" 16 26 16 26] ());
+    [#"../match_int.rs" 16 26 16 26] _0 <- ([#"../match_int.rs" 16 26 16 26] ());
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/mc91.mlcfg b/creusot/tests/should_succeed/mc91.mlcfg
index 3962018ac5..13921832a6 100644
--- a/creusot/tests/should_succeed/mc91.mlcfg
+++ b/creusot/tests/should_succeed/mc91.mlcfg
@@ -16,18 +16,18 @@ module Mc91_Mc91
     goto BB0
   }
   BB0 {
-    [#"../mc91.rs" 8 7 8 14] _3 <- ([#"../mc91.rs" 8 7 8 14] x > ([#"../mc91.rs" 8 11 8 14] (100 : uint32)));
+    [#"../mc91.rs" 8 7 8 14] _3 <- x > ([#"../mc91.rs" 8 11 8 14] (100 : uint32));
     switch (_3)
       | False -> goto BB2
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] x - ([#"../mc91.rs" 9 12 9 14] (10 : uint32)));
+    [#"../mc91.rs" 9 8 9 14] _0 <- x - ([#"../mc91.rs" 9 12 9 14] (10 : uint32));
     goto BB5
   }
   BB2 {
-    [#"../mc91.rs" 11 18 11 24] _7 <- ([#"../mc91.rs" 11 18 11 24] x + ([#"../mc91.rs" 11 22 11 24] (11 : uint32)));
+    [#"../mc91.rs" 11 18 11 24] _7 <- x + ([#"../mc91.rs" 11 22 11 24] (11 : uint32));
     [#"../mc91.rs" 11 13 11 25] _6 <- ([#"../mc91.rs" 11 13 11 25] mc91 _7);
     _7 <- any uint32;
     goto BB3
diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg
index 0b79cec7d9..5c118c656f 100644
--- a/creusot/tests/should_succeed/mutex.mlcfg
+++ b/creusot/tests/should_succeed/mutex.mlcfg
@@ -161,8 +161,8 @@ module Mutex_Impl3_Call
     goto BB2
   }
   BB2 {
-    [#"../mutex.rs" 102 18 102 28] val' <- ([#"../mutex.rs" 102 18 102 28] _5);
-    [#"../mutex.rs" 103 11 103 23] _7 <- ([#"../mutex.rs" 103 11 103 23] val' < ([#"../mutex.rs" 103 17 103 23] (100000 : uint32)));
+    [#"../mutex.rs" 102 18 102 28] val' <- _5;
+    [#"../mutex.rs" 103 11 103 23] _7 <- val' < ([#"../mutex.rs" 103 17 103 23] (100000 : uint32));
     switch (_7)
       | False -> goto BB5
       | True -> goto BB3
@@ -171,14 +171,14 @@ module Mutex_Impl3_Call
   BB3 {
     [#"../mutex.rs" 104 12 104 13] _10 <- Borrow.borrow_mut v;
     [#"../mutex.rs" 104 12 104 13] v <-  ^ _10;
-    [#"../mutex.rs" 104 18 104 25] _11 <- ([#"../mutex.rs" 104 18 104 25] val' + ([#"../mutex.rs" 104 24 104 25] (2 : uint32)));
+    [#"../mutex.rs" 104 18 104 25] _11 <- val' + ([#"../mutex.rs" 104 24 104 25] (2 : uint32));
     [#"../mutex.rs" 104 12 104 26] _9 <- ([#"../mutex.rs" 104 12 104 26] set0 _10 _11);
     _10 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even));
     _11 <- any uint32;
     goto BB4
   }
   BB4 {
-    [#"../mutex.rs" 103 24 105 9] _0 <- ([#"../mutex.rs" 103 24 105 9] [#"../mutex.rs" 103 24 105 9] ());
+    [#"../mutex.rs" 103 24 105 9] _0 <- ([#"../mutex.rs" 103 24 105 9] ());
     goto BB7
   }
   BB5 {
@@ -189,7 +189,7 @@ module Mutex_Impl3_Call
     goto BB6
   }
   BB6 {
-    [#"../mutex.rs" 105 15 107 9] _0 <- ([#"../mutex.rs" 105 15 107 9] [#"../mutex.rs" 105 15 107 9] ());
+    [#"../mutex.rs" 105 15 107 9] _0 <- ([#"../mutex.rs" 105 15 107 9] ());
     goto BB7
   }
   BB7 {
@@ -423,7 +423,7 @@ module Mutex_Concurrent
     goto BB0
   }
   BB0 {
-    [#"../mutex.rs" 164 52 164 56] _5 <- ([#"../mutex.rs" 164 52 164 56] Mutex_Even_Type.C_Even);
+    [#"../mutex.rs" 164 52 164 56] _5 <- Mutex_Even_Type.C_Even;
     [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 ([#"../mutex.rs" 164 49 164 50] (0 : uint32)) _5);
     _5 <- any Mutex_Even_Type.t_even;
     goto BB1
@@ -437,17 +437,17 @@ module Mutex_Concurrent
     goto BB3
   }
   BB3 {
-    [#"../mutex.rs" 164 24 164 59] m <- ([#"../mutex.rs" 164 24 164 59]  * _2);
+    [#"../mutex.rs" 164 24 164 59] m <-  * _2;
     assume { resolve0 _2 };
-    [#"../mutex.rs" 165 30 165 32] _8 <- ([#"../mutex.rs" 165 30 165 32] m);
-    [#"../mutex.rs" 165 13 165 34] t1 <- ([#"../mutex.rs" 165 13 165 34] Mutex_AddsTwo_Type.C_AddsTwo _8);
+    [#"../mutex.rs" 165 30 165 32] _8 <- m;
+    [#"../mutex.rs" 165 13 165 34] t1 <- Mutex_AddsTwo_Type.C_AddsTwo _8;
     [#"../mutex.rs" 166 13 166 22] j1 <- ([#"../mutex.rs" 166 13 166 22] spawn0 t1);
     t1 <- any Mutex_AddsTwo_Type.t_addstwo;
     goto BB4
   }
   BB4 {
-    [#"../mutex.rs" 167 30 167 32] _13 <- ([#"../mutex.rs" 167 30 167 32] m);
-    [#"../mutex.rs" 167 13 167 34] t2 <- ([#"../mutex.rs" 167 13 167 34] Mutex_AddsTwo_Type.C_AddsTwo _13);
+    [#"../mutex.rs" 167 30 167 32] _13 <- m;
+    [#"../mutex.rs" 167 13 167 34] t2 <- Mutex_AddsTwo_Type.C_AddsTwo _13;
     [#"../mutex.rs" 168 13 168 22] j2 <- ([#"../mutex.rs" 168 13 168 22] spawn0 t2);
     t2 <- any Mutex_AddsTwo_Type.t_addstwo;
     goto BB5
@@ -463,7 +463,7 @@ module Mutex_Concurrent
     goto BB7
   }
   BB7 {
-    [#"../mutex.rs" 163 20 175 1] _0 <- ([#"../mutex.rs" 163 20 175 1] [#"../mutex.rs" 163 20 175 1] ());
+    [#"../mutex.rs" 163 20 175 1] _0 <- ([#"../mutex.rs" 163 20 175 1] ());
     goto BB8
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/one_side_update.mlcfg b/creusot/tests/should_succeed/one_side_update.mlcfg
index e8af0ae821..bdd4261803 100644
--- a/creusot/tests/should_succeed/one_side_update.mlcfg
+++ b/creusot/tests/should_succeed/one_side_update.mlcfg
@@ -26,7 +26,7 @@ module OneSideUpdate_F
     goto BB0
   }
   BB0 {
-    [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 6 22 6 24] (10 : usize)));
+    [#"../one_side_update.rs" 6 16 6 25] a <- OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 6 22 6 24] (10 : usize));
     [#"../one_side_update.rs" 7 12 7 18] b <- Borrow.borrow_mut a;
     [#"../one_side_update.rs" 7 12 7 18] a <-  ^ b;
     switch ([#"../one_side_update.rs" 8 7 8 11] true)
@@ -36,15 +36,15 @@ module OneSideUpdate_F
   }
   BB1 {
     assume { resolve0 b };
-    [#"../one_side_update.rs" 8 12 10 5] _0 <- ([#"../one_side_update.rs" 8 12 10 5] [#"../one_side_update.rs" 8 12 10 5] ());
+    [#"../one_side_update.rs" 8 12 10 5] _0 <- ([#"../one_side_update.rs" 8 12 10 5] ());
     goto BB3
   }
   BB2 {
-    [#"../one_side_update.rs" 11 13 11 21] _6 <- ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 11 19 11 20] (5 : usize)));
-    [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = ([#"../one_side_update.rs" 11 8 11 21] _6) ; };
+    [#"../one_side_update.rs" 11 13 11 21] _6 <- OneSideUpdate_MyInt_Type.C_MyInt ([#"../one_side_update.rs" 11 19 11 20] (5 : usize));
+    [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = _6 ; };
     _6 <- any OneSideUpdate_MyInt_Type.t_myint;
     assume { resolve0 b };
-    [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] [#"../one_side_update.rs" 10 11 12 5] ());
+    [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] ());
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/option.mlcfg b/creusot/tests/should_succeed/option.mlcfg
index 0f481b4fa3..83a1b6e3bd 100644
--- a/creusot/tests/should_succeed/option.mlcfg
+++ b/creusot/tests/should_succeed/option.mlcfg
@@ -381,8 +381,8 @@ module Option_TestOption
     goto BB0
   }
   BB0 {
-    [#"../option.rs" 5 32 5 36] none <- ([#"../option.rs" 5 32 5 36] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some ([#"../option.rs" 6 37 6 38] (1 : int32)));
+    [#"../option.rs" 5 32 5 36] none <- Core_Option_Option_Type.C_None;
+    [#"../option.rs" 6 32 6 39] some <- Core_Option_Option_Type.C_Some ([#"../option.rs" 6 37 6 38] (1 : int32));
     [#"../option.rs" 9 12 9 26] _4 <- ([#"../option.rs" 9 12 9 26] is_some0 some);
     goto BB1
   }
@@ -447,7 +447,7 @@ module Option_TestOption
     absurd
   }
   BB15 {
-    [#"../option.rs" 14 12 14 30] _16 <- ([#"../option.rs" 14 12 14 30] _17 = ([#"../option.rs" 14 29 14 30] (1 : int32)));
+    [#"../option.rs" 14 12 14 30] _16 <- _17 = ([#"../option.rs" 14 29 14 30] (1 : int32));
     _17 <- any int32;
     switch (_16)
       | False -> goto BB17
@@ -463,7 +463,7 @@ module Option_TestOption
     absurd
   }
   BB18 {
-    [#"../option.rs" 19 12 19 34] _21 <- ([#"../option.rs" 19 12 19 34] _22 = ([#"../option.rs" 19 33 19 34] (1 : int32)));
+    [#"../option.rs" 19 12 19 34] _21 <- _22 = ([#"../option.rs" 19 33 19 34] (1 : int32));
     _22 <- any int32;
     switch (_21)
       | False -> goto BB20
@@ -479,7 +479,7 @@ module Option_TestOption
     absurd
   }
   BB21 {
-    [#"../option.rs" 20 12 20 34] _26 <- ([#"../option.rs" 20 12 20 34] _27 = ([#"../option.rs" 20 33 20 34] (2 : int32)));
+    [#"../option.rs" 20 12 20 34] _26 <- _27 = ([#"../option.rs" 20 33 20 34] (2 : int32));
     _27 <- any int32;
     switch (_26)
       | False -> goto BB23
@@ -524,13 +524,13 @@ module Option_TestOption
     goto BB29
   }
   BB29 {
-    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] [#"../option.rs" 24 30 24 31] (2 : int32)) ; };
+    [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 30 24 31] (2 : int32)) ; };
     assume { resolve0 _36 };
     [#"../option.rs" 25 12 25 25] _41 <- ([#"../option.rs" 25 12 25 25] unwrap0 some);
     goto BB30
   }
   BB30 {
-    [#"../option.rs" 25 12 25 30] _40 <- ([#"../option.rs" 25 12 25 30] _41 = ([#"../option.rs" 25 29 25 30] (2 : int32)));
+    [#"../option.rs" 25 12 25 30] _40 <- _41 = ([#"../option.rs" 25 29 25 30] (2 : int32));
     _41 <- any int32;
     switch (_40)
       | False -> goto BB32
@@ -554,13 +554,13 @@ module Option_TestOption
     goto BB34
   }
   BB34 {
-    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] [#"../option.rs" 26 30 26 31] (1 : int32)) ; };
+    [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 30 26 31] (1 : int32)) ; };
     assume { resolve0 _44 };
     [#"../option.rs" 27 12 27 25] _49 <- ([#"../option.rs" 27 12 27 25] unwrap0 some);
     goto BB35
   }
   BB35 {
-    [#"../option.rs" 27 12 27 30] _48 <- ([#"../option.rs" 27 12 27 30] _49 = ([#"../option.rs" 27 29 27 30] (1 : int32)));
+    [#"../option.rs" 27 12 27 30] _48 <- _49 = ([#"../option.rs" 27 29 27 30] (1 : int32));
     _49 <- any int32;
     switch (_48)
       | False -> goto BB37
@@ -599,7 +599,7 @@ module Option_TestOption
     goto BB43
   }
   BB43 {
-    [#"../option.rs" 30 12 30 40] _59 <- ([#"../option.rs" 30 12 30 40] _61 = ([#"../option.rs" 30 39 30 40] (1 : int32)));
+    [#"../option.rs" 30 12 30 40] _59 <- _61 = ([#"../option.rs" 30 39 30 40] (1 : int32));
     switch (_59)
       | False -> goto BB45
       | True -> goto BB44
@@ -624,7 +624,7 @@ module Option_TestOption
       end
   }
   BB48 {
-    [#"../option.rs" 34 21 34 28] _77 <- ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 34 26 34 27] (2 : int32)));
+    [#"../option.rs" 34 21 34 28] _77 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 34 26 34 27] (2 : int32));
     [#"../option.rs" 34 12 34 29] _75 <- ([#"../option.rs" 34 12 34 29] and0 none _77);
     _77 <- any Core_Option_Option_Type.t_option int32;
     goto BB50
@@ -662,7 +662,7 @@ module Option_TestOption
       end
   }
   BB56 {
-    [#"../option.rs" 36 21 36 28] _91 <- ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some ([#"../option.rs" 36 26 36 27] (2 : int32)));
+    [#"../option.rs" 36 21 36 28] _91 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 36 26 36 27] (2 : int32));
     [#"../option.rs" 36 12 36 29] _89 <- ([#"../option.rs" 36 12 36 29] and0 some _91);
     _91 <- any Core_Option_Option_Type.t_option int32;
     goto BB58
@@ -677,7 +677,7 @@ module Option_TestOption
     goto BB59
   }
   BB59 {
-    [#"../option.rs" 36 12 36 43] _87 <- ([#"../option.rs" 36 12 36 43] _88 = ([#"../option.rs" 36 42 36 43] (2 : int32)));
+    [#"../option.rs" 36 12 36 43] _87 <- _88 = ([#"../option.rs" 36 42 36 43] (2 : int32));
     _88 <- any int32;
     switch (_87)
       | False -> goto BB61
@@ -703,7 +703,7 @@ module Option_TestOption
       end
   }
   BB64 {
-    [#"../option.rs" 39 20 39 27] _105 <- ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 39 25 39 26] (2 : int32)));
+    [#"../option.rs" 39 20 39 27] _105 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 39 25 39 26] (2 : int32));
     [#"../option.rs" 39 12 39 28] _103 <- ([#"../option.rs" 39 12 39 28] or0 none _105);
     _105 <- any Core_Option_Option_Type.t_option int32;
     goto BB66
@@ -718,7 +718,7 @@ module Option_TestOption
     goto BB67
   }
   BB67 {
-    [#"../option.rs" 39 12 39 42] _101 <- ([#"../option.rs" 39 12 39 42] _102 = ([#"../option.rs" 39 41 39 42] (2 : int32)));
+    [#"../option.rs" 39 12 39 42] _101 <- _102 = ([#"../option.rs" 39 41 39 42] (2 : int32));
     _102 <- any int32;
     switch (_101)
       | False -> goto BB69
@@ -739,7 +739,7 @@ module Option_TestOption
     goto BB71
   }
   BB71 {
-    [#"../option.rs" 40 12 40 39] _108 <- ([#"../option.rs" 40 12 40 39] _109 = ([#"../option.rs" 40 38 40 39] (1 : int32)));
+    [#"../option.rs" 40 12 40 39] _108 <- _109 = ([#"../option.rs" 40 38 40 39] (1 : int32));
     _109 <- any int32;
     switch (_108)
       | False -> goto BB73
@@ -747,7 +747,7 @@ module Option_TestOption
       end
   }
   BB72 {
-    [#"../option.rs" 41 20 41 27] _119 <- ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some ([#"../option.rs" 41 25 41 26] (2 : int32)));
+    [#"../option.rs" 41 20 41 27] _119 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 41 25 41 26] (2 : int32));
     [#"../option.rs" 41 12 41 28] _117 <- ([#"../option.rs" 41 12 41 28] or0 some _119);
     _119 <- any Core_Option_Option_Type.t_option int32;
     goto BB74
@@ -762,7 +762,7 @@ module Option_TestOption
     goto BB75
   }
   BB75 {
-    [#"../option.rs" 41 12 41 42] _115 <- ([#"../option.rs" 41 12 41 42] _116 = ([#"../option.rs" 41 41 41 42] (1 : int32)));
+    [#"../option.rs" 41 12 41 42] _115 <- _116 = ([#"../option.rs" 41 41 41 42] (1 : int32));
     _116 <- any int32;
     switch (_115)
       | False -> goto BB77
@@ -821,7 +821,7 @@ module Option_TestOption
     goto BB86
   }
   BB86 {
-    [#"../option.rs" 46 12 46 37] _132 <- ([#"../option.rs" 46 12 46 37] _133 = ([#"../option.rs" 46 36 46 37] (1 : int32)));
+    [#"../option.rs" 46 12 46 37] _132 <- _133 = ([#"../option.rs" 46 36 46 37] (1 : int32));
     _133 <- any int32;
     switch (_132)
       | False -> goto BB88
@@ -843,8 +843,8 @@ module Option_TestOption
       end
   }
   BB90 {
-    [#"../option.rs" 48 11 48 18] _141 <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some ([#"../option.rs" 48 16 48 17] (1 : int32)));
-    [#"../option.rs" 48 4 48 18] some <- ([#"../option.rs" 48 4 48 18] _141);
+    [#"../option.rs" 48 11 48 18] _141 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 48 16 48 17] (1 : int32));
+    [#"../option.rs" 48 4 48 18] some <- _141;
     _141 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 50 12 50 16] _146 <- Borrow.borrow_mut none;
     [#"../option.rs" 50 12 50 16] none <-  ^ _146;
@@ -875,7 +875,7 @@ module Option_TestOption
     absurd
   }
   BB96 {
-    [#"../option.rs" 51 12 51 30] _149 <- ([#"../option.rs" 51 12 51 30] _150 = ([#"../option.rs" 51 29 51 30] (2 : int32)));
+    [#"../option.rs" 51 12 51 30] _149 <- _150 = ([#"../option.rs" 51 29 51 30] (2 : int32));
     _150 <- any int32;
     switch (_149)
       | False -> goto BB98
@@ -883,8 +883,8 @@ module Option_TestOption
       end
   }
   BB97 {
-    [#"../option.rs" 52 11 52 15] _153 <- ([#"../option.rs" 52 11 52 15] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 52 4 52 15] none <- ([#"../option.rs" 52 4 52 15] _153);
+    [#"../option.rs" 52 11 52 15] _153 <- Core_Option_Option_Type.C_None;
+    [#"../option.rs" 52 4 52 15] none <- _153;
     _153 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 53 12 53 16] _158 <- Borrow.borrow_mut some;
     [#"../option.rs" 53 12 53 16] some <-  ^ _158;
@@ -902,7 +902,7 @@ module Option_TestOption
     goto BB100
   }
   BB100 {
-    [#"../option.rs" 53 12 53 41] _155 <- ([#"../option.rs" 53 12 53 41] _156 = ([#"../option.rs" 53 40 53 41] (1 : int32)));
+    [#"../option.rs" 53 12 53 41] _155 <- _156 = ([#"../option.rs" 53 40 53 41] (1 : int32));
     _156 <- any int32;
     switch (_155)
       | False -> goto BB102
@@ -918,7 +918,7 @@ module Option_TestOption
     absurd
   }
   BB103 {
-    [#"../option.rs" 54 12 54 30] _161 <- ([#"../option.rs" 54 12 54 30] _162 = ([#"../option.rs" 54 29 54 30] (2 : int32)));
+    [#"../option.rs" 54 12 54 30] _161 <- _162 = ([#"../option.rs" 54 29 54 30] (2 : int32));
     _162 <- any int32;
     switch (_161)
       | False -> goto BB105
@@ -942,7 +942,7 @@ module Option_TestOption
     goto BB107
   }
   BB107 {
-    [#"../option.rs" 55 12 55 41] _166 <- ([#"../option.rs" 55 12 55 41] _167 = ([#"../option.rs" 55 40 55 41] (2 : int32)));
+    [#"../option.rs" 55 12 55 41] _166 <- _167 = ([#"../option.rs" 55 40 55 41] (2 : int32));
     _167 <- any int32;
     switch (_166)
       | False -> goto BB109
@@ -958,7 +958,7 @@ module Option_TestOption
     absurd
   }
   BB110 {
-    [#"../option.rs" 56 12 56 30] _172 <- ([#"../option.rs" 56 12 56 30] _173 = ([#"../option.rs" 56 29 56 30] (1 : int32)));
+    [#"../option.rs" 56 12 56 30] _172 <- _173 = ([#"../option.rs" 56 29 56 30] (1 : int32));
     _173 <- any int32;
     switch (_172)
       | False -> goto BB112
@@ -974,7 +974,7 @@ module Option_TestOption
     absurd
   }
   BB113 {
-    [#"../option.rs" 59 12 59 41] _177 <- ([#"../option.rs" 59 12 59 41] _178 = ([#"../option.rs" 59 40 59 41] (0 : int32)));
+    [#"../option.rs" 59 12 59 41] _177 <- _178 = ([#"../option.rs" 59 40 59 41] (0 : int32));
     _178 <- any int32;
     switch (_177)
       | False -> goto BB115
@@ -990,7 +990,7 @@ module Option_TestOption
     absurd
   }
   BB116 {
-    [#"../option.rs" 60 12 60 41] _182 <- ([#"../option.rs" 60 12 60 41] _183 = ([#"../option.rs" 60 40 60 41] (1 : int32)));
+    [#"../option.rs" 60 12 60 41] _182 <- _183 = ([#"../option.rs" 60 40 60 41] (1 : int32));
     _183 <- any int32;
     switch (_182)
       | False -> goto BB118
@@ -1039,7 +1039,7 @@ module Option_TestOption
     goto BB126
   }
   BB126 {
-    [#"../option.rs" 64 12 64 48] _194 <- ([#"../option.rs" 64 12 64 48] _195 = ([#"../option.rs" 64 47 64 48] (1 : int32)));
+    [#"../option.rs" 64 12 64 48] _194 <- _195 = ([#"../option.rs" 64 47 64 48] (1 : int32));
     _195 <- any int32;
     switch (_194)
       | False -> goto BB128
@@ -1094,7 +1094,7 @@ module Option_TestOption
     goto BB136
   }
   BB136 {
-    [#"../option.rs" 66 12 66 48] _208 <- ([#"../option.rs" 66 12 66 48] _209 = ([#"../option.rs" 66 47 66 48] (1 : int32)));
+    [#"../option.rs" 66 12 66 48] _208 <- _209 = ([#"../option.rs" 66 47 66 48] (1 : int32));
     _209 <- any int32;
     switch (_208)
       | False -> goto BB138
@@ -1143,7 +1143,7 @@ module Option_TestOption
     goto BB146
   }
   BB146 {
-    [#"../option.rs" 69 12 69 48] _222 <- ([#"../option.rs" 69 12 69 48] _223 = ([#"../option.rs" 69 47 69 48] (1 : int32)));
+    [#"../option.rs" 69 12 69 48] _222 <- _223 = ([#"../option.rs" 69 47 69 48] (1 : int32));
     _223 <- any int32;
     switch (_222)
       | False -> goto BB148
@@ -1198,7 +1198,7 @@ module Option_TestOption
     goto BB156
   }
   BB156 {
-    [#"../option.rs" 71 12 71 48] _236 <- ([#"../option.rs" 71 12 71 48] _237 = ([#"../option.rs" 71 47 71 48] (1 : int32)));
+    [#"../option.rs" 71 12 71 48] _236 <- _237 = ([#"../option.rs" 71 47 71 48] (1 : int32));
     _237 <- any int32;
     switch (_236)
       | False -> goto BB158
@@ -1206,7 +1206,7 @@ module Option_TestOption
       end
   }
   BB157 {
-    [#"../option.rs" 74 35 74 39] opt <- ([#"../option.rs" 74 35 74 39] Core_Option_Option_Type.C_None);
+    [#"../option.rs" 74 35 74 39] opt <- Core_Option_Option_Type.C_None;
     [#"../option.rs" 75 12 75 25] _246 <- ([#"../option.rs" 75 12 75 25] flatten0 opt);
     goto BB159
   }
@@ -1225,8 +1225,8 @@ module Option_TestOption
       end
   }
   BB161 {
-    [#"../option.rs" 76 40 76 44] _250 <- ([#"../option.rs" 76 40 76 44] Core_Option_Option_Type.C_None);
-    [#"../option.rs" 76 35 76 45] opt1 <- ([#"../option.rs" 76 35 76 45] Core_Option_Option_Type.C_Some _250);
+    [#"../option.rs" 76 40 76 44] _250 <- Core_Option_Option_Type.C_None;
+    [#"../option.rs" 76 35 76 45] opt1 <- Core_Option_Option_Type.C_Some _250;
     _250 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 77 12 77 25] _254 <- ([#"../option.rs" 77 12 77 25] flatten0 opt1);
     goto BB163
@@ -1246,8 +1246,8 @@ module Option_TestOption
       end
   }
   BB165 {
-    [#"../option.rs" 78 40 78 47] _258 <- ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some ([#"../option.rs" 78 45 78 46] (1 : int32)));
-    [#"../option.rs" 78 35 78 48] opt2 <- ([#"../option.rs" 78 35 78 48] Core_Option_Option_Type.C_Some _258);
+    [#"../option.rs" 78 40 78 47] _258 <- Core_Option_Option_Type.C_Some ([#"../option.rs" 78 45 78 46] (1 : int32));
+    [#"../option.rs" 78 35 78 48] opt2 <- Core_Option_Option_Type.C_Some _258;
     _258 <- any Core_Option_Option_Type.t_option int32;
     [#"../option.rs" 79 12 79 25] _262 <- ([#"../option.rs" 79 12 79 25] flatten0 opt2);
     goto BB167
@@ -1262,7 +1262,7 @@ module Option_TestOption
     goto BB168
   }
   BB168 {
-    [#"../option.rs" 79 12 79 39] _260 <- ([#"../option.rs" 79 12 79 39] _261 = ([#"../option.rs" 79 38 79 39] (1 : int32)));
+    [#"../option.rs" 79 12 79 39] _260 <- _261 = ([#"../option.rs" 79 38 79 39] (1 : int32));
     _261 <- any int32;
     switch (_260)
       | False -> goto BB170
@@ -1270,7 +1270,7 @@ module Option_TestOption
       end
   }
   BB169 {
-    [#"../option.rs" 4 21 80 1] _0 <- ([#"../option.rs" 4 21 80 1] [#"../option.rs" 4 21 80 1] ());
+    [#"../option.rs" 4 21 80 1] _0 <- ([#"../option.rs" 4 21 80 1] ());
     return _0
   }
   BB170 {
diff --git a/creusot/tests/should_succeed/ord_trait.mlcfg b/creusot/tests/should_succeed/ord_trait.mlcfg
index 832ad1edcb..0dfbd093c1 100644
--- a/creusot/tests/should_succeed/ord_trait.mlcfg
+++ b/creusot/tests/should_succeed/ord_trait.mlcfg
@@ -183,7 +183,7 @@ module OrdTrait_X
     goto BB0
   }
   BB0 {
-    [#"../ord_trait.rs" 9 9 9 10] _5 <- ([#"../ord_trait.rs" 9 9 9 10] x);
+    [#"../ord_trait.rs" 9 9 9 10] _5 <- x;
     [#"../ord_trait.rs" 9 4 9 10] _0 <- ([#"../ord_trait.rs" 9 4 9 10] le0 x _5);
     goto BB1
   }
@@ -375,7 +375,7 @@ module OrdTrait_GtOrLe
     goto BB0
   }
   BB0 {
-    [#"../ord_trait.rs" 17 9 17 10] _6 <- ([#"../ord_trait.rs" 17 9 17 10] y);
+    [#"../ord_trait.rs" 17 9 17 10] _6 <- y;
     assert { [@expl:type invariant] inv0 y };
     assume { resolve0 y };
     [#"../ord_trait.rs" 17 4 17 10] _0 <- ([#"../ord_trait.rs" 17 4 17 10] ge0 x _6);
@@ -405,7 +405,7 @@ module OrdTrait_GtOrLeInt
     goto BB0
   }
   BB0 {
-    [#"../ord_trait.rs" 22 4 22 10] _0 <- ([#"../ord_trait.rs" 22 4 22 10] x <= y);
+    [#"../ord_trait.rs" 22 4 22 10] _0 <- x <= y;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/projection_toggle.mlcfg b/creusot/tests/should_succeed/projection_toggle.mlcfg
index e7f1978e3a..92d262eb0f 100644
--- a/creusot/tests/should_succeed/projection_toggle.mlcfg
+++ b/creusot/tests/should_succeed/projection_toggle.mlcfg
@@ -136,8 +136,8 @@ module ProjectionToggle_F
     goto BB0
   }
   BB0 {
-    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] [#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
-    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] [#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
+    [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] (10 : int32));
+    [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] (5 : int32));
     [#"../projection_toggle.rs" 17 30 17 36] _5 <- Borrow.borrow_mut a;
     [#"../projection_toggle.rs" 17 30 17 36] a <-  ^ _5;
     [#"../projection_toggle.rs" 17 30 17 36] _4 <- Borrow.borrow_final ( * _5) (Borrow.get_id _5);
@@ -154,16 +154,16 @@ module ProjectionToggle_F
   BB1 {
     assume { resolve0 _7 };
     assume { resolve0 _5 };
-    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11]  * x + ([#"../projection_toggle.rs" 19 10 19 11] (5 : int32))) ; };
+    [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ( * x + ([#"../projection_toggle.rs" 19 10 19 11] (5 : int32))) ; };
     assume { resolve0 x };
-    [#"../projection_toggle.rs" 20 12 20 19] _9 <- ([#"../projection_toggle.rs" 20 12 20 19] a = ([#"../projection_toggle.rs" 20 17 20 19] (15 : int32)));
+    [#"../projection_toggle.rs" 20 12 20 19] _9 <- a = ([#"../projection_toggle.rs" 20 17 20 19] (15 : int32));
     switch (_9)
       | False -> goto BB3
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../projection_toggle.rs" 13 11 21 1] _0 <- ([#"../projection_toggle.rs" 13 11 21 1] [#"../projection_toggle.rs" 13 11 21 1] ());
+    [#"../projection_toggle.rs" 13 11 21 1] _0 <- ([#"../projection_toggle.rs" 13 11 21 1] ());
     return _0
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/projections.mlcfg b/creusot/tests/should_succeed/projections.mlcfg
index 1648dbf408..d9141db8e2 100644
--- a/creusot/tests/should_succeed/projections.mlcfg
+++ b/creusot/tests/should_succeed/projections.mlcfg
@@ -12,7 +12,7 @@ module Projections_CopyOutOfRef
     goto BB0
   }
   BB0 {
-    [#"../projections.rs" 6 4 6 6] _0 <- ([#"../projections.rs" 6 4 6 6] x);
+    [#"../projections.rs" 6 4 6 6] _0 <- x;
     return _0
   }
   
@@ -63,9 +63,9 @@ module Projections_CopyOutOfSum
     goto BB4
   }
   BB2 {
-    [#"../projections.rs" 12 12 12 13] y <- ([#"../projections.rs" 12 12 12 13] Core_Result_Result_Type.err_0 x);
+    [#"../projections.rs" 12 12 12 13] y <- Core_Result_Result_Type.err_0 x;
     x <- (let Core_Result_Result_Type.C_Err x0 = x in Core_Result_Result_Type.C_Err (any borrowed uint32));
-    [#"../projections.rs" 12 18 12 20] _0 <- ([#"../projections.rs" 12 18 12 20]  * y);
+    [#"../projections.rs" 12 18 12 20] _0 <-  * y;
     assume { resolve0 y };
     goto BB5
   }
@@ -74,9 +74,9 @@ module Projections_CopyOutOfSum
     absurd
   }
   BB4 {
-    [#"../projections.rs" 11 11 11 12] x1 <- ([#"../projections.rs" 11 11 11 12] Core_Result_Result_Type.ok_0 x);
+    [#"../projections.rs" 11 11 11 12] x1 <- Core_Result_Result_Type.ok_0 x;
     x <- (let Core_Result_Result_Type.C_Ok x0 = x in Core_Result_Result_Type.C_Ok (any borrowed uint32));
-    [#"../projections.rs" 11 17 11 19] _0 <- ([#"../projections.rs" 11 17 11 19]  * x1);
+    [#"../projections.rs" 11 17 11 19] _0 <-  * x1;
     assume { resolve0 x1 };
     goto BB5
   }
@@ -128,7 +128,7 @@ module Projections_WriteIntoSum
   }
   BB1 {
     assume { resolve1 x };
-    [#"../projections.rs" 19 16 19 18] _0 <- ([#"../projections.rs" 19 16 19 18] ());
+    [#"../projections.rs" 19 16 19 18] _0 <- ();
     goto BB5
   }
   BB2 {
@@ -142,9 +142,9 @@ module Projections_WriteIntoSum
   BB4 {
     [#"../projections.rs" 18 13 18 14] y <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * x)) (Borrow.inherit_id (Borrow.get_id x) 1);
     [#"../projections.rs" 18 13 18 14] x <- { x with current = (let Core_Option_Option_Type.C_Some x0 =  * x in Core_Option_Option_Type.C_Some ( ^ y)) ; };
-    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] [#"../projections.rs" 18 24 18 26] (10 : uint32)) ; };
+    [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 24 18 26] (10 : uint32)) ; };
     assume { resolve0 y };
-    [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] [#"../projections.rs" 18 19 18 26] ());
+    [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] ());
     assume { resolve1 x };
     goto BB5
   }
@@ -167,14 +167,14 @@ module Projections_F
     goto BB0
   }
   BB0 {
-    [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some ([#"../projections.rs" 24 15 24 17] (10 : int32)));
+    [#"../projections.rs" 24 10 24 18] _2 <- Core_Option_Option_Type.C_Some ([#"../projections.rs" 24 15 24 17] (10 : int32));
     switch (_2)
       | Core_Option_Option_Type.C_None -> goto BB1
       | Core_Option_Option_Type.C_Some _ -> goto BB2
       end
   }
   BB1 {
-    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] [#"../projections.rs" 26 16 26 21] false);
+    [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] false);
     goto BB5
   }
   BB2 {
@@ -185,12 +185,12 @@ module Projections_F
     absurd
   }
   BB4 {
-    [#"../projections.rs" 25 13 25 14] x <- ([#"../projections.rs" 25 13 25 14] Core_Option_Option_Type.some_0 _2);
-    [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] x = ([#"../projections.rs" 25 24 25 25] (0 : int32)));
+    [#"../projections.rs" 25 13 25 14] x <- Core_Option_Option_Type.some_0 _2;
+    [#"../projections.rs" 25 19 25 25] _1 <- x = ([#"../projections.rs" 25 24 25 25] (0 : int32));
     goto BB5
   }
   BB5 {
-    [#"../projections.rs" 23 11 28 1] _0 <- ([#"../projections.rs" 23 11 28 1] [#"../projections.rs" 23 11 28 1] ());
+    [#"../projections.rs" 23 11 28 1] _0 <- ([#"../projections.rs" 23 11 28 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/prophecy.mlcfg b/creusot/tests/should_succeed/prophecy.mlcfg
index 249210270e..e731fa9ac6 100644
--- a/creusot/tests/should_succeed/prophecy.mlcfg
+++ b/creusot/tests/should_succeed/prophecy.mlcfg
@@ -17,12 +17,12 @@ module Prophecy_F
     goto BB0
   }
   BB0 {
-    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] [#"../prophecy.rs" 4 16 4 17] (0 : int32));
+    [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] (0 : int32));
     [#"../prophecy.rs" 5 12 5 18] y <- Borrow.borrow_mut x;
     [#"../prophecy.rs" 5 12 5 18] x <-  ^ y;
-    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] [#"../prophecy.rs" 9 9 9 10] (5 : int32)) ; };
+    [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 9 9 10] (5 : int32)) ; };
     assume { resolve0 y };
-    [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] [#"../prophecy.rs" 3 11 10 1] ());
+    [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index 0f7f07408d..3d262290c6 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -27,7 +27,7 @@ module RedBlackTree_Impl16_Clone
     goto BB4
   }
   BB2 {
-    [#"../red_black_tree.rs" 9 5 11 9] _0 <- ([#"../red_black_tree.rs" 9 5 11 9] RedBlackTree_Color_Type.C_Black);
+    [#"../red_black_tree.rs" 9 5 11 9] _0 <- RedBlackTree_Color_Type.C_Black;
     goto BB5
   }
   BB3 {
@@ -35,7 +35,7 @@ module RedBlackTree_Impl16_Clone
     absurd
   }
   BB4 {
-    [#"../red_black_tree.rs" 9 5 10 7] _0 <- ([#"../red_black_tree.rs" 9 5 10 7] RedBlackTree_Color_Type.C_Red);
+    [#"../red_black_tree.rs" 9 5 10 7] _0 <- RedBlackTree_Color_Type.C_Red;
     goto BB5
   }
   BB5 {
@@ -1214,7 +1214,7 @@ module RedBlackTree_Impl13_IsRed
       end
   }
   BB1 {
-    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] [#"../red_black_tree.rs" 391 17 391 22] false);
+    [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] false);
     goto BB5
   }
   BB2 {
@@ -1229,7 +1229,7 @@ module RedBlackTree_Impl13_IsRed
     goto BB4
   }
   BB4 {
-    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] [#"../red_black_tree.rs" 390 49 390 53] true);
+    [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] true);
     goto BB5
   }
   BB5 {
@@ -1785,12 +1785,12 @@ module RedBlackTree_Impl14_RotateRight
     assume { resolve4 _30 };
     assume { resolve4 _28 };
     assert { [@expl:assertion] [#"../red_black_tree.rs" 441 8 441 90] has_mapping0 (RedBlackTree_Node_Type.node_left ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
-    [#"../red_black_tree.rs" 442 34 442 41] _34 <- ([#"../red_black_tree.rs" 442 34 442 41] Core_Option_Option_Type.C_Some x);
+    [#"../red_black_tree.rs" 442 34 442 41] _34 <- Core_Option_Option_Type.C_Some x;
     x <- any RedBlackTree_Node_Type.t_node k v;
     goto BB7
   }
   BB7 {
-    [#"../red_black_tree.rs" 442 21 442 43] _33 <- ([#"../red_black_tree.rs" 442 21 442 43] RedBlackTree_Tree_Type.C_Tree _34);
+    [#"../red_black_tree.rs" 442 21 442 43] _33 <- RedBlackTree_Tree_Type.C_Tree _34;
     _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB8
   }
@@ -1798,7 +1798,7 @@ module RedBlackTree_Impl14_RotateRight
     goto BB9
   }
   BB9 {
-    [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 ([#"../red_black_tree.rs" 442 8 442 18] _33)) ; };
+    [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 _33) ; };
     _33 <- any RedBlackTree_Tree_Type.t_tree k v;
     assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_right ( * self)) };
     assume { resolve5 (RedBlackTree_Node_Type.node_right ( * self)) };
@@ -1807,7 +1807,7 @@ module RedBlackTree_Impl14_RotateRight
     goto BB11
   }
   BB11 {
-    [#"../red_black_tree.rs" 412 31 448 5] _0 <- ([#"../red_black_tree.rs" 412 31 448 5] [#"../red_black_tree.rs" 412 31 448 5] ());
+    [#"../red_black_tree.rs" 412 31 448 5] _0 <- ([#"../red_black_tree.rs" 412 31 448 5] ());
     goto BB12
   }
   BB12 {
@@ -2358,12 +2358,12 @@ module RedBlackTree_Impl14_RotateLeft
     assume { resolve4 _30 };
     assume { resolve4 _28 };
     assert { [@expl:assertion] [#"../red_black_tree.rs" 468 8 468 91] has_mapping0 (RedBlackTree_Node_Type.node_right ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) };
-    [#"../red_black_tree.rs" 469 33 469 40] _34 <- ([#"../red_black_tree.rs" 469 33 469 40] Core_Option_Option_Type.C_Some x);
+    [#"../red_black_tree.rs" 469 33 469 40] _34 <- Core_Option_Option_Type.C_Some x;
     x <- any RedBlackTree_Node_Type.t_node k v;
     goto BB7
   }
   BB7 {
-    [#"../red_black_tree.rs" 469 20 469 42] _33 <- ([#"../red_black_tree.rs" 469 20 469 42] RedBlackTree_Tree_Type.C_Tree _34);
+    [#"../red_black_tree.rs" 469 20 469 42] _33 <- RedBlackTree_Tree_Type.C_Tree _34;
     _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB8
   }
@@ -2371,7 +2371,7 @@ module RedBlackTree_Impl14_RotateLeft
     goto BB9
   }
   BB9 {
-    [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node ([#"../red_black_tree.rs" 469 8 469 17] _33) x1 x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * self in RedBlackTree_Node_Type.C_Node _33 x1 x2 x3 x4) ; };
     _33 <- any RedBlackTree_Tree_Type.t_tree k v;
     assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_left ( * self)) };
     assume { resolve5 (RedBlackTree_Node_Type.node_left ( * self)) };
@@ -2380,7 +2380,7 @@ module RedBlackTree_Impl14_RotateLeft
     goto BB11
   }
   BB11 {
-    [#"../red_black_tree.rs" 462 30 470 5] _0 <- ([#"../red_black_tree.rs" 462 30 470 5] [#"../red_black_tree.rs" 462 30 470 5] ());
+    [#"../red_black_tree.rs" 462 30 470 5] _0 <- ([#"../red_black_tree.rs" 462 30 470 5] ());
     goto BB12
   }
   BB12 {
@@ -2809,7 +2809,7 @@ module RedBlackTree_Impl14_FlipColors
     goto BB2
   }
   BB2 {
-    [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _13 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 487 8 487 59] RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _13 in RedBlackTree_Node_Type.C_Node x0 (RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; };
     assert { [@expl:type invariant] inv1 _13 };
     assume { resolve0 _13 };
     [#"../red_black_tree.rs" 488 23 488 38] _18 <- Borrow.borrow_final (RedBlackTree_Node_Type.node_color ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
@@ -2845,7 +2845,7 @@ module RedBlackTree_Impl14_FlipColors
     assume { resolve1 _18 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve2 self };
-    [#"../red_black_tree.rs" 486 30 489 5] _0 <- ([#"../red_black_tree.rs" 486 30 489 5] [#"../red_black_tree.rs" 486 30 489 5] ());
+    [#"../red_black_tree.rs" 486 30 489 5] _0 <- ([#"../red_black_tree.rs" 486 30 489 5] ());
     return _0
   }
   
@@ -3369,14 +3369,14 @@ module RedBlackTree_Impl14_Balance
     goto BB6
   }
   BB6 {
-    [#"../red_black_tree.rs" 511 54 513 9] _14 <- ([#"../red_black_tree.rs" 511 54 513 9] [#"../red_black_tree.rs" 511 54 513 9] ());
+    [#"../red_black_tree.rs" 511 54 513 9] _14 <- ([#"../red_black_tree.rs" 511 54 513 9] ());
     goto BB9
   }
   BB7 {
     goto BB8
   }
   BB8 {
-    [#"../red_black_tree.rs" 513 9 513 9] _14 <- ([#"../red_black_tree.rs" 513 9 513 9] [#"../red_black_tree.rs" 513 9 513 9] ());
+    [#"../red_black_tree.rs" 513 9 513 9] _14 <- ([#"../red_black_tree.rs" 513 9 513 9] ());
     goto BB9
   }
   BB9 {
@@ -3419,7 +3419,7 @@ module RedBlackTree_Impl14_Balance
     goto BB16
   }
   BB16 {
-    [#"../red_black_tree.rs" 515 80 517 9] _21 <- ([#"../red_black_tree.rs" 515 80 517 9] [#"../red_black_tree.rs" 515 80 517 9] ());
+    [#"../red_black_tree.rs" 515 80 517 9] _21 <- ([#"../red_black_tree.rs" 515 80 517 9] ());
     goto BB20
   }
   BB17 {
@@ -3429,7 +3429,7 @@ module RedBlackTree_Impl14_Balance
     goto BB19
   }
   BB19 {
-    [#"../red_black_tree.rs" 517 9 517 9] _21 <- ([#"../red_black_tree.rs" 517 9 517 9] [#"../red_black_tree.rs" 517 9 517 9] ());
+    [#"../red_black_tree.rs" 517 9 517 9] _21 <- ([#"../red_black_tree.rs" 517 9 517 9] ());
     goto BB20
   }
   BB20 {
@@ -3463,7 +3463,7 @@ module RedBlackTree_Impl14_Balance
   BB25 {
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
-    [#"../red_black_tree.rs" 519 53 521 9] _0 <- ([#"../red_black_tree.rs" 519 53 521 9] [#"../red_black_tree.rs" 519 53 521 9] ());
+    [#"../red_black_tree.rs" 519 53 521 9] _0 <- ([#"../red_black_tree.rs" 519 53 521 9] ());
     goto BB29
   }
   BB26 {
@@ -3477,7 +3477,7 @@ module RedBlackTree_Impl14_Balance
     goto BB28
   }
   BB28 {
-    [#"../red_black_tree.rs" 521 9 521 9] _0 <- ([#"../red_black_tree.rs" 521 9 521 9] [#"../red_black_tree.rs" 521 9 521 9] ());
+    [#"../red_black_tree.rs" 521 9 521 9] _0 <- ([#"../red_black_tree.rs" 521 9 521 9] ());
     goto BB29
   }
   BB29 {
@@ -4083,7 +4083,7 @@ module RedBlackTree_Impl14_MoveRedLeft
   BB13 {
     assert { [@expl:type invariant] inv2 _20 };
     assume { resolve0 _20 };
-    [#"../red_black_tree.rs" 550 15 550 19] _0 <- ([#"../red_black_tree.rs" 550 15 550 19] self);
+    [#"../red_black_tree.rs" 550 15 550 19] _0 <- self;
     self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     goto BB14
   }
@@ -4655,7 +4655,7 @@ module RedBlackTree_Impl14_MoveRedRight
   BB10 {
     assert { [@expl:type invariant] inv2 _20 };
     assume { resolve0 _20 };
-    [#"../red_black_tree.rs" 578 15 578 19] _0 <- ([#"../red_black_tree.rs" 578 15 578 19] self);
+    [#"../red_black_tree.rs" 578 15 578 19] _0 <- self;
     self <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     goto BB11
   }
@@ -4941,8 +4941,8 @@ module RedBlackTree_Impl15_New
     goto BB0
   }
   BB0 {
-    [#"../red_black_tree.rs" 589 21 589 25] _3 <- ([#"../red_black_tree.rs" 589 21 589 25] Core_Option_Option_Type.C_None);
-    [#"../red_black_tree.rs" 589 8 589 27] _0 <- ([#"../red_black_tree.rs" 589 8 589 27] RedBlackTree_Tree_Type.C_Tree _3);
+    [#"../red_black_tree.rs" 589 21 589 25] _3 <- Core_Option_Option_Type.C_None;
+    [#"../red_black_tree.rs" 589 8 589 27] _0 <- RedBlackTree_Tree_Type.C_Tree _3;
     _3 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB1
   }
@@ -5471,7 +5471,7 @@ module RedBlackTree_Impl15_InsertRec
     [#"../red_black_tree.rs" 601 20 601 24] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _11)) (Borrow.inherit_id (Borrow.get_id _11) 1);
     [#"../red_black_tree.rs" 601 20 601 24] _11 <- { _11 with current = (let Core_Option_Option_Type.C_Some x0 =  * _11 in Core_Option_Option_Type.C_Some ( ^ node)) ; };
     assume { inv1 ( ^ node) };
-    [#"../red_black_tree.rs" 602 26 602 35] _18 <- ([#"../red_black_tree.rs" 602 26 602 35] RedBlackTree_Node_Type.node_key ( * node));
+    [#"../red_black_tree.rs" 602 26 602 35] _18 <- RedBlackTree_Node_Type.node_key ( * node);
     assert { [@expl:type invariant] inv2 _18 };
     assume { resolve0 _18 };
     [#"../red_black_tree.rs" 602 18 602 36] _15 <- ([#"../red_black_tree.rs" 602 18 602 36] cmp0 key _18);
@@ -5533,7 +5533,7 @@ module RedBlackTree_Impl15_InsertRec
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 ([#"../red_black_tree.rs" 605 20 605 28] val') x4) ; };
+    [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 val' x4) ; };
     val' <- any v;
     assert { [@expl:type invariant] inv5 (RedBlackTree_Node_Type.node_val ( * node)) };
     assume { resolve2 (RedBlackTree_Node_Type.node_val ( * node)) };
@@ -5546,7 +5546,7 @@ module RedBlackTree_Impl15_InsertRec
     assume { resolve4 _11 };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve5 self };
-    [#"../red_black_tree.rs" 606 20 606 26] _0 <- ([#"../red_black_tree.rs" 606 20 606 26] [#"../red_black_tree.rs" 606 20 606 26] ());
+    [#"../red_black_tree.rs" 606 20 606 26] _0 <- ([#"../red_black_tree.rs" 606 20 606 26] ());
     goto BB32
   }
   BB16 {
@@ -5567,26 +5567,26 @@ module RedBlackTree_Impl15_InsertRec
     assume { resolve4 _11 };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve5 self };
-    [#"../red_black_tree.rs" 601 43 611 9] _0 <- ([#"../red_black_tree.rs" 601 43 611 9] [#"../red_black_tree.rs" 601 43 611 9] ());
+    [#"../red_black_tree.rs" 601 43 611 9] _0 <- ([#"../red_black_tree.rs" 601 43 611 9] ());
     goto BB31
   }
   BB19 {
     assert { [@expl:type invariant] inv7 _11 };
     assume { resolve4 _11 };
-    [#"../red_black_tree.rs" 613 35 613 39] _35 <- ([#"../red_black_tree.rs" 613 35 613 39] Core_Option_Option_Type.C_None);
-    [#"../red_black_tree.rs" 613 22 613 41] _34 <- ([#"../red_black_tree.rs" 613 22 613 41] RedBlackTree_Tree_Type.C_Tree _35);
+    [#"../red_black_tree.rs" 613 35 613 39] _35 <- Core_Option_Option_Type.C_None;
+    [#"../red_black_tree.rs" 613 22 613 41] _34 <- RedBlackTree_Tree_Type.C_Tree _35;
     _35 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB20
   }
   BB20 {
-    [#"../red_black_tree.rs" 614 23 614 26] _36 <- ([#"../red_black_tree.rs" 614 23 614 26] RedBlackTree_Color_Type.C_Red);
-    [#"../red_black_tree.rs" 617 36 617 40] _40 <- ([#"../red_black_tree.rs" 617 36 617 40] Core_Option_Option_Type.C_None);
-    [#"../red_black_tree.rs" 617 23 617 42] _39 <- ([#"../red_black_tree.rs" 617 23 617 42] RedBlackTree_Tree_Type.C_Tree _40);
+    [#"../red_black_tree.rs" 614 23 614 26] _36 <- RedBlackTree_Color_Type.C_Red;
+    [#"../red_black_tree.rs" 617 36 617 40] _40 <- Core_Option_Option_Type.C_None;
+    [#"../red_black_tree.rs" 617 23 617 42] _39 <- RedBlackTree_Tree_Type.C_Tree _40;
     _40 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     goto BB21
   }
   BB21 {
-    [#"../red_black_tree.rs" 612 38 618 13] _33 <- ([#"../red_black_tree.rs" 612 38 618 13] RedBlackTree_Node_Type.C_Node _34 _36 key val' _39);
+    [#"../red_black_tree.rs" 612 38 618 13] _33 <- RedBlackTree_Node_Type.C_Node _34 _36 key val' _39;
     _34 <- any RedBlackTree_Tree_Type.t_tree k v;
     _36 <- any RedBlackTree_Color_Type.t_color;
     key <- any k;
@@ -5607,7 +5607,7 @@ module RedBlackTree_Impl15_InsertRec
     goto BB26
   }
   BB26 {
-    [#"../red_black_tree.rs" 612 24 618 15] _31 <- ([#"../red_black_tree.rs" 612 24 618 15] Core_Option_Option_Type.C_Some _33);
+    [#"../red_black_tree.rs" 612 24 618 15] _31 <- Core_Option_Option_Type.C_Some _33;
     _33 <- any RedBlackTree_Node_Type.t_node k v;
     goto BB27
   }
@@ -5615,7 +5615,7 @@ module RedBlackTree_Impl15_InsertRec
     goto BB28
   }
   BB28 {
-    [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 612 12 612 21] _31)) ; };
+    [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree _31) ; };
     _31 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv0 (RedBlackTree_Tree_Type.tree_node ( * self)) };
     assume { resolve6 (RedBlackTree_Tree_Type.tree_node ( * self)) };
@@ -5624,7 +5624,7 @@ module RedBlackTree_Impl15_InsertRec
     goto BB30
   }
   BB30 {
-    [#"../red_black_tree.rs" 619 12 619 18] _0 <- ([#"../red_black_tree.rs" 619 12 619 18] [#"../red_black_tree.rs" 619 12 619 18] ());
+    [#"../red_black_tree.rs" 619 12 619 18] _0 <- ([#"../red_black_tree.rs" 619 12 619 18] ());
     goto BB32
   }
   BB31 {
@@ -6132,7 +6132,7 @@ module RedBlackTree_Impl15_Insert
     goto BB2
   }
   BB2 {
-    [#"../red_black_tree.rs" 628 44 628 49] _11 <- ([#"../red_black_tree.rs" 628 44 628 49] RedBlackTree_Color_Type.C_Black);
+    [#"../red_black_tree.rs" 628 44 628 49] _11 <- RedBlackTree_Color_Type.C_Black;
     [#"../red_black_tree.rs" 628 8 628 17] _14 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 628 8 628 17] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _14)) ; };
     assume { inv1 ( ^ _14) };
@@ -6146,7 +6146,7 @@ module RedBlackTree_Impl15_Insert
     goto BB4
   }
   BB4 {
-    [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _12 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 628 8 628 49] _11) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _12 in RedBlackTree_Node_Type.C_Node x0 _11 x2 x3 x4) ; };
     _11 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _12 };
     assume { resolve0 _12 };
@@ -6157,7 +6157,7 @@ module RedBlackTree_Impl15_Insert
   }
   BB5 {
     assume { resolve2 _15 };
-    [#"../red_black_tree.rs" 626 45 630 5] _0 <- ([#"../red_black_tree.rs" 626 45 630 5] [#"../red_black_tree.rs" 626 45 630 5] ());
+    [#"../red_black_tree.rs" 626 45 630 5] _0 <- ([#"../red_black_tree.rs" 626 45 630 5] ());
     goto BB6
   }
   BB6 {
@@ -6845,7 +6845,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     goto BB8
   }
   BB7 {
-    [#"../red_black_tree.rs" 647 9 647 9] _16 <- ([#"../red_black_tree.rs" 647 9 647 9] [#"../red_black_tree.rs" 647 9 647 9] ());
+    [#"../red_black_tree.rs" 647 9 647 9] _16 <- ([#"../red_black_tree.rs" 647 9 647 9] ());
     goto BB8
   }
   BB8 {
@@ -6882,7 +6882,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
   BB12 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve4 node1 };
-    [#"../red_black_tree.rs" 650 19 650 39] _0 <- ([#"../red_black_tree.rs" 650 19 650 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    [#"../red_black_tree.rs" 650 19 650 39] _0 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB13
@@ -6944,15 +6944,15 @@ module RedBlackTree_Impl15_DeleteMaxRec
     assume { inv3 ( ^ _37) };
     assert { [@expl:type invariant] inv4 node };
     assume { resolve1 node };
-    [#"../red_black_tree.rs" 653 12 653 40] node <- ([#"../red_black_tree.rs" 653 12 653 40] _37);
+    [#"../red_black_tree.rs" 653 12 653 40] node <- _37;
     _37 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv4 _38 };
     assume { resolve1 _38 };
-    [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] [#"../red_black_tree.rs" 652 84 654 9] ());
+    [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] ());
     goto BB26
   }
   BB25 {
-    [#"../red_black_tree.rs" 654 9 654 9] _29 <- ([#"../red_black_tree.rs" 654 9 654 9] [#"../red_black_tree.rs" 654 9 654 9] ());
+    [#"../red_black_tree.rs" 654 9 654 9] _29 <- ([#"../red_black_tree.rs" 654 9 654 9] ());
     goto BB26
   }
   BB26 {
@@ -6976,7 +6976,7 @@ module RedBlackTree_Impl15_DeleteMaxRec
     assume { resolve1 node };
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 657 8 657 9] _0 <- ([#"../red_black_tree.rs" 657 8 657 9] r);
+    [#"../red_black_tree.rs" 657 8 657 9] _0 <- r;
     r <- any (k, v);
     goto BB29
   }
@@ -7567,18 +7567,18 @@ module RedBlackTree_Impl15_DeleteMax
     assume { resolve1 node };
     assert { [@expl:type invariant] inv4 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 672 13 672 13] _7 <- ([#"../red_black_tree.rs" 672 13 672 13] [#"../red_black_tree.rs" 672 13 672 13] ());
+    [#"../red_black_tree.rs" 672 13 672 13] _7 <- ([#"../red_black_tree.rs" 672 13 672 13] ());
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 671 29 671 32] _13 <- ([#"../red_black_tree.rs" 671 29 671 32] RedBlackTree_Color_Type.C_Red);
-    [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 671 16 671 32] _13) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 671 29 671 32] _13 <- RedBlackTree_Color_Type.C_Red;
+    [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 _13 x2 x3 x4) ; };
     _13 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv3 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv4 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 670 35 672 13] _7 <- ([#"../red_black_tree.rs" 670 35 672 13] [#"../red_black_tree.rs" 670 35 672 13] ());
+    [#"../red_black_tree.rs" 670 35 672 13] _7 <- ([#"../red_black_tree.rs" 670 35 672 13] ());
     goto BB7
   }
   BB7 {
@@ -7593,7 +7593,7 @@ module RedBlackTree_Impl15_DeleteMax
   BB8 {
     assert { [@expl:type invariant] inv4 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 674 19 674 23] _0 <- ([#"../red_black_tree.rs" 674 19 674 23] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 674 19 674 23] _0 <- Core_Option_Option_Type.C_None;
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
     goto BB19
@@ -7609,7 +7609,7 @@ module RedBlackTree_Impl15_DeleteMax
       end
   }
   BB11 {
-    [#"../red_black_tree.rs" 679 48 679 53] _22 <- ([#"../red_black_tree.rs" 679 48 679 53] RedBlackTree_Color_Type.C_Black);
+    [#"../red_black_tree.rs" 679 48 679 53] _22 <- RedBlackTree_Color_Type.C_Black;
     [#"../red_black_tree.rs" 679 12 679 21] _25 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 679 12 679 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _25)) ; };
     assume { inv1 ( ^ _25) };
@@ -7623,19 +7623,19 @@ module RedBlackTree_Impl15_DeleteMax
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _23 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 679 12 679 53] _22) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _23 in RedBlackTree_Node_Type.C_Node x0 _22 x2 x3 x4) ; };
     _22 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv3 _23 };
     assume { resolve1 _23 };
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 678 25 680 9] _19 <- ([#"../red_black_tree.rs" 678 25 680 9] [#"../red_black_tree.rs" 678 25 680 9] ());
+    [#"../red_black_tree.rs" 678 25 680 9] _19 <- ([#"../red_black_tree.rs" 678 25 680 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv6 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 680 9 680 9] _19 <- ([#"../red_black_tree.rs" 680 9 680 9] [#"../red_black_tree.rs" 680 9 680 9] ());
+    [#"../red_black_tree.rs" 680 9 680 9] _19 <- ([#"../red_black_tree.rs" 680 9 680 9] ());
     goto BB15
   }
   BB15 {
@@ -7644,7 +7644,7 @@ module RedBlackTree_Impl15_DeleteMax
   }
   BB16 {
     assume { resolve4 _26 };
-    [#"../red_black_tree.rs" 682 8 682 15] _0 <- ([#"../red_black_tree.rs" 682 8 682 15] Core_Option_Option_Type.C_Some r);
+    [#"../red_black_tree.rs" 682 8 682 15] _0 <- Core_Option_Option_Type.C_Some r;
     r <- any (k, v);
     goto BB17
   }
@@ -8333,7 +8333,7 @@ module RedBlackTree_Impl15_DeleteMinRec
   BB7 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve4 node1 };
-    [#"../red_black_tree.rs" 700 19 700 39] _0 <- ([#"../red_black_tree.rs" 700 19 700 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    [#"../red_black_tree.rs" 700 19 700 39] _0 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB8
@@ -8395,15 +8395,15 @@ module RedBlackTree_Impl15_DeleteMinRec
     assume { inv7 ( ^ _33) };
     assert { [@expl:type invariant] inv3 node };
     assume { resolve1 node };
-    [#"../red_black_tree.rs" 703 12 703 39] node <- ([#"../red_black_tree.rs" 703 12 703 39] _33);
+    [#"../red_black_tree.rs" 703 12 703 39] node <- _33;
     _33 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv3 _34 };
     assume { resolve1 _34 };
-    [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] [#"../red_black_tree.rs" 702 82 704 9] ());
+    [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] ());
     goto BB21
   }
   BB20 {
-    [#"../red_black_tree.rs" 704 9 704 9] _25 <- ([#"../red_black_tree.rs" 704 9 704 9] [#"../red_black_tree.rs" 704 9 704 9] ());
+    [#"../red_black_tree.rs" 704 9 704 9] _25 <- ([#"../red_black_tree.rs" 704 9 704 9] ());
     goto BB21
   }
   BB21 {
@@ -8427,7 +8427,7 @@ module RedBlackTree_Impl15_DeleteMinRec
     assume { resolve1 node };
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 707 8 707 9] _0 <- ([#"../red_black_tree.rs" 707 8 707 9] r);
+    [#"../red_black_tree.rs" 707 8 707 9] _0 <- r;
     r <- any (k, v);
     goto BB24
   }
@@ -8993,18 +8993,18 @@ module RedBlackTree_Impl15_DeleteMin
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 725 13 725 13] _7 <- ([#"../red_black_tree.rs" 725 13 725 13] [#"../red_black_tree.rs" 725 13 725 13] ());
+    [#"../red_black_tree.rs" 725 13 725 13] _7 <- ([#"../red_black_tree.rs" 725 13 725 13] ());
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 724 29 724 32] _13 <- ([#"../red_black_tree.rs" 724 29 724 32] RedBlackTree_Color_Type.C_Red);
-    [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 724 16 724 32] _13) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 724 29 724 32] _13 <- RedBlackTree_Color_Type.C_Red;
+    [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 _13 x2 x3 x4) ; };
     _13 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 723 35 725 13] _7 <- ([#"../red_black_tree.rs" 723 35 725 13] [#"../red_black_tree.rs" 723 35 725 13] ());
+    [#"../red_black_tree.rs" 723 35 725 13] _7 <- ([#"../red_black_tree.rs" 723 35 725 13] ());
     goto BB7
   }
   BB7 {
@@ -9018,7 +9018,7 @@ module RedBlackTree_Impl15_DeleteMin
   BB8 {
     assert { [@expl:type invariant] inv3 _8 };
     assume { resolve2 _8 };
-    [#"../red_black_tree.rs" 727 19 727 23] _0 <- ([#"../red_black_tree.rs" 727 19 727 23] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 727 19 727 23] _0 <- Core_Option_Option_Type.C_None;
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
     goto BB18
@@ -9034,7 +9034,7 @@ module RedBlackTree_Impl15_DeleteMin
       end
   }
   BB11 {
-    [#"../red_black_tree.rs" 731 48 731 53] _20 <- ([#"../red_black_tree.rs" 731 48 731 53] RedBlackTree_Color_Type.C_Black);
+    [#"../red_black_tree.rs" 731 48 731 53] _20 <- RedBlackTree_Color_Type.C_Black;
     [#"../red_black_tree.rs" 731 12 731 21] _23 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 731 12 731 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _23)) ; };
     assume { inv0 ( ^ _23) };
@@ -9048,23 +9048,23 @@ module RedBlackTree_Impl15_DeleteMin
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _21 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 731 12 731 53] _20) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _21 in RedBlackTree_Node_Type.C_Node x0 _20 x2 x3 x4) ; };
     _20 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _21 };
     assume { resolve1 _21 };
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 730 25 732 9] _17 <- ([#"../red_black_tree.rs" 730 25 732 9] [#"../red_black_tree.rs" 730 25 732 9] ());
+    [#"../red_black_tree.rs" 730 25 732 9] _17 <- ([#"../red_black_tree.rs" 730 25 732 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv5 self };
     assume { resolve3 self };
-    [#"../red_black_tree.rs" 732 9 732 9] _17 <- ([#"../red_black_tree.rs" 732 9 732 9] [#"../red_black_tree.rs" 732 9 732 9] ());
+    [#"../red_black_tree.rs" 732 9 732 9] _17 <- ([#"../red_black_tree.rs" 732 9 732 9] ());
     goto BB15
   }
   BB15 {
-    [#"../red_black_tree.rs" 733 8 733 15] _0 <- ([#"../red_black_tree.rs" 733 8 733 15] Core_Option_Option_Type.C_Some r);
+    [#"../red_black_tree.rs" 733 8 733 15] _0 <- Core_Option_Option_Type.C_Some r;
     r <- any (k, v);
     goto BB16
   }
@@ -10010,7 +10010,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB3 {
     assert { [@expl:type invariant] inv2 _14 };
     assume { resolve0 _14 };
-    [#"../red_black_tree.rs" 751 22 751 31] _21 <- ([#"../red_black_tree.rs" 751 22 751 31] RedBlackTree_Node_Type.node_key ( * node));
+    [#"../red_black_tree.rs" 751 22 751 31] _21 <- RedBlackTree_Node_Type.node_key ( * node);
     assert { [@expl:type invariant] inv3 _21 };
     assume { resolve1 _21 };
     [#"../red_black_tree.rs" 751 14 751 32] _18 <- ([#"../red_black_tree.rs" 751 14 751 32] cmp0 key _21);
@@ -10026,7 +10026,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 761 12 761 15] ord <- ([#"../red_black_tree.rs" 761 12 761 15] _18);
+    [#"../red_black_tree.rs" 761 12 761 15] ord <- _18;
     [#"../red_black_tree.rs" 762 19 762 37] _42 <- ([#"../red_black_tree.rs" 762 19 762 37] is_red0 (RedBlackTree_Node_Type.node_left ( * node)));
     goto BB26
   }
@@ -10047,7 +10047,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { resolve1 key };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 754 27 754 31] _0 <- ([#"../red_black_tree.rs" 754 27 754 31] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 754 27 754 31] _0 <- Core_Option_Option_Type.C_None;
     goto BB74
   }
   BB10 {
@@ -10101,15 +10101,15 @@ module RedBlackTree_Impl15_DeleteRec
     assume { inv5 ( ^ _35) };
     assert { [@expl:type invariant] inv6 node };
     assume { resolve3 node };
-    [#"../red_black_tree.rs" 757 20 757 47] node <- ([#"../red_black_tree.rs" 757 20 757 47] _35);
+    [#"../red_black_tree.rs" 757 20 757 47] node <- _35;
     _35 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _36 };
     assume { resolve3 _36 };
-    [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] [#"../red_black_tree.rs" 756 90 758 17] ());
+    [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] ());
     goto BB21
   }
   BB20 {
-    [#"../red_black_tree.rs" 758 17 758 17] _27 <- ([#"../red_black_tree.rs" 758 17 758 17] [#"../red_black_tree.rs" 758 17 758 17] ());
+    [#"../red_black_tree.rs" 758 17 758 17] _27 <- ([#"../red_black_tree.rs" 758 17 758 17] ());
     goto BB21
   }
   BB21 {
@@ -10126,9 +10126,9 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB23
   }
   BB23 {
-    [#"../red_black_tree.rs" 759 16 759 17] r <- ([#"../red_black_tree.rs" 759 16 759 17] _38);
+    [#"../red_black_tree.rs" 759 16 759 17] r <- _38;
     _38 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] [#"../red_black_tree.rs" 759 16 759 45] ());
+    [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] ());
     goto BB25
   }
   BB25 {
@@ -10162,9 +10162,9 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB30
   }
   BB30 {
-    [#"../red_black_tree.rs" 764 20 764 21] r <- ([#"../red_black_tree.rs" 764 20 764 21] _46);
+    [#"../red_black_tree.rs" 764 20 764 21] r <- _46;
     _46 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] [#"../red_black_tree.rs" 764 20 764 50] ());
+    [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] ());
     goto BB32
   }
   BB32 {
@@ -10196,7 +10196,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB37 {
     assert { [@expl:type invariant] inv8 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 768 35 768 39] _0 <- ([#"../red_black_tree.rs" 768 35 768 39] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 768 35 768 39] _0 <- Core_Option_Option_Type.C_None;
     goto BB73
   }
   BB38 {
@@ -10222,7 +10222,7 @@ module RedBlackTree_Impl15_DeleteRec
   BB40 {
     assert { [@expl:type invariant] inv1 node1 };
     assume { resolve9 node1 };
-    [#"../red_black_tree.rs" 771 36 771 56] _60 <- ([#"../red_black_tree.rs" 771 36 771 56] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1));
+    [#"../red_black_tree.rs" 771 36 771 56] _60 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4);
     node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4);
     goto BB41
@@ -10231,7 +10231,7 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB42
   }
   BB42 {
-    [#"../red_black_tree.rs" 771 31 771 57] _0 <- ([#"../red_black_tree.rs" 771 31 771 57] Core_Option_Option_Type.C_Some _60);
+    [#"../red_black_tree.rs" 771 31 771 57] _0 <- Core_Option_Option_Type.C_Some _60;
     _60 <- any (k, v);
     goto BB43
   }
@@ -10260,7 +10260,7 @@ module RedBlackTree_Impl15_DeleteRec
       end
   }
   BB48 {
-    [#"../red_black_tree.rs" 775 21 775 21] _63 <- ([#"../red_black_tree.rs" 775 21 775 21] [#"../red_black_tree.rs" 775 21 775 21] ());
+    [#"../red_black_tree.rs" 775 21 775 21] _63 <- ([#"../red_black_tree.rs" 775 21 775 21] ());
     goto BB51
   }
   BB49 {
@@ -10277,11 +10277,11 @@ module RedBlackTree_Impl15_DeleteRec
     assume { inv5 ( ^ _69) };
     assert { [@expl:type invariant] inv6 node };
     assume { resolve3 node };
-    [#"../red_black_tree.rs" 774 24 774 52] node <- ([#"../red_black_tree.rs" 774 24 774 52] _69);
+    [#"../red_black_tree.rs" 774 24 774 52] node <- _69;
     _69 <- any borrowed (RedBlackTree_Node_Type.t_node k v);
     assert { [@expl:type invariant] inv6 _70 };
     assume { resolve3 _70 };
-    [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] [#"../red_black_tree.rs" 773 72 775 21] ());
+    [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] ());
     goto BB51
   }
   BB51 {
@@ -10353,7 +10353,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { resolve7 _86 };
     assert { [@expl:type invariant] inv12 _84 };
     assume { resolve7 _84 };
-    [#"../red_black_tree.rs" 781 28 781 36] _87 <- ([#"../red_black_tree.rs" 781 28 781 36] Core_Option_Option_Type.C_Some kv);
+    [#"../red_black_tree.rs" 781 28 781 36] _87 <- Core_Option_Option_Type.C_Some kv;
     kv <- any (k, v);
     goto BB58
   }
@@ -10361,9 +10361,9 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB59
   }
   BB59 {
-    [#"../red_black_tree.rs" 781 24 781 25] r <- ([#"../red_black_tree.rs" 781 24 781 25] _87);
+    [#"../red_black_tree.rs" 781 24 781 25] r <- _87;
     _87 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] [#"../red_black_tree.rs" 781 24 781 36] ());
+    [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] ());
     goto BB61
   }
   BB61 {
@@ -10386,9 +10386,9 @@ module RedBlackTree_Impl15_DeleteRec
     goto BB65
   }
   BB65 {
-    [#"../red_black_tree.rs" 783 24 783 25] r <- ([#"../red_black_tree.rs" 783 24 783 25] _89);
+    [#"../red_black_tree.rs" 783 24 783 25] r <- _89;
     _89 <- any Core_Option_Option_Type.t_option (k, v);
-    [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] [#"../red_black_tree.rs" 783 24 783 54] ());
+    [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] ());
     goto BB67
   }
   BB67 {
@@ -10410,7 +10410,7 @@ module RedBlackTree_Impl15_DeleteRec
     assume { resolve3 node };
     assert { [@expl:type invariant] inv8 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 789 8 789 9] _0 <- ([#"../red_black_tree.rs" 789 8 789 9] r);
+    [#"../red_black_tree.rs" 789 8 789 9] _0 <- r;
     r <- any Core_Option_Option_Type.t_option (k, v);
     goto BB71
   }
@@ -10997,18 +10997,18 @@ module RedBlackTree_Impl15_Delete
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _10 };
     assume { resolve2 _10 };
-    [#"../red_black_tree.rs" 806 13 806 13] _9 <- ([#"../red_black_tree.rs" 806 13 806 13] [#"../red_black_tree.rs" 806 13 806 13] ());
+    [#"../red_black_tree.rs" 806 13 806 13] _9 <- ([#"../red_black_tree.rs" 806 13 806 13] ());
     goto BB7
   }
   BB6 {
-    [#"../red_black_tree.rs" 805 29 805 32] _15 <- ([#"../red_black_tree.rs" 805 29 805 32] RedBlackTree_Color_Type.C_Red);
-    [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 805 16 805 32] _15) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 805 29 805 32] _15 <- RedBlackTree_Color_Type.C_Red;
+    [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * node in RedBlackTree_Node_Type.C_Node x0 _15 x2 x3 x4) ; };
     _15 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 node };
     assume { resolve1 node };
     assert { [@expl:type invariant] inv3 _10 };
     assume { resolve2 _10 };
-    [#"../red_black_tree.rs" 804 35 806 13] _9 <- ([#"../red_black_tree.rs" 804 35 806 13] [#"../red_black_tree.rs" 804 35 806 13] ());
+    [#"../red_black_tree.rs" 804 35 806 13] _9 <- ([#"../red_black_tree.rs" 804 35 806 13] ());
     goto BB7
   }
   BB7 {
@@ -11026,7 +11026,7 @@ module RedBlackTree_Impl15_Delete
     assume { resolve2 _10 };
     assert { [@expl:type invariant] inv5 key };
     assume { resolve3 key };
-    [#"../red_black_tree.rs" 808 19 808 23] _0 <- ([#"../red_black_tree.rs" 808 19 808 23] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 808 19 808 23] _0 <- Core_Option_Option_Type.C_None;
     assert { [@expl:type invariant] inv6 self };
     assume { resolve4 self };
     goto BB17
@@ -11042,7 +11042,7 @@ module RedBlackTree_Impl15_Delete
       end
   }
   BB11 {
-    [#"../red_black_tree.rs" 812 48 812 53] _23 <- ([#"../red_black_tree.rs" 812 48 812 53] RedBlackTree_Color_Type.C_Black);
+    [#"../red_black_tree.rs" 812 48 812 53] _23 <- RedBlackTree_Color_Type.C_Black;
     [#"../red_black_tree.rs" 812 12 812 21] _26 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1);
     [#"../red_black_tree.rs" 812 12 812 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 =  * self in RedBlackTree_Tree_Type.C_Tree ( ^ _26)) ; };
     assume { inv0 ( ^ _26) };
@@ -11056,23 +11056,23 @@ module RedBlackTree_Impl15_Delete
     goto BB13
   }
   BB13 {
-    [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _24 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 812 12 812 53] _23) x2 x3 x4) ; };
+    [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 =  * _24 in RedBlackTree_Node_Type.C_Node x0 _23 x2 x3 x4) ; };
     _23 <- any RedBlackTree_Color_Type.t_color;
     assert { [@expl:type invariant] inv2 _24 };
     assume { resolve1 _24 };
     assert { [@expl:type invariant] inv6 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 811 25 813 9] _20 <- ([#"../red_black_tree.rs" 811 25 813 9] [#"../red_black_tree.rs" 811 25 813 9] ());
+    [#"../red_black_tree.rs" 811 25 813 9] _20 <- ([#"../red_black_tree.rs" 811 25 813 9] ());
     goto BB15
   }
   BB14 {
     assert { [@expl:type invariant] inv6 self };
     assume { resolve4 self };
-    [#"../red_black_tree.rs" 813 9 813 9] _20 <- ([#"../red_black_tree.rs" 813 9 813 9] [#"../red_black_tree.rs" 813 9 813 9] ());
+    [#"../red_black_tree.rs" 813 9 813 9] _20 <- ([#"../red_black_tree.rs" 813 9 813 9] ());
     goto BB15
   }
   BB15 {
-    [#"../red_black_tree.rs" 814 8 814 9] _0 <- ([#"../red_black_tree.rs" 814 8 814 9] r);
+    [#"../red_black_tree.rs" 814 8 814 9] _0 <- r;
     r <- any Core_Option_Option_Type.t_option (k, v);
     goto BB16
   }
@@ -11537,7 +11537,7 @@ module RedBlackTree_Impl15_Get
   }
   BB1 {
     assume { resolve0 _6 };
-    [#"../red_black_tree.rs" 825 23 825 27] tree <- ([#"../red_black_tree.rs" 825 23 825 27] self);
+    [#"../red_black_tree.rs" 825 23 825 27] tree <- self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
     goto BB2
@@ -11549,7 +11549,7 @@ module RedBlackTree_Impl15_Get
     goto BB3
   }
   BB3 {
-    [#"../red_black_tree.rs" 828 31 828 41] _13 <- ([#"../red_black_tree.rs" 828 31 828 41] RedBlackTree_Tree_Type.tree_node tree);
+    [#"../red_black_tree.rs" 828 31 828 41] _13 <- RedBlackTree_Tree_Type.tree_node tree;
     assert { [@expl:type invariant] inv0 tree };
     assume { resolve1 tree };
     switch (_13)
@@ -11561,10 +11561,10 @@ module RedBlackTree_Impl15_Get
     goto BB5
   }
   BB5 {
-    [#"../red_black_tree.rs" 828 23 828 27] node <- ([#"../red_black_tree.rs" 828 23 828 27] Core_Option_Option_Type.some_0 _13);
+    [#"../red_black_tree.rs" 828 23 828 27] node <- Core_Option_Option_Type.some_0 _13;
     assert { [@expl:type invariant] inv2 _13 };
     assume { resolve2 _13 };
-    [#"../red_black_tree.rs" 829 26 829 35] _19 <- ([#"../red_black_tree.rs" 829 26 829 35] RedBlackTree_Node_Type.node_key node);
+    [#"../red_black_tree.rs" 829 26 829 35] _19 <- RedBlackTree_Node_Type.node_key node;
     assert { [@expl:type invariant] inv3 _19 };
     assume { resolve3 _19 };
     [#"../red_black_tree.rs" 829 18 829 36] _16 <- ([#"../red_black_tree.rs" 829 18 829 36] cmp0 key _19);
@@ -11584,13 +11584,13 @@ module RedBlackTree_Impl15_Get
     goto BB12
   }
   BB9 {
-    [#"../red_black_tree.rs" 832 34 832 45] _27 <- ([#"../red_black_tree.rs" 832 34 832 45] RedBlackTree_Node_Type.node_right node);
+    [#"../red_black_tree.rs" 832 34 832 45] _27 <- RedBlackTree_Node_Type.node_right node;
     assert { [@expl:type invariant] inv4 node };
     assume { resolve4 node };
     assert { [@expl:type invariant] inv0 _27 };
     assume { resolve1 _27 };
-    [#"../red_black_tree.rs" 832 27 832 45] tree <- ([#"../red_black_tree.rs" 832 27 832 45] _27);
-    [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] [#"../red_black_tree.rs" 832 27 832 45] ());
+    [#"../red_black_tree.rs" 832 27 832 45] tree <- _27;
+    [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] ());
     goto BB13
   }
   BB10 {
@@ -11602,24 +11602,24 @@ module RedBlackTree_Impl15_Get
     absurd
   }
   BB11 {
-    [#"../red_black_tree.rs" 830 31 830 41] _22 <- ([#"../red_black_tree.rs" 830 31 830 41] RedBlackTree_Node_Type.node_left node);
+    [#"../red_black_tree.rs" 830 31 830 41] _22 <- RedBlackTree_Node_Type.node_left node;
     assert { [@expl:type invariant] inv4 node };
     assume { resolve4 node };
     assert { [@expl:type invariant] inv0 _22 };
     assume { resolve1 _22 };
-    [#"../red_black_tree.rs" 830 24 830 41] tree <- ([#"../red_black_tree.rs" 830 24 830 41] _22);
-    [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] [#"../red_black_tree.rs" 830 24 830 41] ());
+    [#"../red_black_tree.rs" 830 24 830 41] tree <- _22;
+    [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] ());
     goto BB13
   }
   BB12 {
     assert { [@expl:type invariant] inv3 key };
     assume { resolve3 key };
-    [#"../red_black_tree.rs" 831 37 831 46] _25 <- ([#"../red_black_tree.rs" 831 37 831 46] RedBlackTree_Node_Type.node_val node);
+    [#"../red_black_tree.rs" 831 37 831 46] _25 <- RedBlackTree_Node_Type.node_val node;
     assert { [@expl:type invariant] inv4 node };
     assume { resolve4 node };
     assert { [@expl:type invariant] inv5 _25 };
     assume { resolve5 _25 };
-    [#"../red_black_tree.rs" 831 32 831 47] _0 <- ([#"../red_black_tree.rs" 831 32 831 47] Core_Option_Option_Type.C_Some _25);
+    [#"../red_black_tree.rs" 831 32 831 47] _0 <- Core_Option_Option_Type.C_Some _25;
     goto BB15
   }
   BB13 {
@@ -11630,7 +11630,7 @@ module RedBlackTree_Impl15_Get
     assume { resolve2 _13 };
     assert { [@expl:type invariant] inv3 key };
     assume { resolve3 key };
-    [#"../red_black_tree.rs" 835 15 835 19] _0 <- ([#"../red_black_tree.rs" 835 15 835 19] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 835 15 835 19] _0 <- Core_Option_Option_Type.C_None;
     goto BB15
   }
   BB15 {
@@ -12151,7 +12151,7 @@ module RedBlackTree_Impl15_GetMut
   BB2 {
     assert { [@expl:type invariant] inv0 old_self };
     assume { resolve1 old_self };
-    [#"../red_black_tree.rs" 848 23 848 27] tree <- ([#"../red_black_tree.rs" 848 23 848 27] self);
+    [#"../red_black_tree.rs" 848 23 848 27] tree <- self;
     self <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
     goto BB3
   }
@@ -12192,7 +12192,7 @@ module RedBlackTree_Impl15_GetMut
     [#"../red_black_tree.rs" 862 23 862 27] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _23)) (Borrow.inherit_id (Borrow.get_id _23) 1);
     [#"../red_black_tree.rs" 862 23 862 27] _23 <- { _23 with current = (let Core_Option_Option_Type.C_Some x0 =  * _23 in Core_Option_Option_Type.C_Some ( ^ node)) ; };
     assume { inv4 ( ^ node) };
-    [#"../red_black_tree.rs" 863 26 863 35] _29 <- ([#"../red_black_tree.rs" 863 26 863 35] RedBlackTree_Node_Type.node_key ( * node));
+    [#"../red_black_tree.rs" 863 26 863 35] _29 <- RedBlackTree_Node_Type.node_key ( * node);
     assert { [@expl:type invariant] inv5 _29 };
     assume { resolve2 _29 };
     [#"../red_black_tree.rs" 863 18 863 36] _26 <- ([#"../red_black_tree.rs" 863 18 863 36] cmp0 key _29);
@@ -12220,9 +12220,9 @@ module RedBlackTree_Impl15_GetMut
     assume { inv6 ( ^ _36) };
     assert { [@expl:type invariant] inv7 tree };
     assume { resolve3 tree };
-    [#"../red_black_tree.rs" 866 27 866 49] tree <- ([#"../red_black_tree.rs" 866 27 866 49] _36);
+    [#"../red_black_tree.rs" 866 27 866 49] tree <- _36;
     _36 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] [#"../red_black_tree.rs" 866 27 866 49] ());
+    [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] ());
     assert { [@expl:type invariant] inv7 _37 };
     assume { resolve3 _37 };
     goto BB14
@@ -12248,9 +12248,9 @@ module RedBlackTree_Impl15_GetMut
     assume { inv6 ( ^ _31) };
     assert { [@expl:type invariant] inv7 tree };
     assume { resolve3 tree };
-    [#"../red_black_tree.rs" 864 24 864 45] tree <- ([#"../red_black_tree.rs" 864 24 864 45] _31);
+    [#"../red_black_tree.rs" 864 24 864 45] tree <- _31;
     _31 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v);
-    [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] [#"../red_black_tree.rs" 864 24 864 45] ());
+    [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] ());
     assert { [@expl:type invariant] inv7 _32 };
     assume { resolve3 _32 };
     goto BB14
@@ -12264,7 +12264,7 @@ module RedBlackTree_Impl15_GetMut
     [#"../red_black_tree.rs" 865 37 865 50] _34 <- Borrow.borrow_final ( * _35) (Borrow.get_id _35);
     [#"../red_black_tree.rs" 865 37 865 50] _35 <- { _35 with current = ( ^ _34) ; };
     assume { inv1 ( ^ _34) };
-    [#"../red_black_tree.rs" 865 32 865 51] _0 <- ([#"../red_black_tree.rs" 865 32 865 51] Core_Option_Option_Type.C_Some _34);
+    [#"../red_black_tree.rs" 865 32 865 51] _0 <- Core_Option_Option_Type.C_Some _34;
     _34 <- any borrowed v;
     assert { [@expl:type invariant] inv8 _35 };
     assume { resolve4 _35 };
@@ -12286,7 +12286,7 @@ module RedBlackTree_Impl15_GetMut
     assume { resolve6 _23 };
     assert { [@expl:type invariant] inv5 key };
     assume { resolve2 key };
-    [#"../red_black_tree.rs" 869 15 869 19] _0 <- ([#"../red_black_tree.rs" 869 15 869 19] Core_Option_Option_Type.C_None);
+    [#"../red_black_tree.rs" 869 15 869 19] _0 <- Core_Option_Option_Type.C_None;
     goto BB16
   }
   BB16 {
diff --git a/creusot/tests/should_succeed/replace.mlcfg b/creusot/tests/should_succeed/replace.mlcfg
index 7b5eafc777..99b9806c9b 100644
--- a/creusot/tests/should_succeed/replace.mlcfg
+++ b/creusot/tests/should_succeed/replace.mlcfg
@@ -28,12 +28,12 @@ module Replace_Test
     goto BB1
   }
   BB1 {
-    [#"../replace.rs" 9 4 9 6] _a <- ([#"../replace.rs" 9 4 9 6] b);
+    [#"../replace.rs" 9 4 9 6] _a <- b;
     b <- any Replace_Something_Type.t_something;
     goto BB3
   }
   BB3 {
-    [#"../replace.rs" 8 45 10 1] _0 <- ([#"../replace.rs" 8 45 10 1] [#"../replace.rs" 8 45 10 1] ());
+    [#"../replace.rs" 8 45 10 1] _0 <- ([#"../replace.rs" 8 45 10 1] ());
     goto BB4
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/resolve_uninit.mlcfg b/creusot/tests/should_succeed/resolve_uninit.mlcfg
index 3d4b7b50b8..79d68e3d13 100644
--- a/creusot/tests/should_succeed/resolve_uninit.mlcfg
+++ b/creusot/tests/should_succeed/resolve_uninit.mlcfg
@@ -50,30 +50,30 @@ module ResolveUninit_MaybeUninit
     goto BB3
   }
   BB3 {
-    [#"../resolve_uninit.rs" 8 8 8 9] x <- ([#"../resolve_uninit.rs" 8 8 8 9] _6);
+    [#"../resolve_uninit.rs" 8 8 8 9] x <- _6;
     _6 <- any t;
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     goto BB5
   }
   BB5 {
-    [#"../resolve_uninit.rs" 7 9 9 5] _4 <- ([#"../resolve_uninit.rs" 7 9 9 5] [#"../resolve_uninit.rs" 7 9 9 5] ());
+    [#"../resolve_uninit.rs" 7 9 9 5] _4 <- ([#"../resolve_uninit.rs" 7 9 9 5] ());
     goto BB7
   }
   BB6 {
-    [#"../resolve_uninit.rs" 9 5 9 5] _4 <- ([#"../resolve_uninit.rs" 9 5 9 5] [#"../resolve_uninit.rs" 9 5 9 5] ());
+    [#"../resolve_uninit.rs" 9 5 9 5] _4 <- ([#"../resolve_uninit.rs" 9 5 9 5] ());
     goto BB7
   }
   BB7 {
     goto BB8
   }
   BB8 {
-    [#"../resolve_uninit.rs" 11 4 11 5] x <- ([#"../resolve_uninit.rs" 11 4 11 5] y);
+    [#"../resolve_uninit.rs" 11 4 11 5] x <- y;
     y <- any t;
     goto BB10
   }
   BB10 {
-    [#"../resolve_uninit.rs" 12 4 12 5] _0 <- ([#"../resolve_uninit.rs" 12 4 12 5] x);
+    [#"../resolve_uninit.rs" 12 4 12 5] _0 <- x;
     x <- any t;
     goto BB11
   }
@@ -124,17 +124,17 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 20 12 20 18] x <-  ^ _8;
     [#"../resolve_uninit.rs" 20 12 20 18] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../resolve_uninit.rs" 20 12 20 18] _8 <- { _8 with current = ( ^ _7) ; };
-    [#"../resolve_uninit.rs" 20 8 20 18] z <- ([#"../resolve_uninit.rs" 20 8 20 18] _7);
+    [#"../resolve_uninit.rs" 20 8 20 18] z <- _7;
     _7 <- any borrowed int32;
     assume { resolve0 _8 };
     [#"../resolve_uninit.rs" 21 12 21 19] _10 <- Borrow.borrow_final ( * z) (Borrow.get_id z);
     [#"../resolve_uninit.rs" 21 12 21 19] z <- { z with current = ( ^ _10) ; };
     [#"../resolve_uninit.rs" 21 12 21 19] _9 <- Borrow.borrow_final ( * _10) (Borrow.get_id _10);
     [#"../resolve_uninit.rs" 21 12 21 19] _10 <- { _10 with current = ( ^ _9) ; };
-    [#"../resolve_uninit.rs" 21 8 21 19] y <- ([#"../resolve_uninit.rs" 21 8 21 19] _9);
+    [#"../resolve_uninit.rs" 21 8 21 19] y <- _9;
     _9 <- any borrowed int32;
     assume { resolve0 _10 };
-    [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] [#"../resolve_uninit.rs" 19 9 23 5] ());
+    [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] ());
     goto BB7
   }
   BB2 {
@@ -142,23 +142,23 @@ module ResolveUninit_InitJoin
     [#"../resolve_uninit.rs" 24 12 24 18] x <-  ^ _12;
     [#"../resolve_uninit.rs" 24 12 24 18] _11 <- Borrow.borrow_final ( * _12) (Borrow.get_id _12);
     [#"../resolve_uninit.rs" 24 12 24 18] _12 <- { _12 with current = ( ^ _11) ; };
-    [#"../resolve_uninit.rs" 24 8 24 18] y <- ([#"../resolve_uninit.rs" 24 8 24 18] _11);
+    [#"../resolve_uninit.rs" 24 8 24 18] y <- _11;
     _11 <- any borrowed int32;
     assume { resolve0 _12 };
-    [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] [#"../resolve_uninit.rs" 23 11 25 5] ());
+    [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] ());
     goto BB3
   }
   BB3 {
-    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] [#"../resolve_uninit.rs" 27 9 27 10] (5 : int32)) ; };
+    [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 9 27 10] (5 : int32)) ; };
     assume { resolve0 y };
-    [#"../resolve_uninit.rs" 28 12 28 18] _14 <- ([#"../resolve_uninit.rs" 28 12 28 18] x = ([#"../resolve_uninit.rs" 28 17 28 18] (5 : int32)));
+    [#"../resolve_uninit.rs" 28 12 28 18] _14 <- x = ([#"../resolve_uninit.rs" 28 17 28 18] (5 : int32));
     switch (_14)
       | False -> goto BB5
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../resolve_uninit.rs" 15 38 29 1] _0 <- ([#"../resolve_uninit.rs" 15 38 29 1] [#"../resolve_uninit.rs" 15 38 29 1] ());
+    [#"../resolve_uninit.rs" 15 38 29 1] _0 <- ([#"../resolve_uninit.rs" 15 38 29 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/result/own.mlcfg b/creusot/tests/should_succeed/result/own.mlcfg
index c969ca5575..3f175a029b 100644
--- a/creusot/tests/should_succeed/result/own.mlcfg
+++ b/creusot/tests/should_succeed/result/own.mlcfg
@@ -134,7 +134,7 @@ module Own_Impl0_IsErr
     goto BB1
   }
   BB1 {
-    [#"../own.rs" 31 8 31 21] _0 <- ([#"../own.rs" 31 8 31 21] not _3);
+    [#"../own.rs" 31 8 31 21] _0 <- not _3;
     _3 <- any bool;
     return _0
   }
@@ -240,13 +240,13 @@ module Own_Impl0_Ok
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 40 27 40 28] x1 <- ([#"../own.rs" 40 27 40 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 40 27 40 28] x1 <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 x1 };
     assume { resolve1 x1 };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 40 33 40 37] _0 <- ([#"../own.rs" 40 33 40 37] Core_Option_Option_Type.C_None);
+    [#"../own.rs" 40 33 40 37] _0 <- Core_Option_Option_Type.C_None;
     goto BB9
   }
   BB5 {
@@ -256,11 +256,11 @@ module Own_Impl0_Ok
     absurd
   }
   BB6 {
-    [#"../own.rs" 38 26 38 27] x <- ([#"../own.rs" 38 26 38 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 38 26 38 27] x <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 38 32 38 39] _0 <- ([#"../own.rs" 38 32 38 39] Core_Option_Option_Type.C_Some x);
+    [#"../own.rs" 38 32 38 39] _0 <- Core_Option_Option_Type.C_Some x;
     x <- any t;
     goto BB7
   }
@@ -370,11 +370,11 @@ module Own_Impl0_Err
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 50 27 50 28] x1 <- ([#"../own.rs" 50 27 50 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 50 27 50 28] x1 <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 50 33 50 40] _0 <- ([#"../own.rs" 50 33 50 40] Core_Option_Option_Type.C_Some x1);
+    [#"../own.rs" 50 33 50 40] _0 <- Core_Option_Option_Type.C_Some x1;
     x1 <- any e;
     goto BB8
   }
@@ -385,13 +385,13 @@ module Own_Impl0_Err
     absurd
   }
   BB6 {
-    [#"../own.rs" 49 26 49 27] x <- ([#"../own.rs" 49 26 49 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 49 26 49 27] x <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 49 32 49 36] _0 <- ([#"../own.rs" 49 32 49 36] Core_Option_Option_Type.C_None);
+    [#"../own.rs" 49 32 49 36] _0 <- Core_Option_Option_Type.C_None;
     goto BB7
   }
   BB7 {
@@ -490,12 +490,12 @@ module Own_Impl0_AsRef
     goto BB4
   }
   BB2 {
-    [#"../own.rs" 59 27 59 32] x1 <- ([#"../own.rs" 59 27 59 32] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 59 27 59 32] x1 <- Own_OwnResult_Type.err_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv2 x1 };
     assume { resolve2 x1 };
-    [#"../own.rs" 59 37 59 54] _0 <- ([#"../own.rs" 59 37 59 54] Own_OwnResult_Type.C_Err x1);
+    [#"../own.rs" 59 37 59 54] _0 <- Own_OwnResult_Type.C_Err x1;
     goto BB5
   }
   BB3 {
@@ -505,12 +505,12 @@ module Own_Impl0_AsRef
     absurd
   }
   BB4 {
-    [#"../own.rs" 58 26 58 31] x <- ([#"../own.rs" 58 26 58 31] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 58 26 58 31] x <- Own_OwnResult_Type.ok_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 x };
     assume { resolve1 x };
-    [#"../own.rs" 58 36 58 52] _0 <- ([#"../own.rs" 58 36 58 52] Own_OwnResult_Type.C_Ok x);
+    [#"../own.rs" 58 36 58 52] _0 <- Own_OwnResult_Type.C_Ok x;
     goto BB5
   }
   BB5 {
@@ -623,7 +623,7 @@ module Own_Impl0_AsMut
     [#"../own.rs" 74 56 74 57] _7 <- Borrow.borrow_final ( * x1) (Borrow.get_id x1);
     [#"../own.rs" 74 56 74 57] x1 <- { x1 with current = ( ^ _7) ; };
     assume { inv2 ( ^ _7) };
-    [#"../own.rs" 74 41 74 58] _0 <- ([#"../own.rs" 74 41 74 58] Own_OwnResult_Type.C_Err _7);
+    [#"../own.rs" 74 41 74 58] _0 <- Own_OwnResult_Type.C_Err _7;
     _7 <- any borrowed e;
     assert { [@expl:type invariant] inv3 x1 };
     assume { resolve1 x1 };
@@ -642,7 +642,7 @@ module Own_Impl0_AsMut
     [#"../own.rs" 73 54 73 55] _5 <- Borrow.borrow_final ( * x) (Borrow.get_id x);
     [#"../own.rs" 73 54 73 55] x <- { x with current = ( ^ _5) ; };
     assume { inv0 ( ^ _5) };
-    [#"../own.rs" 73 40 73 56] _0 <- ([#"../own.rs" 73 40 73 56] Own_OwnResult_Type.C_Ok _5);
+    [#"../own.rs" 73 40 73 56] _0 <- Own_OwnResult_Type.C_Ok _5;
     _5 <- any borrowed t;
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
@@ -732,7 +732,7 @@ module Own_Impl0_Unwrap
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 86 27 86 29] _e <- ([#"../own.rs" 86 27 86 29] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 86 27 86 29] _e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 _e };
     assume { resolve1 _e };
@@ -748,11 +748,11 @@ module Own_Impl0_Unwrap
     absurd
   }
   BB6 {
-    [#"../own.rs" 85 26 85 27] t <- ([#"../own.rs" 85 26 85 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 85 26 85 27] t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 85 32 85 33] _0 <- ([#"../own.rs" 85 32 85 33] t);
+    [#"../own.rs" 85 32 85 33] _0 <- t;
     t <- any t;
     goto BB7
   }
@@ -842,7 +842,7 @@ module Own_Impl0_Expect
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 98 27 98 29] _e <- ([#"../own.rs" 98 27 98 29] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 98 27 98 29] _e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 _e };
     assume { resolve1 _e };
@@ -858,11 +858,11 @@ module Own_Impl0_Expect
     absurd
   }
   BB6 {
-    [#"../own.rs" 97 26 97 27] t <- ([#"../own.rs" 97 26 97 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 97 26 97 27] t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 97 32 97 33] _0 <- ([#"../own.rs" 97 32 97 33] t);
+    [#"../own.rs" 97 32 97 33] _0 <- t;
     t <- any t;
     goto BB7
   }
@@ -951,11 +951,11 @@ module Own_Impl0_UnwrapErr
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 110 27 110 28] e <- ([#"../own.rs" 110 27 110 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 110 27 110 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 110 33 110 34] _0 <- ([#"../own.rs" 110 33 110 34] e);
+    [#"../own.rs" 110 33 110 34] _0 <- e;
     e <- any e;
     goto BB7
   }
@@ -966,7 +966,7 @@ module Own_Impl0_UnwrapErr
     absurd
   }
   BB6 {
-    [#"../own.rs" 109 26 109 28] _t <- ([#"../own.rs" 109 26 109 28] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 109 26 109 28] _t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
@@ -1063,13 +1063,13 @@ module Own_Impl0_UnwrapOr
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 120 27 120 28] e <- ([#"../own.rs" 120 27 120 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 120 27 120 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv2 e };
     assume { resolve2 e };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 120 33 120 40] _0 <- ([#"../own.rs" 120 33 120 40] default);
+    [#"../own.rs" 120 33 120 40] _0 <- default;
     default <- any t;
     goto BB8
   }
@@ -1084,11 +1084,11 @@ module Own_Impl0_UnwrapOr
   BB6 {
     assert { [@expl:type invariant] inv0 default };
     assume { resolve0 default };
-    [#"../own.rs" 118 26 118 27] t <- ([#"../own.rs" 118 26 118 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 118 26 118 27] t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 118 32 118 33] _0 <- ([#"../own.rs" 118 32 118 33] t);
+    [#"../own.rs" 118 32 118 33] _0 <- t;
     t <- any t;
     goto BB7
   }
@@ -1206,11 +1206,11 @@ module Own_Impl0_UnwrapOrDefault
     absurd
   }
   BB6 {
-    [#"../own.rs" 131 26 131 27] x <- ([#"../own.rs" 131 26 131 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 131 26 131 27] x <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 131 32 131 33] _0 <- ([#"../own.rs" 131 32 131 33] x);
+    [#"../own.rs" 131 32 131 33] _0 <- x;
     x <- any t;
     goto BB7
   }
@@ -1329,11 +1329,11 @@ module Own_Impl0_And
   BB4 {
     assert { [@expl:type invariant] inv2 res };
     assume { resolve2 res };
-    [#"../own.rs" 142 27 142 28] e <- ([#"../own.rs" 142 27 142 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 142 27 142 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 142 33 142 50] _0 <- ([#"../own.rs" 142 33 142 50] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 142 33 142 50] _0 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB8
   }
@@ -1346,13 +1346,13 @@ module Own_Impl0_And
     absurd
   }
   BB6 {
-    [#"../own.rs" 141 26 141 27] x <- ([#"../own.rs" 141 26 141 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 141 26 141 27] x <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 141 32 141 35] _0 <- ([#"../own.rs" 141 32 141 35] res);
+    [#"../own.rs" 141 32 141 35] _0 <- res;
     res <- any Own_OwnResult_Type.t_ownresult u e;
     goto BB7
   }
@@ -1479,13 +1479,13 @@ module Own_Impl0_Or
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 152 27 152 28] e <- ([#"../own.rs" 152 27 152 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 152 27 152 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv2 e };
     assume { resolve2 e };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 152 33 152 36] _0 <- ([#"../own.rs" 152 33 152 36] res);
+    [#"../own.rs" 152 33 152 36] _0 <- res;
     res <- any Own_OwnResult_Type.t_ownresult t f;
     goto BB9
   }
@@ -1500,11 +1500,11 @@ module Own_Impl0_Or
   BB6 {
     assert { [@expl:type invariant] inv0 res };
     assume { resolve0 res };
-    [#"../own.rs" 150 26 150 27] v <- ([#"../own.rs" 150 26 150 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 150 26 150 27] v <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t));
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../own.rs" 150 32 150 48] _0 <- ([#"../own.rs" 150 32 150 48] Own_OwnResult_Type.C_Ok v);
+    [#"../own.rs" 150 32 150 48] _0 <- Own_OwnResult_Type.C_Ok v;
     v <- any t;
     goto BB7
   }
@@ -1617,11 +1617,11 @@ module Own_Impl1_Copied
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 167 27 167 28] e <- ([#"../own.rs" 167 27 167 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 167 27 167 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 167 33 167 50] _0 <- ([#"../own.rs" 167 33 167 50] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 167 33 167 50] _0 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB7
   }
@@ -1632,12 +1632,12 @@ module Own_Impl1_Copied
     absurd
   }
   BB6 {
-    [#"../own.rs" 166 26 166 27] t <- ([#"../own.rs" 166 26 166 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 166 26 166 27] t <- Own_OwnResult_Type.ok_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 166 32 166 49] _0 <- ([#"../own.rs" 166 32 166 49] Own_OwnResult_Type.C_Ok t);
+    [#"../own.rs" 166 32 166 49] _0 <- Own_OwnResult_Type.C_Ok t;
     goto BB9
   }
   BB7 {
@@ -1758,11 +1758,11 @@ module Own_Impl1_Cloned
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 180 27 180 28] e <- ([#"../own.rs" 180 27 180 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 180 27 180 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 180 33 180 50] _0 <- ([#"../own.rs" 180 33 180 50] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 180 33 180 50] _0 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB9
   }
@@ -1773,7 +1773,7 @@ module Own_Impl1_Cloned
     absurd
   }
   BB6 {
-    [#"../own.rs" 179 26 179 27] t <- ([#"../own.rs" 179 26 179 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 179 26 179 27] t <- Own_OwnResult_Type.ok_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
@@ -1782,7 +1782,7 @@ module Own_Impl1_Cloned
     goto BB7
   }
   BB7 {
-    [#"../own.rs" 179 32 179 56] _0 <- ([#"../own.rs" 179 32 179 56] Own_OwnResult_Type.C_Ok _6);
+    [#"../own.rs" 179 32 179 56] _0 <- Own_OwnResult_Type.C_Ok _6;
     _6 <- any t;
     goto BB8
   }
@@ -1893,11 +1893,11 @@ module Own_Impl2_Copied
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 195 27 195 28] e <- ([#"../own.rs" 195 27 195 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 195 27 195 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 195 33 195 50] _0 <- ([#"../own.rs" 195 33 195 50] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 195 33 195 50] _0 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB7
   }
@@ -1908,13 +1908,13 @@ module Own_Impl2_Copied
     absurd
   }
   BB6 {
-    [#"../own.rs" 194 26 194 27] t <- ([#"../own.rs" 194 26 194 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 194 26 194 27] t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 194 32 194 49] _0 <- ([#"../own.rs" 194 32 194 49] Own_OwnResult_Type.C_Ok ( * t));
+    [#"../own.rs" 194 32 194 49] _0 <- Own_OwnResult_Type.C_Ok ( * t);
     goto BB9
   }
   BB7 {
@@ -2045,11 +2045,11 @@ module Own_Impl2_Cloned
     goto BB6
   }
   BB4 {
-    [#"../own.rs" 208 27 208 28] e <- ([#"../own.rs" 208 27 208 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 208 27 208 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 208 33 208 50] _0 <- ([#"../own.rs" 208 33 208 50] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 208 33 208 50] _0 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB9
   }
@@ -2060,7 +2060,7 @@ module Own_Impl2_Cloned
     absurd
   }
   BB6 {
-    [#"../own.rs" 207 26 207 27] t <- ([#"../own.rs" 207 26 207 27] Own_OwnResult_Type.ok_0 self);
+    [#"../own.rs" 207 26 207 27] t <- Own_OwnResult_Type.ok_0 self;
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
@@ -2070,7 +2070,7 @@ module Own_Impl2_Cloned
   BB7 {
     assert { [@expl:type invariant] inv1 t };
     assume { resolve1 t };
-    [#"../own.rs" 207 32 207 56] _0 <- ([#"../own.rs" 207 32 207 56] Own_OwnResult_Type.C_Ok _6);
+    [#"../own.rs" 207 32 207 56] _0 <- Own_OwnResult_Type.C_Ok _6;
     _6 <- any t;
     goto BB8
   }
@@ -2205,25 +2205,25 @@ module Own_Impl3_Transpose
     absurd
   }
   BB8 {
-    [#"../own.rs" 221 27 221 28] e <- ([#"../own.rs" 221 27 221 28] Own_OwnResult_Type.err_0 self);
+    [#"../own.rs" 221 27 221 28] e <- Own_OwnResult_Type.err_0 self;
     self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 221 38 221 55] _11 <- ([#"../own.rs" 221 38 221 55] Own_OwnResult_Type.C_Err e);
+    [#"../own.rs" 221 38 221 55] _11 <- Own_OwnResult_Type.C_Err e;
     e <- any e;
     goto BB14
   }
   BB9 {
-    [#"../own.rs" 219 31 219 32] x <- ([#"../own.rs" 219 31 219 32] Core_Option_Option_Type.some_0 (Own_OwnResult_Type.ok_0 self));
+    [#"../own.rs" 219 31 219 32] x <- Core_Option_Option_Type.some_0 (Own_OwnResult_Type.ok_0 self);
     self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (let Core_Option_Option_Type.C_Some x0 = Own_OwnResult_Type.ok_0 self in Core_Option_Option_Type.C_Some (any t)));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 219 43 219 59] _8 <- ([#"../own.rs" 219 43 219 59] Own_OwnResult_Type.C_Ok x);
+    [#"../own.rs" 219 43 219 59] _8 <- Own_OwnResult_Type.C_Ok x;
     x <- any t;
     goto BB10
   }
   BB10 {
-    [#"../own.rs" 219 38 219 60] _0 <- ([#"../own.rs" 219 38 219 60] Core_Option_Option_Type.C_Some _8);
+    [#"../own.rs" 219 38 219 60] _0 <- Core_Option_Option_Type.C_Some _8;
     _8 <- any Own_OwnResult_Type.t_ownresult t e;
     goto BB11
   }
@@ -2236,11 +2236,11 @@ module Own_Impl3_Transpose
   BB13 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../own.rs" 220 35 220 39] _0 <- ([#"../own.rs" 220 35 220 39] Core_Option_Option_Type.C_None);
+    [#"../own.rs" 220 35 220 39] _0 <- Core_Option_Option_Type.C_None;
     goto BB17
   }
   BB14 {
-    [#"../own.rs" 221 33 221 56] _0 <- ([#"../own.rs" 221 33 221 56] Core_Option_Option_Type.C_Some _11);
+    [#"../own.rs" 221 33 221 56] _0 <- Core_Option_Option_Type.C_Some _11;
     _11 <- any Own_OwnResult_Type.t_ownresult t e;
     goto BB15
   }
diff --git a/creusot/tests/should_succeed/result/result.mlcfg b/creusot/tests/should_succeed/result/result.mlcfg
index c8a974761b..07b4e4f6fb 100644
--- a/creusot/tests/should_succeed/result/result.mlcfg
+++ b/creusot/tests/should_succeed/result/result.mlcfg
@@ -517,8 +517,8 @@ module Result_TestResult
     goto BB0
   }
   BB0 {
-    [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok ([#"../result.rs" 4 38 4 39] (1 : int32)));
-    [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err ([#"../result.rs" 5 40 5 42] (-1 : int32)));
+    [#"../result.rs" 4 35 4 40] ok <- Core_Result_Result_Type.C_Ok ([#"../result.rs" 4 38 4 39] (1 : int32));
+    [#"../result.rs" 5 36 5 43] err <- Core_Result_Result_Type.C_Err ([#"../result.rs" 5 40 5 42] (-1 : int32));
     [#"../result.rs" 8 12 8 22] _4 <- ([#"../result.rs" 8 12 8 22] is_ok0 ok);
     goto BB1
   }
@@ -588,7 +588,7 @@ module Result_TestResult
     goto BB16
   }
   BB16 {
-    [#"../result.rs" 13 12 13 33] _16 <- ([#"../result.rs" 13 12 13 33] _17 = ([#"../result.rs" 13 32 13 33] (1 : int32)));
+    [#"../result.rs" 13 12 13 33] _16 <- _17 = ([#"../result.rs" 13 32 13 33] (1 : int32));
     _17 <- any int32;
     switch (_16)
       | False -> goto BB18
@@ -645,7 +645,7 @@ module Result_TestResult
     goto BB28
   }
   BB28 {
-    [#"../result.rs" 17 12 17 36] _34 <- ([#"../result.rs" 17 12 17 36] _35 = ([#"../result.rs" 17 34 17 36] (-1 : int32)));
+    [#"../result.rs" 17 12 17 36] _34 <- _35 = ([#"../result.rs" 17 34 17 36] (-1 : int32));
     _35 <- any int32;
     switch (_34)
       | False -> goto BB30
@@ -666,7 +666,7 @@ module Result_TestResult
     goto BB32
   }
   BB32 {
-    [#"../result.rs" 20 12 20 38] _40 <- ([#"../result.rs" 20 12 20 38] _42 = ([#"../result.rs" 20 37 20 38] (1 : int32)));
+    [#"../result.rs" 20 12 20 38] _40 <- _42 = ([#"../result.rs" 20 37 20 38] (1 : int32));
     switch (_40)
       | False -> goto BB34
       | True -> goto BB33
@@ -686,7 +686,7 @@ module Result_TestResult
     goto BB36
   }
   BB36 {
-    [#"../result.rs" 21 12 21 44] _47 <- ([#"../result.rs" 21 12 21 44] _49 = ([#"../result.rs" 21 42 21 44] (-1 : int32)));
+    [#"../result.rs" 21 12 21 44] _47 <- _49 = ([#"../result.rs" 21 42 21 44] (-1 : int32));
     switch (_47)
       | False -> goto BB38
       | True -> goto BB37
@@ -709,13 +709,13 @@ module Result_TestResult
     goto BB40
   }
   BB40 {
-    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] [#"../result.rs" 23 28 23 29] (0 : int32)) ; };
+    [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 28 23 29] (0 : int32)) ; };
     assume { resolve0 _53 };
     [#"../result.rs" 24 12 24 23] _58 <- ([#"../result.rs" 24 12 24 23] unwrap3 ok);
     goto BB41
   }
   BB41 {
-    [#"../result.rs" 24 12 24 28] _57 <- ([#"../result.rs" 24 12 24 28] _58 = ([#"../result.rs" 24 27 24 28] (0 : int32)));
+    [#"../result.rs" 24 12 24 28] _57 <- _58 = ([#"../result.rs" 24 27 24 28] (0 : int32));
     _58 <- any int32;
     switch (_57)
       | False -> goto BB43
@@ -739,13 +739,13 @@ module Result_TestResult
     goto BB45
   }
   BB45 {
-    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] [#"../result.rs" 25 28 25 29] (1 : int32)) ; };
+    [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 28 25 29] (1 : int32)) ; };
     assume { resolve0 _61 };
     [#"../result.rs" 26 12 26 23] _66 <- ([#"../result.rs" 26 12 26 23] unwrap3 ok);
     goto BB46
   }
   BB46 {
-    [#"../result.rs" 26 12 26 28] _65 <- ([#"../result.rs" 26 12 26 28] _66 = ([#"../result.rs" 26 27 26 28] (1 : int32)));
+    [#"../result.rs" 26 12 26 28] _65 <- _66 = ([#"../result.rs" 26 27 26 28] (1 : int32));
     _66 <- any int32;
     switch (_65)
       | False -> goto BB48
@@ -769,13 +769,13 @@ module Result_TestResult
     goto BB50
   }
   BB50 {
-    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] [#"../result.rs" 27 33 27 34] (0 : int32)) ; };
+    [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 33 27 34] (0 : int32)) ; };
     assume { resolve0 _69 };
     [#"../result.rs" 28 12 28 28] _74 <- ([#"../result.rs" 28 12 28 28] unwrap_err2 err);
     goto BB51
   }
   BB51 {
-    [#"../result.rs" 28 12 28 33] _73 <- ([#"../result.rs" 28 12 28 33] _74 = ([#"../result.rs" 28 32 28 33] (0 : int32)));
+    [#"../result.rs" 28 12 28 33] _73 <- _74 = ([#"../result.rs" 28 32 28 33] (0 : int32));
     _74 <- any int32;
     switch (_73)
       | False -> goto BB53
@@ -799,13 +799,13 @@ module Result_TestResult
     goto BB55
   }
   BB55 {
-    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] [#"../result.rs" 29 33 29 35] (-1 : int32)) ; };
+    [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 33 29 35] (-1 : int32)) ; };
     assume { resolve0 _77 };
     [#"../result.rs" 30 12 30 28] _82 <- ([#"../result.rs" 30 12 30 28] unwrap_err2 err);
     goto BB56
   }
   BB56 {
-    [#"../result.rs" 30 12 30 34] _81 <- ([#"../result.rs" 30 12 30 34] _82 = ([#"../result.rs" 30 32 30 34] (-1 : int32)));
+    [#"../result.rs" 30 12 30 34] _81 <- _82 = ([#"../result.rs" 30 32 30 34] (-1 : int32));
     _82 <- any int32;
     switch (_81)
       | False -> goto BB58
@@ -821,7 +821,7 @@ module Result_TestResult
     absurd
   }
   BB59 {
-    [#"../result.rs" 33 12 33 28] _86 <- ([#"../result.rs" 33 12 33 28] _87 = ([#"../result.rs" 33 27 33 28] (1 : int32)));
+    [#"../result.rs" 33 12 33 28] _86 <- _87 = ([#"../result.rs" 33 27 33 28] (1 : int32));
     _87 <- any int32;
     switch (_86)
       | False -> goto BB61
@@ -837,7 +837,7 @@ module Result_TestResult
     absurd
   }
   BB62 {
-    [#"../result.rs" 37 12 37 34] _91 <- ([#"../result.rs" 37 12 37 34] _92 = ([#"../result.rs" 37 32 37 34] (-1 : int32)));
+    [#"../result.rs" 37 12 37 34] _91 <- _92 = ([#"../result.rs" 37 32 37 34] (-1 : int32));
     _92 <- any int32;
     switch (_91)
       | False -> goto BB64
@@ -853,7 +853,7 @@ module Result_TestResult
     absurd
   }
   BB65 {
-    [#"../result.rs" 40 12 40 32] _96 <- ([#"../result.rs" 40 12 40 32] _97 = ([#"../result.rs" 40 31 40 32] (1 : int32)));
+    [#"../result.rs" 40 12 40 32] _96 <- _97 = ([#"../result.rs" 40 31 40 32] (1 : int32));
     _97 <- any int32;
     switch (_96)
       | False -> goto BB67
@@ -869,7 +869,7 @@ module Result_TestResult
     absurd
   }
   BB68 {
-    [#"../result.rs" 41 12 41 33] _101 <- ([#"../result.rs" 41 12 41 33] _102 = ([#"../result.rs" 41 32 41 33] (0 : int32)));
+    [#"../result.rs" 41 12 41 33] _101 <- _102 = ([#"../result.rs" 41 32 41 33] (0 : int32));
     _102 <- any int32;
     switch (_101)
       | False -> goto BB70
@@ -885,7 +885,7 @@ module Result_TestResult
     absurd
   }
   BB71 {
-    [#"../result.rs" 43 12 43 39] _106 <- ([#"../result.rs" 43 12 43 39] _107 = ([#"../result.rs" 43 38 43 39] (1 : int32)));
+    [#"../result.rs" 43 12 43 39] _106 <- _107 = ([#"../result.rs" 43 38 43 39] (1 : int32));
     _107 <- any int32;
     switch (_106)
       | False -> goto BB73
@@ -901,7 +901,7 @@ module Result_TestResult
     absurd
   }
   BB74 {
-    [#"../result.rs" 44 12 44 40] _111 <- ([#"../result.rs" 44 12 44 40] _112 = ([#"../result.rs" 44 39 44 40] (0 : int32)));
+    [#"../result.rs" 44 12 44 40] _111 <- _112 = ([#"../result.rs" 44 39 44 40] (0 : int32));
     _112 <- any int32;
     switch (_111)
       | False -> goto BB76
@@ -909,7 +909,7 @@ module Result_TestResult
       end
   }
   BB75 {
-    [#"../result.rs" 47 26 47 33] _120 <- ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err ([#"../result.rs" 47 30 47 32] (-2 : int32)));
+    [#"../result.rs" 47 26 47 33] _120 <- Core_Result_Result_Type.C_Err ([#"../result.rs" 47 30 47 32] (-2 : int32));
     [#"../result.rs" 47 12 47 34] _118 <- ([#"../result.rs" 47 12 47 34] and0 ok _120);
     _120 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB77
@@ -924,7 +924,7 @@ module Result_TestResult
     goto BB78
   }
   BB78 {
-    [#"../result.rs" 47 12 47 53] _116 <- ([#"../result.rs" 47 12 47 53] _117 = ([#"../result.rs" 47 51 47 53] (-2 : int32)));
+    [#"../result.rs" 47 12 47 53] _116 <- _117 = ([#"../result.rs" 47 51 47 53] (-2 : int32));
     _117 <- any int32;
     switch (_116)
       | False -> goto BB80
@@ -932,7 +932,7 @@ module Result_TestResult
       end
   }
   BB79 {
-    [#"../result.rs" 48 19 48 24] _127 <- ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok ([#"../result.rs" 48 22 48 23] (2 : int32)));
+    [#"../result.rs" 48 19 48 24] _127 <- Core_Result_Result_Type.C_Ok ([#"../result.rs" 48 22 48 23] (2 : int32));
     [#"../result.rs" 48 12 48 25] _125 <- ([#"../result.rs" 48 12 48 25] and0 ok _127);
     _127 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB81
@@ -947,7 +947,7 @@ module Result_TestResult
     goto BB82
   }
   BB82 {
-    [#"../result.rs" 48 12 48 39] _123 <- ([#"../result.rs" 48 12 48 39] _124 = ([#"../result.rs" 48 38 48 39] (2 : int32)));
+    [#"../result.rs" 48 12 48 39] _123 <- _124 = ([#"../result.rs" 48 38 48 39] (2 : int32));
     _124 <- any int32;
     switch (_123)
       | False -> goto BB84
@@ -955,7 +955,7 @@ module Result_TestResult
       end
   }
   BB83 {
-    [#"../result.rs" 49 27 49 34] _134 <- ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err ([#"../result.rs" 49 31 49 33] (-2 : int32)));
+    [#"../result.rs" 49 27 49 34] _134 <- Core_Result_Result_Type.C_Err ([#"../result.rs" 49 31 49 33] (-2 : int32));
     [#"../result.rs" 49 12 49 35] _132 <- ([#"../result.rs" 49 12 49 35] and0 err _134);
     _134 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB85
@@ -970,7 +970,7 @@ module Result_TestResult
     goto BB86
   }
   BB86 {
-    [#"../result.rs" 49 12 49 54] _130 <- ([#"../result.rs" 49 12 49 54] _131 = ([#"../result.rs" 49 52 49 54] (-1 : int32)));
+    [#"../result.rs" 49 12 49 54] _130 <- _131 = ([#"../result.rs" 49 52 49 54] (-1 : int32));
     _131 <- any int32;
     switch (_130)
       | False -> goto BB88
@@ -978,7 +978,7 @@ module Result_TestResult
       end
   }
   BB87 {
-    [#"../result.rs" 50 20 50 25] _141 <- ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok ([#"../result.rs" 50 23 50 24] (2 : int32)));
+    [#"../result.rs" 50 20 50 25] _141 <- Core_Result_Result_Type.C_Ok ([#"../result.rs" 50 23 50 24] (2 : int32));
     [#"../result.rs" 50 12 50 26] _139 <- ([#"../result.rs" 50 12 50 26] and0 err _141);
     _141 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB89
@@ -993,7 +993,7 @@ module Result_TestResult
     goto BB90
   }
   BB90 {
-    [#"../result.rs" 50 12 50 45] _137 <- ([#"../result.rs" 50 12 50 45] _138 = ([#"../result.rs" 50 43 50 45] (-1 : int32)));
+    [#"../result.rs" 50 12 50 45] _137 <- _138 = ([#"../result.rs" 50 43 50 45] (-1 : int32));
     _138 <- any int32;
     switch (_137)
       | False -> goto BB92
@@ -1001,7 +1001,7 @@ module Result_TestResult
       end
   }
   BB91 {
-    [#"../result.rs" 53 18 53 25] _148 <- ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err ([#"../result.rs" 53 22 53 24] (-2 : int32)));
+    [#"../result.rs" 53 18 53 25] _148 <- Core_Result_Result_Type.C_Err ([#"../result.rs" 53 22 53 24] (-2 : int32));
     [#"../result.rs" 53 12 53 26] _146 <- ([#"../result.rs" 53 12 53 26] or0 ok _148);
     _148 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB93
@@ -1016,7 +1016,7 @@ module Result_TestResult
     goto BB94
   }
   BB94 {
-    [#"../result.rs" 53 12 53 40] _144 <- ([#"../result.rs" 53 12 53 40] _145 = ([#"../result.rs" 53 39 53 40] (1 : int32)));
+    [#"../result.rs" 53 12 53 40] _144 <- _145 = ([#"../result.rs" 53 39 53 40] (1 : int32));
     _145 <- any int32;
     switch (_144)
       | False -> goto BB96
@@ -1024,7 +1024,7 @@ module Result_TestResult
       end
   }
   BB95 {
-    [#"../result.rs" 54 25 54 30] _155 <- ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok ([#"../result.rs" 54 28 54 29] (2 : int32)));
+    [#"../result.rs" 54 25 54 30] _155 <- Core_Result_Result_Type.C_Ok ([#"../result.rs" 54 28 54 29] (2 : int32));
     [#"../result.rs" 54 12 54 31] _153 <- ([#"../result.rs" 54 12 54 31] or0 ok _155);
     _155 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB97
@@ -1039,7 +1039,7 @@ module Result_TestResult
     goto BB98
   }
   BB98 {
-    [#"../result.rs" 54 12 54 45] _151 <- ([#"../result.rs" 54 12 54 45] _152 = ([#"../result.rs" 54 44 54 45] (1 : int32)));
+    [#"../result.rs" 54 12 54 45] _151 <- _152 = ([#"../result.rs" 54 44 54 45] (1 : int32));
     _152 <- any int32;
     switch (_151)
       | False -> goto BB100
@@ -1047,7 +1047,7 @@ module Result_TestResult
       end
   }
   BB99 {
-    [#"../result.rs" 55 19 55 26] _162 <- ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err ([#"../result.rs" 55 23 55 25] (-2 : int32)));
+    [#"../result.rs" 55 19 55 26] _162 <- Core_Result_Result_Type.C_Err ([#"../result.rs" 55 23 55 25] (-2 : int32));
     [#"../result.rs" 55 12 55 27] _160 <- ([#"../result.rs" 55 12 55 27] or0 err _162);
     _162 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB101
@@ -1062,7 +1062,7 @@ module Result_TestResult
     goto BB102
   }
   BB102 {
-    [#"../result.rs" 55 12 55 46] _158 <- ([#"../result.rs" 55 12 55 46] _159 = ([#"../result.rs" 55 44 55 46] (-2 : int32)));
+    [#"../result.rs" 55 12 55 46] _158 <- _159 = ([#"../result.rs" 55 44 55 46] (-2 : int32));
     _159 <- any int32;
     switch (_158)
       | False -> goto BB104
@@ -1070,7 +1070,7 @@ module Result_TestResult
       end
   }
   BB103 {
-    [#"../result.rs" 56 26 56 31] _169 <- ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok ([#"../result.rs" 56 29 56 30] (2 : int32)));
+    [#"../result.rs" 56 26 56 31] _169 <- Core_Result_Result_Type.C_Ok ([#"../result.rs" 56 29 56 30] (2 : int32));
     [#"../result.rs" 56 12 56 32] _167 <- ([#"../result.rs" 56 12 56 32] or0 err _169);
     _169 <- any Core_Result_Result_Type.t_result int32 int32;
     goto BB105
@@ -1085,7 +1085,7 @@ module Result_TestResult
     goto BB106
   }
   BB106 {
-    [#"../result.rs" 56 12 56 46] _165 <- ([#"../result.rs" 56 12 56 46] _166 = ([#"../result.rs" 56 45 56 46] (2 : int32)));
+    [#"../result.rs" 56 12 56 46] _165 <- _166 = ([#"../result.rs" 56 45 56 46] (2 : int32));
     _166 <- any int32;
     switch (_165)
       | False -> goto BB108
@@ -1111,7 +1111,7 @@ module Result_TestResult
     goto BB111
   }
   BB111 {
-    [#"../result.rs" 59 12 59 46] _172 <- ([#"../result.rs" 59 12 59 46] _173 = ([#"../result.rs" 59 45 59 46] (1 : int32)));
+    [#"../result.rs" 59 12 59 46] _172 <- _173 = ([#"../result.rs" 59 45 59 46] (1 : int32));
     _173 <- any int32;
     switch (_172)
       | False -> goto BB113
@@ -1137,7 +1137,7 @@ module Result_TestResult
     goto BB116
   }
   BB116 {
-    [#"../result.rs" 60 12 60 53] _179 <- ([#"../result.rs" 60 12 60 53] _181 = ([#"../result.rs" 60 51 60 53] (-1 : int32)));
+    [#"../result.rs" 60 12 60 53] _179 <- _181 = ([#"../result.rs" 60 51 60 53] (-1 : int32));
     switch (_179)
       | False -> goto BB118
       | True -> goto BB117
@@ -1165,7 +1165,7 @@ module Result_TestResult
     goto BB121
   }
   BB121 {
-    [#"../result.rs" 61 12 61 46] _187 <- ([#"../result.rs" 61 12 61 46] _188 = ([#"../result.rs" 61 45 61 46] (1 : int32)));
+    [#"../result.rs" 61 12 61 46] _187 <- _188 = ([#"../result.rs" 61 45 61 46] (1 : int32));
     _188 <- any int32;
     switch (_187)
       | False -> goto BB123
@@ -1195,7 +1195,7 @@ module Result_TestResult
   }
   BB126 {
     assume { resolve0 _196 };
-    [#"../result.rs" 62 12 62 53] _194 <- ([#"../result.rs" 62 12 62 53]  * _196 = ([#"../result.rs" 62 51 62 53] (-1 : int32)));
+    [#"../result.rs" 62 12 62 53] _194 <-  * _196 = ([#"../result.rs" 62 51 62 53] (-1 : int32));
     switch (_194)
       | False -> goto BB128
       | True -> goto BB127
@@ -1220,7 +1220,7 @@ module Result_TestResult
     goto BB131
   }
   BB131 {
-    [#"../result.rs" 64 12 64 46] _202 <- ([#"../result.rs" 64 12 64 46] _203 = ([#"../result.rs" 64 45 64 46] (1 : int32)));
+    [#"../result.rs" 64 12 64 46] _202 <- _203 = ([#"../result.rs" 64 45 64 46] (1 : int32));
     _203 <- any int32;
     switch (_202)
       | False -> goto BB133
@@ -1246,7 +1246,7 @@ module Result_TestResult
     goto BB136
   }
   BB136 {
-    [#"../result.rs" 65 12 65 53] _209 <- ([#"../result.rs" 65 12 65 53] _211 = ([#"../result.rs" 65 51 65 53] (-1 : int32)));
+    [#"../result.rs" 65 12 65 53] _209 <- _211 = ([#"../result.rs" 65 51 65 53] (-1 : int32));
     switch (_209)
       | False -> goto BB138
       | True -> goto BB137
@@ -1274,7 +1274,7 @@ module Result_TestResult
     goto BB141
   }
   BB141 {
-    [#"../result.rs" 66 12 66 46] _217 <- ([#"../result.rs" 66 12 66 46] _218 = ([#"../result.rs" 66 45 66 46] (1 : int32)));
+    [#"../result.rs" 66 12 66 46] _217 <- _218 = ([#"../result.rs" 66 45 66 46] (1 : int32));
     _218 <- any int32;
     switch (_217)
       | False -> goto BB143
@@ -1304,15 +1304,15 @@ module Result_TestResult
   }
   BB146 {
     assume { resolve0 _226 };
-    [#"../result.rs" 67 12 67 53] _224 <- ([#"../result.rs" 67 12 67 53]  * _226 = ([#"../result.rs" 67 51 67 53] (-1 : int32)));
+    [#"../result.rs" 67 12 67 53] _224 <-  * _226 = ([#"../result.rs" 67 51 67 53] (-1 : int32));
     switch (_224)
       | False -> goto BB148
       | True -> goto BB147
       end
   }
   BB147 {
-    [#"../result.rs" 70 43 70 47] _232 <- ([#"../result.rs" 70 43 70 47] Core_Option_Option_Type.C_None);
-    [#"../result.rs" 70 40 70 48] res <- ([#"../result.rs" 70 40 70 48] Core_Result_Result_Type.C_Ok _232);
+    [#"../result.rs" 70 43 70 47] _232 <- Core_Option_Option_Type.C_None;
+    [#"../result.rs" 70 40 70 48] res <- Core_Result_Result_Type.C_Ok _232;
     _232 <- any Core_Option_Option_Type.t_option int32;
     [#"../result.rs" 71 12 71 27] _236 <- ([#"../result.rs" 71 12 71 27] transpose0 res);
     goto BB149
@@ -1332,8 +1332,8 @@ module Result_TestResult
       end
   }
   BB151 {
-    [#"../result.rs" 72 43 72 50] _240 <- ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some ([#"../result.rs" 72 48 72 49] (1 : int32)));
-    [#"../result.rs" 72 40 72 51] res1 <- ([#"../result.rs" 72 40 72 51] Core_Result_Result_Type.C_Ok _240);
+    [#"../result.rs" 72 43 72 50] _240 <- Core_Option_Option_Type.C_Some ([#"../result.rs" 72 48 72 49] (1 : int32));
+    [#"../result.rs" 72 40 72 51] res1 <- Core_Result_Result_Type.C_Ok _240;
     _240 <- any Core_Option_Option_Type.t_option int32;
     [#"../result.rs" 73 12 73 27] _245 <- ([#"../result.rs" 73 12 73 27] transpose0 res1);
     goto BB153
@@ -1353,7 +1353,7 @@ module Result_TestResult
     goto BB155
   }
   BB155 {
-    [#"../result.rs" 73 12 73 50] _242 <- ([#"../result.rs" 73 12 73 50] _243 = ([#"../result.rs" 73 49 73 50] (1 : int32)));
+    [#"../result.rs" 73 12 73 50] _242 <- _243 = ([#"../result.rs" 73 49 73 50] (1 : int32));
     _243 <- any int32;
     switch (_242)
       | False -> goto BB157
@@ -1361,7 +1361,7 @@ module Result_TestResult
       end
   }
   BB156 {
-    [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err ([#"../result.rs" 74 44 74 46] (-1 : int32)));
+    [#"../result.rs" 74 40 74 47] res2 <- Core_Result_Result_Type.C_Err ([#"../result.rs" 74 44 74 46] (-1 : int32));
     [#"../result.rs" 75 12 75 27] _253 <- ([#"../result.rs" 75 12 75 27] transpose0 res2);
     goto BB158
   }
@@ -1380,7 +1380,7 @@ module Result_TestResult
     goto BB160
   }
   BB160 {
-    [#"../result.rs" 75 12 75 55] _250 <- ([#"../result.rs" 75 12 75 55] _251 = ([#"../result.rs" 75 53 75 55] (-1 : int32)));
+    [#"../result.rs" 75 12 75 55] _250 <- _251 = ([#"../result.rs" 75 53 75 55] (-1 : int32));
     _251 <- any int32;
     switch (_250)
       | False -> goto BB162
@@ -1388,7 +1388,7 @@ module Result_TestResult
       end
   }
   BB161 {
-    [#"../result.rs" 3 21 76 1] _0 <- ([#"../result.rs" 3 21 76 1] [#"../result.rs" 3 21 76 1] ());
+    [#"../result.rs" 3 21 76 1] _0 <- ([#"../result.rs" 3 21 76 1] ());
     return _0
   }
   BB162 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
index aa6551e937..68d3e7b19d 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg
@@ -27,7 +27,7 @@ module IncMax_TakeMax
     goto BB0
   }
   BB0 {
-    [#"../inc_max.rs" 7 7 7 17] _6 <- ([#"../inc_max.rs" 7 7 7 17]  * ma >=  * mb);
+    [#"../inc_max.rs" 7 7 7 17] _6 <-  * ma >=  * mb;
     switch (_6)
       | False -> goto BB2
       | True -> goto BB1
@@ -110,16 +110,16 @@ module IncMax_IncMax
   BB1 {
     assume { resolve0 _8 };
     assume { resolve0 _6 };
-    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12]  * mc + ([#"../inc_max.rs" 17 11 17 12] (1 : uint32))) ; };
+    [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ( * mc + ([#"../inc_max.rs" 17 11 17 12] (1 : uint32))) ; };
     assume { resolve0 mc };
-    [#"../inc_max.rs" 18 12 18 18] _10 <- ([#"../inc_max.rs" 18 12 18 18] a <> b);
+    [#"../inc_max.rs" 18 12 18 18] _10 <- a <> b;
     switch (_10)
       | False -> goto BB3
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../inc_max.rs" 15 39 19 1] _0 <- ([#"../inc_max.rs" 15 39 19 1] [#"../inc_max.rs" 15 39 19 1] ());
+    [#"../inc_max.rs" 15 39 19 1] _0 <- ([#"../inc_max.rs" 15 39 19 1] ());
     return _0
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
index 218a4d16d3..7bf5320c30 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg
@@ -50,7 +50,7 @@ module IncMax3_IncMax3
     goto BB0
   }
   BB0 {
-    [#"../inc_max_3.rs" 13 7 13 16] _7 <- ([#"../inc_max_3.rs" 13 7 13 16]  * ma <  * mb);
+    [#"../inc_max_3.rs" 13 7 13 16] _7 <-  * ma <  * mb;
     switch (_7)
       | False -> goto BB3
       | True -> goto BB1
@@ -73,15 +73,15 @@ module IncMax3_IncMax3
   BB2 {
     assume { resolve0 _14 };
     assume { resolve0 _12 };
-    [#"../inc_max_3.rs" 13 17 15 5] _6 <- ([#"../inc_max_3.rs" 13 17 15 5] [#"../inc_max_3.rs" 13 17 15 5] ());
+    [#"../inc_max_3.rs" 13 17 15 5] _6 <- ([#"../inc_max_3.rs" 13 17 15 5] ());
     goto BB4
   }
   BB3 {
-    [#"../inc_max_3.rs" 15 5 15 5] _6 <- ([#"../inc_max_3.rs" 15 5 15 5] [#"../inc_max_3.rs" 15 5 15 5] ());
+    [#"../inc_max_3.rs" 15 5 15 5] _6 <- ([#"../inc_max_3.rs" 15 5 15 5] ());
     goto BB4
   }
   BB4 {
-    [#"../inc_max_3.rs" 16 7 16 16] _16 <- ([#"../inc_max_3.rs" 16 7 16 16]  * mb <  * mc);
+    [#"../inc_max_3.rs" 16 7 16 16] _16 <-  * mb <  * mc;
     switch (_16)
       | False -> goto BB7
       | True -> goto BB5
@@ -105,16 +105,16 @@ module IncMax3_IncMax3
     assume { resolve0 _23 };
     assume { resolve0 _21 };
     assume { resolve1 mc };
-    [#"../inc_max_3.rs" 16 17 18 5] _15 <- ([#"../inc_max_3.rs" 16 17 18 5] [#"../inc_max_3.rs" 16 17 18 5] ());
+    [#"../inc_max_3.rs" 16 17 18 5] _15 <- ([#"../inc_max_3.rs" 16 17 18 5] ());
     goto BB8
   }
   BB7 {
     assume { resolve1 mc };
-    [#"../inc_max_3.rs" 18 5 18 5] _15 <- ([#"../inc_max_3.rs" 18 5 18 5] [#"../inc_max_3.rs" 18 5 18 5] ());
+    [#"../inc_max_3.rs" 18 5 18 5] _15 <- ([#"../inc_max_3.rs" 18 5 18 5] ());
     goto BB8
   }
   BB8 {
-    [#"../inc_max_3.rs" 19 7 19 16] _25 <- ([#"../inc_max_3.rs" 19 7 19 16]  * ma <  * mb);
+    [#"../inc_max_3.rs" 19 7 19 16] _25 <-  * ma <  * mb;
     switch (_25)
       | False -> goto BB11
       | True -> goto BB9
@@ -137,19 +137,19 @@ module IncMax3_IncMax3
   BB10 {
     assume { resolve0 _32 };
     assume { resolve0 _30 };
-    [#"../inc_max_3.rs" 19 17 21 5] _24 <- ([#"../inc_max_3.rs" 19 17 21 5] [#"../inc_max_3.rs" 19 17 21 5] ());
+    [#"../inc_max_3.rs" 19 17 21 5] _24 <- ([#"../inc_max_3.rs" 19 17 21 5] ());
     goto BB12
   }
   BB11 {
-    [#"../inc_max_3.rs" 21 5 21 5] _24 <- ([#"../inc_max_3.rs" 21 5 21 5] [#"../inc_max_3.rs" 21 5 21 5] ());
+    [#"../inc_max_3.rs" 21 5 21 5] _24 <- ([#"../inc_max_3.rs" 21 5 21 5] ());
     goto BB12
   }
   BB12 {
-    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12]  * ma + ([#"../inc_max_3.rs" 22 11 22 12] (2 : uint32))) ; };
+    [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ( * ma + ([#"../inc_max_3.rs" 22 11 22 12] (2 : uint32))) ; };
     assume { resolve1 ma };
-    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12]  * mb + ([#"../inc_max_3.rs" 23 11 23 12] (1 : uint32))) ; };
+    [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ( * mb + ([#"../inc_max_3.rs" 23 11 23 12] (1 : uint32))) ; };
     assume { resolve1 mb };
-    [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] [#"../inc_max_3.rs" 12 80 24 1] ());
+    [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] ());
     return _0
   }
   
@@ -211,28 +211,28 @@ module IncMax3_TestIncMax3
     assume { resolve0 _11 };
     assume { resolve0 _9 };
     assume { resolve0 _7 };
-    [#"../inc_max_3.rs" 29 12 29 18] _13 <- ([#"../inc_max_3.rs" 29 12 29 18] a <> b);
+    [#"../inc_max_3.rs" 29 12 29 18] _13 <- a <> b;
     switch (_13)
       | False -> goto BB7
       | True -> goto BB2
       end
   }
   BB2 {
-    [#"../inc_max_3.rs" 29 22 29 28] _16 <- ([#"../inc_max_3.rs" 29 22 29 28] b <> c);
+    [#"../inc_max_3.rs" 29 22 29 28] _16 <- b <> c;
     switch (_16)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../inc_max_3.rs" 29 32 29 38] _19 <- ([#"../inc_max_3.rs" 29 32 29 38] c <> a);
+    [#"../inc_max_3.rs" 29 32 29 38] _19 <- c <> a;
     switch (_19)
       | False -> goto BB5
       | True -> goto BB4
       end
   }
   BB4 {
-    [#"../inc_max_3.rs" 27 58 30 1] _0 <- ([#"../inc_max_3.rs" 27 58 30 1] [#"../inc_max_3.rs" 27 58 30 1] ());
+    [#"../inc_max_3.rs" 27 58 30 1] _0 <- ([#"../inc_max_3.rs" 27 58 30 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
index 2d21ff1091..f19346f24a 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg
@@ -27,7 +27,7 @@ module IncMaxMany_TakeMax
     goto BB0
   }
   BB0 {
-    [#"../inc_max_many.rs" 7 7 7 17] _6 <- ([#"../inc_max_many.rs" 7 7 7 17]  * ma >=  * mb);
+    [#"../inc_max_many.rs" 7 7 7 17] _6 <-  * ma >=  * mb;
     switch (_6)
       | False -> goto BB2
       | True -> goto BB1
@@ -114,10 +114,10 @@ module IncMaxMany_IncMaxMany
   BB1 {
     assume { resolve0 _9 };
     assume { resolve0 _7 };
-    [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max_many.rs" 17 4 17 12]  * mc + k) ; };
+    [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ( * mc + k) ; };
     assume { resolve0 mc };
-    [#"../inc_max_many.rs" 18 17 18 22] _14 <- ([#"../inc_max_many.rs" 18 17 18 22] b + k);
-    [#"../inc_max_many.rs" 18 12 18 22] _12 <- ([#"../inc_max_many.rs" 18 12 18 22] a >= _14);
+    [#"../inc_max_many.rs" 18 17 18 22] _14 <- b + k;
+    [#"../inc_max_many.rs" 18 12 18 22] _12 <- a >= _14;
     _14 <- any uint32;
     switch (_12)
       | False -> goto BB3
@@ -128,8 +128,8 @@ module IncMaxMany_IncMaxMany
     goto BB4
   }
   BB3 {
-    [#"../inc_max_many.rs" 18 31 18 36] _19 <- ([#"../inc_max_many.rs" 18 31 18 36] a + k);
-    [#"../inc_max_many.rs" 18 26 18 36] _17 <- ([#"../inc_max_many.rs" 18 26 18 36] b >= _19);
+    [#"../inc_max_many.rs" 18 31 18 36] _19 <- a + k;
+    [#"../inc_max_many.rs" 18 26 18 36] _17 <- b >= _19;
     _19 <- any uint32;
     switch (_17)
       | False -> goto BB5
@@ -137,7 +137,7 @@ module IncMaxMany_IncMaxMany
       end
   }
   BB4 {
-    [#"../inc_max_many.rs" 15 52 19 1] _0 <- ([#"../inc_max_many.rs" 15 52 19 1] [#"../inc_max_many.rs" 15 52 19 1] ());
+    [#"../inc_max_many.rs" 15 52 19 1] _0 <- ([#"../inc_max_many.rs" 15 52 19 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
index e86d370e18..e9833795a0 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg
@@ -27,7 +27,7 @@ module IncMaxRepeat_TakeMax
     goto BB0
   }
   BB0 {
-    [#"../inc_max_repeat.rs" 7 7 7 17] _6 <- ([#"../inc_max_repeat.rs" 7 7 7 17]  * ma >=  * mb);
+    [#"../inc_max_repeat.rs" 7 7 7 17] _6 <-  * ma >=  * mb;
     switch (_6)
       | False -> goto BB2
       | True -> goto BB1
@@ -264,7 +264,7 @@ module IncMaxRepeat_IncMaxRepeat
     goto BB0
   }
   BB0 {
-    [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range ([#"../inc_max_repeat.rs" 18 13 18 14] (0 : uint32)) n);
+    [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- Core_Ops_Range_Range_Type.C_Range ([#"../inc_max_repeat.rs" 18 13 18 14] (0 : uint32)) n;
     [#"../inc_max_repeat.rs" 16 4 16 86] iter <- ([#"../inc_max_repeat.rs" 16 4 16 86] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
@@ -304,8 +304,8 @@ module IncMaxRepeat_IncMaxRepeat
       end
   }
   BB7 {
-    [#"../inc_max_repeat.rs" 22 17 22 22] _34 <- ([#"../inc_max_repeat.rs" 22 17 22 22] b + n);
-    [#"../inc_max_repeat.rs" 22 12 22 22] _32 <- ([#"../inc_max_repeat.rs" 22 12 22 22] a >= _34);
+    [#"../inc_max_repeat.rs" 22 17 22 22] _34 <- b + n;
+    [#"../inc_max_repeat.rs" 22 12 22 22] _32 <- a >= _34;
     _34 <- any uint32;
     switch (_32)
       | False -> goto BB14
@@ -320,12 +320,12 @@ module IncMaxRepeat_IncMaxRepeat
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _18;
     [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- ([#"../inc_max_repeat.rs" 16 4 16 86] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] _23);
+    [#"../inc_max_repeat.rs" 16 4 16 86] produced <- _23;
     _23 <- any Snapshot.snap_ty (Seq.seq uint32);
     [#"../inc_max_repeat.rs" 19 26 19 32] _27 <- Borrow.borrow_mut a;
     [#"../inc_max_repeat.rs" 19 26 19 32] a <-  ^ _27;
@@ -343,7 +343,7 @@ module IncMaxRepeat_IncMaxRepeat
   BB12 {
     assume { resolve1 _29 };
     assume { resolve1 _27 };
-    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16]  * mc + ([#"../inc_max_repeat.rs" 20 15 20 16] (1 : uint32))) ; };
+    [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ( * mc + ([#"../inc_max_repeat.rs" 20 15 20 16] (1 : uint32))) ; };
     assume { resolve1 mc };
     goto BB4
   }
@@ -351,8 +351,8 @@ module IncMaxRepeat_IncMaxRepeat
     goto BB15
   }
   BB14 {
-    [#"../inc_max_repeat.rs" 22 31 22 36] _39 <- ([#"../inc_max_repeat.rs" 22 31 22 36] a + n);
-    [#"../inc_max_repeat.rs" 22 26 22 36] _37 <- ([#"../inc_max_repeat.rs" 22 26 22 36] b >= _39);
+    [#"../inc_max_repeat.rs" 22 31 22 36] _39 <- a + n;
+    [#"../inc_max_repeat.rs" 22 26 22 36] _37 <- b >= _39;
     _39 <- any uint32;
     switch (_37)
       | False -> goto BB16
@@ -360,7 +360,7 @@ module IncMaxRepeat_IncMaxRepeat
       end
   }
   BB15 {
-    [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- ([#"../inc_max_repeat.rs" 15 54 23 1] [#"../inc_max_repeat.rs" 15 54 23 1] ());
+    [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- ([#"../inc_max_repeat.rs" 15 54 23 1] ());
     return _0
   }
   BB16 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
index 273ac399dc..5cb2609161 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg
@@ -75,7 +75,7 @@ module IncSome2List_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] [#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
+    [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -83,13 +83,13 @@ module IncSome2List_Impl0_SumX
     absurd
   }
   BB4 {
-    [#"../inc_some_2_list.rs" 45 17 45 18] a <- ([#"../inc_some_2_list.rs" 45 17 45 18] IncSome2List_List_Type.cons_0 self);
-    [#"../inc_some_2_list.rs" 45 20 45 21] l <- ([#"../inc_some_2_list.rs" 45 20 45 21] IncSome2List_List_Type.cons_1 self);
+    [#"../inc_some_2_list.rs" 45 17 45 18] a <- IncSome2List_List_Type.cons_0 self;
+    [#"../inc_some_2_list.rs" 45 20 45 21] l <- IncSome2List_List_Type.cons_1 self;
     [#"../inc_some_2_list.rs" 45 31 45 40] _8 <- ([#"../inc_some_2_list.rs" 45 31 45 40] sum_x l);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- ([#"../inc_some_2_list.rs" 45 26 45 40] a + _8);
+    [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- a + _8;
     _8 <- any uint32;
     goto BB6
   }
@@ -204,7 +204,7 @@ module IncSome2List_Impl0_TakeSomeRest
     [#"../inc_some_2_list.rs" 59 21 59 23] ma <- { ma with current = ( ^ _11) ; };
     [#"../inc_some_2_list.rs" 59 25 59 27] _12 <- Borrow.borrow_mut ( * ml);
     [#"../inc_some_2_list.rs" 59 25 59 27] ml <- { ml with current = ( ^ _12) ; };
-    [#"../inc_some_2_list.rs" 59 20 59 28] _0 <- ([#"../inc_some_2_list.rs" 59 20 59 28] (_11, _12));
+    [#"../inc_some_2_list.rs" 59 20 59 28] _0 <- (_11, _12);
     _11 <- any borrowed uint32;
     _12 <- any borrowed (IncSome2List_List_Type.t_list);
     goto BB10
@@ -316,9 +316,9 @@ module IncSome2List_IncSome2List
     goto BB3
   }
   BB3 {
-    [#"../inc_some_2_list.rs" 72 9 72 11] ma <- ([#"../inc_some_2_list.rs" 72 9 72 11] let (a, _) = _9 in a);
+    [#"../inc_some_2_list.rs" 72 9 72 11] ma <- (let (a, _) = _9 in a);
     _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
-    [#"../inc_some_2_list.rs" 72 13 72 15] ml <- ([#"../inc_some_2_list.rs" 72 13 72 15] let (_, a) = _9 in a);
+    [#"../inc_some_2_list.rs" 72 13 72 15] ml <- (let (_, a) = _9 in a);
     _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2List_List_Type.t_list)));
     assume { resolve0 _9 };
     [#"../inc_some_2_list.rs" 73 18 73 20] _13 <- Borrow.borrow_final ( * ml) (Borrow.get_id ml);
@@ -328,22 +328,22 @@ module IncSome2List_IncSome2List
     goto BB4
   }
   BB4 {
-    [#"../inc_some_2_list.rs" 73 9 73 11] mb <- ([#"../inc_some_2_list.rs" 73 9 73 11] let (a, _) = _12 in a);
+    [#"../inc_some_2_list.rs" 73 9 73 11] mb <- (let (a, _) = _12 in a);
     _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
     assume { resolve0 _12 };
-    [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ([#"../inc_some_2_list.rs" 74 4 74 12]  * ma + j) ; };
+    [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ( * ma + j) ; };
     assume { resolve1 ma };
-    [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ([#"../inc_some_2_list.rs" 75 4 75 12]  * mb + k) ; };
+    [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ( * mb + k) ; };
     assume { resolve1 mb };
     assume { resolve2 ml };
     [#"../inc_some_2_list.rs" 76 12 76 21] _18 <- ([#"../inc_some_2_list.rs" 76 12 76 21] sum_x0 l);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_list.rs" 76 25 76 33] _21 <- ([#"../inc_some_2_list.rs" 76 25 76 33] sum0 + j);
-    [#"../inc_some_2_list.rs" 76 25 76 37] _20 <- ([#"../inc_some_2_list.rs" 76 25 76 37] _21 + k);
+    [#"../inc_some_2_list.rs" 76 25 76 33] _21 <- sum0 + j;
+    [#"../inc_some_2_list.rs" 76 25 76 37] _20 <- _21 + k;
     _21 <- any uint32;
-    [#"../inc_some_2_list.rs" 76 12 76 37] _17 <- ([#"../inc_some_2_list.rs" 76 12 76 37] _18 = _20);
+    [#"../inc_some_2_list.rs" 76 12 76 37] _17 <- _18 = _20;
     _18 <- any uint32;
     _20 <- any uint32;
     switch (_17)
@@ -352,7 +352,7 @@ module IncSome2List_IncSome2List
       end
   }
   BB6 {
-    [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- ([#"../inc_some_2_list.rs" 70 52 77 1] [#"../inc_some_2_list.rs" 70 52 77 1] ());
+    [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- ([#"../inc_some_2_list.rs" 70 52 77 1] ());
     goto BB8
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
index 029d3943a1..1782e510fd 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg
@@ -93,7 +93,7 @@ module IncSome2Tree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] [#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -101,21 +101,21 @@ module IncSome2Tree_Impl0_SumX
     absurd
   }
   BB4 {
-    [#"../inc_some_2_tree.rs" 47 17 47 19] tl <- ([#"../inc_some_2_tree.rs" 47 17 47 19] IncSome2Tree_Tree_Type.node_0 self);
-    [#"../inc_some_2_tree.rs" 47 21 47 22] a <- ([#"../inc_some_2_tree.rs" 47 21 47 22] IncSome2Tree_Tree_Type.node_1 self);
-    [#"../inc_some_2_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_2_tree.rs" 47 24 47 26] IncSome2Tree_Tree_Type.node_2 self);
+    [#"../inc_some_2_tree.rs" 47 17 47 19] tl <- IncSome2Tree_Tree_Type.node_0 self;
+    [#"../inc_some_2_tree.rs" 47 21 47 22] a <- IncSome2Tree_Tree_Type.node_1 self;
+    [#"../inc_some_2_tree.rs" 47 24 47 26] tr <- IncSome2Tree_Tree_Type.node_2 self;
     assert { [@expl:assertion] [#"../inc_some_2_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true };
     [#"../inc_some_2_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_2_tree.rs" 53 16 53 26] sum_x tl);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_2_tree.rs" 53 16 53 31] _11 + a);
+    [#"../inc_some_2_tree.rs" 53 16 53 31] _10 <- _11 + a;
     _11 <- any uint32;
     [#"../inc_some_2_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_2_tree.rs" 53 34 53 44] sum_x tr);
     goto BB6
   }
   BB6 {
-    [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_2_tree.rs" 53 16 53 44] _10 + _14);
+    [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- _10 + _14;
     _10 <- any uint32;
     _14 <- any uint32;
     goto BB7
@@ -258,7 +258,7 @@ module IncSome2Tree_Impl0_TakeSomeRest
   BB10 {
     [#"../inc_some_2_tree.rs" 72 25 72 57] _13 <- Borrow.borrow_final ( * _14) (Borrow.get_id _14);
     [#"../inc_some_2_tree.rs" 72 25 72 57] _14 <- { _14 with current = ( ^ _13) ; };
-    [#"../inc_some_2_tree.rs" 72 20 72 58] _0 <- ([#"../inc_some_2_tree.rs" 72 20 72 58] (_12, _13));
+    [#"../inc_some_2_tree.rs" 72 20 72 58] _0 <- (_12, _13);
     _12 <- any borrowed uint32;
     _13 <- any borrowed (IncSome2Tree_Tree_Type.t_tree);
     assume { resolve2 _14 };
@@ -397,9 +397,9 @@ module IncSome2Tree_IncSome2Tree
     goto BB3
   }
   BB3 {
-    [#"../inc_some_2_tree.rs" 87 9 87 11] ma <- ([#"../inc_some_2_tree.rs" 87 9 87 11] let (a, _) = _9 in a);
+    [#"../inc_some_2_tree.rs" 87 9 87 11] ma <- (let (a, _) = _9 in a);
     _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1));
-    [#"../inc_some_2_tree.rs" 87 13 87 15] mt <- ([#"../inc_some_2_tree.rs" 87 13 87 15] let (_, a) = _9 in a);
+    [#"../inc_some_2_tree.rs" 87 13 87 15] mt <- (let (_, a) = _9 in a);
     _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2Tree_Tree_Type.t_tree)));
     assume { resolve0 _9 };
     [#"../inc_some_2_tree.rs" 88 18 88 20] _13 <- Borrow.borrow_final ( * mt) (Borrow.get_id mt);
@@ -409,22 +409,22 @@ module IncSome2Tree_IncSome2Tree
     goto BB4
   }
   BB4 {
-    [#"../inc_some_2_tree.rs" 88 9 88 11] mb <- ([#"../inc_some_2_tree.rs" 88 9 88 11] let (a, _) = _12 in a);
+    [#"../inc_some_2_tree.rs" 88 9 88 11] mb <- (let (a, _) = _12 in a);
     _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1));
     assume { resolve0 _12 };
-    [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ([#"../inc_some_2_tree.rs" 89 4 89 12]  * ma + j) ; };
+    [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ( * ma + j) ; };
     assume { resolve1 ma };
-    [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ([#"../inc_some_2_tree.rs" 90 4 90 12]  * mb + k) ; };
+    [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ( * mb + k) ; };
     assume { resolve1 mb };
     assume { resolve2 mt };
     [#"../inc_some_2_tree.rs" 91 12 91 21] _18 <- ([#"../inc_some_2_tree.rs" 91 12 91 21] sum_x0 t);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_2_tree.rs" 91 25 91 33] _21 <- ([#"../inc_some_2_tree.rs" 91 25 91 33] sum0 + j);
-    [#"../inc_some_2_tree.rs" 91 25 91 37] _20 <- ([#"../inc_some_2_tree.rs" 91 25 91 37] _21 + k);
+    [#"../inc_some_2_tree.rs" 91 25 91 33] _21 <- sum0 + j;
+    [#"../inc_some_2_tree.rs" 91 25 91 37] _20 <- _21 + k;
     _21 <- any uint32;
-    [#"../inc_some_2_tree.rs" 91 12 91 37] _17 <- ([#"../inc_some_2_tree.rs" 91 12 91 37] _18 = _20);
+    [#"../inc_some_2_tree.rs" 91 12 91 37] _17 <- _18 = _20;
     _18 <- any uint32;
     _20 <- any uint32;
     switch (_17)
@@ -433,7 +433,7 @@ module IncSome2Tree_IncSome2Tree
       end
   }
   BB6 {
-    [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- ([#"../inc_some_2_tree.rs" 85 52 92 1] [#"../inc_some_2_tree.rs" 85 52 92 1] ());
+    [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- ([#"../inc_some_2_tree.rs" 85 52 92 1] ());
     goto BB8
   }
   BB7 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
index 71fbe503c1..25280abcbc 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg
@@ -75,7 +75,7 @@ module IncSomeList_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] [#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
+    [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] (0 : uint32));
     goto BB6
   }
   BB3 {
@@ -83,13 +83,13 @@ module IncSomeList_Impl0_SumX
     absurd
   }
   BB4 {
-    [#"../inc_some_list.rs" 44 17 44 18] a <- ([#"../inc_some_list.rs" 44 17 44 18] IncSomeList_List_Type.cons_0 self);
-    [#"../inc_some_list.rs" 44 20 44 21] l <- ([#"../inc_some_list.rs" 44 20 44 21] IncSomeList_List_Type.cons_1 self);
+    [#"../inc_some_list.rs" 44 17 44 18] a <- IncSomeList_List_Type.cons_0 self;
+    [#"../inc_some_list.rs" 44 20 44 21] l <- IncSomeList_List_Type.cons_1 self;
     [#"../inc_some_list.rs" 44 31 44 40] _8 <- ([#"../inc_some_list.rs" 44 31 44 40] sum_x l);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_list.rs" 44 26 44 40] _0 <- ([#"../inc_some_list.rs" 44 26 44 40] a + _8);
+    [#"../inc_some_list.rs" 44 26 44 40] _0 <- a + _8;
     _8 <- any uint32;
     goto BB6
   }
@@ -315,14 +315,14 @@ module IncSomeList_IncSomeList
     goto BB3
   }
   BB3 {
-    [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ([#"../inc_some_list.rs" 70 4 70 12]  * ma + k) ; };
+    [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ( * ma + k) ; };
     assume { resolve0 ma };
     [#"../inc_some_list.rs" 71 12 71 21] _11 <- ([#"../inc_some_list.rs" 71 12 71 21] sum_x0 l);
     goto BB4
   }
   BB4 {
-    [#"../inc_some_list.rs" 71 25 71 33] _13 <- ([#"../inc_some_list.rs" 71 25 71 33] sum0 + k);
-    [#"../inc_some_list.rs" 71 12 71 33] _10 <- ([#"../inc_some_list.rs" 71 12 71 33] _11 = _13);
+    [#"../inc_some_list.rs" 71 25 71 33] _13 <- sum0 + k;
+    [#"../inc_some_list.rs" 71 12 71 33] _10 <- _11 = _13;
     _11 <- any uint32;
     _13 <- any uint32;
     switch (_10)
@@ -331,7 +331,7 @@ module IncSomeList_IncSomeList
       end
   }
   BB5 {
-    [#"../inc_some_list.rs" 67 42 72 1] _0 <- ([#"../inc_some_list.rs" 67 42 72 1] [#"../inc_some_list.rs" 67 42 72 1] ());
+    [#"../inc_some_list.rs" 67 42 72 1] _0 <- ([#"../inc_some_list.rs" 67 42 72 1] ());
     goto BB7
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
index 8b17f81846..47b5ecf1ad 100644
--- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
+++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg
@@ -93,7 +93,7 @@ module IncSomeTree_Impl0_SumX
     goto BB4
   }
   BB2 {
-    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] [#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
+    [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32));
     goto BB7
   }
   BB3 {
@@ -101,21 +101,21 @@ module IncSomeTree_Impl0_SumX
     absurd
   }
   BB4 {
-    [#"../inc_some_tree.rs" 47 17 47 19] tl <- ([#"../inc_some_tree.rs" 47 17 47 19] IncSomeTree_Tree_Type.node_0 self);
-    [#"../inc_some_tree.rs" 47 21 47 22] a <- ([#"../inc_some_tree.rs" 47 21 47 22] IncSomeTree_Tree_Type.node_1 self);
-    [#"../inc_some_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_tree.rs" 47 24 47 26] IncSomeTree_Tree_Type.node_2 self);
+    [#"../inc_some_tree.rs" 47 17 47 19] tl <- IncSomeTree_Tree_Type.node_0 self;
+    [#"../inc_some_tree.rs" 47 21 47 22] a <- IncSomeTree_Tree_Type.node_1 self;
+    [#"../inc_some_tree.rs" 47 24 47 26] tr <- IncSomeTree_Tree_Type.node_2 self;
     assert { [@expl:assertion] [#"../inc_some_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true };
     [#"../inc_some_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_tree.rs" 53 16 53 26] sum_x tl);
     goto BB5
   }
   BB5 {
-    [#"../inc_some_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_tree.rs" 53 16 53 31] _11 + a);
+    [#"../inc_some_tree.rs" 53 16 53 31] _10 <- _11 + a;
     _11 <- any uint32;
     [#"../inc_some_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_tree.rs" 53 34 53 44] sum_x tr);
     goto BB6
   }
   BB6 {
-    [#"../inc_some_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_tree.rs" 53 16 53 44] _10 + _14);
+    [#"../inc_some_tree.rs" 53 16 53 44] _0 <- _10 + _14;
     _10 <- any uint32;
     _14 <- any uint32;
     goto BB7
@@ -376,14 +376,14 @@ module IncSomeTree_IncSomeTree
     goto BB3
   }
   BB3 {
-    [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ([#"../inc_some_tree.rs" 86 4 86 12]  * ma + k) ; };
+    [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ( * ma + k) ; };
     assume { resolve0 ma };
     [#"../inc_some_tree.rs" 87 12 87 21] _11 <- ([#"../inc_some_tree.rs" 87 12 87 21] sum_x0 t);
     goto BB4
   }
   BB4 {
-    [#"../inc_some_tree.rs" 87 25 87 33] _13 <- ([#"../inc_some_tree.rs" 87 25 87 33] sum0 + k);
-    [#"../inc_some_tree.rs" 87 12 87 33] _10 <- ([#"../inc_some_tree.rs" 87 12 87 33] _11 = _13);
+    [#"../inc_some_tree.rs" 87 25 87 33] _13 <- sum0 + k;
+    [#"../inc_some_tree.rs" 87 12 87 33] _10 <- _11 = _13;
     _11 <- any uint32;
     _13 <- any uint32;
     switch (_10)
@@ -392,7 +392,7 @@ module IncSomeTree_IncSomeTree
       end
   }
   BB5 {
-    [#"../inc_some_tree.rs" 83 42 88 1] _0 <- ([#"../inc_some_tree.rs" 83 42 88 1] [#"../inc_some_tree.rs" 83 42 88 1] ());
+    [#"../inc_some_tree.rs" 83 42 88 1] _0 <- ([#"../inc_some_tree.rs" 83 42 88 1] ());
     goto BB7
   }
   BB6 {
diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index eed53ff567..5e8120e810 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -644,7 +644,7 @@ module SelectionSortGeneric_SelectionSort
     goto BB2
   }
   BB2 {
-    [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range ([#"../selection_sort_generic.rs" 38 13 38 14] (0 : usize)) _8);
+    [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- Core_Ops_Range_Range_Type.C_Range ([#"../selection_sort_generic.rs" 38 13 38 14] (0 : usize)) _8;
     _8 <- any usize;
     [#"../selection_sort_generic.rs" 35 4 35 43] iter <- ([#"../selection_sort_generic.rs" 35 4 35 43] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -688,7 +688,7 @@ module SelectionSortGeneric_SelectionSort
   BB9 {
     assert { [@expl:type invariant] inv6 v };
     assume { resolve4 v };
-    [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- ([#"../selection_sort_generic.rs" 35 4 35 43] [#"../selection_sort_generic.rs" 35 4 35 43] ());
+    [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- ([#"../selection_sort_generic.rs" 35 4 35 43] ());
     return _0
   }
   BB10 {
@@ -699,21 +699,21 @@ module SelectionSortGeneric_SelectionSort
     absurd
   }
   BB12 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _20);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _20;
     [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- ([#"../selection_sort_generic.rs" 35 4 35 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
-    [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] _25);
+    [#"../selection_sort_generic.rs" 35 4 35 43] produced <- _25;
     _25 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../selection_sort_generic.rs" 39 22 39 23] min <- ([#"../selection_sort_generic.rs" 39 22 39 23] i);
-    [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- ([#"../selection_sort_generic.rs" 43 17 43 24] i + ([#"../selection_sort_generic.rs" 43 22 43 23] (1 : usize)));
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
+    [#"../selection_sort_generic.rs" 39 22 39 23] min <- i;
+    [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- i + ([#"../selection_sort_generic.rs" 43 22 43 23] (1 : usize));
     [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ( * v));
     goto BB14
   }
   BB14 {
-    [#"../selection_sort_generic.rs" 43 17 43 33] _31 <- ([#"../selection_sort_generic.rs" 43 17 43 33] Core_Ops_Range_Range_Type.C_Range _32 _34);
+    [#"../selection_sort_generic.rs" 43 17 43 33] _31 <- Core_Ops_Range_Range_Type.C_Range _32 _34;
     _32 <- any usize;
     _34 <- any usize;
     [#"../selection_sort_generic.rs" 41 8 41 121] iter1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] into_iter0 _31);
@@ -767,14 +767,14 @@ module SelectionSortGeneric_SelectionSort
     goto BB23
   }
   BB23 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _44);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _44;
     [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB24
   }
   BB24 {
-    [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] _49);
+    [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- _49;
     _49 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1;
     [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ( * v) j);
     goto BB25
   }
@@ -797,12 +797,12 @@ module SelectionSortGeneric_SelectionSort
       end
   }
   BB28 {
-    [#"../selection_sort_generic.rs" 45 16 45 23] min <- ([#"../selection_sort_generic.rs" 45 16 45 23] j);
-    [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] [#"../selection_sort_generic.rs" 44 29 46 13] ());
+    [#"../selection_sort_generic.rs" 45 16 45 23] min <- j;
+    [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] ());
     goto BB30
   }
   BB29 {
-    [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] [#"../selection_sort_generic.rs" 46 13 46 13] ());
+    [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] ());
     goto BB30
   }
   BB30 {
@@ -821,7 +821,7 @@ module SelectionSortGeneric_SelectionSort
     assume { resolve3 _65 };
     assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v)
      -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) };
-    [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] [#"../selection_sort_generic.rs" 38 24 51 5] ());
+    [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] ());
     goto BB6
   }
   BB34 {
diff --git a/creusot/tests/should_succeed/slices/01.mlcfg b/creusot/tests/should_succeed/slices/01.mlcfg
index 0f5016e73f..648cc21d8d 100644
--- a/creusot/tests/should_succeed/slices/01.mlcfg
+++ b/creusot/tests/should_succeed/slices/01.mlcfg
@@ -56,14 +56,14 @@ module C01_IndexSlice
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] [#"../01.rs" 7 6 7 8] (10 : usize));
-    [#"../01.rs" 7 4 7 9] _4 <- ([#"../01.rs" 7 4 7 9] Slice.length a);
-    [#"../01.rs" 7 4 7 9] _5 <- ([#"../01.rs" 7 4 7 9] _3 < _4);
+    [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] (10 : usize));
+    [#"../01.rs" 7 4 7 9] _4 <- Slice.length a;
+    [#"../01.rs" 7 4 7 9] _5 <- _3 < _4;
     assert { [@expl:index in bounds] [#"../01.rs" 7 4 7 9] _5 };
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 7 4 7 9] _0 <- ([#"../01.rs" 7 4 7 9] Slice.get a _3);
+    [#"../01.rs" 7 4 7 9] _0 <- Slice.get a _3;
     return _0
   }
   
@@ -138,16 +138,16 @@ module C01_IndexMutSlice
     goto BB0
   }
   BB0 {
-    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] [#"../01.rs" 13 6 13 7] (2 : usize));
-    [#"../01.rs" 13 4 13 8] _5 <- ([#"../01.rs" 13 4 13 8] Slice.length ( * a));
-    [#"../01.rs" 13 4 13 8] _6 <- ([#"../01.rs" 13 4 13 8] _4 < _5);
+    [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] (2 : usize));
+    [#"../01.rs" 13 4 13 8] _5 <- Slice.length ( * a);
+    [#"../01.rs" 13 4 13 8] _6 <- _4 < _5;
     assert { [@expl:index in bounds] [#"../01.rs" 13 4 13 8] _6 };
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] [#"../01.rs" 13 11 13 12] (3 : uint32)) ; };
+    [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 11 13 12] (3 : uint32)) ; };
     assume { resolve0 a };
-    [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] [#"../01.rs" 12 38 14 1] ());
+    [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] ());
     return _0
   }
   
@@ -271,7 +271,7 @@ module C01_SliceFirst
     goto BB1
   }
   BB1 {
-    [#"../01.rs" 21 7 21 18] _3 <- ([#"../01.rs" 21 7 21 18] _4 > ([#"../01.rs" 21 17 21 18] (0 : usize)));
+    [#"../01.rs" 21 7 21 18] _3 <- _4 > ([#"../01.rs" 21 17 21 18] (0 : usize));
     _4 <- any usize;
     switch (_3)
       | False -> goto BB4
@@ -279,25 +279,25 @@ module C01_SliceFirst
       end
   }
   BB2 {
-    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] [#"../01.rs" 22 16 22 17] (0 : usize));
-    [#"../01.rs" 22 14 22 18] _9 <- ([#"../01.rs" 22 14 22 18] Slice.length a);
-    [#"../01.rs" 22 14 22 18] _10 <- ([#"../01.rs" 22 14 22 18] _8 < _9);
+    [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] (0 : usize));
+    [#"../01.rs" 22 14 22 18] _9 <- Slice.length a;
+    [#"../01.rs" 22 14 22 18] _10 <- _8 < _9;
     assert { [@expl:index in bounds] [#"../01.rs" 22 14 22 18] _10 };
     goto BB3
   }
   BB3 {
-    [#"../01.rs" 22 13 22 18] _7 <- ([#"../01.rs" 22 13 22 18] Slice.get a _8);
+    [#"../01.rs" 22 13 22 18] _7 <- Slice.get a _8;
     assert { [@expl:type invariant] inv0 a };
     assume { resolve0 a };
     assert { [@expl:type invariant] inv1 _7 };
     assume { resolve1 _7 };
-    [#"../01.rs" 22 8 22 19] _0 <- ([#"../01.rs" 22 8 22 19] Core_Option_Option_Type.C_Some _7);
+    [#"../01.rs" 22 8 22 19] _0 <- Core_Option_Option_Type.C_Some _7;
     goto BB5
   }
   BB4 {
     assert { [@expl:type invariant] inv0 a };
     assume { resolve0 a };
-    [#"../01.rs" 24 8 24 12] _0 <- ([#"../01.rs" 24 8 24 12] Core_Option_Option_Type.C_None);
+    [#"../01.rs" 24 8 24 12] _0 <- Core_Option_Option_Type.C_None;
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/slices/02_std.mlcfg b/creusot/tests/should_succeed/slices/02_std.mlcfg
index 44aa1c6d0e..bd3989d106 100644
--- a/creusot/tests/should_succeed/slices/02_std.mlcfg
+++ b/creusot/tests/should_succeed/slices/02_std.mlcfg
@@ -175,7 +175,7 @@ module C02Std_BinarySearch
      -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) }
     
   let constant promoted0 [#"../02_std.rs" 8 0 8 40]  : uint32 = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../02_std.rs" 9 30 9 31] [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0
+    let _1 = [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = _1 in _0
   let rec cfg binary_search [#"../02_std.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (s : slice uint32) : usize
     requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s)
      -> UInt32.to_int (index_logic0 s i) = i}
@@ -192,8 +192,8 @@ module C02Std_BinarySearch
     goto BB0
   }
   BB0 {
-    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] [#"../02_std.rs" 9 29 9 31] promoted0);
-    [#"../02_std.rs" 9 29 9 31] _8 <- ([#"../02_std.rs" 9 29 9 31] _12);
+    [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] promoted0);
+    [#"../02_std.rs" 9 29 9 31] _8 <- _12;
     [#"../02_std.rs" 9 13 9 32] _5 <- ([#"../02_std.rs" 9 13 9 32] binary_search0 s _8);
     goto BB1
   }
@@ -204,7 +204,7 @@ module C02Std_BinarySearch
   }
   BB2 {
     assert { [@expl:assertion] [#"../02_std.rs" 11 20 11 27] UIntSize.to_int ix < 5 };
-    [#"../02_std.rs" 12 4 12 6] _0 <- ([#"../02_std.rs" 12 4 12 6] ix);
+    [#"../02_std.rs" 12 4 12 6] _0 <- ix;
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index b83ae2cad9..94dbf46f1b 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -351,8 +351,8 @@ module SparseArray_Impl2_Get
     goto BB1
   }
   BB1 {
-    [#"../sparse_array.rs" 90 20 90 31] index <- ([#"../sparse_array.rs" 90 20 90 31] _7);
-    [#"../sparse_array.rs" 91 11 91 25] _10 <- ([#"../sparse_array.rs" 91 11 91 25] index < SparseArray_Sparse_Type.sparse_n self);
+    [#"../sparse_array.rs" 90 20 90 31] index <- _7;
+    [#"../sparse_array.rs" 91 11 91 25] _10 <- index < SparseArray_Sparse_Type.sparse_n self;
     switch (_10)
       | False -> goto BB7
       | True -> goto BB2
@@ -363,7 +363,7 @@ module SparseArray_Impl2_Get
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 91 29 91 50] _13 <- ([#"../sparse_array.rs" 91 29 91 50] _15 = i);
+    [#"../sparse_array.rs" 91 29 91 50] _13 <- _15 = i;
     switch (_13)
       | False -> goto BB6
       | True -> goto BB4
@@ -376,12 +376,12 @@ module SparseArray_Impl2_Get
     goto BB5
   }
   BB5 {
-    [#"../sparse_array.rs" 92 17 92 32] _20 <- ([#"../sparse_array.rs" 92 17 92 32] _21);
+    [#"../sparse_array.rs" 92 17 92 32] _20 <- _21;
     assert { [@expl:type invariant] inv1 _21 };
     assume { resolve1 _21 };
     assert { [@expl:type invariant] inv1 _20 };
     assume { resolve1 _20 };
-    [#"../sparse_array.rs" 92 12 92 33] _0 <- ([#"../sparse_array.rs" 92 12 92 33] Core_Option_Option_Type.C_Some _20);
+    [#"../sparse_array.rs" 92 12 92 33] _0 <- Core_Option_Option_Type.C_Some _20;
     goto BB9
   }
   BB6 {
@@ -395,7 +395,7 @@ module SparseArray_Impl2_Get
     goto BB8
   }
   BB8 {
-    [#"../sparse_array.rs" 94 12 94 16] _0 <- ([#"../sparse_array.rs" 94 12 94 16] Core_Option_Option_Type.C_None);
+    [#"../sparse_array.rs" 94 12 94 16] _0 <- Core_Option_Option_Type.C_None;
     goto BB9
   }
   BB9 {
@@ -902,7 +902,7 @@ module SparseArray_Impl2_Set
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = ([#"../sparse_array.rs" 113 8 113 22] v) ; };
+    [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = v ; };
     v <- any t;
     assert { [@expl:type invariant] inv1 ( * _9) };
     assume { resolve0 ( * _9) };
@@ -915,8 +915,8 @@ module SparseArray_Impl2_Set
     goto BB6
   }
   BB6 {
-    [#"../sparse_array.rs" 114 20 114 31] index <- ([#"../sparse_array.rs" 114 20 114 31] _13);
-    [#"../sparse_array.rs" 115 13 115 27] _16 <- ([#"../sparse_array.rs" 115 13 115 27] index < SparseArray_Sparse_Type.sparse_n ( * self));
+    [#"../sparse_array.rs" 114 20 114 31] index <- _13;
+    [#"../sparse_array.rs" 115 13 115 27] _16 <- index < SparseArray_Sparse_Type.sparse_n ( * self);
     switch (_16)
       | False -> goto BB11
       | True -> goto BB7
@@ -927,7 +927,7 @@ module SparseArray_Impl2_Set
     goto BB8
   }
   BB8 {
-    [#"../sparse_array.rs" 115 31 115 52] _19 <- ([#"../sparse_array.rs" 115 31 115 52] _21 = i);
+    [#"../sparse_array.rs" 115 31 115 52] _19 <- _21 = i;
     switch (_19)
       | False -> goto BB10
       | True -> goto BB9
@@ -936,7 +936,7 @@ module SparseArray_Impl2_Set
   BB9 {
     assert { [@expl:type invariant] inv3 self };
     assume { resolve4 self };
-    [#"../sparse_array.rs" 123 9 123 9] _0 <- ([#"../sparse_array.rs" 123 9 123 9] [#"../sparse_array.rs" 123 9 123 9] ());
+    [#"../sparse_array.rs" 123 9 123 9] _0 <- ([#"../sparse_array.rs" 123 9 123 9] ());
     goto BB16
   }
   BB10 {
@@ -959,7 +959,7 @@ module SparseArray_Impl2_Set
     goto BB14
   }
   BB14 {
-    [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = ([#"../sparse_array.rs" 120 12 120 32] SparseArray_Sparse_Type.sparse_n ( * self)) ; };
+    [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = SparseArray_Sparse_Type.sparse_n ( * self) ; };
     assume { resolve3 _30 };
     [#"../sparse_array.rs" 121 12 121 21] _35 <- Borrow.borrow_final (SparseArray_Sparse_Type.sparse_back ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5);
     [#"../sparse_array.rs" 121 12 121 21] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 ( ^ _35)) ; };
@@ -968,12 +968,12 @@ module SparseArray_Impl2_Set
     goto BB15
   }
   BB15 {
-    [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = ([#"../sparse_array.rs" 121 12 121 33] i) ; };
+    [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = i ; };
     assume { resolve3 _34 };
-    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + ([#"../sparse_array.rs" 122 22 122 23] (1 : usize))) x2 x3 x4) ; };
+    [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 =  * self in SparseArray_Sparse_Type.C_Sparse x0 (SparseArray_Sparse_Type.sparse_n ( * self) + ([#"../sparse_array.rs" 122 22 122 23] (1 : usize))) x2 x3 x4) ; };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve4 self };
-    [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] [#"../sparse_array.rs" 115 54 123 9] ());
+    [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] ());
     goto BB16
   }
   BB16 {
@@ -1172,7 +1172,7 @@ module SparseArray_Create
     goto BB3
   }
   BB3 {
-    [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse sz ([#"../sparse_array.rs" 135 26 135 27] (0 : usize)) _6 _9 _11);
+    [#"../sparse_array.rs" 135 4 135 91] _0 <- SparseArray_Sparse_Type.C_Sparse sz ([#"../sparse_array.rs" 135 26 135 27] (0 : usize)) _6 _9 _11;
     _6 <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global);
     _9 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     _11 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
@@ -1423,7 +1423,7 @@ module SparseArray_F
     goto BB0
   }
   BB0 {
-    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] [#"../sparse_array.rs" 141 18 141 19] (0 : int32));
+    [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] (0 : int32));
     [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 ([#"../sparse_array.rs" 142 23 142 25] (10 : usize)) default);
     goto BB1
   }
@@ -1461,13 +1461,13 @@ module SparseArray_F
     goto BB7
   }
   BB7 {
-    [#"../sparse_array.rs" 150 4 150 16] x <- ([#"../sparse_array.rs" 150 4 150 16] _16);
+    [#"../sparse_array.rs" 150 4 150 16] x <- _16;
     _16 <- any Core_Option_Option_Type.t_option int32;
     [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 b ([#"../sparse_array.rs" 151 14 151 15] (7 : usize)));
     goto BB8
   }
   BB8 {
-    [#"../sparse_array.rs" 151 4 151 16] y <- ([#"../sparse_array.rs" 151 4 151 16] _18);
+    [#"../sparse_array.rs" 151 4 151 16] y <- _18;
     _18 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 152 18 155 5] match x with
       | Core_Option_Option_Type.C_None -> false
@@ -1481,42 +1481,42 @@ module SparseArray_F
     goto BB9
   }
   BB9 {
-    [#"../sparse_array.rs" 161 4 161 16] x <- ([#"../sparse_array.rs" 161 4 161 16] _24);
+    [#"../sparse_array.rs" 161 4 161 16] x <- _24;
     _24 <- any Core_Option_Option_Type.t_option int32;
     [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 b ([#"../sparse_array.rs" 162 14 162 15] (5 : usize)));
     goto BB10
   }
   BB10 {
-    [#"../sparse_array.rs" 162 4 162 16] y <- ([#"../sparse_array.rs" 162 4 162 16] _26);
+    [#"../sparse_array.rs" 162 4 162 16] y <- _26;
     _26 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 163 18 163 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
     [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 a ([#"../sparse_array.rs" 165 14 165 15] (0 : usize)));
     goto BB11
   }
   BB11 {
-    [#"../sparse_array.rs" 165 4 165 16] x <- ([#"../sparse_array.rs" 165 4 165 16] _30);
+    [#"../sparse_array.rs" 165 4 165 16] x <- _30;
     _30 <- any Core_Option_Option_Type.t_option int32;
     [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 b ([#"../sparse_array.rs" 166 14 166 15] (0 : usize)));
     goto BB12
   }
   BB12 {
-    [#"../sparse_array.rs" 166 4 166 16] y <- ([#"../sparse_array.rs" 166 4 166 16] _32);
+    [#"../sparse_array.rs" 166 4 166 16] y <- _32;
     _32 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 167 18 167 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
     [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 a ([#"../sparse_array.rs" 169 14 169 15] (9 : usize)));
     goto BB13
   }
   BB13 {
-    [#"../sparse_array.rs" 169 4 169 16] x <- ([#"../sparse_array.rs" 169 4 169 16] _36);
+    [#"../sparse_array.rs" 169 4 169 16] x <- _36;
     _36 <- any Core_Option_Option_Type.t_option int32;
     [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 b ([#"../sparse_array.rs" 170 14 170 15] (9 : usize)));
     goto BB14
   }
   BB14 {
-    [#"../sparse_array.rs" 170 4 170 16] y <- ([#"../sparse_array.rs" 170 4 170 16] _38);
+    [#"../sparse_array.rs" 170 4 170 16] y <- _38;
     _38 <- any Core_Option_Option_Type.t_option int32;
     assert { [@expl:assertion] [#"../sparse_array.rs" 171 18 171 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None };
-    [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] [#"../sparse_array.rs" 171 4 171 41] ());
+    [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] ());
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/spec_tests.mlcfg b/creusot/tests/should_succeed/spec_tests.mlcfg
index efa8cc215f..a662169771 100644
--- a/creusot/tests/should_succeed/spec_tests.mlcfg
+++ b/creusot/tests/should_succeed/spec_tests.mlcfg
@@ -25,7 +25,7 @@ module SpecTests_TestSpecs
     goto BB0
   }
   BB0 {
-    [#"../spec_tests.rs" 18 20 18 22] _0 <- ([#"../spec_tests.rs" 18 20 18 22] [#"../spec_tests.rs" 18 20 18 22] ());
+    [#"../spec_tests.rs" 18 20 18 22] _0 <- ([#"../spec_tests.rs" 18 20 18 22] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/division.mlcfg b/creusot/tests/should_succeed/specification/division.mlcfg
index 0dbcc0ff2e..2d53404a9a 100644
--- a/creusot/tests/should_succeed/specification/division.mlcfg
+++ b/creusot/tests/should_succeed/specification/division.mlcfg
@@ -15,13 +15,13 @@ module Division_Divide
     goto BB0
   }
   BB0 {
-    [#"../division.rs" 7 8 7 9] _5 <- ([#"../division.rs" 7 8 7 9] x);
-    [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = ([#"../division.rs" 7 4 7 9] (0 : uint32)));
+    [#"../division.rs" 7 8 7 9] _5 <- x;
+    [#"../division.rs" 7 4 7 9] _6 <- _5 = ([#"../division.rs" 7 4 7 9] (0 : uint32));
     assert { [@expl:division by zero] [#"../division.rs" 7 4 7 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../division.rs" 7 4 7 9] _0 <- ([#"../division.rs" 7 4 7 9] y / _5);
+    [#"../division.rs" 7 4 7 9] _0 <- y / _5;
     _5 <- any uint32;
     return _0
   }
diff --git a/creusot/tests/should_succeed/specification/forall.mlcfg b/creusot/tests/should_succeed/specification/forall.mlcfg
index 6eb3d303de..d2905b36d8 100644
--- a/creusot/tests/should_succeed/specification/forall.mlcfg
+++ b/creusot/tests/should_succeed/specification/forall.mlcfg
@@ -11,7 +11,7 @@ module Forall_F
     goto BB0
   }
   BB0 {
-    [#"../forall.rs" 6 11 6 13] _0 <- ([#"../forall.rs" 6 11 6 13] [#"../forall.rs" 6 11 6 13] ());
+    [#"../forall.rs" 6 11 6 13] _0 <- ([#"../forall.rs" 6 11 6 13] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/logic_call.mlcfg b/creusot/tests/should_succeed/specification/logic_call.mlcfg
index 9f18d949a6..90835dd6b0 100644
--- a/creusot/tests/should_succeed/specification/logic_call.mlcfg
+++ b/creusot/tests/should_succeed/specification/logic_call.mlcfg
@@ -16,7 +16,7 @@ module LogicCall_Dummy
     goto BB0
   }
   BB0 {
-    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] [#"../logic_call.rs" 12 4 12 5] (0 : uint32));
+    [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] (0 : uint32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/logic_functions.mlcfg b/creusot/tests/should_succeed/specification/logic_functions.mlcfg
index 69ca12751e..3be1b9abd5 100644
--- a/creusot/tests/should_succeed/specification/logic_functions.mlcfg
+++ b/creusot/tests/should_succeed/specification/logic_functions.mlcfg
@@ -14,7 +14,7 @@ module LogicFunctions_UseLogic
     goto BB0
   }
   BB0 {
-    [#"../logic_functions.rs" 10 19 10 21] _0 <- ([#"../logic_functions.rs" 10 19 10 21] [#"../logic_functions.rs" 10 19 10 21] ());
+    [#"../logic_functions.rs" 10 19 10 21] _0 <- ([#"../logic_functions.rs" 10 19 10 21] ());
     return _0
   }
   
@@ -34,7 +34,7 @@ module LogicFunctions_UseLogicPearlite
     goto BB0
   }
   BB0 {
-    [#"../logic_functions.rs" 19 28 19 30] _0 <- ([#"../logic_functions.rs" 19 28 19 30] [#"../logic_functions.rs" 19 28 19 30] ());
+    [#"../logic_functions.rs" 19 28 19 30] _0 <- ([#"../logic_functions.rs" 19 28 19 30] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/loops.mlcfg b/creusot/tests/should_succeed/specification/loops.mlcfg
index f607a754b4..bdf5f2abd2 100644
--- a/creusot/tests/should_succeed/specification/loops.mlcfg
+++ b/creusot/tests/should_succeed/specification/loops.mlcfg
@@ -24,7 +24,7 @@ module Loops_WhileLoopVariant
     goto BB1
   }
   BB4 {
-    [#"../loops.rs" 6 4 6 14] _0 <- ([#"../loops.rs" 6 4 6 14] [#"../loops.rs" 6 4 6 14] ());
+    [#"../loops.rs" 6 4 6 14] _0 <- ([#"../loops.rs" 6 4 6 14] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/specification/model.mlcfg b/creusot/tests/should_succeed/specification/model.mlcfg
index a0ebc6a546..59a478c112 100644
--- a/creusot/tests/should_succeed/specification/model.mlcfg
+++ b/creusot/tests/should_succeed/specification/model.mlcfg
@@ -74,7 +74,7 @@ module Model_TestArc
     goto BB1
   }
   BB1 {
-    [#"../model.rs" 43 42 43 44] _0 <- ([#"../model.rs" 43 42 43 44] [#"../model.rs" 43 42 43 44] ());
+    [#"../model.rs" 43 42 43 44] _0 <- ([#"../model.rs" 43 42 43 44] ());
     goto BB2
   }
   BB2 {
@@ -126,7 +126,7 @@ module Model_TestRc
     goto BB1
   }
   BB1 {
-    [#"../model.rs" 46 38 46 40] _0 <- ([#"../model.rs" 46 38 46 40] [#"../model.rs" 46 38 46 40] ());
+    [#"../model.rs" 46 38 46 40] _0 <- ([#"../model.rs" 46 38 46 40] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/specification/opaque.mlcfg b/creusot/tests/should_succeed/specification/opaque.mlcfg
index 9f2c73d665..f44067afe1 100644
--- a/creusot/tests/should_succeed/specification/opaque.mlcfg
+++ b/creusot/tests/should_succeed/specification/opaque.mlcfg
@@ -19,7 +19,7 @@ module Opaque_Test
   BB0 {
     assert { [@expl:assertion] [#"../opaque.rs" 21 18 21 34] transparent0 () };
     assert { [@expl:assertion] [#"../opaque.rs" 22 18 22 40] transparent_crate0 () };
-    [#"../opaque.rs" 20 14 23 1] _0 <- ([#"../opaque.rs" 20 14 23 1] [#"../opaque.rs" 20 14 23 1] ());
+    [#"../opaque.rs" 20 14 23 1] _0 <- ([#"../opaque.rs" 20 14 23 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/split_borrow.mlcfg b/creusot/tests/should_succeed/split_borrow.mlcfg
index 88564e5e8f..4a1f142cde 100644
--- a/creusot/tests/should_succeed/split_borrow.mlcfg
+++ b/creusot/tests/should_succeed/split_borrow.mlcfg
@@ -7,7 +7,7 @@ module SplitBorrow_Z
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] [#"../split_borrow.rs" 6 4 6 8] true);
+    [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] true);
     return _0
   }
   
@@ -55,9 +55,9 @@ module SplitBorrow_F
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 10 17 10 25] _2 <- ([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 23 10 24] (1 : usize)));
-    [#"../split_borrow.rs" 10 27 10 35] _3 <- ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 33 10 34] (2 : usize)));
-    [#"../split_borrow.rs" 10 16 10 36] x <- ([#"../split_borrow.rs" 10 16 10 36] (_2, _3));
+    [#"../split_borrow.rs" 10 17 10 25] _2 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 23 10 24] (1 : usize));
+    [#"../split_borrow.rs" 10 27 10 35] _3 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 10 33 10 34] (2 : usize));
+    [#"../split_borrow.rs" 10 16 10 36] x <- (_2, _3);
     _2 <- any SplitBorrow_MyInt_Type.t_myint;
     _3 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 11 12 11 18] y <- Borrow.borrow_mut x;
@@ -72,23 +72,23 @@ module SplitBorrow_F
       end
   }
   BB2 {
-    [#"../split_borrow.rs" 14 17 14 25] _7 <- ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 14 23 14 24] (4 : usize)));
-    [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) =  * y in (x0, ([#"../split_borrow.rs" 14 8 14 25] _7))) ; };
+    [#"../split_borrow.rs" 14 17 14 25] _7 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 14 23 14 24] (4 : usize));
+    [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) =  * y in (x0, _7)) ; };
     _7 <- any SplitBorrow_MyInt_Type.t_myint;
-    [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] [#"../split_borrow.rs" 13 11 15 5] ());
+    [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] ());
     goto BB4
   }
   BB3 {
-    [#"../split_borrow.rs" 16 17 16 26] _8 <- ([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 16 23 16 25] (10 : usize)));
-    [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) =  * y in (([#"../split_borrow.rs" 16 8 16 26] _8), x1)) ; };
+    [#"../split_borrow.rs" 16 17 16 26] _8 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 16 23 16 25] (10 : usize));
+    [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) =  * y in (_8, x1)) ; };
     _8 <- any SplitBorrow_MyInt_Type.t_myint;
-    [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] [#"../split_borrow.rs" 15 11 17 5] ());
+    [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] ());
     goto BB4
   }
   BB4 {
     assume { resolve0 y };
     assume { resolve1 x };
-    [#"../split_borrow.rs" 9 11 21 1] _0 <- ([#"../split_borrow.rs" 9 11 21 1] [#"../split_borrow.rs" 9 11 21 1] ());
+    [#"../split_borrow.rs" 9 11 21 1] _0 <- ([#"../split_borrow.rs" 9 11 21 1] ());
     return _0
   }
   
@@ -131,9 +131,9 @@ module SplitBorrow_G
     goto BB0
   }
   BB0 {
-    [#"../split_borrow.rs" 24 17 24 25] _2 <- ([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 23 24 24] (1 : usize)));
-    [#"../split_borrow.rs" 24 27 24 35] _3 <- ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 33 24 34] (2 : usize)));
-    [#"../split_borrow.rs" 24 16 24 36] a <- ([#"../split_borrow.rs" 24 16 24 36] (_2, _3));
+    [#"../split_borrow.rs" 24 17 24 25] _2 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 23 24 24] (1 : usize));
+    [#"../split_borrow.rs" 24 27 24 35] _3 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 24 33 24 34] (2 : usize));
+    [#"../split_borrow.rs" 24 16 24 36] a <- (_2, _3);
     _2 <- any SplitBorrow_MyInt_Type.t_myint;
     _3 <- any SplitBorrow_MyInt_Type.t_myint;
     [#"../split_borrow.rs" 25 12 25 18] x <- Borrow.borrow_mut a;
@@ -141,12 +141,12 @@ module SplitBorrow_G
     [#"../split_borrow.rs" 27 13 27 21] _z <- Borrow.borrow_final (let (_, a) =  * x in a) (Borrow.inherit_id (Borrow.get_id x) 2);
     [#"../split_borrow.rs" 27 13 27 21] x <- { x with current = (let (x0, x1) =  * x in (x0,  ^ _z)) ; };
     assume { resolve0 _z };
-    [#"../split_borrow.rs" 29 13 29 21] _6 <- ([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 29 19 29 20] (3 : usize)));
-    [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) =  * x in (([#"../split_borrow.rs" 29 4 29 21] _6), x1)) ; };
+    [#"../split_borrow.rs" 29 13 29 21] _6 <- SplitBorrow_MyInt_Type.C_MyInt ([#"../split_borrow.rs" 29 19 29 20] (3 : usize));
+    [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) =  * x in (_6, x1)) ; };
     _6 <- any SplitBorrow_MyInt_Type.t_myint;
     assume { resolve1 x };
     assume { resolve2 a };
-    [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] [#"../split_borrow.rs" 23 11 32 1] ());
+    [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/std_types.mlcfg b/creusot/tests/should_succeed/std_types.mlcfg
index 740099b545..8517de6b44 100644
--- a/creusot/tests/should_succeed/std_types.mlcfg
+++ b/creusot/tests/should_succeed/std_types.mlcfg
@@ -23,7 +23,7 @@ module StdTypes_X
     goto BB0
   }
   BB0 {
-    [#"../std_types.rs" 5 21 5 23] _0 <- ([#"../std_types.rs" 5 21 5 23] [#"../std_types.rs" 5 21 5 23] ());
+    [#"../std_types.rs" 5 21 5 23] _0 <- ([#"../std_types.rs" 5 21 5 23] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg
index 11977f77cf..24accef357 100644
--- a/creusot/tests/should_succeed/sum.mlcfg
+++ b/creusot/tests/should_succeed/sum.mlcfg
@@ -232,7 +232,7 @@ module Sum_SumFirstN
     goto BB0
   }
   BB0 {
-    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] [#"../sum.rs" 7 18 7 19] (0 : uint32));
+    [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] (0 : uint32));
     [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 ([#"../sum.rs" 9 13 9 14] (1 : uint32)) n);
     goto BB1
   }
@@ -275,7 +275,7 @@ module Sum_SumFirstN
       end
   }
   BB8 {
-    [#"../sum.rs" 12 4 12 7] _0 <- ([#"../sum.rs" 12 4 12 7] sum);
+    [#"../sum.rs" 12 4 12 7] _0 <- sum;
     return _0
   }
   BB9 {
@@ -286,15 +286,15 @@ module Sum_SumFirstN
     absurd
   }
   BB11 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     [#"../sum.rs" 8 4 8 67] _22 <- ([#"../sum.rs" 8 4 8 67] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB12
   }
   BB12 {
-    [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] _22);
+    [#"../sum.rs" 8 4 8 67] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq uint32);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
-    [#"../sum.rs" 10 8 10 16] sum <- ([#"../sum.rs" 10 8 10 16] sum + i);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
+    [#"../sum.rs" 10 8 10 16] sum <- sum + i;
     goto BB5
   }
   
diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg
index 1f31f3448e..fdedb69611 100644
--- a/creusot/tests/should_succeed/sum_of_odds.mlcfg
+++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg
@@ -244,8 +244,8 @@ module SumOfOdds_ComputeSumOfOdd
     goto BB0
   }
   BB0 {
-    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] [#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
-    [#"../sum_of_odds.rs" 39 13 39 17] _8 <- ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range ([#"../sum_of_odds.rs" 39 13 39 14] (0 : uint32)) x);
+    [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32));
+    [#"../sum_of_odds.rs" 39 13 39 17] _8 <- Core_Ops_Range_Range_Type.C_Range ([#"../sum_of_odds.rs" 39 13 39 14] (0 : uint32)) x;
     [#"../sum_of_odds.rs" 38 4 38 50] iter <- ([#"../sum_of_odds.rs" 38 4 38 50] into_iter0 _8);
     _8 <- any Core_Ops_Range_Range_Type.t_range uint32;
     goto BB1
@@ -284,7 +284,7 @@ module SumOfOdds_ComputeSumOfOdd
       end
   }
   BB7 {
-    [#"../sum_of_odds.rs" 46 11 46 12] _0 <- ([#"../sum_of_odds.rs" 46 11 46 12] s);
+    [#"../sum_of_odds.rs" 46 11 46 12] _0 <- s;
     return _0
   }
   BB8 {
@@ -295,19 +295,19 @@ module SumOfOdds_ComputeSumOfOdd
     absurd
   }
   BB10 {
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _18;
     [#"../sum_of_odds.rs" 38 4 38 50] _23 <- ([#"../sum_of_odds.rs" 38 4 38 50] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] _23);
+    [#"../sum_of_odds.rs" 38 4 38 50] produced <- _23;
     _23 <- any Snapshot.snap_ty (Seq.seq uint32);
-    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 41 12 41 33] let _ = sum_of_odd_is_sqr0 (UInt32.to_int i) in true };
-    [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 18] ([#"../sum_of_odds.rs" 44 13 44 14] (2 : uint32)) * i);
-    [#"../sum_of_odds.rs" 44 13 44 22] _28 <- ([#"../sum_of_odds.rs" 44 13 44 22] _29 + ([#"../sum_of_odds.rs" 44 21 44 22] (1 : uint32)));
+    [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 14] (2 : uint32)) * i;
+    [#"../sum_of_odds.rs" 44 13 44 22] _28 <- _29 + ([#"../sum_of_odds.rs" 44 21 44 22] (1 : uint32));
     _29 <- any uint32;
-    [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + _28);
+    [#"../sum_of_odds.rs" 44 8 44 22] s <- s + _28;
     _28 <- any uint32;
     goto BB4
   }
@@ -368,7 +368,7 @@ module SumOfOdds_Test
   }
   BB1 {
     assert { [@expl:assertion] [#"../sum_of_odds.rs" 53 8 53 29] let _ = sum_of_odd_is_sqr0 (UInt32.to_int x) in is_square0 (UInt32.to_int y) };
-    [#"../sum_of_odds.rs" 52 4 55 5] _0 <- ([#"../sum_of_odds.rs" 52 4 55 5] [#"../sum_of_odds.rs" 52 4 55 5] ());
+    [#"../sum_of_odds.rs" 52 4 55 5] _0 <- ([#"../sum_of_odds.rs" 52 4 55 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/swap_borrows.mlcfg b/creusot/tests/should_succeed/swap_borrows.mlcfg
index 0bcfab730c..718c248214 100644
--- a/creusot/tests/should_succeed/swap_borrows.mlcfg
+++ b/creusot/tests/should_succeed/swap_borrows.mlcfg
@@ -36,7 +36,7 @@ module SwapBorrows_Swap
   BB1 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../swap_borrows.rs" 6 4 6 14] _0 <- ([#"../swap_borrows.rs" 6 4 6 14] ((let (_, a) = x in a), (let (a, _) = x in a)));
+    [#"../swap_borrows.rs" 6 4 6 14] _0 <- ((let (_, a) = x in a), (let (a, _) = x in a));
     x <- (let (x0, x1) = x in (x0, any t));
     x <- (let (x0, x1) = x in (any t, x1));
     goto BB2
@@ -106,9 +106,9 @@ module SwapBorrows_F
     goto BB0
   }
   BB0 {
-    [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] (([#"../swap_borrows.rs" 11 26 11 27] (0 : uint32)), ([#"../swap_borrows.rs" 11 29 11 30] (0 : uint32))));
-    [#"../swap_borrows.rs" 11 9 11 14] a <- ([#"../swap_borrows.rs" 11 9 11 14] let (a, _) = _3 in a);
-    [#"../swap_borrows.rs" 11 16 11 21] b <- ([#"../swap_borrows.rs" 11 16 11 21] let (_, a) = _3 in a);
+    [#"../swap_borrows.rs" 11 25 11 31] _3 <- (([#"../swap_borrows.rs" 11 26 11 27] (0 : uint32)), ([#"../swap_borrows.rs" 11 29 11 30] (0 : uint32)));
+    [#"../swap_borrows.rs" 11 9 11 14] a <- (let (a, _) = _3 in a);
+    [#"../swap_borrows.rs" 11 16 11 21] b <- (let (_, a) = _3 in a);
     assume { resolve0 _3 };
     [#"../swap_borrows.rs" 12 18 12 24] _6 <- Borrow.borrow_mut a;
     [#"../swap_borrows.rs" 12 18 12 24] a <-  ^ _6;
@@ -116,7 +116,7 @@ module SwapBorrows_F
     [#"../swap_borrows.rs" 12 26 12 32] b <-  ^ _8;
     [#"../swap_borrows.rs" 12 26 12 32] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
     [#"../swap_borrows.rs" 12 26 12 32] _8 <- { _8 with current = ( ^ _7) ; };
-    [#"../swap_borrows.rs" 12 17 12 33] _5 <- ([#"../swap_borrows.rs" 12 17 12 33] (_6, _7));
+    [#"../swap_borrows.rs" 12 17 12 33] _5 <- (_6, _7);
     _6 <- any borrowed uint32;
     _7 <- any borrowed uint32;
     [#"../swap_borrows.rs" 12 12 12 34] p <- ([#"../swap_borrows.rs" 12 12 12 34] swap0 _5);
@@ -125,11 +125,11 @@ module SwapBorrows_F
   }
   BB1 {
     assume { resolve1 _8 };
-    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] [#"../swap_borrows.rs" 13 11 13 13] (10 : uint32)) ; }, x1));
+    [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 11 13 13] (10 : uint32)) ; }, x1));
     assume { resolve2 p };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 15 20 15 30] b = (10 : uint32) };
     assert { [@expl:assertion] [#"../swap_borrows.rs" 16 20 16 29] a = (0 : uint32) };
-    [#"../swap_borrows.rs" 10 11 17 1] _0 <- ([#"../swap_borrows.rs" 10 11 17 1] [#"../swap_borrows.rs" 10 11 17 1] ());
+    [#"../swap_borrows.rs" 10 11 17 1] _0 <- ([#"../swap_borrows.rs" 10 11 17 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/switch.mlcfg b/creusot/tests/should_succeed/switch.mlcfg
index 881225a54d..707653dbc2 100644
--- a/creusot/tests/should_succeed/switch.mlcfg
+++ b/creusot/tests/should_succeed/switch.mlcfg
@@ -33,7 +33,7 @@ module Switch_Test
     goto BB4
   }
   BB2 {
-    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] [#"../switch.rs" 12 16 12 21] false);
+    [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] false);
     goto BB5
   }
   BB3 {
@@ -41,8 +41,8 @@ module Switch_Test
     absurd
   }
   BB4 {
-    [#"../switch.rs" 11 13 11 14] x <- ([#"../switch.rs" 11 13 11 14] Switch_Option_Type.some_0 o);
-    [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] x > ([#"../switch.rs" 11 23 11 24] (0 : uint32)));
+    [#"../switch.rs" 11 13 11 14] x <- Switch_Option_Type.some_0 o;
+    [#"../switch.rs" 11 19 11 24] _0 <- x > ([#"../switch.rs" 11 23 11 24] (0 : uint32));
     goto BB5
   }
   BB5 {
@@ -88,7 +88,7 @@ module Switch_Test2
     goto BB4
   }
   BB2 {
-    [#"../switch.rs" 19 16 19 19] _0 <- ([#"../switch.rs" 19 16 19 19] let (_, a) = o in a);
+    [#"../switch.rs" 19 16 19 19] _0 <- (let (_, a) = o in a);
     assume { resolve0 o };
     goto BB5
   }
@@ -98,9 +98,9 @@ module Switch_Test2
     absurd
   }
   BB4 {
-    [#"../switch.rs" 18 13 18 14] x <- ([#"../switch.rs" 18 13 18 14] Switch_Option_Type.some_0 (let (a, _) = o in a));
+    [#"../switch.rs" 18 13 18 14] x <- Switch_Option_Type.some_0 (let (a, _) = o in a);
     assume { resolve0 o };
-    [#"../switch.rs" 18 19 18 20] _0 <- ([#"../switch.rs" 18 19 18 20] x);
+    [#"../switch.rs" 18 19 18 20] _0 <- x;
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/switch_struct.mlcfg b/creusot/tests/should_succeed/switch_struct.mlcfg
index add5733e50..8dc5ed23a9 100644
--- a/creusot/tests/should_succeed/switch_struct.mlcfg
+++ b/creusot/tests/should_succeed/switch_struct.mlcfg
@@ -41,8 +41,8 @@ module SwitchStruct_Test
     goto BB4
   }
   BB2 {
-    [#"../switch_struct.rs" 12 12 12 18] field2 <- ([#"../switch_struct.rs" 12 12 12 18] SwitchStruct_M_Type.g_field2 o);
-    [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] field2 = ([#"../switch_struct.rs" 12 34 12 35] (0 : uint32)));
+    [#"../switch_struct.rs" 12 12 12 18] field2 <- SwitchStruct_M_Type.g_field2 o;
+    [#"../switch_struct.rs" 12 24 12 35] _0 <- field2 = ([#"../switch_struct.rs" 12 34 12 35] (0 : uint32));
     goto BB5
   }
   BB3 {
@@ -50,8 +50,8 @@ module SwitchStruct_Test
     absurd
   }
   BB4 {
-    [#"../switch_struct.rs" 11 12 11 18] field1 <- ([#"../switch_struct.rs" 11 12 11 18] SwitchStruct_M_Type.f_field1 o);
-    [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] field1 > ([#"../switch_struct.rs" 11 33 11 34] (0 : uint32)));
+    [#"../switch_struct.rs" 11 12 11 18] field1 <- SwitchStruct_M_Type.f_field1 o;
+    [#"../switch_struct.rs" 11 24 11 34] _0 <- field1 > ([#"../switch_struct.rs" 11 33 11 34] (0 : uint32));
     goto BB5
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/syntax/01_idents.mlcfg b/creusot/tests/should_succeed/syntax/01_idents.mlcfg
index 24569dbecd..f2db50cf1c 100644
--- a/creusot/tests/should_succeed/syntax/01_idents.mlcfg
+++ b/creusot/tests/should_succeed/syntax/01_idents.mlcfg
@@ -7,7 +7,7 @@ module C01Idents_Clone
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 3 15 3 17] _0 <- ([#"../01_idents.rs" 3 15 3 17] [#"../01_idents.rs" 3 15 3 17] ());
+    [#"../01_idents.rs" 3 15 3 17] _0 <- ([#"../01_idents.rs" 3 15 3 17] ());
     return _0
   }
   
@@ -20,7 +20,7 @@ module C01Idents_Function
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 5 18 5 20] _0 <- ([#"../01_idents.rs" 5 18 5 20] [#"../01_idents.rs" 5 18 5 20] ());
+    [#"../01_idents.rs" 5 18 5 20] _0 <- ([#"../01_idents.rs" 5 18 5 20] ());
     return _0
   }
   
@@ -33,7 +33,7 @@ module C01Idents_Import
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 7 16 7 18] _0 <- ([#"../01_idents.rs" 7 16 7 18] [#"../01_idents.rs" 7 16 7 18] ());
+    [#"../01_idents.rs" 7 16 7 18] _0 <- ([#"../01_idents.rs" 7 16 7 18] ());
     return _0
   }
   
@@ -46,7 +46,7 @@ module C01Idents_Export
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 9 16 9 18] _0 <- ([#"../01_idents.rs" 9 16 9 18] [#"../01_idents.rs" 9 16 9 18] ());
+    [#"../01_idents.rs" 9 16 9 18] _0 <- ([#"../01_idents.rs" 9 16 9 18] ());
     return _0
   }
   
@@ -59,7 +59,7 @@ module C01Idents_Result
     goto BB0
   }
   BB0 {
-    [#"../01_idents.rs" 11 16 11 18] _0 <- ([#"../01_idents.rs" 11 16 11 18] [#"../01_idents.rs" 11 16 11 18] ());
+    [#"../01_idents.rs" 11 16 11 18] _0 <- ([#"../01_idents.rs" 11 16 11 18] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
index f69547e003..af8d352226 100644
--- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg
+++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg
@@ -16,13 +16,13 @@ module C02Operators_Division
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y);
-    [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = ([#"../02_operators.rs" 9 4 9 9] (0 : usize)));
+    [#"../02_operators.rs" 9 8 9 9] _5 <- y;
+    [#"../02_operators.rs" 9 4 9 9] _6 <- _5 = ([#"../02_operators.rs" 9 4 9 9] (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] x / _5);
+    [#"../02_operators.rs" 9 4 9 9] _0 <- x / _5;
     _5 <- any usize;
     return _0
   }
@@ -45,13 +45,13 @@ module C02Operators_Modulus
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y);
-    [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = ([#"../02_operators.rs" 24 4 24 9] (0 : usize)));
+    [#"../02_operators.rs" 24 8 24 9] _5 <- y;
+    [#"../02_operators.rs" 24 4 24 9] _6 <- _5 = ([#"../02_operators.rs" 24 4 24 9] (0 : usize));
     assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 };
     goto BB1
   }
   BB1 {
-    [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] x % _5);
+    [#"../02_operators.rs" 24 4 24 9] _0 <- x % _5;
     _5 <- any usize;
     return _0
   }
@@ -74,7 +74,7 @@ module C02Operators_Multiply
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] x * y);
+    [#"../02_operators.rs" 39 4 39 9] _0 <- x * y;
     return _0
   }
   
@@ -96,7 +96,7 @@ module C02Operators_Add
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] x + y);
+    [#"../02_operators.rs" 49 4 49 9] _0 <- x + y;
     return _0
   }
   
@@ -116,7 +116,7 @@ module C02Operators_Sub
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] x - y);
+    [#"../02_operators.rs" 64 4 64 9] _0 <- x - y;
     return _0
   }
   
@@ -149,27 +149,27 @@ module C02Operators_Expression
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y);
-    [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = ([#"../02_operators.rs" 78 4 78 9] (0 : usize)));
+    [#"../02_operators.rs" 78 8 78 9] _10 <- y;
+    [#"../02_operators.rs" 78 4 78 9] _11 <- _10 = ([#"../02_operators.rs" 78 4 78 9] (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 };
     goto BB1
   }
   BB1 {
-    [#"../02_operators.rs" 78 4 78 9] _8 <- ([#"../02_operators.rs" 78 4 78 9] x / _10);
+    [#"../02_operators.rs" 78 4 78 9] _8 <- x / _10;
     _10 <- any usize;
-    [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z);
+    [#"../02_operators.rs" 78 4 78 13] _7 <- _8 * z;
     _8 <- any usize;
-    [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y);
-    [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = ([#"../02_operators.rs" 78 17 78 24] (0 : usize)));
+    [#"../02_operators.rs" 78 22 78 23] _16 <- y;
+    [#"../02_operators.rs" 78 17 78 24] _17 <- _16 = ([#"../02_operators.rs" 78 17 78 24] (0 : usize));
     assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 };
     goto BB2
   }
   BB2 {
-    [#"../02_operators.rs" 78 17 78 24] _14 <- ([#"../02_operators.rs" 78 17 78 24] x / _16);
+    [#"../02_operators.rs" 78 17 78 24] _14 <- x / _16;
     _16 <- any usize;
-    [#"../02_operators.rs" 78 17 78 28] _13 <- ([#"../02_operators.rs" 78 17 78 28] _14 * z);
+    [#"../02_operators.rs" 78 17 78 28] _13 <- _14 * z;
     _14 <- any usize;
-    [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] _7 = _13);
+    [#"../02_operators.rs" 78 4 78 28] _0 <- _7 = _13;
     _7 <- any usize;
     _13 <- any usize;
     return _0
@@ -208,7 +208,7 @@ module C02Operators_PrimitiveComparison
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] [#"../02_operators.rs" 92 30 92 32] ());
+    [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] ());
     return _0
   }
   
@@ -226,7 +226,7 @@ module C02Operators_BoolEq
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb a b);
+    [#"../02_operators.rs" 96 4 96 10] _0 <- Bool.eqb a b;
     return _0
   }
   
@@ -241,7 +241,7 @@ module C02Operators_OldTest
     goto BB0
   }
   BB0 {
-    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] [#"../02_operators.rs" 100 21 100 23] ());
+    [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
index a8d7f742d2..6d88f21530 100644
--- a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg
@@ -25,7 +25,7 @@ module C04AssocPrec_RespectPrec
   }
   BB0 {
     assume { resolve0 x };
-    [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- ([#"../04_assoc_prec.rs" 10 35 10 37] [#"../04_assoc_prec.rs" 10 35 10 37] ());
+    [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- ([#"../04_assoc_prec.rs" 10 35 10 37] ());
     return _0
   }
   
@@ -41,7 +41,7 @@ module C04AssocPrec_RespectAssoc
     goto BB0
   }
   BB0 {
-    [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- ([#"../04_assoc_prec.rs" 13 23 13 25] [#"../04_assoc_prec.rs" 13 23 13 25] ());
+    [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- ([#"../04_assoc_prec.rs" 13 23 13 25] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
index 7d9918a914..78a410f58d 100644
--- a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg
@@ -30,7 +30,7 @@ module C05Annotations_Assertion
     goto BB1
   }
   BB1 {
-    [#"../05_annotations.rs" 5 26 7 1] _0 <- ([#"../05_annotations.rs" 5 26 7 1] [#"../05_annotations.rs" 5 26 7 1] ());
+    [#"../05_annotations.rs" 5 26 7 1] _0 <- ([#"../05_annotations.rs" 5 26 7 1] ());
     goto BB2
   }
   BB2 {
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index 49296ded96..a10fd8fb62 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -67,7 +67,7 @@ module C05Pearlite_StructInPearlite
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 24 32 24 34] _0 <- ([#"../05_pearlite.rs" 24 32 24 34] [#"../05_pearlite.rs" 24 32 24 34] ());
+    [#"../05_pearlite.rs" 24 32 24 34] _0 <- ([#"../05_pearlite.rs" 24 32 24 34] ());
     return _0
   }
   
@@ -92,7 +92,7 @@ module C05Pearlite_StructOrder
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 32 26 32 28] _0 <- ([#"../05_pearlite.rs" 32 26 32 28] [#"../05_pearlite.rs" 32 26 32 28] ());
+    [#"../05_pearlite.rs" 32 26 32 28] _0 <- ([#"../05_pearlite.rs" 32 26 32 28] ());
     return _0
   }
   
@@ -116,7 +116,7 @@ module C05Pearlite_GhostClosure
     goto BB1
   }
   BB1 {
-    [#"../05_pearlite.rs" 48 23 50 1] _0 <- ([#"../05_pearlite.rs" 48 23 50 1] [#"../05_pearlite.rs" 48 23 50 1] ());
+    [#"../05_pearlite.rs" 48 23 50 1] _0 <- ([#"../05_pearlite.rs" 48 23 50 1] ());
     return _0
   }
   
@@ -134,7 +134,7 @@ module C05Pearlite_PearliteClosure
     goto BB0
   }
   BB0 {
-    [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] [#"../05_pearlite.rs" 52 58 52 60] ());
+    [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] ());
     return _0
   }
   
@@ -165,7 +165,7 @@ module C05Pearlite_Caller
     goto BB2
   }
   BB2 {
-    [#"../05_pearlite.rs" 54 16 56 1] _0 <- ([#"../05_pearlite.rs" 54 16 56 1] [#"../05_pearlite.rs" 54 16 56 1] ());
+    [#"../05_pearlite.rs" 54 16 56 1] _0 <- ([#"../05_pearlite.rs" 54 16 56 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
index c1687a288a..bf420021a7 100644
--- a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
+++ b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg
@@ -9,7 +9,7 @@ module C07ExternSpec_Impl0_Func
     goto BB0
   }
   BB0 {
-    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] [#"../07_extern_spec.rs" 12 8 12 12] true);
+    [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] true);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
index 5372bc1fb9..bf775481c0 100644
--- a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
+++ b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg
@@ -23,7 +23,7 @@ module C09Maintains_Test1
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 28 37 28 39] _0 <- ([#"../09_maintains.rs" 28 37 28 39] [#"../09_maintains.rs" 28 37 28 39] ());
+    [#"../09_maintains.rs" 28 37 28 39] _0 <- ([#"../09_maintains.rs" 28 37 28 39] ());
     return _0
   }
   
@@ -55,7 +55,7 @@ module C09Maintains_Test2
   }
   BB0 {
     assume { resolve0 a };
-    [#"../09_maintains.rs" 31 42 31 44] _0 <- ([#"../09_maintains.rs" 31 42 31 44] [#"../09_maintains.rs" 31 42 31 44] ());
+    [#"../09_maintains.rs" 31 42 31 44] _0 <- ([#"../09_maintains.rs" 31 42 31 44] ());
     return _0
   }
   
@@ -94,7 +94,7 @@ module C09Maintains_Test3
   BB0 {
     assume { resolve0 b };
     assume { resolve1 a };
-    [#"../09_maintains.rs" 34 47 34 49] _0 <- ([#"../09_maintains.rs" 34 47 34 49] [#"../09_maintains.rs" 34 47 34 49] ());
+    [#"../09_maintains.rs" 34 47 34 49] _0 <- ([#"../09_maintains.rs" 34 47 34 49] ());
     return _0
   }
   
@@ -119,7 +119,7 @@ module C09Maintains_Test5
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 37 30 37 32] _0 <- ([#"../09_maintains.rs" 37 30 37 32] [#"../09_maintains.rs" 37 30 37 32] ());
+    [#"../09_maintains.rs" 37 30 37 32] _0 <- ([#"../09_maintains.rs" 37 30 37 32] ());
     return _0
   }
   
@@ -141,7 +141,7 @@ module C09Maintains_Test6
     goto BB0
   }
   BB0 {
-    [#"../09_maintains.rs" 40 29 40 31] _0 <- ([#"../09_maintains.rs" 40 29 40 31] [#"../09_maintains.rs" 40 29 40 31] ());
+    [#"../09_maintains.rs" 40 29 40 31] _0 <- ([#"../09_maintains.rs" 40 29 40 31] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
index 43065ad5d2..6e05b7b0e9 100644
--- a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg
@@ -46,7 +46,7 @@ module C10MutualRecTypes_UseTree
     goto BB0
   }
   BB0 {
-    [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- ([#"../10_mutual_rec_types.rs" 13 26 13 28] [#"../10_mutual_rec_types.rs" 13 26 13 28] ());
+    [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- ([#"../10_mutual_rec_types.rs" 13 26 13 28] ());
     return _0
   }
   
@@ -119,7 +119,7 @@ module C10MutualRecTypes_Impl0_Height
     goto BB4
   }
   BB2 {
-    [#"../10_mutual_rec_types.rs" 19 22 19 23] n <- ([#"../10_mutual_rec_types.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C10MutualRecTypes_Tree_Type.tree_0 self));
+    [#"../10_mutual_rec_types.rs" 19 22 19 23] n <- Core_Option_Option_Type.some_0 (C10MutualRecTypes_Tree_Type.tree_0 self);
     [#"../10_mutual_rec_types.rs" 19 29 19 44] _5 <- ([#"../10_mutual_rec_types.rs" 19 29 19 44] height (C10MutualRecTypes_Node_Type.node_left n));
     goto BB5
   }
@@ -128,7 +128,7 @@ module C10MutualRecTypes_Impl0_Height
     absurd
   }
   BB4 {
-    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] [#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
+    [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64));
     goto BB8
   }
   BB5 {
@@ -142,7 +142,7 @@ module C10MutualRecTypes_Impl0_Height
     goto BB7
   }
   BB7 {
-    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + ([#"../10_mutual_rec_types.rs" 19 69 19 70] (1 : uint64)));
+    [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- _4 + ([#"../10_mutual_rec_types.rs" 19 69 19 70] (1 : uint64));
     _4 <- any uint64;
     goto BB8
   }
diff --git a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
index b6a4c2c827..b1c5968fc3 100644
--- a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
+++ b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg
@@ -42,16 +42,16 @@ module C11ArrayTypes_Omg
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] [#"../11_array_types.rs" 9 8 9 9] (0 : usize));
-    [#"../11_array_types.rs" 9 4 9 10] _4 <- ([#"../11_array_types.rs" 9 4 9 10] Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x));
-    [#"../11_array_types.rs" 9 4 9 10] _5 <- ([#"../11_array_types.rs" 9 4 9 10] _3 < _4);
+    [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] (0 : usize));
+    [#"../11_array_types.rs" 9 4 9 10] _4 <- Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x);
+    [#"../11_array_types.rs" 9 4 9 10] _5 <- _3 < _4;
     assert { [@expl:index in bounds] [#"../11_array_types.rs" 9 4 9 10] _5 };
     goto BB1
   }
   BB1 {
-    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] [#"../11_array_types.rs" 9 13 9 14] (5 : int64))));
+    [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 13 9 14] (5 : int64))));
     assert { [@expl:assertion] [#"../11_array_types.rs" 11 20 11 32] Int64.to_int (index_logic0 (C11ArrayTypes_UsesArray_Type.usesarray_0 x) 0) = 5 };
-    [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] [#"../11_array_types.rs" 8 29 12 1] ());
+    [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] ());
     return _0
   }
   
@@ -79,8 +79,8 @@ module C11ArrayTypes_CallOmg
     goto BB0
   }
   BB0 {
-    [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create ([#"../11_array_types.rs" 15 14 15 24] (5 : usize)) (fun _ -> [#"../11_array_types.rs" 15 15 15 20] (3 : int64)));
-    [#"../11_array_types.rs" 16 8 16 22] _2 <- ([#"../11_array_types.rs" 16 8 16 22] C11ArrayTypes_UsesArray_Type.C_UsesArray arr);
+    [#"../11_array_types.rs" 15 14 15 24] arr <- Slice.create ([#"../11_array_types.rs" 15 14 15 24] (5 : usize)) (fun _ -> [#"../11_array_types.rs" 15 15 15 20] (3 : int64));
+    [#"../11_array_types.rs" 16 8 16 22] _2 <- C11ArrayTypes_UsesArray_Type.C_UsesArray arr;
     [#"../11_array_types.rs" 16 4 16 23] _0 <- ([#"../11_array_types.rs" 16 4 16 23] omg0 _2);
     _2 <- any C11ArrayTypes_UsesArray_Type.t_usesarray;
     goto BB1
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index 884cabb418..aa3ee02811 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -19,7 +19,7 @@ module C12GhostCode_GhostArg
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] [#"../12_ghost_code.rs" 4 35 6 1] ());
+    [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] ());
     return _0
   }
   
@@ -144,7 +144,7 @@ module C12GhostCode_GhostVec
     goto BB2
   }
   BB2 {
-    [#"../12_ghost_code.rs" 8 19 11 1] _0 <- ([#"../12_ghost_code.rs" 8 19 11 1] [#"../12_ghost_code.rs" 8 19 11 1] ());
+    [#"../12_ghost_code.rs" 8 19 11 1] _0 <- ([#"../12_ghost_code.rs" 8 19 11 1] ());
     goto BB3
   }
   BB3 {
@@ -171,7 +171,7 @@ module C12GhostCode_GhostCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] [#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
+    [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] (0 : int32));
     [#"../12_ghost_code.rs" 19 17 19 52] _s <- ([#"../12_ghost_code.rs" 19 17 19 52] Snapshot.new (Seq.snoc (Seq.empty ) (0 : int32)));
     goto BB1
   }
@@ -180,9 +180,9 @@ module C12GhostCode_GhostCopy
     goto BB2
   }
   BB2 {
-    [#"../12_ghost_code.rs" 20 4 20 33] _s <- ([#"../12_ghost_code.rs" 20 4 20 33] _4);
+    [#"../12_ghost_code.rs" 20 4 20 33] _s <- _4;
     _4 <- any Snapshot.snap_ty (Seq.seq int32);
-    [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] [#"../12_ghost_code.rs" 17 20 21 1] ());
+    [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] ());
     return _0
   }
   
@@ -210,7 +210,7 @@ module C12GhostCode_GhostIsCopy
     goto BB0
   }
   BB0 {
-    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] [#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
+    [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] (0 : int32));
     [#"../12_ghost_code.rs" 25 12 25 18] r <- Borrow.borrow_mut x;
     [#"../12_ghost_code.rs" 25 12 25 18] x <-  ^ r;
     assume { resolve0 r };
@@ -218,10 +218,10 @@ module C12GhostCode_GhostIsCopy
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 27 13 27 14] g1 <- ([#"../12_ghost_code.rs" 27 13 27 14] g);
-    [#"../12_ghost_code.rs" 28 13 28 14] g2 <- ([#"../12_ghost_code.rs" 28 13 28 14] g);
+    [#"../12_ghost_code.rs" 27 13 27 14] g1 <- g;
+    [#"../12_ghost_code.rs" 28 13 28 14] g2 <- g;
     assert { [@expl:assertion] [#"../12_ghost_code.rs" 29 18 29 26] g1 = g2 };
-    [#"../12_ghost_code.rs" 23 23 30 1] _0 <- ([#"../12_ghost_code.rs" 23 23 30 1] [#"../12_ghost_code.rs" 23 23 30 1] ());
+    [#"../12_ghost_code.rs" 23 23 30 1] _0 <- ([#"../12_ghost_code.rs" 23 23 30 1] ());
     return _0
   }
   
@@ -382,7 +382,7 @@ module C12GhostCode_GhostCheck
   }
   BB4 {
     assume { resolve0 x };
-    [#"../12_ghost_code.rs" 43 12 43 24] _7 <- ([#"../12_ghost_code.rs" 43 12 43 24] _8 = ([#"../12_ghost_code.rs" 43 23 43 24] (1 : usize)));
+    [#"../12_ghost_code.rs" 43 12 43 24] _7 <- _8 = ([#"../12_ghost_code.rs" 43 23 43 24] (1 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB6
@@ -390,7 +390,7 @@ module C12GhostCode_GhostCheck
       end
   }
   BB5 {
-    [#"../12_ghost_code.rs" 35 21 44 1] _0 <- ([#"../12_ghost_code.rs" 35 21 44 1] [#"../12_ghost_code.rs" 35 21 44 1] ());
+    [#"../12_ghost_code.rs" 35 21 44 1] _0 <- ([#"../12_ghost_code.rs" 35 21 44 1] ());
     goto BB7
   }
   BB6 {
@@ -453,9 +453,9 @@ module C12GhostCode_TakesStruct
     goto BB1
   }
   BB1 {
-    [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 27] _3));
+    [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 _3);
     _3 <- any Snapshot.snap_ty uint32;
-    [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] [#"../12_ghost_code.rs" 52 37 54 1] ());
+    [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index 64ea1e72d9..a5ee93ce46 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -238,7 +238,7 @@ module C13VecMacro_X
     goto BB4
   }
   BB4 {
-    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
+    [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = ([#"../13_vec_macro.rs" 12 18 12 19] (1 : int32))}; assume {Seq.get (__arr_temp.elts) 1 = ([#"../13_vec_macro.rs" 12 21 12 22] (2 : int32))}; assume {Seq.get (__arr_temp.elts) 2 = ([#"../13_vec_macro.rs" 12 24 12 25] (3 : int32))}; assume {Slice.length __arr_temp = 3}; __arr_temp);
     goto BB5
   }
   BB5 {
@@ -255,7 +255,7 @@ module C13VecMacro_X
     goto BB8
   }
   BB8 {
-    [#"../13_vec_macro.rs" 5 11 14 1] _0 <- ([#"../13_vec_macro.rs" 5 11 14 1] [#"../13_vec_macro.rs" 5 11 14 1] ());
+    [#"../13_vec_macro.rs" 5 11 14 1] _0 <- ([#"../13_vec_macro.rs" 5 11 14 1] ());
     goto BB9
   }
   BB9 {
diff --git a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
index 4090c4ffdd..748e49e9fd 100644
--- a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
+++ b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg
@@ -13,7 +13,7 @@ module C14ConstFns_Omg
     goto BB0
   }
   BB0 {
-    [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] x - ([#"../14_const_fns.rs" 6 8 6 9] (1 : int32)));
+    [#"../14_const_fns.rs" 6 4 6 9] _0 <- x - ([#"../14_const_fns.rs" 6 8 6 9] (1 : int32));
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
index 6719efb634..a8b65f896e 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
+++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
@@ -109,14 +109,14 @@ module DeriveMacros_Impl2_Clone
     goto BB0
   }
   BB0 {
-    [#"../derive_macros.rs" 10 4 10 8] _5 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a self);
+    [#"../derive_macros.rs" 10 4 10 8] _5 <- DeriveMacros_Product_Type.product_a self;
     assert { [@expl:type invariant] inv0 _5 };
     assume { resolve0 _5 };
     [#"../derive_macros.rs" 10 4 10 8] _3 <- ([#"../derive_macros.rs" 10 4 10 8] clone0 _5);
     goto BB1
   }
   BB1 {
-    [#"../derive_macros.rs" 11 4 11 8] _8 <- ([#"../derive_macros.rs" 11 4 11 8] DeriveMacros_Product_Type.product_b self);
+    [#"../derive_macros.rs" 11 4 11 8] _8 <- DeriveMacros_Product_Type.product_b self;
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
     assert { [@expl:type invariant] inv2 _8 };
@@ -125,7 +125,7 @@ module DeriveMacros_Impl2_Clone
     goto BB2
   }
   BB2 {
-    [#"../derive_macros.rs" 8 9 8 14] _0 <- ([#"../derive_macros.rs" 8 9 8 14] DeriveMacros_Product_Type.C_Product _3 _6);
+    [#"../derive_macros.rs" 8 9 8 14] _0 <- DeriveMacros_Product_Type.C_Product _3 _6;
     _3 <- any a;
     _6 <- any b;
     goto BB3
@@ -242,7 +242,7 @@ module DeriveMacros_Impl3_Eq
     goto BB0
   }
   BB0 {
-    [#"../derive_macros.rs" 10 4 10 8] _7 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a rhs);
+    [#"../derive_macros.rs" 10 4 10 8] _7 <- DeriveMacros_Product_Type.product_a rhs;
     assert { [@expl:type invariant] inv0 _7 };
     assume { resolve0 _7 };
     [#"../derive_macros.rs" 10 4 10 8] _4 <- ([#"../derive_macros.rs" 10 4 10 8] eq0 (DeriveMacros_Product_Type.product_a self) _7);
@@ -257,7 +257,7 @@ module DeriveMacros_Impl3_Eq
   BB2 {
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../derive_macros.rs" 11 4 11 8] _10 <- ([#"../derive_macros.rs" 11 4 11 8] DeriveMacros_Product_Type.product_b rhs);
+    [#"../derive_macros.rs" 11 4 11 8] _10 <- DeriveMacros_Product_Type.product_b rhs;
     assert { [@expl:type invariant] inv1 rhs };
     assume { resolve1 rhs };
     assert { [@expl:type invariant] inv2 _10 };
@@ -270,7 +270,7 @@ module DeriveMacros_Impl3_Eq
     assume { resolve1 rhs };
     assert { [@expl:type invariant] inv1 self };
     assume { resolve1 self };
-    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] [#"../derive_macros.rs" 10 4 11 8] false);
+    [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] false);
     goto BB5
   }
   BB4 {
@@ -431,10 +431,10 @@ module DeriveMacros_Impl4_Clone
     goto BB4
   }
   BB2 {
-    [#"../derive_macros.rs" 28 9 28 14] v0_11 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.b_0 self);
+    [#"../derive_macros.rs" 28 9 28 14] v0_11 <- DeriveMacros_Sum_Type.b_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../derive_macros.rs" 28 9 28 14] _11 <- ([#"../derive_macros.rs" 28 9 28 14] v0_11);
+    [#"../derive_macros.rs" 28 9 28 14] _11 <- v0_11;
     assert { [@expl:type invariant] inv3 _11 };
     assume { resolve3 _11 };
     [#"../derive_macros.rs" 28 9 28 14] _9 <- ([#"../derive_macros.rs" 28 9 28 14] clone1 _11);
@@ -447,10 +447,10 @@ module DeriveMacros_Impl4_Clone
     absurd
   }
   BB4 {
-    [#"../derive_macros.rs" 28 9 28 14] v0_1 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.a_0 self);
+    [#"../derive_macros.rs" 28 9 28 14] v0_1 <- DeriveMacros_Sum_Type.a_0 self;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
-    [#"../derive_macros.rs" 28 9 28 14] _7 <- ([#"../derive_macros.rs" 28 9 28 14] v0_1);
+    [#"../derive_macros.rs" 28 9 28 14] _7 <- v0_1;
     assert { [@expl:type invariant] inv1 _7 };
     assume { resolve1 _7 };
     [#"../derive_macros.rs" 28 9 28 14] _5 <- ([#"../derive_macros.rs" 28 9 28 14] clone0 _7);
@@ -459,7 +459,7 @@ module DeriveMacros_Impl4_Clone
   BB5 {
     assert { [@expl:type invariant] inv2 v0_1 };
     assume { resolve2 v0_1 };
-    [#"../derive_macros.rs" 28 9 28 14] _0 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.C_A _5);
+    [#"../derive_macros.rs" 28 9 28 14] _0 <- DeriveMacros_Sum_Type.C_A _5;
     _5 <- any a;
     goto BB6
   }
@@ -469,7 +469,7 @@ module DeriveMacros_Impl4_Clone
   BB7 {
     assert { [@expl:type invariant] inv4 v0_11 };
     assume { resolve4 v0_11 };
-    [#"../derive_macros.rs" 28 9 28 14] _0 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.C_B _9);
+    [#"../derive_macros.rs" 28 9 28 14] _0 <- DeriveMacros_Sum_Type.C_B _9;
     _9 <- any b;
     goto BB8
   }
@@ -610,7 +610,7 @@ module DeriveMacros_Impl5_Eq
     assume { resolve0 self };
     assert { [@expl:type invariant] inv0 rhs };
     assume { resolve0 rhs };
-    [#"../derive_macros.rs" 28 16 28 25] _4 <- ([#"../derive_macros.rs" 28 16 28 25] (self, rhs));
+    [#"../derive_macros.rs" 28 16 28 25] _4 <- (self, rhs);
     switch (let (a, _) = _4 in a)
       | DeriveMacros_Sum_Type.C_A _ -> goto BB1
       | DeriveMacros_Sum_Type.C_B _ -> goto BB4
@@ -628,7 +628,7 @@ module DeriveMacros_Impl5_Eq
   BB3 {
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve1 _4 };
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB16
   }
   BB4 {
@@ -641,8 +641,8 @@ module DeriveMacros_Impl5_Eq
     goto BB11
   }
   BB6 {
-    [#"../derive_macros.rs" 28 16 28 25] v0_1 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.a_0 (let (a, _) = _4 in a));
-    [#"../derive_macros.rs" 28 16 28 25] v0_2 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.a_0 (let (_, a) = _4 in a));
+    [#"../derive_macros.rs" 28 16 28 25] v0_1 <- DeriveMacros_Sum_Type.a_0 (let (a, _) = _4 in a);
+    [#"../derive_macros.rs" 28 16 28 25] v0_2 <- DeriveMacros_Sum_Type.a_0 (let (_, a) = _4 in a);
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve1 _4 };
     assert { [@expl:type invariant] inv2 v0_1 };
@@ -659,19 +659,19 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB8 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
     goto BB10
   }
   BB9 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB10
   }
   BB10 {
     goto BB16
   }
   BB11 {
-    [#"../derive_macros.rs" 28 16 28 25] v0_11 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.b_0 (let (a, _) = _4 in a));
-    [#"../derive_macros.rs" 28 16 28 25] v0_21 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.b_0 (let (_, a) = _4 in a));
+    [#"../derive_macros.rs" 28 16 28 25] v0_11 <- DeriveMacros_Sum_Type.b_0 (let (a, _) = _4 in a);
+    [#"../derive_macros.rs" 28 16 28 25] v0_21 <- DeriveMacros_Sum_Type.b_0 (let (_, a) = _4 in a);
     assert { [@expl:type invariant] inv1 _4 };
     assume { resolve1 _4 };
     assert { [@expl:type invariant] inv3 v0_11 };
@@ -688,11 +688,11 @@ module DeriveMacros_Impl5_Eq
       end
   }
   BB13 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] true);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true);
     goto BB15
   }
   BB14 {
-    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] [#"../derive_macros.rs" 28 16 28 25] false);
+    [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false);
     goto BB15
   }
   BB15 {
diff --git a/creusot/tests/should_succeed/take_first_mut.mlcfg b/creusot/tests/should_succeed/take_first_mut.mlcfg
index 9fbf1b24c7..c015850993 100644
--- a/creusot/tests/should_succeed/take_first_mut.mlcfg
+++ b/creusot/tests/should_succeed/take_first_mut.mlcfg
@@ -206,16 +206,16 @@ module TakeFirstMut_TakeFirstMut
     goto BB6
   }
   BB4 {
-    [#"../take_first_mut.rs" 17 14 17 19] first <- ([#"../take_first_mut.rs" 17 14 17 19] let (a, _) = Core_Option_Option_Type.some_0 _3 in a);
+    [#"../take_first_mut.rs" 17 14 17 19] first <- (let (a, _) = Core_Option_Option_Type.some_0 _3 in a);
     _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (any borrowed t, x1)));
-    [#"../take_first_mut.rs" 17 21 17 24] rem <- ([#"../take_first_mut.rs" 17 21 17 24] let (_, a) = Core_Option_Option_Type.some_0 _3 in a);
+    [#"../take_first_mut.rs" 17 21 17 24] rem <- (let (_, a) = Core_Option_Option_Type.some_0 _3 in a);
     _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (x0, any borrowed (slice t))));
     assert { [@expl:type invariant] inv2 _3 };
     assume { resolve0 _3 };
     [#"../take_first_mut.rs" 18 21 18 24] _11 <- Borrow.borrow_final ( * rem) (Borrow.get_id rem);
     [#"../take_first_mut.rs" 18 21 18 24] rem <- { rem with current = ( ^ _11) ; };
     assume { inv1 ( ^ _11) };
-    [#"../take_first_mut.rs" 18 12 18 24] self_ <- { self_ with current = ([#"../take_first_mut.rs" 18 12 18 24] _11) ; };
+    [#"../take_first_mut.rs" 18 12 18 24] self_ <- { self_ with current = _11 ; };
     _11 <- any borrowed (slice t);
     assert { [@expl:type invariant] inv0 ( * self_) };
     assume { resolve2 ( * self_) };
@@ -224,7 +224,7 @@ module TakeFirstMut_TakeFirstMut
     [#"../take_first_mut.rs" 19 17 19 22] _12 <- Borrow.borrow_final ( * first) (Borrow.get_id first);
     [#"../take_first_mut.rs" 19 17 19 22] first <- { first with current = ( ^ _12) ; };
     assume { inv4 ( ^ _12) };
-    [#"../take_first_mut.rs" 19 12 19 23] _0 <- ([#"../take_first_mut.rs" 19 12 19 23] Core_Option_Option_Type.C_Some _12);
+    [#"../take_first_mut.rs" 19 12 19 23] _0 <- Core_Option_Option_Type.C_Some _12;
     _12 <- any borrowed t;
     assert { [@expl:type invariant] inv0 rem };
     assume { resolve2 rem };
@@ -249,7 +249,7 @@ module TakeFirstMut_TakeFirstMut
     assume { resolve0 _3 };
     assert { [@expl:type invariant] inv3 self_ };
     assume { resolve1 self_ };
-    [#"../take_first_mut.rs" 16 23 16 27] _0 <- ([#"../take_first_mut.rs" 16 23 16 27] Core_Option_Option_Type.C_None);
+    [#"../take_first_mut.rs" 16 23 16 27] _0 <- Core_Option_Option_Type.C_None;
     assert { [@expl:type invariant] inv0 _5 };
     assume { resolve2 _5 };
     goto BB7
diff --git a/creusot/tests/should_succeed/trait.mlcfg b/creusot/tests/should_succeed/trait.mlcfg
index b091b2062b..37b9f6d5b8 100644
--- a/creusot/tests/should_succeed/trait.mlcfg
+++ b/creusot/tests/should_succeed/trait.mlcfg
@@ -26,7 +26,7 @@ module Trait_UsesCustom
     goto BB0
   }
   BB0 {
-    [#"../trait.rs" 9 55 9 57] _0 <- ([#"../trait.rs" 9 55 9 57] [#"../trait.rs" 9 55 9 57] ());
+    [#"../trait.rs" 9 55 9 57] _0 <- ([#"../trait.rs" 9 55 9 57] ());
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
     goto BB1
@@ -63,7 +63,7 @@ module Trait_UsesCustom2
     goto BB0
   }
   BB0 {
-    [#"../trait.rs" 13 62 13 64] _0 <- ([#"../trait.rs" 13 62 13 64] [#"../trait.rs" 13 62 13 64] ());
+    [#"../trait.rs" 13 62 13 64] _0 <- ([#"../trait.rs" 13 62 13 64] ());
     assert { [@expl:type invariant] inv0 _t };
     assume { resolve0 _t };
     goto BB1
diff --git a/creusot/tests/should_succeed/trait_impl.mlcfg b/creusot/tests/should_succeed/trait_impl.mlcfg
index 6da53136a4..3dd0b12645 100644
--- a/creusot/tests/should_succeed/trait_impl.mlcfg
+++ b/creusot/tests/should_succeed/trait_impl.mlcfg
@@ -35,7 +35,7 @@ module TraitImpl_Impl0_X
     goto BB0
   }
   BB0 {
-    [#"../trait_impl.rs" 25 15 25 17] _0 <- ([#"../trait_impl.rs" 25 15 25 17] [#"../trait_impl.rs" 25 15 25 17] ());
+    [#"../trait_impl.rs" 25 15 25 17] _0 <- ([#"../trait_impl.rs" 25 15 25 17] ());
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     goto BB1
@@ -56,7 +56,7 @@ module TraitImpl_Impl1_X
     goto BB0
   }
   BB0 {
-    [#"../trait_impl.rs" 29 15 29 17] _0 <- ([#"../trait_impl.rs" 29 15 29 17] [#"../trait_impl.rs" 29 15 29 17] ());
+    [#"../trait_impl.rs" 29 15 29 17] _0 <- ([#"../trait_impl.rs" 29 15 29 17] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/03.mlcfg b/creusot/tests/should_succeed/traits/03.mlcfg
index 427b3d0584..0207562222 100644
--- a/creusot/tests/should_succeed/traits/03.mlcfg
+++ b/creusot/tests/should_succeed/traits/03.mlcfg
@@ -10,7 +10,7 @@ module C03_Impl0_F
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] [#"../03.rs" 10 8 10 9] (0 : int32));
+    [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] (0 : int32));
     return _0
   }
   
@@ -26,7 +26,7 @@ module C03_Impl1_G
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] [#"../03.rs" 21 8 21 9] (1 : uint32));
+    [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] (1 : uint32));
     return _0
   }
   
@@ -58,7 +58,7 @@ module C03_Impl2_H
     goto BB0
   }
   BB0 {
-    [#"../03.rs" 31 8 31 9] _0 <- ([#"../03.rs" 31 8 31 9] y);
+    [#"../03.rs" 31 8 31 9] _0 <- y;
     assert { [@expl:type invariant] inv0 y };
     assume { resolve0 y };
     return _0
diff --git a/creusot/tests/should_succeed/traits/04.mlcfg b/creusot/tests/should_succeed/traits/04.mlcfg
index 12f055d489..f29b5ed62e 100644
--- a/creusot/tests/should_succeed/traits/04.mlcfg
+++ b/creusot/tests/should_succeed/traits/04.mlcfg
@@ -84,7 +84,7 @@ module C04_User
     goto BB7
   }
   BB7 {
-    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] [#"../04.rs" 13 4 13 42] false);
+    [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] false);
     goto BB9
   }
   BB8 {
diff --git a/creusot/tests/should_succeed/traits/07.mlcfg b/creusot/tests/should_succeed/traits/07.mlcfg
index 000a84b85f..5f9d9cf45b 100644
--- a/creusot/tests/should_succeed/traits/07.mlcfg
+++ b/creusot/tests/should_succeed/traits/07.mlcfg
@@ -10,7 +10,7 @@ module C07_Impl0_Ix
     goto BB0
   }
   BB0 {
-    [#"../07.rs" 12 8 12 10] _0 <- ([#"../07.rs" 12 8 12 10] ());
+    [#"../07.rs" 12 8 12 10] _0 <- ();
     return _0
   }
   
@@ -29,7 +29,7 @@ module C07_Test
     goto BB0
   }
   BB0 {
-    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] [#"../07.rs" 17 4 17 8] true);
+    [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] true);
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/08.mlcfg b/creusot/tests/should_succeed/traits/08.mlcfg
index 55c34ef5bc..fb7f9560b3 100644
--- a/creusot/tests/should_succeed/traits/08.mlcfg
+++ b/creusot/tests/should_succeed/traits/08.mlcfg
@@ -25,7 +25,7 @@ module C08_Tr_Program
     goto BB0
   }
   BB0 {
-    [#"../08.rs" 12 22 12 24] _0 <- ([#"../08.rs" 12 22 12 24] [#"../08.rs" 12 22 12 24] ());
+    [#"../08.rs" 12 22 12 24] _0 <- ([#"../08.rs" 12 22 12 24] ());
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     return _0
@@ -57,7 +57,7 @@ module C08_Test
     goto BB0
   }
   BB0 {
-    [#"../08.rs" 15 25 15 27] _0 <- ([#"../08.rs" 15 25 15 27] [#"../08.rs" 15 25 15 27] ());
+    [#"../08.rs" 15 25 15 27] _0 <- ([#"../08.rs" 15 25 15 27] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/traits/09.mlcfg b/creusot/tests/should_succeed/traits/09.mlcfg
index 88df5428a8..b60d9fe059 100644
--- a/creusot/tests/should_succeed/traits/09.mlcfg
+++ b/creusot/tests/should_succeed/traits/09.mlcfg
@@ -11,7 +11,7 @@ module C09_Test
     goto BB0
   }
   BB0 {
-    [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] t + ([#"../09.rs" 8 8 8 9] (0 : uint32)));
+    [#"../09.rs" 8 4 8 9] _0 <- t + ([#"../09.rs" 8 8 8 9] (0 : uint32));
     return _0
   }
   
@@ -40,7 +40,7 @@ module C09_Test2
     goto BB0
   }
   BB0 {
-    [#"../09.rs" 12 4 12 5] _0 <- ([#"../09.rs" 12 4 12 5] t);
+    [#"../09.rs" 12 4 12 5] _0 <- t;
     t <- any x0;
     goto BB1
   }
diff --git a/creusot/tests/should_succeed/traits/11.mlcfg b/creusot/tests/should_succeed/traits/11.mlcfg
index 4f7deb31f0..70fb6a02cf 100644
--- a/creusot/tests/should_succeed/traits/11.mlcfg
+++ b/creusot/tests/should_succeed/traits/11.mlcfg
@@ -24,7 +24,7 @@ module C11_Test
     goto BB0
   }
   BB0 {
-    [#"../11.rs" 18 24 18 26] _0 <- ([#"../11.rs" 18 24 18 26] [#"../11.rs" 18 24 18 26] ());
+    [#"../11.rs" 18 24 18 26] _0 <- ([#"../11.rs" 18 24 18 26] ());
     assert { [@expl:type invariant] inv0 _1 };
     assume { resolve0 _1 };
     goto BB1
diff --git a/creusot/tests/should_succeed/traits/12_default_method.mlcfg b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
index a13d16aa60..d57d1dff80 100644
--- a/creusot/tests/should_succeed/traits/12_default_method.mlcfg
+++ b/creusot/tests/should_succeed/traits/12_default_method.mlcfg
@@ -27,7 +27,7 @@ module C12DefaultMethod_T_Default
     goto BB0
   }
   BB0 {
-    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] [#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
+    [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] (0 : uint32));
     assert { [@expl:type invariant] inv0 self };
     assume { resolve0 self };
     return _0
@@ -71,7 +71,7 @@ module C12DefaultMethod_ShouldUseImpl
     goto BB1
   }
   BB1 {
-    [#"../12_default_method.rs" 20 31 22 1] _0 <- ([#"../12_default_method.rs" 20 31 22 1] [#"../12_default_method.rs" 20 31 22 1] ());
+    [#"../12_default_method.rs" 20 31 22 1] _0 <- ([#"../12_default_method.rs" 20 31 22 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
index 8cc5a1ce08..caff2ea273 100644
--- a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
+++ b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg
@@ -13,7 +13,7 @@ module C15ImplInterfaces_Calls
     goto BB0
   }
   BB0 {
-    [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- ([#"../15_impl_interfaces.rs" 23 37 23 39] [#"../15_impl_interfaces.rs" 23 37 23 39] ());
+    [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- ([#"../15_impl_interfaces.rs" 23 37 23 39] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
index 2bd5179205..8a88e4f01e 100644
--- a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
+++ b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
@@ -86,7 +86,7 @@ module C16ImplCloning_Test
   BB0 {
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- ([#"../16_impl_cloning.rs" 17 31 17 33] [#"../16_impl_cloning.rs" 17 31 17 33] ());
+    [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- ([#"../16_impl_cloning.rs" 17 31 17 33] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/two_modules.mlcfg b/creusot/tests/should_succeed/two_modules.mlcfg
index b77eccb7c5..05014b6a89 100644
--- a/creusot/tests/should_succeed/two_modules.mlcfg
+++ b/creusot/tests/should_succeed/two_modules.mlcfg
@@ -16,7 +16,7 @@ module TwoModules_Mod2_X
     goto BB0
   }
   BB0 {
-    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] [#"../two_modules.rs" 16 8 16 12] true);
+    [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] true);
     return _0
   }
   
@@ -33,13 +33,13 @@ module TwoModules_F
     goto BB0
   }
   BB0 {
-    [#"../two_modules.rs" 23 12 23 13] _2 <- ([#"../two_modules.rs" 23 12 23 13] TwoModules_Mod1_T_Type.C_B);
+    [#"../two_modules.rs" 23 12 23 13] _2 <- TwoModules_Mod1_T_Type.C_B;
     [#"../two_modules.rs" 23 4 23 14] _1 <- ([#"../two_modules.rs" 23 4 23 14] x0 _2);
     _2 <- any TwoModules_Mod1_T_Type.t_t;
     goto BB1
   }
   BB1 {
-    [#"../two_modules.rs" 22 11 24 1] _0 <- ([#"../two_modules.rs" 22 11 24 1] [#"../two_modules.rs" 22 11 24 1] ());
+    [#"../two_modules.rs" 22 11 24 1] _0 <- ([#"../two_modules.rs" 22 11 24 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_constructors.mlcfg b/creusot/tests/should_succeed/type_constructors.mlcfg
index 103bc9b952..3c4e89ee68 100644
--- a/creusot/tests/should_succeed/type_constructors.mlcfg
+++ b/creusot/tests/should_succeed/type_constructors.mlcfg
@@ -16,8 +16,8 @@ module TypeConstructors_F
     goto BB0
   }
   BB0 {
-    [#"../type_constructors.rs" 18 17 18 24] _3 <- ([#"../type_constructors.rs" 18 17 18 24] TypeConstructors_B_X_Type.C_B);
-    [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] [#"../type_constructors.rs" 16 11 19 1] ());
+    [#"../type_constructors.rs" 18 17 18 24] _3 <- TypeConstructors_B_X_Type.C_B;
+    [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
index 2707ed6d8c..a43665884a 100644
--- a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg
@@ -39,7 +39,7 @@ module Borrows_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 18 8 18 15] _0 <- ([#"../borrows.rs" 18 8 18 15] Borrows_NonZero_Type.C_NonZero n);
+    [#"../borrows.rs" 18 8 18 15] _0 <- Borrows_NonZero_Type.C_NonZero n;
     return _0
   }
   
@@ -139,9 +139,9 @@ module Borrows_Inc
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11]  * x + ([#"../borrows.rs" 102 10 102 11] (1 : int32))) ; };
+    [#"../borrows.rs" 102 4 102 11] x <- { x with current = ( * x + ([#"../borrows.rs" 102 10 102 11] (1 : int32))) ; };
     assume { resolve0 x };
-    [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] [#"../borrows.rs" 101 24 103 1] ());
+    [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] ());
     return _0
   }
   
@@ -223,7 +223,7 @@ module Borrows_Simple
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 31 31 34 1] _0 <- ([#"../borrows.rs" 31 31 34 1] [#"../borrows.rs" 31 31 34 1] ());
+    [#"../borrows.rs" 31 31 34 1] _0 <- ([#"../borrows.rs" 31 31 34 1] ());
     return _0
   }
   
@@ -317,7 +317,7 @@ module Borrows_Hard
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv1 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 38 29 41 1] _0 <- ([#"../borrows.rs" 38 29 41 1] [#"../borrows.rs" 38 29 41 1] ());
+    [#"../borrows.rs" 38 29 41 1] _0 <- ([#"../borrows.rs" 38 29 41 1] ());
     return _0
   }
   
@@ -407,7 +407,7 @@ module Borrows_Tuple
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] [#"../borrows.rs" 46 13 46 14] (0 : int32))), x1));
+    [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 13 46 14] (0 : int32))), x1));
     [#"../borrows.rs" 47 8 47 19] _6 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1);
     [#"../borrows.rs" 47 8 47 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _6)) ; }));
     [#"../borrows.rs" 47 8 47 19] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6);
@@ -420,7 +420,7 @@ module Borrows_Tuple
     assume { resolve0 _6 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 45 45 49 1] _0 <- ([#"../borrows.rs" 45 45 49 1] [#"../borrows.rs" 45 45 49 1] ());
+    [#"../borrows.rs" 45 45 49 1] _0 <- ([#"../borrows.rs" 45 45 49 1] ());
     return _0
   }
   
@@ -511,7 +511,7 @@ module Borrows_PartialMove
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 54 16 54 19] a <- ([#"../borrows.rs" 54 16 54 19] let (a, _) = x in a);
+    [#"../borrows.rs" 54 16 54 19] a <- (let (a, _) = x in a);
     x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
     [#"../borrows.rs" 55 8 55 19] _7 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1);
     [#"../borrows.rs" 55 8 55 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _7)) ; }));
@@ -525,8 +525,8 @@ module Borrows_PartialMove
     assume { resolve0 _7 };
     assert { [@expl:type invariant] inv0 x };
     assume { resolve1 x };
-    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] [#"../borrows.rs" 56 10 56 11] (0 : int32)));
-    [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] [#"../borrows.rs" 53 48 57 1] ());
+    [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 10 56 11] (0 : int32)));
+    [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] ());
     return _0
   }
   
@@ -618,13 +618,13 @@ module Borrows_Destruct
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 62 9 62 14] a <- ([#"../borrows.rs" 62 9 62 14] let (a, _) = x in a);
+    [#"../borrows.rs" 62 9 62 14] a <- (let (a, _) = x in a);
     x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1));
-    [#"../borrows.rs" 62 16 62 17] b <- ([#"../borrows.rs" 62 16 62 17] let (_, a) = x in a);
+    [#"../borrows.rs" 62 16 62 17] b <- (let (_, a) = x in a);
     x <- (let (x0, x1) = x in (x0, any borrowed (Borrows_NonZero_Type.t_nonzero)));
     assert { [@expl:type invariant] inv0 x };
     assume { resolve0 x };
-    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] [#"../borrows.rs" 63 10 63 11] (0 : int32)));
+    [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 10 63 11] (0 : int32)));
     [#"../borrows.rs" 64 8 64 16] _8 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * b)) (Borrow.inherit_id (Borrow.get_id b) 1);
     [#"../borrows.rs" 64 8 64 16] b <- { b with current = (let Borrows_NonZero_Type.C_NonZero x0 =  * b in Borrows_NonZero_Type.C_NonZero ( ^ _8)) ; };
     [#"../borrows.rs" 64 8 64 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8);
@@ -637,7 +637,7 @@ module Borrows_Destruct
     assume { resolve1 _8 };
     assert { [@expl:type invariant] inv1 b };
     assume { resolve2 b };
-    [#"../borrows.rs" 61 44 65 1] _0 <- ([#"../borrows.rs" 61 44 65 1] [#"../borrows.rs" 61 44 65 1] ());
+    [#"../borrows.rs" 61 44 65 1] _0 <- ([#"../borrows.rs" 61 44 65 1] ());
     return _0
   }
   
@@ -717,7 +717,7 @@ module Borrows_FrozenDead
     assume { inv0 ( ^ _6) };
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
-    [#"../borrows.rs" 73 4 74 9] x <- ([#"../borrows.rs" 73 4 74 9] _6);
+    [#"../borrows.rs" 73 4 74 9] x <- _6;
     _6 <- any borrowed (Borrows_NonZero_Type.t_nonzero);
     assert { [@expl:type invariant] inv1 x };
     assume { resolve0 x };
@@ -729,7 +729,7 @@ module Borrows_FrozenDead
   }
   BB1 {
     assume { resolve1 _a };
-    [#"../borrows.rs" 69 67 76 1] _0 <- ([#"../borrows.rs" 69 67 76 1] [#"../borrows.rs" 69 67 76 1] ());
+    [#"../borrows.rs" 69 67 76 1] _0 <- ([#"../borrows.rs" 69 67 76 1] ());
     assert { [@expl:type invariant] inv1 y };
     assume { resolve0 y };
     return _0
@@ -780,9 +780,9 @@ module Borrows_Dec
     goto BB0
   }
   BB0 {
-    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11]  * x - ([#"../borrows.rs" 108 10 108 11] (1 : int32))) ; };
+    [#"../borrows.rs" 108 4 108 11] x <- { x with current = ( * x - ([#"../borrows.rs" 108 10 108 11] (1 : int32))) ; };
     assume { resolve0 x };
-    [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] [#"../borrows.rs" 107 24 109 1] ());
+    [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] ());
     return _0
   }
   
@@ -882,7 +882,7 @@ module Borrows_Impl3_Foo
     assume { resolve0 _8 };
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
-    [#"../borrows.rs" 93 26 96 5] _0 <- ([#"../borrows.rs" 93 26 96 5] [#"../borrows.rs" 93 26 96 5] ());
+    [#"../borrows.rs" 93 26 96 5] _0 <- ([#"../borrows.rs" 93 26 96 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/generated.mlcfg b/creusot/tests/should_succeed/type_invariants/generated.mlcfg
index efc20b1f50..679f36dda7 100644
--- a/creusot/tests/should_succeed/type_invariants/generated.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/generated.mlcfg
@@ -113,7 +113,7 @@ module Generated_UseFoo
   }
   BB0 {
     assert { [@expl:assertion] [#"../generated.rs" 20 18 20 35] inv0 x };
-    [#"../generated.rs" 19 62 21 1] _0 <- ([#"../generated.rs" 19 62 21 1] [#"../generated.rs" 19 62 21 1] ());
+    [#"../generated.rs" 19 62 21 1] _0 <- ([#"../generated.rs" 19 62 21 1] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
index 85f7281307..28344900de 100644
--- a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg
@@ -38,7 +38,7 @@ module NonZero_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 17 8 17 15] _0 <- ([#"../non_zero.rs" 17 8 17 15] NonZero_NonZeroU32_Type.C_NonZeroU32 n);
+    [#"../non_zero.rs" 17 8 17 15] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 n;
     return _0
   }
   
@@ -77,8 +77,8 @@ module NonZero_Impl1_Add
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 22 13 22 27] _4 <- ([#"../non_zero.rs" 22 13 22 27] NonZero_NonZeroU32_Type.nonzerou32_0 self + NonZero_NonZeroU32_Type.nonzerou32_0 rhs);
-    [#"../non_zero.rs" 22 8 22 28] _0 <- ([#"../non_zero.rs" 22 8 22 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4);
+    [#"../non_zero.rs" 22 13 22 27] _4 <- NonZero_NonZeroU32_Type.nonzerou32_0 self + NonZero_NonZeroU32_Type.nonzerou32_0 rhs;
+    [#"../non_zero.rs" 22 8 22 28] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 _4;
     _4 <- any uint32;
     return _0
   }
@@ -157,8 +157,8 @@ module NonZero_Impl1_Sub
     goto BB0
   }
   BB0 {
-    [#"../non_zero.rs" 41 13 41 27] _4 <- ([#"../non_zero.rs" 41 13 41 27] NonZero_NonZeroU32_Type.nonzerou32_0 self - NonZero_NonZeroU32_Type.nonzerou32_0 rhs);
-    [#"../non_zero.rs" 41 8 41 28] _0 <- ([#"../non_zero.rs" 41 8 41 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4);
+    [#"../non_zero.rs" 41 13 41 27] _4 <- NonZero_NonZeroU32_Type.nonzerou32_0 self - NonZero_NonZeroU32_Type.nonzerou32_0 rhs;
+    [#"../non_zero.rs" 41 8 41 28] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 _4;
     _4 <- any uint32;
     return _0
   }
diff --git a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
index cd9bd4371a..d24fa5afcd 100644
--- a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg
@@ -29,7 +29,7 @@ module TypeInvariants_Id
     goto BB0
   }
   BB0 {
-    [#"../type_invariants.rs" 15 4 15 5] _0 <- ([#"../type_invariants.rs" 15 4 15 5] x);
+    [#"../type_invariants.rs" 15 4 15 5] _0 <- x;
     x <- any TypeInvariants_WithInvariant_Type.t_withinvariant;
     return _0
   }
diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
index 21135df73a..f7a5322f87 100644
--- a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
@@ -206,7 +206,7 @@ module VecInv_Vec
     goto BB2
   }
   BB2 {
-    [#"../vec_inv.rs" 18 33 20 1] _0 <- ([#"../vec_inv.rs" 18 33 20 1] [#"../vec_inv.rs" 18 33 20 1] ());
+    [#"../vec_inv.rs" 18 33 20 1] _0 <- ([#"../vec_inv.rs" 18 33 20 1] ());
     goto BB3
   }
   BB3 {
diff --git a/creusot/tests/should_succeed/unused_in_loop.mlcfg b/creusot/tests/should_succeed/unused_in_loop.mlcfg
index f1fca52781..3e27964fce 100644
--- a/creusot/tests/should_succeed/unused_in_loop.mlcfg
+++ b/creusot/tests/should_succeed/unused_in_loop.mlcfg
@@ -13,7 +13,7 @@ module UnusedInLoop_UnusedInLoop
     goto BB0
   }
   BB0 {
-    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] [#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
+    [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32));
     goto BB1
   }
   BB1 {
@@ -27,7 +27,7 @@ module UnusedInLoop_UnusedInLoop
       end
   }
   BB3 {
-    [#"../unused_in_loop.rs" 13 4 13 5] _0 <- ([#"../unused_in_loop.rs" 13 4 13 5] x);
+    [#"../unused_in_loop.rs" 13 4 13 5] _0 <- x;
     return _0
   }
   BB4 {
diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg
index 8885afa9d3..35cafebbb6 100644
--- a/creusot/tests/should_succeed/vecdeque.mlcfg
+++ b/creusot/tests/should_succeed/vecdeque.mlcfg
@@ -232,16 +232,16 @@ module Vecdeque_TestDeque
     
   let constant promoted0 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 24 37 24 38] (3 : uint32)) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0
+    let _1 = Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 24 37 24 38] (3 : uint32)) in let _0 = _1 in _0
   let constant promoted1 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 23 38 23 39] (2 : uint32)) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0
+    let _1 = Core_Option_Option_Type.C_Some ([#"../vecdeque.rs" 23 38 23 39] (2 : uint32)) in let _0 = _1 in _0
   let constant promoted2 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 17 32 17 36] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 17 32 17 36] _1 in _0
+    let _1 = Core_Option_Option_Type.C_None in let _0 = _1 in _0
   let constant promoted3 [#"../vecdeque.rs" 5 0 5 19]  : Core_Option_Option_Type.t_option uint32
    = [@vc:do_not_keep_trace] [@vc:sp]
-    let _1 = [#"../vecdeque.rs" 16 33 16 37] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 16 33 16 37] _1 in _0
+    let _1 = Core_Option_Option_Type.C_None in let _0 = _1 in _0
   let rec cfg test_deque [#"../vecdeque.rs" 5 0 5 19] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : ()
    = [@vc:do_not_keep_trace] [@vc:sp]
   var _0 : ();
@@ -304,7 +304,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB5 {
-    [#"../vecdeque.rs" 9 12 9 28] _7 <- ([#"../vecdeque.rs" 9 12 9 28] _8 = ([#"../vecdeque.rs" 9 27 9 28] (0 : usize)));
+    [#"../vecdeque.rs" 9 12 9 28] _7 <- _8 = ([#"../vecdeque.rs" 9 27 9 28] (0 : usize));
     _8 <- any usize;
     switch (_7)
       | False -> goto BB7
@@ -338,7 +338,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB12 {
-    [#"../vecdeque.rs" 14 12 14 28] _17 <- ([#"../vecdeque.rs" 14 12 14 28] _18 = ([#"../vecdeque.rs" 14 27 14 28] (0 : usize)));
+    [#"../vecdeque.rs" 14 12 14 28] _17 <- _18 = ([#"../vecdeque.rs" 14 27 14 28] (0 : usize));
     _18 <- any usize;
     switch (_17)
       | False -> goto BB14
@@ -357,7 +357,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB15 {
-    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] [#"../vecdeque.rs" 16 33 16 37] promoted3);
+    [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] promoted3);
     [#"../vecdeque.rs" 16 12 16 37] _22 <- ([#"../vecdeque.rs" 16 12 16 37] eq0 _24 _68);
     goto BB16
   }
@@ -379,7 +379,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB19 {
-    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] [#"../vecdeque.rs" 17 32 17 36] promoted2);
+    [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] promoted2);
     [#"../vecdeque.rs" 17 12 17 36] _30 <- ([#"../vecdeque.rs" 17 12 17 36] eq0 _32 _67);
     goto BB20
   }
@@ -422,7 +422,7 @@ module Vecdeque_TestDeque
     goto BB26
   }
   BB26 {
-    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] [#"../vecdeque.rs" 23 33 23 40] promoted1);
+    [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] promoted1);
     [#"../vecdeque.rs" 23 12 23 40] _44 <- ([#"../vecdeque.rs" 23 12 23 40] eq0 _46 _66);
     goto BB27
   }
@@ -444,7 +444,7 @@ module Vecdeque_TestDeque
     absurd
   }
   BB30 {
-    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] [#"../vecdeque.rs" 24 32 24 39] promoted0);
+    [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] promoted0);
     [#"../vecdeque.rs" 24 12 24 39] _52 <- ([#"../vecdeque.rs" 24 12 24 39] eq0 _54 _65);
     goto BB31
   }
@@ -476,7 +476,7 @@ module Vecdeque_TestDeque
       end
   }
   BB36 {
-    [#"../vecdeque.rs" 5 20 27 1] _0 <- ([#"../vecdeque.rs" 5 20 27 1] [#"../vecdeque.rs" 5 20 27 1] ());
+    [#"../vecdeque.rs" 5 20 27 1] _0 <- ([#"../vecdeque.rs" 5 20 27 1] ());
     goto BB38
   }
   BB37 {
diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index ff4cafa265..913aa429f9 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -383,7 +383,7 @@ module C01_AllZero
     goto BB2
   }
   BB2 {
-    [#"../01.rs" 11 13 11 23] _7 <- ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range ([#"../01.rs" 11 13 11 14] (0 : usize)) _8);
+    [#"../01.rs" 11 13 11 23] _7 <- Core_Ops_Range_Range_Type.C_Range ([#"../01.rs" 11 13 11 14] (0 : usize)) _8;
     _8 <- any usize;
     [#"../01.rs" 9 4 9 42] iter <- ([#"../01.rs" 9 4 9 42] into_iter0 _7);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -426,7 +426,7 @@ module C01_AllZero
   }
   BB9 {
     assume { resolve2 v };
-    [#"../01.rs" 9 4 9 42] _0 <- ([#"../01.rs" 9 4 9 42] [#"../01.rs" 9 4 9 42] ());
+    [#"../01.rs" 9 4 9 42] _0 <- ([#"../01.rs" 9 4 9 42] ());
     return _0
   }
   BB10 {
@@ -438,14 +438,14 @@ module C01_AllZero
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _19;
     [#"../01.rs" 9 4 9 42] _24 <- ([#"../01.rs" 9 4 9 42] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
-    [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] _24);
+    [#"../01.rs" 9 4 9 42] produced <- _24;
     _24 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
     [#"../01.rs" 12 8 12 9] _28 <- Borrow.borrow_mut ( * v);
     [#"../01.rs" 12 8 12 9] v <- { v with current = ( ^ _28) ; };
     [#"../01.rs" 12 9 12 12] _27 <- ([#"../01.rs" 12 9 12 12] index_mut0 _28 i);
@@ -453,7 +453,7 @@ module C01_AllZero
     goto BB14
   }
   BB14 {
-    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] [#"../01.rs" 12 15 12 16] (0 : uint32)) ; };
+    [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 15 12 16] (0 : uint32)) ; };
     assume { resolve1 _27 };
     goto BB6
   }
diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index d8a3aa84c7..5dfade5ff0 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -462,7 +462,7 @@ module C02Gnome_GnomeSort
   BB1 {
     assert { [@expl:type invariant] inv0 old_v };
     assume { resolve0 old_v };
-    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] [#"../02_gnome.rs" 27 16 27 17] (0 : usize));
+    [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] (0 : usize));
     goto BB2
   }
   BB2 {
@@ -475,7 +475,7 @@ module C02Gnome_GnomeSort
     goto BB4
   }
   BB4 {
-    [#"../02_gnome.rs" 30 10 30 21] _10 <- ([#"../02_gnome.rs" 30 10 30 21] i < _12);
+    [#"../02_gnome.rs" 30 10 30 21] _10 <- i < _12;
     _12 <- any usize;
     switch (_10)
       | False -> goto BB16
@@ -483,7 +483,7 @@ module C02Gnome_GnomeSort
       end
   }
   BB5 {
-    [#"../02_gnome.rs" 31 11 31 17] _14 <- ([#"../02_gnome.rs" 31 11 31 17] i = ([#"../02_gnome.rs" 31 16 31 17] (0 : usize)));
+    [#"../02_gnome.rs" 31 11 31 17] _14 <- i = ([#"../02_gnome.rs" 31 16 31 17] (0 : usize));
     switch (_14)
       | False -> goto BB7
       | True -> goto BB6
@@ -493,7 +493,7 @@ module C02Gnome_GnomeSort
     goto BB11
   }
   BB7 {
-    [#"../02_gnome.rs" 31 23 31 28] _20 <- ([#"../02_gnome.rs" 31 23 31 28] i - ([#"../02_gnome.rs" 31 27 31 28] (1 : usize)));
+    [#"../02_gnome.rs" 31 23 31 28] _20 <- i - ([#"../02_gnome.rs" 31 27 31 28] (1 : usize));
     [#"../02_gnome.rs" 31 22 31 29] _18 <- ([#"../02_gnome.rs" 31 22 31 29] index0 ( * v) _20);
     _20 <- any usize;
     goto BB8
@@ -505,7 +505,7 @@ module C02Gnome_GnomeSort
     goto BB9
   }
   BB9 {
-    [#"../02_gnome.rs" 31 33 31 38] _23 <- ([#"../02_gnome.rs" 31 33 31 38] _24);
+    [#"../02_gnome.rs" 31 33 31 38] _23 <- _24;
     assert { [@expl:type invariant] inv2 _24 };
     assume { resolve2 _24 };
     assert { [@expl:type invariant] inv2 _23 };
@@ -520,8 +520,8 @@ module C02Gnome_GnomeSort
       end
   }
   BB11 {
-    [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + ([#"../02_gnome.rs" 32 17 32 18] (1 : usize)));
-    [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] [#"../02_gnome.rs" 31 40 33 9] ());
+    [#"../02_gnome.rs" 32 12 32 18] i <- i + ([#"../02_gnome.rs" 32 17 32 18] (1 : usize));
+    [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] ());
     goto BB15
   }
   BB12 {
@@ -536,7 +536,7 @@ module C02Gnome_GnomeSort
     [#"../02_gnome.rs" 34 12 34 13] _28 <- Borrow.borrow_final ( * _29) (Borrow.get_id _29);
     [#"../02_gnome.rs" 34 12 34 13] _29 <- { _29 with current = ( ^ _28) ; };
     assume { inv4 ( ^ _28) };
-    [#"../02_gnome.rs" 34 19 34 24] _31 <- ([#"../02_gnome.rs" 34 19 34 24] i - ([#"../02_gnome.rs" 34 23 34 24] (1 : usize)));
+    [#"../02_gnome.rs" 34 19 34 24] _31 <- i - ([#"../02_gnome.rs" 34 23 34 24] (1 : usize));
     [#"../02_gnome.rs" 34 12 34 28] _27 <- ([#"../02_gnome.rs" 34 12 34 28] swap0 _28 _31 i);
     _28 <- any borrowed (slice t);
     _31 <- any usize;
@@ -545,8 +545,8 @@ module C02Gnome_GnomeSort
   BB14 {
     assert { [@expl:type invariant] inv5 _29 };
     assume { resolve3 _29 };
-    [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - ([#"../02_gnome.rs" 35 17 35 18] (1 : usize)));
-    [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] [#"../02_gnome.rs" 33 15 36 9] ());
+    [#"../02_gnome.rs" 35 12 35 18] i <- i - ([#"../02_gnome.rs" 35 17 35 18] (1 : usize));
+    [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] ());
     goto BB15
   }
   BB15 {
@@ -555,7 +555,7 @@ module C02Gnome_GnomeSort
   BB16 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve1 v };
-    [#"../02_gnome.rs" 30 4 37 5] _0 <- ([#"../02_gnome.rs" 30 4 37 5] [#"../02_gnome.rs" 30 4 37 5] ());
+    [#"../02_gnome.rs" 30 4 37 5] _0 <- ([#"../02_gnome.rs" 30 4 37 5] ());
     return _0
   }
   
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index 1d32b64cb4..249a188820 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -399,7 +399,7 @@ module C03KnuthShuffle_KnuthShuffle
     goto BB2
   }
   BB2 {
-    [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range ([#"../03_knuth_shuffle.rs" 17 13 17 14] (0 : usize)) _7);
+    [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- Core_Ops_Range_Range_Type.C_Range ([#"../03_knuth_shuffle.rs" 17 13 17 14] (0 : usize)) _7;
     _7 <- any usize;
     [#"../03_knuth_shuffle.rs" 16 4 16 43] iter <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] into_iter0 _6);
     _6 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -441,7 +441,7 @@ module C03KnuthShuffle_KnuthShuffle
   BB9 {
     assert { [@expl:type invariant] inv5 v };
     assume { resolve3 v };
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] [#"../03_knuth_shuffle.rs" 16 4 16 43] ());
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] ());
     return _0
   }
   BB10 {
@@ -454,19 +454,19 @@ module C03KnuthShuffle_KnuthShuffle
     absurd
   }
   BB12 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB13
   }
   BB13 {
-    [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] _22);
+    [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- __creusot_proc_iter_elem;
     [#"../03_knuth_shuffle.rs" 20 20 20 27] _26 <- ([#"../03_knuth_shuffle.rs" 20 20 20 27] len0 ( * v));
     goto BB14
   }
   BB14 {
-    [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- ([#"../03_knuth_shuffle.rs" 20 20 20 31] _26 - n);
+    [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- _26 - n;
     _26 <- any usize;
     [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 ([#"../03_knuth_shuffle.rs" 21 30 21 31] (0 : usize)) upper);
     goto BB15
@@ -483,7 +483,7 @@ module C03KnuthShuffle_KnuthShuffle
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _32 <- Borrow.borrow_final ( * _33) (Borrow.get_id _33);
     [#"../03_knuth_shuffle.rs" 22 8 22 9] _33 <- { _33 with current = ( ^ _32) ; };
     assume { inv3 ( ^ _32) };
-    [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- ([#"../03_knuth_shuffle.rs" 22 18 22 27] upper - ([#"../03_knuth_shuffle.rs" 22 26 22 27] (1 : usize)));
+    [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- upper - ([#"../03_knuth_shuffle.rs" 22 26 22 27] (1 : usize));
     [#"../03_knuth_shuffle.rs" 22 8 22 28] _31 <- ([#"../03_knuth_shuffle.rs" 22 8 22 28] swap0 _32 i _36);
     _32 <- any borrowed (slice t);
     _36 <- any usize;
diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
index 0a48f487c3..07387cf82d 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
+++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
@@ -199,7 +199,7 @@ module C04BinarySearch_BinarySearch
     goto BB1
   }
   BB1 {
-    [#"../04_binary_search.rs" 27 7 27 21] _9 <- ([#"../04_binary_search.rs" 27 7 27 21] _10 = ([#"../04_binary_search.rs" 27 20 27 21] (0 : usize)));
+    [#"../04_binary_search.rs" 27 7 27 21] _9 <- _10 = ([#"../04_binary_search.rs" 27 20 27 21] (0 : usize));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB3
@@ -207,7 +207,7 @@ module C04BinarySearch_BinarySearch
       end
   }
   BB2 {
-    [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 28 19 28 20] (0 : usize)));
+    [#"../04_binary_search.rs" 28 15 28 21] _0 <- Core_Result_Result_Type.C_Err ([#"../04_binary_search.rs" 28 19 28 20] (0 : usize));
     goto BB21
   }
   BB3 {
@@ -215,7 +215,7 @@ module C04BinarySearch_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] [#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
+    [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] (0 : usize));
     goto BB5
   }
   BB5 {
@@ -227,42 +227,42 @@ module C04BinarySearch_BinarySearch
     goto BB6
   }
   BB6 {
-    [#"../04_binary_search.rs" 36 10 36 18] _21 <- ([#"../04_binary_search.rs" 36 10 36 18] size > ([#"../04_binary_search.rs" 36 17 36 18] (1 : usize)));
+    [#"../04_binary_search.rs" 36 10 36 18] _21 <- size > ([#"../04_binary_search.rs" 36 17 36 18] (1 : usize));
     switch (_21)
       | False -> goto BB13
       | True -> goto BB7
       end
   }
   BB7 {
-    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize)) = ([#"../04_binary_search.rs" 37 19 37 27] (0 : usize)));
+    [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize)) = ([#"../04_binary_search.rs" 37 19 37 27] (0 : usize));
     assert { [@expl:division by zero] [#"../04_binary_search.rs" 37 19 37 27] not _25 };
     goto BB8
   }
   BB8 {
-    [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] size / ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize)));
-    [#"../04_binary_search.rs" 38 18 38 29] mid <- ([#"../04_binary_search.rs" 38 18 38 29] base + half);
+    [#"../04_binary_search.rs" 37 19 37 27] half <- size / ([#"../04_binary_search.rs" 37 26 37 27] (2 : usize));
+    [#"../04_binary_search.rs" 38 18 38 29] mid <- base + half;
     [#"../04_binary_search.rs" 40 21 40 26] _32 <- ([#"../04_binary_search.rs" 40 21 40 26] index0 arr mid);
     goto BB9
   }
   BB9 {
-    [#"../04_binary_search.rs" 40 18 40 33] _30 <- ([#"../04_binary_search.rs" 40 18 40 33] _32 > elem);
+    [#"../04_binary_search.rs" 40 18 40 33] _30 <- _32 > elem;
     switch (_30)
       | False -> goto BB11
       | True -> goto BB10
       end
   }
   BB10 {
-    [#"../04_binary_search.rs" 40 36 40 40] _29 <- ([#"../04_binary_search.rs" 40 36 40 40] base);
+    [#"../04_binary_search.rs" 40 36 40 40] _29 <- base;
     goto BB12
   }
   BB11 {
-    [#"../04_binary_search.rs" 40 50 40 53] _29 <- ([#"../04_binary_search.rs" 40 50 40 53] mid);
+    [#"../04_binary_search.rs" 40 50 40 53] _29 <- mid;
     goto BB12
   }
   BB12 {
-    [#"../04_binary_search.rs" 40 8 40 55] base <- ([#"../04_binary_search.rs" 40 8 40 55] _29);
+    [#"../04_binary_search.rs" 40 8 40 55] base <- _29;
     _29 <- any usize;
-    [#"../04_binary_search.rs" 41 8 41 20] size <- ([#"../04_binary_search.rs" 41 8 41 20] size - half);
+    [#"../04_binary_search.rs" 41 8 41 20] size <- size - half;
     goto BB5
   }
   BB13 {
@@ -270,32 +270,32 @@ module C04BinarySearch_BinarySearch
     goto BB14
   }
   BB14 {
-    [#"../04_binary_search.rs" 44 14 44 23] cmp <- ([#"../04_binary_search.rs" 44 14 44 23] _41);
-    [#"../04_binary_search.rs" 45 7 45 18] _44 <- ([#"../04_binary_search.rs" 45 7 45 18] cmp = elem);
+    [#"../04_binary_search.rs" 44 14 44 23] cmp <- _41;
+    [#"../04_binary_search.rs" 45 7 45 18] _44 <- cmp = elem;
     switch (_44)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB15 {
-    [#"../04_binary_search.rs" 46 8 46 16] _0 <- ([#"../04_binary_search.rs" 46 8 46 16] Core_Result_Result_Type.C_Ok base);
+    [#"../04_binary_search.rs" 46 8 46 16] _0 <- Core_Result_Result_Type.C_Ok base;
     goto BB20
   }
   BB16 {
-    [#"../04_binary_search.rs" 47 14 47 24] _48 <- ([#"../04_binary_search.rs" 47 14 47 24] cmp < elem);
+    [#"../04_binary_search.rs" 47 14 47 24] _48 <- cmp < elem;
     switch (_48)
       | False -> goto BB18
       | True -> goto BB17
       end
   }
   BB17 {
-    [#"../04_binary_search.rs" 48 12 48 20] _51 <- ([#"../04_binary_search.rs" 48 12 48 20] base + ([#"../04_binary_search.rs" 48 19 48 20] (1 : usize)));
-    [#"../04_binary_search.rs" 48 8 48 21] _0 <- ([#"../04_binary_search.rs" 48 8 48 21] Core_Result_Result_Type.C_Err _51);
+    [#"../04_binary_search.rs" 48 12 48 20] _51 <- base + ([#"../04_binary_search.rs" 48 19 48 20] (1 : usize));
+    [#"../04_binary_search.rs" 48 8 48 21] _0 <- Core_Result_Result_Type.C_Err _51;
     _51 <- any usize;
     goto BB19
   }
   BB18 {
-    [#"../04_binary_search.rs" 50 8 50 17] _0 <- ([#"../04_binary_search.rs" 50 8 50 17] Core_Result_Result_Type.C_Err base);
+    [#"../04_binary_search.rs" 50 8 50 17] _0 <- Core_Result_Result_Type.C_Err base;
     goto BB19
   }
   BB19 {
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
index 6ed7c06b37..f7aebdc9ef 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
@@ -400,7 +400,7 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB4
   }
   BB4 {
-    [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = ([#"../05_binary_search_generic.rs" 31 20 31 21] (0 : usize)));
+    [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- _10 = ([#"../05_binary_search_generic.rs" 31 20 31 21] (0 : usize));
     _10 <- any usize;
     switch (_9)
       | False -> goto BB7
@@ -412,7 +412,7 @@ module C05BinarySearchGeneric_BinarySearch
     assume { resolve2 elem };
     assert { [@expl:type invariant] inv0 arr };
     assume { resolve0 arr };
-    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 32 19 32 20] (0 : usize)));
+    [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- Core_Result_Result_Type.C_Err ([#"../05_binary_search_generic.rs" 32 19 32 20] (0 : usize));
     goto BB29
   }
   BB6 {
@@ -424,7 +424,7 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB8
   }
   BB8 {
-    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] [#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
+    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
     goto BB9
   }
   BB9 {
@@ -442,20 +442,20 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB12
   }
   BB12 {
-    [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- ([#"../05_binary_search_generic.rs" 40 10 40 18] size > ([#"../05_binary_search_generic.rs" 40 17 40 18] (1 : usize)));
+    [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- size > ([#"../05_binary_search_generic.rs" 40 17 40 18] (1 : usize));
     switch (_21)
       | False -> goto BB20
       | True -> goto BB13
       end
   }
   BB13 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)) = ([#"../05_binary_search_generic.rs" 41 19 41 27] (0 : usize)));
+    [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)) = ([#"../05_binary_search_generic.rs" 41 19 41 27] (0 : usize));
     assert { [@expl:division by zero] [#"../05_binary_search_generic.rs" 41 19 41 27] not _25 };
     goto BB14
   }
   BB14 {
-    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] size / ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)));
-    [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- ([#"../05_binary_search_generic.rs" 42 18 42 29] base + half);
+    [#"../05_binary_search_generic.rs" 41 19 41 27] half <- size / ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize));
+    [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- base + half;
     [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 arr mid);
     goto BB15
   }
@@ -472,17 +472,17 @@ module C05BinarySearchGeneric_BinarySearch
       end
   }
   BB17 {
-    [#"../05_binary_search_generic.rs" 44 36 44 40] _29 <- ([#"../05_binary_search_generic.rs" 44 36 44 40] base);
+    [#"../05_binary_search_generic.rs" 44 36 44 40] _29 <- base;
     goto BB19
   }
   BB18 {
-    [#"../05_binary_search_generic.rs" 44 50 44 53] _29 <- ([#"../05_binary_search_generic.rs" 44 50 44 53] mid);
+    [#"../05_binary_search_generic.rs" 44 50 44 53] _29 <- mid;
     goto BB19
   }
   BB19 {
-    [#"../05_binary_search_generic.rs" 44 8 44 55] base <- ([#"../05_binary_search_generic.rs" 44 8 44 55] _29);
+    [#"../05_binary_search_generic.rs" 44 8 44 55] base <- _29;
     _29 <- any usize;
-    [#"../05_binary_search_generic.rs" 46 8 46 20] size <- ([#"../05_binary_search_generic.rs" 46 8 46 20] size - half);
+    [#"../05_binary_search_generic.rs" 46 8 46 20] size <- size - half;
     goto BB11
   }
   BB20 {
@@ -492,12 +492,12 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB21
   }
   BB21 {
-    [#"../05_binary_search_generic.rs" 49 14 49 24] cmp <- ([#"../05_binary_search_generic.rs" 49 14 49 24] _41);
+    [#"../05_binary_search_generic.rs" 49 14 49 24] cmp <- _41;
     assert { [@expl:type invariant] inv1 _41 };
     assume { resolve1 _41 };
     assert { [@expl:type invariant] inv1 cmp };
     assume { resolve1 cmp };
-    [#"../05_binary_search_generic.rs" 51 18 51 23] _47 <- ([#"../05_binary_search_generic.rs" 51 18 51 23] elem);
+    [#"../05_binary_search_generic.rs" 51 18 51 23] _47 <- elem;
     assert { [@expl:type invariant] inv1 _47 };
     assume { resolve1 _47 };
     [#"../05_binary_search_generic.rs" 51 10 51 24] _44 <- ([#"../05_binary_search_generic.rs" 51 10 51 24] cmp0 cmp _47);
@@ -519,16 +519,16 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB26
   }
   BB25 {
-    [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- ([#"../05_binary_search_generic.rs" 54 29 54 38] Core_Result_Result_Type.C_Err base);
+    [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- Core_Result_Result_Type.C_Err base;
     goto BB28
   }
   BB26 {
-    [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- ([#"../05_binary_search_generic.rs" 52 27 52 35] Core_Result_Result_Type.C_Ok base);
+    [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- Core_Result_Result_Type.C_Ok base;
     goto BB28
   }
   BB27 {
-    [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- ([#"../05_binary_search_generic.rs" 53 30 53 38] base + ([#"../05_binary_search_generic.rs" 53 37 53 38] (1 : usize)));
-    [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- ([#"../05_binary_search_generic.rs" 53 26 53 39] Core_Result_Result_Type.C_Err _50);
+    [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- base + ([#"../05_binary_search_generic.rs" 53 37 53 38] (1 : usize));
+    [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- Core_Result_Result_Type.C_Err _50;
     _50 <- any usize;
     goto BB28
   }
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index c4bca34a66..a9d527c027 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -36,17 +36,17 @@ module C06KnightsTour_Impl3_Clone
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 6 4 6 12] _5 <- ([#"../06_knights_tour.rs" 6 4 6 12] C06KnightsTour_Point_Type.point_x self);
+    [#"../06_knights_tour.rs" 6 4 6 12] _5 <- C06KnightsTour_Point_Type.point_x self;
     [#"../06_knights_tour.rs" 6 4 6 12] _3 <- ([#"../06_knights_tour.rs" 6 4 6 12] clone0 _5);
     goto BB1
   }
   BB1 {
-    [#"../06_knights_tour.rs" 7 4 7 12] _8 <- ([#"../06_knights_tour.rs" 7 4 7 12] C06KnightsTour_Point_Type.point_y self);
+    [#"../06_knights_tour.rs" 7 4 7 12] _8 <- C06KnightsTour_Point_Type.point_y self;
     [#"../06_knights_tour.rs" 7 4 7 12] _6 <- ([#"../06_knights_tour.rs" 7 4 7 12] clone0 _8);
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 4 15 4 20] _0 <- ([#"../06_knights_tour.rs" 4 15 4 20] C06KnightsTour_Point_Type.C_Point _3 _6);
+    [#"../06_knights_tour.rs" 4 15 4 20] _0 <- C06KnightsTour_Point_Type.C_Point _3 _6;
     _3 <- any isize;
     _6 <- any isize;
     return _0
@@ -77,9 +77,9 @@ module C06KnightsTour_Impl0_Mov
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 19 18 19 32] _9 <- ([#"../06_knights_tour.rs" 19 18 19 32] C06KnightsTour_Point_Type.point_x self + (let (a, _) = p in a));
-    [#"../06_knights_tour.rs" 19 37 19 51] _12 <- ([#"../06_knights_tour.rs" 19 37 19 51] C06KnightsTour_Point_Type.point_y self + (let (_, a) = p in a));
-    [#"../06_knights_tour.rs" 19 8 19 53] _0 <- ([#"../06_knights_tour.rs" 19 8 19 53] C06KnightsTour_Point_Type.C_Point _9 _12);
+    [#"../06_knights_tour.rs" 19 18 19 32] _9 <- C06KnightsTour_Point_Type.point_x self + (let (a, _) = p in a);
+    [#"../06_knights_tour.rs" 19 37 19 51] _12 <- C06KnightsTour_Point_Type.point_y self + (let (_, a) = p in a);
+    [#"../06_knights_tour.rs" 19 8 19 53] _0 <- C06KnightsTour_Point_Type.C_Point _9 _12;
     _9 <- any isize;
     _12 <- any isize;
     return _0
@@ -272,7 +272,7 @@ module C06KnightsTour_Impl1_New_Closure3
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 43 16 43 50] _0 <- ([#"../06_knights_tour.rs" 43 16 43 50] res);
+    [#"../06_knights_tour.rs" 43 16 43 50] _0 <- res;
     res <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global);
     goto BB3
   }
@@ -744,8 +744,8 @@ module C06KnightsTour_Impl1_New
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 41 19 41 28] _7 <- ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 41 20 41 21] (0 : usize)) size);
-    [#"../06_knights_tour.rs" 43 16 43 50] _9 <- ([#"../06_knights_tour.rs" 43 16 43 50] C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size);
+    [#"../06_knights_tour.rs" 41 19 41 28] _7 <- Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 41 20 41 21] (0 : usize)) size;
+    [#"../06_knights_tour.rs" 43 16 43 50] _9 <- C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size;
     [#"../06_knights_tour.rs" 41 19 45 13] _6 <- ([#"../06_knights_tour.rs" 41 19 45 13] map_inv0 _7 _9);
     _7 <- any Core_Ops_Range_Range_Type.t_range usize;
     _9 <- any C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3;
@@ -757,7 +757,7 @@ module C06KnightsTour_Impl1_New
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 47 8 47 34] _0 <- ([#"../06_knights_tour.rs" 47 8 47 34] C06KnightsTour_Board_Type.C_Board size rows);
+    [#"../06_knights_tour.rs" 47 8 47 34] _0 <- C06KnightsTour_Board_Type.C_Board size rows;
     rows <- any Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global);
     goto BB3
   }
@@ -981,15 +981,15 @@ module C06KnightsTour_Impl1_Available
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 16] ([#"../06_knights_tour.rs" 53 8 53 9] (0 : isize)) <= C06KnightsTour_Point_Type.point_x p);
+    [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 9] (0 : isize)) <= C06KnightsTour_Point_Type.point_x p;
     switch (_5)
       | False -> goto BB8
       | True -> goto BB1
       end
   }
   BB1 {
-    [#"../06_knights_tour.rs" 54 15 54 29] _8 <- ([#"../06_knights_tour.rs" 54 15 54 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
-    [#"../06_knights_tour.rs" 54 15 54 41] _7 <- ([#"../06_knights_tour.rs" 54 15 54 41] _8 < C06KnightsTour_Board_Type.board_size self);
+    [#"../06_knights_tour.rs" 54 15 54 29] _8 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p));
+    [#"../06_knights_tour.rs" 54 15 54 41] _7 <- _8 < C06KnightsTour_Board_Type.board_size self;
     _8 <- any usize;
     switch (_7)
       | False -> goto BB7
@@ -997,15 +997,15 @@ module C06KnightsTour_Impl1_Available
       end
   }
   BB2 {
-    [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 23] ([#"../06_knights_tour.rs" 55 15 55 16] (0 : isize)) <= C06KnightsTour_Point_Type.point_y p);
+    [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 16] (0 : isize)) <= C06KnightsTour_Point_Type.point_y p;
     switch (_11)
       | False -> goto BB6
       | True -> goto BB3
       end
   }
   BB3 {
-    [#"../06_knights_tour.rs" 56 15 56 29] _14 <- ([#"../06_knights_tour.rs" 56 15 56 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
-    [#"../06_knights_tour.rs" 56 15 56 41] _13 <- ([#"../06_knights_tour.rs" 56 15 56 41] _14 < C06KnightsTour_Board_Type.board_size self);
+    [#"../06_knights_tour.rs" 56 15 56 29] _14 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p));
+    [#"../06_knights_tour.rs" 56 15 56 41] _13 <- _14 < C06KnightsTour_Board_Type.board_size self;
     _14 <- any usize;
     switch (_13)
       | False -> goto BB5
@@ -1013,7 +1013,7 @@ module C06KnightsTour_Impl1_Available
       end
   }
   BB4 {
-    [#"../06_knights_tour.rs" 57 26 57 38] _22 <- ([#"../06_knights_tour.rs" 57 26 57 38] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
+    [#"../06_knights_tour.rs" 57 26 57 38] _22 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p));
     [#"../06_knights_tour.rs" 57 25 57 39] _20 <- ([#"../06_knights_tour.rs" 57 25 57 39] index0 (C06KnightsTour_Board_Type.board_field self) _22);
     _22 <- any usize;
     goto BB10
@@ -1031,17 +1031,17 @@ module C06KnightsTour_Impl1_Available
     goto BB9
   }
   BB9 {
-    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] [#"../06_knights_tour.rs" 53 8 57 58] false);
+    [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] false);
     goto BB12
   }
   BB10 {
-    [#"../06_knights_tour.rs" 57 40 57 52] _24 <- ([#"../06_knights_tour.rs" 57 40 57 52] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
+    [#"../06_knights_tour.rs" 57 40 57 52] _24 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p));
     [#"../06_knights_tour.rs" 57 39 57 53] _18 <- ([#"../06_knights_tour.rs" 57 39 57 53] index1 _20 _24);
     _24 <- any usize;
     goto BB11
   }
   BB11 {
-    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] _18 = ([#"../06_knights_tour.rs" 57 57 57 58] (0 : usize)));
+    [#"../06_knights_tour.rs" 57 15 57 58] _0 <- _18 = ([#"../06_knights_tour.rs" 57 57 57 58] (0 : usize));
     goto BB12
   }
   BB12 {
@@ -1407,7 +1407,7 @@ module C06KnightsTour_Impl1_CountDegree
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] [#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
+    [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] (0 : usize));
     [#"../06_knights_tour.rs" 74 17 74 24] _8 <- ([#"../06_knights_tour.rs" 74 17 74 24] moves0 ([#"../06_knights_tour.rs" 74 17 74 24] ()));
     goto BB1
   }
@@ -1468,16 +1468,16 @@ module C06KnightsTour_Impl1_CountDegree
     absurd
   }
   BB13 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17;
     [#"../06_knights_tour.rs" 73 8 73 46] _22 <- ([#"../06_knights_tour.rs" 73 8 73 46] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB14
   }
   BB14 {
-    [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] _22);
+    [#"../06_knights_tour.rs" 73 8 73 46] produced <- _22;
     _22 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- __creusot_proc_iter_elem;
     assume { resolve1 __creusot_proc_iter_elem };
-    [#"../06_knights_tour.rs" 75 29 75 31] _28 <- ([#"../06_knights_tour.rs" 75 29 75 31] m);
+    [#"../06_knights_tour.rs" 75 29 75 31] _28 <- m;
     [#"../06_knights_tour.rs" 75 23 75 32] next <- ([#"../06_knights_tour.rs" 75 23 75 32] mov0 p _28);
     goto BB15
   }
@@ -1493,19 +1493,19 @@ module C06KnightsTour_Impl1_CountDegree
       end
   }
   BB17 {
-    [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + ([#"../06_knights_tour.rs" 77 25 77 26] (1 : usize)));
-    [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] [#"../06_knights_tour.rs" 76 36 78 13] ());
+    [#"../06_knights_tour.rs" 77 16 77 26] count <- count + ([#"../06_knights_tour.rs" 77 25 77 26] (1 : usize));
+    [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] ());
     goto BB19
   }
   BB18 {
-    [#"../06_knights_tour.rs" 78 13 78 13] _16 <- ([#"../06_knights_tour.rs" 78 13 78 13] [#"../06_knights_tour.rs" 78 13 78 13] ());
+    [#"../06_knights_tour.rs" 78 13 78 13] _16 <- ([#"../06_knights_tour.rs" 78 13 78 13] ());
     goto BB19
   }
   BB19 {
     goto BB7
   }
   BB20 {
-    [#"../06_knights_tour.rs" 80 8 80 13] _0 <- ([#"../06_knights_tour.rs" 80 8 80 13] count);
+    [#"../06_knights_tour.rs" 80 8 80 13] _0 <- count;
     return _0
   }
   
@@ -1760,7 +1760,7 @@ module C06KnightsTour_Impl1_Set
   BB0 {
     [#"../06_knights_tour.rs" 88 8 88 18] _12 <- Borrow.borrow_final (C06KnightsTour_Board_Type.board_field ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2);
     [#"../06_knights_tour.rs" 88 8 88 18] self <- { self with current = (let C06KnightsTour_Board_Type.C_Board x0 x1 =  * self in C06KnightsTour_Board_Type.C_Board x0 ( ^ _12)) ; };
-    [#"../06_knights_tour.rs" 88 19 88 31] _13 <- ([#"../06_knights_tour.rs" 88 19 88 31] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)));
+    [#"../06_knights_tour.rs" 88 19 88 31] _13 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p));
     [#"../06_knights_tour.rs" 88 18 88 32] _11 <- ([#"../06_knights_tour.rs" 88 18 88 32] index_mut0 _12 _13);
     _12 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _13 <- any usize;
@@ -1769,16 +1769,16 @@ module C06KnightsTour_Impl1_Set
   BB1 {
     [#"../06_knights_tour.rs" 88 8 88 32] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11);
     [#"../06_knights_tour.rs" 88 8 88 32] _11 <- { _11 with current = ( ^ _10) ; };
-    [#"../06_knights_tour.rs" 88 33 88 45] _15 <- ([#"../06_knights_tour.rs" 88 33 88 45] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)));
+    [#"../06_knights_tour.rs" 88 33 88 45] _15 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p));
     [#"../06_knights_tour.rs" 88 32 88 46] _9 <- ([#"../06_knights_tour.rs" 88 32 88 46] index_mut1 _10 _15);
     _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
     _15 <- any usize;
     goto BB2
   }
   BB2 {
-    [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = ([#"../06_knights_tour.rs" 88 8 88 50] v) ; };
+    [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = v ; };
     assume { resolve0 _9 };
-    [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] [#"../06_knights_tour.rs" 88 8 88 50] ());
+    [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] ());
     assume { resolve1 _11 };
     assume { resolve2 self };
     return _0
@@ -2064,7 +2064,7 @@ module C06KnightsTour_Min
     goto BB0
   }
   BB0 {
-    [#"../06_knights_tour.rs" 112 18 112 22] min <- ([#"../06_knights_tour.rs" 112 18 112 22] Core_Option_Option_Type.C_None);
+    [#"../06_knights_tour.rs" 112 18 112 22] min <- Core_Option_Option_Type.C_None;
     [#"../06_knights_tour.rs" 113 4 114 74] iter <- ([#"../06_knights_tour.rs" 113 4 114 74] into_iter0 v);
     goto BB1
   }
@@ -2103,7 +2103,7 @@ module C06KnightsTour_Min
       end
   }
   BB7 {
-    [#"../06_knights_tour.rs" 125 4 125 7] _0 <- ([#"../06_knights_tour.rs" 125 4 125 7] min);
+    [#"../06_knights_tour.rs" 125 4 125 7] _0 <- min;
     return _0
   }
   BB8 {
@@ -2114,14 +2114,14 @@ module C06KnightsTour_Min
     absurd
   }
   BB10 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _15;
     [#"../06_knights_tour.rs" 113 4 114 74] _20 <- ([#"../06_knights_tour.rs" 113 4 114 74] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB11
   }
   BB11 {
-    [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] _20);
+    [#"../06_knights_tour.rs" 113 4 114 74] produced <- _20;
     _20 <- any Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem;
     switch (min)
       | Core_Option_Option_Type.C_None -> goto BB12
       | Core_Option_Option_Type.C_Some _ -> goto BB13
@@ -2131,29 +2131,29 @@ module C06KnightsTour_Min
     goto BB14
   }
   BB13 {
-    [#"../06_knights_tour.rs" 118 17 118 18] m <- ([#"../06_knights_tour.rs" 118 17 118 18] Core_Option_Option_Type.some_0 min);
-    [#"../06_knights_tour.rs" 119 19 119 28] _28 <- ([#"../06_knights_tour.rs" 119 19 119 28] (let (a, _) = x in a) < (let (a, _) = m in a));
+    [#"../06_knights_tour.rs" 118 17 118 18] m <- Core_Option_Option_Type.some_0 min;
+    [#"../06_knights_tour.rs" 119 19 119 28] _28 <- (let (a, _) = x in a) < (let (a, _) = m in a);
     switch (_28)
       | False -> goto BB16
       | True -> goto BB15
       end
   }
   BB14 {
-    [#"../06_knights_tour.rs" 117 26 117 33] _25 <- ([#"../06_knights_tour.rs" 117 26 117 33] Core_Option_Option_Type.C_Some x);
-    [#"../06_knights_tour.rs" 117 20 117 33] min <- ([#"../06_knights_tour.rs" 117 20 117 33] _25);
+    [#"../06_knights_tour.rs" 117 26 117 33] _25 <- Core_Option_Option_Type.C_Some x;
+    [#"../06_knights_tour.rs" 117 20 117 33] min <- _25;
     _25 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
-    [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] [#"../06_knights_tour.rs" 117 20 117 33] ());
+    [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] ());
     goto BB18
   }
   BB15 {
-    [#"../06_knights_tour.rs" 120 26 120 33] _31 <- ([#"../06_knights_tour.rs" 120 26 120 33] Core_Option_Option_Type.C_Some x);
-    [#"../06_knights_tour.rs" 120 20 120 33] min <- ([#"../06_knights_tour.rs" 120 20 120 33] _31);
+    [#"../06_knights_tour.rs" 120 26 120 33] _31 <- Core_Option_Option_Type.C_Some x;
+    [#"../06_knights_tour.rs" 120 20 120 33] min <- _31;
     _31 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
-    [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] [#"../06_knights_tour.rs" 120 20 120 33] ());
+    [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] ());
     goto BB17
   }
   BB16 {
-    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] [#"../06_knights_tour.rs" 121 17 121 17] ());
+    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] ());
     goto BB17
   }
   BB17 {
@@ -2797,9 +2797,9 @@ module C06KnightsTour_KnightsTour
     goto BB1
   }
   BB1 {
-    [#"../06_knights_tour.rs" 138 27 138 37] _10 <- ([#"../06_knights_tour.rs" 138 27 138 37] IntSize.of_int (UIntSize.to_int x));
-    [#"../06_knights_tour.rs" 138 42 138 52] _12 <- ([#"../06_knights_tour.rs" 138 42 138 52] IntSize.of_int (UIntSize.to_int y));
-    [#"../06_knights_tour.rs" 138 16 138 54] p <- ([#"../06_knights_tour.rs" 138 16 138 54] C06KnightsTour_Point_Type.C_Point _10 _12);
+    [#"../06_knights_tour.rs" 138 27 138 37] _10 <- IntSize.of_int (UIntSize.to_int x);
+    [#"../06_knights_tour.rs" 138 42 138 52] _12 <- IntSize.of_int (UIntSize.to_int y);
+    [#"../06_knights_tour.rs" 138 16 138 54] p <- C06KnightsTour_Point_Type.C_Point _10 _12;
     _10 <- any isize;
     _12 <- any isize;
     [#"../06_knights_tour.rs" 139 4 139 9] _15 <- Borrow.borrow_mut board;
@@ -2813,8 +2813,8 @@ module C06KnightsTour_KnightsTour
     goto BB3
   }
   BB3 {
-    [#"../06_knights_tour.rs" 145 19 145 32] _22 <- ([#"../06_knights_tour.rs" 145 19 145 32] size * size);
-    [#"../06_knights_tour.rs" 145 16 145 32] _21 <- ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 145 16 145 17] (2 : usize)) _22);
+    [#"../06_knights_tour.rs" 145 19 145 32] _22 <- size * size;
+    [#"../06_knights_tour.rs" 145 16 145 32] _21 <- Core_Ops_Range_Range_Type.C_Range ([#"../06_knights_tour.rs" 145 16 145 17] (2 : usize)) _22;
     _22 <- any usize;
     [#"../06_knights_tour.rs" 142 4 142 36] iter <- ([#"../06_knights_tour.rs" 142 4 142 36] into_iter0 _21);
     _21 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -2862,7 +2862,7 @@ module C06KnightsTour_KnightsTour
       end
   }
   BB12 {
-    [#"../06_knights_tour.rs" 163 4 163 15] _0 <- ([#"../06_knights_tour.rs" 163 4 163 15] Core_Option_Option_Type.C_Some board);
+    [#"../06_knights_tour.rs" 163 4 163 15] _0 <- Core_Option_Option_Type.C_Some board;
     board <- any C06KnightsTour_Board_Type.t_board;
     goto BB46
   }
@@ -2874,14 +2874,14 @@ module C06KnightsTour_KnightsTour
     absurd
   }
   BB15 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _35);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _35;
     [#"../06_knights_tour.rs" 142 4 142 36] _40 <- ([#"../06_knights_tour.rs" 142 4 142 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB16
   }
   BB16 {
-    [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] _40);
+    [#"../06_knights_tour.rs" 142 4 142 36] produced <- _40;
     _40 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- __creusot_proc_iter_elem;
     [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ([#"../06_knights_tour.rs" 147 50 147 60] ()));
     goto BB17
   }
@@ -2945,16 +2945,16 @@ module C06KnightsTour_KnightsTour
     goto BB30
   }
   BB30 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _54);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _54;
     [#"../06_knights_tour.rs" 148 8 149 54] _59 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB31
   }
   BB31 {
-    [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] _59);
+    [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- _59;
     _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- __creusot_proc_iter_elem1;
     assume { resolve2 __creusot_proc_iter_elem1 };
-    [#"../06_knights_tour.rs" 151 28 151 30] _65 <- ([#"../06_knights_tour.rs" 151 28 151 30] m);
+    [#"../06_knights_tour.rs" 151 28 151 30] _65 <- m;
     [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 p _65);
     goto BB32
   }
@@ -2976,25 +2976,25 @@ module C06KnightsTour_KnightsTour
   BB35 {
     [#"../06_knights_tour.rs" 154 16 154 26] _73 <- Borrow.borrow_mut candidates;
     [#"../06_knights_tour.rs" 154 16 154 26] candidates <-  ^ _73;
-    [#"../06_knights_tour.rs" 154 32 154 45] _74 <- ([#"../06_knights_tour.rs" 154 32 154 45] (degree, adj));
+    [#"../06_knights_tour.rs" 154 32 154 45] _74 <- (degree, adj);
     [#"../06_knights_tour.rs" 154 16 154 46] _72 <- ([#"../06_knights_tour.rs" 154 16 154 46] push0 _73 _74);
     _73 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global));
     _74 <- any (usize, C06KnightsTour_Point_Type.t_point);
     goto BB36
   }
   BB36 {
-    [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] [#"../06_knights_tour.rs" 152 36 155 13] ());
+    [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] ());
     goto BB38
   }
   BB37 {
-    [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] [#"../06_knights_tour.rs" 155 13 155 13] ());
+    [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] ());
     goto BB38
   }
   BB38 {
     goto BB25
   }
   BB39 {
-    [#"../06_knights_tour.rs" 157 18 157 29] _81 <- ([#"../06_knights_tour.rs" 157 18 157 29] candidates);
+    [#"../06_knights_tour.rs" 157 18 157 29] _81 <- candidates;
     [#"../06_knights_tour.rs" 157 14 157 30] _79 <- ([#"../06_knights_tour.rs" 157 14 157 30] min0 _81);
     goto BB40
   }
@@ -3005,7 +3005,7 @@ module C06KnightsTour_KnightsTour
       end
   }
   BB41 {
-    [#"../06_knights_tour.rs" 159 27 159 31] _0 <- ([#"../06_knights_tour.rs" 159 27 159 31] Core_Option_Option_Type.C_None);
+    [#"../06_knights_tour.rs" 159 27 159 31] _0 <- Core_Option_Option_Type.C_None;
     assume { resolve4 candidates };
     goto BB48
   }
@@ -3013,9 +3013,9 @@ module C06KnightsTour_KnightsTour
     goto BB43
   }
   BB43 {
-    [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- ([#"../06_knights_tour.rs" 158 22 158 25] let (_, a) = Core_Option_Option_Type.some_0 _79 in a);
+    [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- (let (_, a) = Core_Option_Option_Type.some_0 _79 in a);
     assume { resolve4 candidates };
-    [#"../06_knights_tour.rs" 158 31 158 38] p <- ([#"../06_knights_tour.rs" 158 31 158 38] adj1);
+    [#"../06_knights_tour.rs" 158 31 158 38] p <- adj1;
     [#"../06_knights_tour.rs" 161 8 161 13] _87 <- Borrow.borrow_mut board;
     [#"../06_knights_tour.rs" 161 8 161 13] board <-  ^ _87;
     [#"../06_knights_tour.rs" 161 8 161 26] _86 <- ([#"../06_knights_tour.rs" 161 8 161 26] set0 _87 p step);
@@ -3023,7 +3023,7 @@ module C06KnightsTour_KnightsTour
     goto BB44
   }
   BB44 {
-    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] [#"../06_knights_tour.rs" 145 33 162 5] ());
+    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] ());
     goto BB45
   }
   BB45 {
diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
index 7a73cf7f08..7d543ae314 100644
--- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg
+++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
@@ -236,7 +236,7 @@ module C07ReadWrite_ReadWrite
     goto BB1
   }
   BB1 {
-    [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = ([#"../07_read_write.rs" 7 4 7 12] x) ; };
+    [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = x ; };
     assert { [@expl:type invariant] inv1 ( * _6) };
     assume { resolve0 ( * _6) };
     assert { [@expl:type invariant] inv2 _6 };
@@ -261,7 +261,7 @@ module C07ReadWrite_ReadWrite
     assume { resolve0 x };
     assert { [@expl:type invariant] inv4 a };
     assume { resolve3 a };
-    [#"../07_read_write.rs" 6 76 9 1] _0 <- ([#"../07_read_write.rs" 6 76 9 1] [#"../07_read_write.rs" 6 76 9 1] ());
+    [#"../07_read_write.rs" 6 76 9 1] _0 <- ([#"../07_read_write.rs" 6 76 9 1] ());
     return _0
   }
   BB5 {
diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index bcb27a7e3f..e60836dca5 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -507,7 +507,7 @@ module C08Haystack_Search
     goto BB2
   }
   BB2 {
-    [#"../08_haystack.rs" 23 21 23 50] _11 <- ([#"../08_haystack.rs" 23 21 23 50] _12 - _14);
+    [#"../08_haystack.rs" 23 21 23 50] _11 <- _12 - _14;
     _12 <- any usize;
     _14 <- any usize;
     [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 ([#"../08_haystack.rs" 23 17 23 18] (0 : usize)) _11);
@@ -565,19 +565,19 @@ module C08Haystack_Search
     absurd
   }
   BB13 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _24);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _24;
     [#"../08_haystack.rs" 22 4 22 112] _29 <- ([#"../08_haystack.rs" 22 4 22 112] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem)));
     goto BB14
   }
   BB14 {
-    [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] _29);
+    [#"../08_haystack.rs" 22 4 22 112] produced <- _29;
     _29 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem;
     [#"../08_haystack.rs" 25 20 25 32] _36 <- ([#"../08_haystack.rs" 25 20 25 32] len0 needle);
     goto BB15
   }
   BB15 {
-    [#"../08_haystack.rs" 25 17 25 32] _35 <- ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range ([#"../08_haystack.rs" 25 17 25 18] (0 : usize)) _36);
+    [#"../08_haystack.rs" 25 17 25 32] _35 <- Core_Ops_Range_Range_Type.C_Range ([#"../08_haystack.rs" 25 17 25 18] (0 : usize)) _36;
     _36 <- any usize;
     [#"../08_haystack.rs" 24 8 24 68] iter1 <- ([#"../08_haystack.rs" 24 8 24 68] into_iter1 _35);
     _35 <- any Core_Ops_Range_Range_Type.t_range usize;
@@ -617,32 +617,32 @@ module C08Haystack_Search
       end
   }
   BB22 {
-    [#"../08_haystack.rs" 31 15 31 16] _0 <- ([#"../08_haystack.rs" 31 15 31 16] i);
+    [#"../08_haystack.rs" 31 15 31 16] _0 <- i;
     goto BB31
   }
   BB23 {
     goto BB24
   }
   BB24 {
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _45);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _45;
     [#"../08_haystack.rs" 24 8 24 68] _50 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
     goto BB25
   }
   BB25 {
-    [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] _50);
+    [#"../08_haystack.rs" 24 8 24 68] produced1 <- _50;
     _50 <- any Snapshot.snap_ty (Seq.seq usize);
-    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1);
+    [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1;
     [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 needle j);
     goto BB26
   }
   BB26 {
-    [#"../08_haystack.rs" 26 37 26 42] _61 <- ([#"../08_haystack.rs" 26 37 26 42] i + j);
+    [#"../08_haystack.rs" 26 37 26 42] _61 <- i + j;
     [#"../08_haystack.rs" 26 36 26 43] _59 <- ([#"../08_haystack.rs" 26 36 26 43] index0 haystack _61);
     _61 <- any usize;
     goto BB27
   }
   BB27 {
-    [#"../08_haystack.rs" 26 15 26 43] _53 <- ([#"../08_haystack.rs" 26 15 26 43] _55 <> _59);
+    [#"../08_haystack.rs" 26 15 26 43] _53 <- _55 <> _59;
     switch (_53)
       | False -> goto BB29
       | True -> goto BB28
diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
index dc1d4c242d..e043f3fb01 100644
--- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg
+++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
@@ -175,7 +175,7 @@ module C09Capacity_ChangeCapacity
   BB4 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve0 v };
-    [#"../09_capacity.rs" 6 42 11 1] _0 <- ([#"../09_capacity.rs" 6 42 11 1] [#"../09_capacity.rs" 6 42 11 1] ());
+    [#"../09_capacity.rs" 6 42 11 1] _0 <- ([#"../09_capacity.rs" 6 42 11 1] ());
     return _0
   }
   
@@ -259,7 +259,7 @@ module C09Capacity_ClearVec
   BB1 {
     assert { [@expl:type invariant] inv1 v };
     assume { resolve0 v };
-    [#"../09_capacity.rs" 14 36 16 1] _0 <- ([#"../09_capacity.rs" 14 36 16 1] [#"../09_capacity.rs" 14 36 16 1] ());
+    [#"../09_capacity.rs" 14 36 16 1] _0 <- ([#"../09_capacity.rs" 14 36 16 1] ());
     return _0
   }
   

From d9de6188df98ed2c25c1c7538bf7ed3e5465a920 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Mon, 11 Mar 2024 22:38:44 +0100
Subject: [PATCH 64/66] Update creusot-metadata

---
 creusot-metadata/src/decoder.rs | 145 ++++++++++++++----------------
 creusot-metadata/src/encoder.rs | 152 +++++++++++++++++++-------------
 creusot-metadata/src/lib.rs     |  47 ++--------
 3 files changed, 163 insertions(+), 181 deletions(-)

diff --git a/creusot-metadata/src/decoder.rs b/creusot-metadata/src/decoder.rs
index cf3df46432..24e744a842 100644
--- a/creusot-metadata/src/decoder.rs
+++ b/creusot-metadata/src/decoder.rs
@@ -34,79 +34,28 @@ impl<'a, 'tcx> MetadataDecoder<'a, 'tcx> {
         self.file_index_to_file
             .entry(index)
             .or_insert_with(|| {
-                let stable_id = self.file_index_to_stable_id[&index].translate(self.tcx);
-                self.tcx.cstore_untracked().import_source_files(self.tcx.sess, stable_id.cnum);
+                let source_file_id = &self.file_index_to_stable_id[&index];
+                let source_file_cnum =
+                    self.tcx.stable_crate_id_to_crate_num(source_file_id.stable_crate_id);
+
+                self.tcx.cstore_untracked().import_source_files(self.tcx.sess, source_file_cnum);
                 self.tcx
                     .sess
                     .source_map()
-                    .source_file_by_stable_id(stable_id)
+                    .source_file_by_stable_id(source_file_id.stable_source_file_id)
                     .expect("failed to lookup `SourceFile` in new context")
             })
             .clone()
     }
 }
 
-// Both the `CrateNum` and the `DefIndex` of a `DefId` can change in between two
-// compilation sessions. We use the `DefPathHash`, which is stable across
-// sessions, to map the old `DefId` to the new one.
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for DefId {
-    fn decode(d: &mut MetadataDecoder<'a, 'tcx>) -> Self {
-        let def_path_hash = DefPathHash::decode(d);
-        d.tcx.def_path_hash_to_def_id(def_path_hash, &mut || panic!("Cannot resolve crate."))
-    }
-}
-
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for CrateNum {
-    fn decode(d: &mut MetadataDecoder<'a, 'tcx>) -> CrateNum {
-        let stable_id = StableCrateId::decode(d);
-        d.tcx.stable_crate_id_to_crate_num(stable_id)
-    }
-}
-
-// This impl makes sure that we get a runtime error when we try decode a
-// `DefIndex` that is not contained in a `DefId`. Such a case would be problematic
-// because we would not know how to transform the `DefIndex` to the current
-// context.
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for DefIndex {
-    fn decode(_: &mut MetadataDecoder<'a, 'tcx>) -> DefIndex {
-        panic!("trying to decode `DefIndex` outside the context of a `DefId`")
-    }
-}
-
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for SyntaxContext {
-    fn decode(decoder: &mut MetadataDecoder<'a, 'tcx>) -> Self {
-        let syntax_contexts = decoder.syntax_contexts;
-        rustc_span::hygiene::decode_syntax_context(decoder, &decoder.hygiene_context, |this, id| {
-            // This closure is invoked if we haven't already decoded the data for the `SyntaxContext` we are deserializing.
-            // We look up the position of the associated `SyntaxData` and decode it.
-            let pos = syntax_contexts.get(&id).unwrap();
-            this.with_position(pos.to_usize(), |decoder| SyntaxContextData::decode(decoder))
-        })
-    }
-}
-
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for ExpnId {
-    fn decode(decoder: &mut MetadataDecoder<'a, 'tcx>) -> Self {
-        let stable_id = StableCrateId::decode(decoder);
-        let cnum = decoder.tcx.stable_crate_id_to_crate_num(stable_id);
-        let index = u32::decode(decoder);
-
-        let expn_id = rustc_span::hygiene::decode_expn_id(cnum, index, |_| {
-            let pos = decoder.expn_data.get(&(stable_id, index)).unwrap();
-            decoder.with_position(pos.to_usize(), |decoder| {
-                let data = ExpnData::decode(decoder);
-                let hash = ExpnHash::decode(decoder);
-                (data, hash)
-            })
-        });
-        expn_id
-    }
-}
+implement_ty_decoder!(MetadataDecoder<'a, 'tcx>);
 
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for Span {
-    fn decode(decoder: &mut MetadataDecoder<'a, 'tcx>) -> Self {
-        let ctxt = SyntaxContext::decode(decoder);
-        let tag: u8 = Decodable::decode(decoder);
+use rustc_span::{AttrId, SpanDecoder};
+impl SpanDecoder for MetadataDecoder<'_, '_> {
+    fn decode_span(&mut self) -> Span {
+        let ctxt = SyntaxContext::decode(self);
+        let tag: u8 = Decodable::decode(self);
 
         if tag == TAG_PARTIAL_SPAN {
             return DUMMY_SP.with_ctxt(ctxt);
@@ -114,49 +63,89 @@ impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for Span {
 
         debug_assert!(tag == TAG_FULL_SPAN);
 
-        let source_file_index = SourceFileIndex::decode(decoder);
-        let lo = BytePos::decode(decoder);
-        let len = BytePos::decode(decoder);
+        let source_file_index = SourceFileIndex::decode(self);
+
+        let lo = BytePos::decode(self);
+        let len = BytePos::decode(self);
 
-        let file = decoder.file_index_to_file(source_file_index);
+        let file = self.file_index_to_file(source_file_index);
         let lo = file.start_pos + lo;
         let hi = lo + len;
 
         Span::new(lo, hi, ctxt, None)
     }
-}
 
-// copy&paste impl from rustc_metadata
-impl<'a, 'tcx> Decodable<MetadataDecoder<'a, 'tcx>> for Symbol {
-    fn decode(d: &mut MetadataDecoder<'a, 'tcx>) -> Self {
-        let tag = d.read_u8();
+    fn decode_symbol(&mut self) -> Symbol {
+        let tag = self.read_u8();
 
         match tag {
             SYMBOL_STR => {
-                let s = d.read_str();
+                let s = self.read_str();
                 Symbol::intern(s)
             }
             SYMBOL_OFFSET => {
                 // read str offset
-                let pos = d.read_usize();
+                let pos = self.read_usize();
 
                 // move to str ofset and read
-                let sym = d.opaque.with_position(pos, |d| {
+                let sym = self.opaque.with_position(pos, |d| {
                     let s = d.read_str();
                     Symbol::intern(s)
                 });
                 sym
             }
             SYMBOL_PREINTERNED => {
-                let symbol_index = d.read_u32();
+                let symbol_index = self.read_u32();
                 Symbol::new_from_decoded(symbol_index)
             }
             _ => unreachable!(),
         }
     }
-}
 
-implement_ty_decoder!(MetadataDecoder<'a, 'tcx>);
+    fn decode_expn_id(&mut self) -> ExpnId {
+        let stable_id = StableCrateId::decode(self);
+        let cnum = self.tcx.stable_crate_id_to_crate_num(stable_id);
+        let index = u32::decode(self);
+
+        let expn_id = rustc_span::hygiene::decode_expn_id(cnum, index, |_| {
+            let pos = self.expn_data.get(&(stable_id, index)).unwrap();
+            self.with_position(pos.to_usize(), |decoder| {
+                let data = ExpnData::decode(decoder);
+                let hash = ExpnHash::decode(decoder);
+                (data, hash)
+            })
+        });
+        expn_id
+    }
+    fn decode_syntax_context(&mut self) -> SyntaxContext {
+        let syntax_contexts = self.syntax_contexts;
+        rustc_span::hygiene::decode_syntax_context(self, &self.hygiene_context, |this, id| {
+            // This closure is invoked if we haven't already decoded the data for the `SyntaxContext` we are deserializing.
+            // We look up the position of the associated `SyntaxData` and decode it.
+            let pos = syntax_contexts.get(&id).unwrap();
+            this.with_position(pos.to_usize(), |decoder| SyntaxContextData::decode(decoder))
+        })
+    }
+    fn decode_crate_num(&mut self) -> CrateNum {
+        let stable_id = StableCrateId::decode(self);
+        self.tcx.stable_crate_id_to_crate_num(stable_id)
+    }
+    fn decode_def_index(&mut self) -> DefIndex {
+        panic!("trying to decode `DefIndex` outside the context of a `DefId`")
+    }
+
+    // Both the `CrateNum` and the `DefIndex` of a `DefId` can change in between two
+    // compilation sessions. We use the `DefPathHash`, which is stable across
+    // sessions, to map the old `DefId` to the new one.
+    fn decode_def_id(&mut self) -> DefId {
+        let def_path_hash = DefPathHash::decode(self);
+        self.tcx.def_path_hash_to_def_id(def_path_hash, &mut || panic!("Cannot resolve crate."))
+    }
+
+    fn decode_attr_id(&mut self) -> AttrId {
+        todo!()
+    }
+}
 
 impl<'a, 'tcx> TyDecoder for MetadataDecoder<'a, 'tcx> {
     // Whether crate-local information can be cleared while encoding
diff --git a/creusot-metadata/src/encoder.rs b/creusot-metadata/src/encoder.rs
index cd58464fd7..244da48563 100644
--- a/creusot-metadata/src/encoder.rs
+++ b/creusot-metadata/src/encoder.rs
@@ -16,7 +16,11 @@ use rustc_span::{
     hygiene::{raw_encode_syntax_context, HygieneEncodeContext},
     ExpnId, SourceFile, Span, Symbol, SyntaxContext,
 };
-use std::{collections::hash_map::Entry, io::Error, path::Path};
+use std::{
+    collections::hash_map::Entry,
+    io::Error,
+    path::{Path, PathBuf},
+};
 
 pub struct MetadataEncoder<'a, 'tcx> {
     tcx: TyCtxt<'tcx>,
@@ -29,7 +33,7 @@ pub struct MetadataEncoder<'a, 'tcx> {
 }
 
 impl<'a, 'tcx> MetadataEncoder<'a, 'tcx> {
-    pub fn finish(self) -> Result<usize, Error> {
+    pub fn finish(mut self) -> Result<usize, (PathBuf, Error)> {
         self.opaque.finish()
     }
 
@@ -68,88 +72,71 @@ impl<'a, 'tcx> Encoder for MetadataEncoder<'a, 'tcx> {
     }
 }
 
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for DefId {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
-        s.tcx.def_path_hash(*self).encode(s)
-    }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for CrateNum {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
-        s.tcx.stable_crate_id(*self).encode(s)
-    }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for DefIndex {
-    fn encode(&self, _: &mut MetadataEncoder<'a, 'tcx>) {
-        panic!("encoding `DefIndex` without context");
-    }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for SyntaxContext {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
-        raw_encode_syntax_context(*self, &s.hygiene_context, s);
-    }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for ExpnId {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
-        s.hygiene_context.schedule_expn_data_for_encoding(*self);
-        self.krate.encode(s);
-        self.local_id.as_u32().encode(s);
-    }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for Span {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
-        let span = self.data();
-        span.ctxt.encode(s);
+use rustc_span::SpanEncoder;
+impl SpanEncoder for MetadataEncoder<'_, '_> {
+    fn encode_span(&mut self, span: Span) {
+        let span = span.data();
+        span.ctxt.encode(self);
 
         if span.is_dummy() {
-            return TAG_PARTIAL_SPAN.encode(s);
+            return TAG_PARTIAL_SPAN.encode(self);
         }
 
-        let source_file = s.tcx.sess().source_map().lookup_source_file(span.lo);
+        let source_file = self.tcx.sess().source_map().lookup_source_file(span.lo);
         if !source_file.contains(span.hi) {
             // Unfortunately, macro expansion still sometimes generates Spans
             // that malformed in this way.
-            return TAG_PARTIAL_SPAN.encode(s);
+            return TAG_PARTIAL_SPAN.encode(self);
         }
 
         let lo = span.lo - source_file.start_pos;
         let len = span.hi - span.lo;
-        let source_file_index = s.source_file_index(source_file);
+        let source_file_index = self.source_file_index(source_file);
 
-        TAG_FULL_SPAN.encode(s);
-        source_file_index.encode(s);
-        lo.encode(s);
-        len.encode(s);
+        TAG_FULL_SPAN.encode(self);
+        source_file_index.encode(self);
+        lo.encode(self);
+        len.encode(self);
     }
-}
-
-impl<'a, 'tcx> Encodable<MetadataEncoder<'a, 'tcx>> for Symbol {
-    fn encode(&self, s: &mut MetadataEncoder<'a, 'tcx>) {
+    fn encode_symbol(&mut self, sym: Symbol) {
         // if symbol preinterned, emit tag and symbol index
-        if self.is_preinterned() {
-            s.opaque.emit_u8(SYMBOL_PREINTERNED);
-            s.opaque.emit_u32(self.as_u32());
+        if sym.is_preinterned() {
+            self.opaque.emit_u8(SYMBOL_PREINTERNED);
+            self.opaque.emit_u32(sym.as_u32());
         } else {
             // otherwise write it as string or as offset to it
-            match s.symbol_table.entry(*self) {
+            match self.symbol_table.entry(sym) {
                 Entry::Vacant(o) => {
-                    s.opaque.emit_u8(SYMBOL_STR);
-                    let pos = s.opaque.position();
+                    self.opaque.emit_u8(SYMBOL_STR);
+                    let pos = self.opaque.position();
                     o.insert(pos);
-                    s.emit_str(self.as_str());
+                    self.emit_str(sym.as_str());
                 }
                 Entry::Occupied(o) => {
                     let x = *o.get();
-                    s.emit_u8(SYMBOL_OFFSET);
-                    s.emit_usize(x);
+                    self.emit_u8(SYMBOL_OFFSET);
+                    self.emit_usize(x);
                 }
             }
         }
     }
+    fn encode_expn_id(&mut self, eid: ExpnId) {
+        self.hygiene_context.schedule_expn_data_for_encoding(eid);
+        eid.krate.encode(self);
+        eid.local_id.as_u32().encode(self);
+    }
+    fn encode_syntax_context(&mut self, ctx: SyntaxContext) {
+        raw_encode_syntax_context(ctx, &self.hygiene_context, self);
+    }
+    fn encode_crate_num(&mut self, cnum: CrateNum) {
+        self.tcx.stable_crate_id(cnum).encode(self)
+    }
+    fn encode_def_index(&mut self, _: DefIndex) {
+        panic!("encoding `DefIndex` without context");
+    }
+    fn encode_def_id(&mut self, id: DefId) {
+        self.tcx.def_path_hash(id).encode(self)
+    }
 }
 
 impl<'a, 'tcx> TyEncoder for MetadataEncoder<'a, 'tcx> {
@@ -179,19 +166,58 @@ pub fn encode_metadata<'tcx, T: for<'a> Encodable<MetadataEncoder<'a, 'tcx>>>(
     tcx: TyCtxt<'tcx>,
     path: &Path,
     x: T,
-) -> Result<(), Error> {
+) -> Result<(), (PathBuf, Error)> {
     let (file_to_file_index, file_index_to_stable_id) = {
         let files = tcx.sess.source_map().files();
         let mut file_to_file_index =
             FxHashMap::with_capacity_and_hasher(files.len(), Default::default());
         let mut file_index_to_stable_id =
             FxHashMap::with_capacity_and_hasher(files.len(), Default::default());
-
+        use rustc_span::def_id::LOCAL_CRATE;
+        let source_map = tcx.sess.source_map();
+        let working_directory = &tcx.sess.opts.working_dir;
+        let local_crate_stable_id = tcx.stable_crate_id(LOCAL_CRATE);
+
+        // This portion of the code is adapted from the rustc metadata encoder, while the rest of
+        // the code in this file is based off the rustc incremental cache encoder.
+        //
+        // Probably we should refactor the code to be exclusively based on the metadata encoder
         for (index, file) in files.iter().enumerate() {
             let index = SourceFileIndex(index as u32);
             let file_ptr: *const SourceFile = &**file as *const _;
             file_to_file_index.insert(file_ptr, index);
-            let source_file_id = EncodedSourceFileId::new(tcx, &file);
+
+            let mut adapted_source_file = (**file).clone();
+            if adapted_source_file.cnum == LOCAL_CRATE {
+                use rustc_span::FileName;
+                match file.name {
+                    FileName::Real(ref original_file_name) => {
+                        let adapted_file_name = if tcx.sess.should_prefer_remapped_for_codegen() {
+                            source_map.path_mapping().to_embeddable_absolute_path(
+                                original_file_name.clone(),
+                                working_directory,
+                            )
+                        } else {
+                            source_map.path_mapping().to_local_embeddable_absolute_path(
+                                original_file_name.clone(),
+                                working_directory,
+                            )
+                        };
+
+                        adapted_source_file.name = FileName::Real(adapted_file_name);
+                    }
+                    _ => {
+                        // expanded code, not from a file
+                    }
+                };
+                use rustc_span::StableSourceFileId;
+                adapted_source_file.stable_id = StableSourceFileId::from_filename_for_export(
+                    &adapted_source_file.name,
+                    local_crate_stable_id,
+                );
+            }
+
+            let source_file_id = EncodedSourceFileId::new(tcx, &adapted_source_file);
             file_index_to_stable_id.insert(index, source_file_id);
         }
 
@@ -202,7 +228,7 @@ pub fn encode_metadata<'tcx, T: for<'a> Encodable<MetadataEncoder<'a, 'tcx>>>(
 
     let mut encoder = MetadataEncoder {
         tcx,
-        opaque: FileEncoder::new(path)?,
+        opaque: FileEncoder::new(path).unwrap(),
         type_shorthands: Default::default(),
         predicate_shorthands: Default::default(),
         hygiene_context: &hygiene_context,
diff --git a/creusot-metadata/src/lib.rs b/creusot-metadata/src/lib.rs
index d062575960..e20e08e328 100644
--- a/creusot-metadata/src/lib.rs
+++ b/creusot-metadata/src/lib.rs
@@ -26,19 +26,12 @@ mod encoder;
 
 pub use decoder::decode_metadata;
 pub use encoder::encode_metadata;
-use rustc_data_structures::{
-    fx::FxHashMap,
-    stable_hasher::{Hash64, StableHasher},
-};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::{
-    def_id::{StableCrateId, LOCAL_CRATE},
-    source_map::StableSourceFileId,
-    FileName, SourceFile,
-};
+use rustc_span::{def_id::StableCrateId, SourceFile, StableSourceFileId};
 use std::hash::Hash;
 
-#[derive(Encodable, Decodable, Eq, PartialEq, Hash, Clone, Copy)]
+#[derive(Encodable, Decodable, Eq, PartialEq, Hash, Clone, Copy, Debug)]
 struct SourceFileIndex(u32);
 
 #[derive(Encodable, Decodable, Clone, Copy)]
@@ -61,42 +54,16 @@ impl AbsoluteBytePos {
 /// is the only thing available when decoding the [Footer].
 #[derive(Encodable, Decodable, Clone, Debug)]
 struct EncodedSourceFileId {
-    file_name_hash: Hash64,
+    stable_source_file_id: StableSourceFileId,
     stable_crate_id: StableCrateId,
 }
 
 impl EncodedSourceFileId {
-    fn translate(&self, tcx: TyCtxt<'_>) -> StableSourceFileId {
-        let cnum = tcx.stable_crate_id_to_crate_num(self.stable_crate_id);
-        StableSourceFileId { file_name_hash: self.file_name_hash, cnum }
-    }
-
+    #[inline]
     fn new(tcx: TyCtxt<'_>, file: &SourceFile) -> EncodedSourceFileId {
-        if file.cnum == LOCAL_CRATE {
-            /* Cf rustc_metadata::rmeta::encode_source_map */
-            if let FileName::Real(ref original_file_name) = file.name {
-                let adapted_file_name =
-                    tcx.sess.source_map().path_mapping().to_embeddable_absolute_path(
-                        original_file_name.clone(),
-                        &tcx.sess.opts.working_dir,
-                    );
-                if adapted_file_name != *original_file_name {
-                    let file_name_hash = {
-                        let mut hasher = StableHasher::new();
-                        FileName::Real(adapted_file_name).hash(&mut hasher);
-                        hasher.finish::<_>()
-                    };
-                    return EncodedSourceFileId {
-                        file_name_hash,
-                        stable_crate_id: tcx.stable_crate_id(LOCAL_CRATE),
-                    };
-                }
-            }
-        }
-        let source_file_id = StableSourceFileId::new(file);
         EncodedSourceFileId {
-            file_name_hash: source_file_id.file_name_hash,
-            stable_crate_id: tcx.stable_crate_id(source_file_id.cnum),
+            stable_source_file_id: file.stable_id,
+            stable_crate_id: tcx.stable_crate_id(file.cnum),
         }
     }
 }

From a6273fbfef250963eab05b3c4e6571512099ebc8 Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Mon, 11 Mar 2024 22:39:06 +0100
Subject: [PATCH 65/66] Update to 31/01/2024 rustc

---
 ci/rust-toolchain                             |   2 +-
 creusot-contracts/src/lib.rs                  |   7 +-
 creusot-rustc/src/main.rs                     |  17 +--
 creusot/src/analysis.rs                       |   2 +-
 creusot/src/analysis/frozen_locals.rs         |   4 +-
 creusot/src/analysis/init_locals.rs           |   4 +-
 creusot/src/analysis/liveness_no_drop.rs      |   4 +-
 creusot/src/analysis/not_final_places.rs      |   4 +-
 creusot/src/analysis/uninit_locals.rs         |   4 +-
 creusot/src/backend.rs                        |   6 +-
 creusot/src/backend/clone_map.rs              |   8 +-
 creusot/src/backend/clone_map/elaborator.rs   |   2 +-
 creusot/src/backend/clone_map/expander.rs     |   7 +-
 creusot/src/backend/dependency.rs             |   5 +-
 creusot/src/backend/optimization.rs           |  24 ++--
 creusot/src/backend/program.rs                |   8 +-
 creusot/src/backend/ty.rs                     |   4 +-
 creusot/src/backend/ty_inv.rs                 |   6 +-
 creusot/src/callbacks.rs                      |  12 +-
 creusot/src/cleanup_spec_closures.rs          |  39 ++++++-
 creusot/src/ctx.rs                            |  40 ++-----
 creusot/src/error.rs                          |   8 +-
 creusot/src/extended_location.rs              |   7 +-
 creusot/src/lints/experimental_types.rs       |  12 +-
 creusot/src/lints/resolve_trait.rs            |   6 +-
 creusot/src/metadata.rs                       |   4 +-
 creusot/src/run_why3.rs                       |  10 +-
 creusot/src/translated_item.rs                |   4 +-
 creusot/src/translation.rs                    |   6 +-
 creusot/src/translation/constant.rs           |   9 +-
 creusot/src/translation/external.rs           |  22 +++-
 creusot/src/translation/function.rs           |  16 ++-
 creusot/src/translation/function/statement.rs |  19 ++--
 .../src/translation/function/terminator.rs    |   4 +-
 creusot/src/translation/pearlite.rs           |  32 +++---
 creusot/src/translation/pearlite/normalize.rs | 106 ++++++++++++++----
 creusot/src/translation/specification.rs      |  23 ++--
 creusot/src/translation/traits.rs             |  13 ++-
 creusot/src/util.rs                           |  27 +++--
 39 files changed, 331 insertions(+), 206 deletions(-)

diff --git a/ci/rust-toolchain b/ci/rust-toolchain
index a49a9c7e7b..8ec00e1cb2 100644
--- a/ci/rust-toolchain
+++ b/ci/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-10-20"
+channel = "nightly-2024-01-31"
 components = [ "rustfmt", "rustc-dev", "llvm-tools" ]
diff --git a/creusot-contracts/src/lib.rs b/creusot-contracts/src/lib.rs
index fd324b72dc..ab030ea0a9 100644
--- a/creusot-contracts/src/lib.rs
+++ b/creusot-contracts/src/lib.rs
@@ -203,8 +203,6 @@ mod macros {
     /// This means you cannot `#[open]` a body which refers to a `pub(crate)` symbol.
     pub use creusot_contracts_dummy::open;
 
-    pub use creusot_contracts_proc::DeepModel;
-
     pub use creusot_contracts_proc::Resolve;
 }
 
@@ -251,6 +249,7 @@ pub mod resolve;
 pub mod util;
 pub mod well_founded;
 
+pub use macros::*;
 // We add some common things at the root of the creusot-contracts library
 pub use crate::{
     logic::{IndexLogic as _, Int, OrdLogic, Seq},
@@ -297,3 +296,7 @@ macro_rules! vec {
     );
     ($($x:expr,)*) => (vec![$($x),*])
 }
+
+// #[logic]
+// #[open]
+// pub fn foo() -> bool { true }
diff --git a/creusot-rustc/src/main.rs b/creusot-rustc/src/main.rs
index d8d3c4fb52..bb4d67837b 100644
--- a/creusot-rustc/src/main.rs
+++ b/creusot-rustc/src/main.rs
@@ -14,9 +14,9 @@ extern crate log;
 use creusot::callbacks::*;
 use options::CreusotArgs;
 use rustc_driver::{RunCompiler, DEFAULT_LOCALE_RESOURCES};
-use rustc_errors::emitter::EmitterWriter;
+use rustc_errors::emitter::HumanEmitter;
 use rustc_interface::interface::try_print_query_stack;
-use rustc_session::{config::ErrorOutputType, EarlyErrorHandler};
+use rustc_session::{config::ErrorOutputType, EarlyDiagCtxt};
 use std::{env, panic, panic::PanicInfo, process::Command};
 
 const BUG_REPORT_URL: &'static str = &"https://github.com/xldenis/creusot/issues/new";
@@ -37,10 +37,10 @@ fn report_panic(info: &PanicInfo) {
     let fallback_bundle =
         rustc_errors::fallback_fluent_bundle(DEFAULT_LOCALE_RESOURCES.to_vec(), false);
 
-    let emitter = Box::new(EmitterWriter::stderr(rustc_errors::ColorConfig::Auto, fallback_bundle));
-    let handler = rustc_errors::Handler::with_emitter(emitter);
+    let emitter = Box::new(HumanEmitter::stderr(rustc_errors::ColorConfig::Auto, fallback_bundle));
+    let handler = rustc_errors::DiagCtxt::with_emitter(emitter);
 
-    let mut diagnostic = handler.struct_note_without_error("Creusot has panic-ed!");
+    let mut diagnostic = handler.struct_note("Creusot has panic-ed!");
     diagnostic.note("Oops, that shouldn't have happened, sorry about that.");
     diagnostic.note(format!("Please report this bug over here: {}", BUG_REPORT_URL));
 
@@ -58,7 +58,7 @@ struct DefaultCallbacks;
 impl rustc_driver::Callbacks for DefaultCallbacks {}
 
 fn main() {
-    let handler = EarlyErrorHandler::new(ErrorOutputType::default());
+    let handler = EarlyDiagCtxt::new(ErrorOutputType::default());
     rustc_driver::init_rustc_env_logger(&handler);
     env_logger::init();
     lazy_static::initialize(&ICE_HOOK);
@@ -107,6 +107,7 @@ fn setup_plugin() {
         args.push("-Zcrate-attr=feature(rustc_attrs)".to_owned());
         args.push("-Zcrate-attr=feature(unsized_fn_params)".to_owned());
         args.push("--allow=internal_features".to_owned());
+        args.push("-Zdump-mir=speccleanup".to_owned());
         args.extend(["--cfg", "creusot"].into_iter().map(str::to_owned));
         debug!("creusot args={:?}", args);
 
@@ -137,7 +138,7 @@ fn _emit_warning(text: String) {
     let fallback_bundle =
         rustc_errors::fallback_fluent_bundle(DEFAULT_LOCALE_RESOURCES.to_vec(), false);
 
-    let emitter = Box::new(EmitterWriter::stderr(rustc_errors::ColorConfig::Auto, fallback_bundle));
-    let handler = rustc_errors::Handler::with_emitter(emitter);
+    let emitter = Box::new(HumanEmitter::stderr(rustc_errors::ColorConfig::Auto, fallback_bundle));
+    let handler = rustc_errors::DiagCtxt::with_emitter(emitter);
     handler.warn(text);
 }
diff --git a/creusot/src/analysis.rs b/creusot/src/analysis.rs
index ae5f464433..70f2309d8d 100644
--- a/creusot/src/analysis.rs
+++ b/creusot/src/analysis.rs
@@ -112,7 +112,7 @@ pub(crate) fn categorize(context: PlaceContext) -> Option<DefUse> {
         // cross suspension points so this behavior is unproblematic.
         PlaceContext::MutatingUse(MutatingUseContext::Borrow) |
         PlaceContext::NonMutatingUse(NonMutatingUseContext::SharedBorrow) |
-        PlaceContext::NonMutatingUse(NonMutatingUseContext::ShallowBorrow) |
+        PlaceContext::NonMutatingUse(NonMutatingUseContext::FakeBorrow) |
         PlaceContext::NonMutatingUse(NonMutatingUseContext::PlaceMention) |
         PlaceContext::MutatingUse(MutatingUseContext::AddressOf) |
         PlaceContext::NonMutatingUse(NonMutatingUseContext::AddressOf) |
diff --git a/creusot/src/analysis/frozen_locals.rs b/creusot/src/analysis/frozen_locals.rs
index 3717b458a7..4c3be0ef90 100644
--- a/creusot/src/analysis/frozen_locals.rs
+++ b/creusot/src/analysis/frozen_locals.rs
@@ -185,7 +185,7 @@ impl<'tcx> dataflow::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
 
     fn before_terminator_effect(
         &mut self,
-        _trans: &mut impl GenKill<Self::Idx>,
+        _trans: &mut Self::Domain,
         _terminator: &mir::Terminator<'tcx>,
         _location: Location,
     ) {
@@ -213,7 +213,7 @@ impl<'tcx> dataflow::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
 
     fn call_return_effect(
         &mut self,
-        _trans: &mut impl GenKill<Self::Idx>,
+        _trans: &mut Self::Domain,
         _block: mir::BasicBlock,
         _return_places: CallReturnPlaces<'_, 'tcx>,
     ) {
diff --git a/creusot/src/analysis/init_locals.rs b/creusot/src/analysis/init_locals.rs
index 06c9656a82..1023597205 100644
--- a/creusot/src/analysis/init_locals.rs
+++ b/creusot/src/analysis/init_locals.rs
@@ -54,7 +54,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeInitializedLocals {
 
     fn call_return_effect(
         &mut self,
-        trans: &mut impl GenKill<Self::Idx>,
+        trans: &mut Self::Domain,
         _block: BasicBlock,
         return_places: CallReturnPlaces<'_, 'tcx>,
     ) {
@@ -108,7 +108,7 @@ where
                 NonMutatingUseContext::Inspect
                 | NonMutatingUseContext::Copy
                 | NonMutatingUseContext::SharedBorrow
-                | NonMutatingUseContext::ShallowBorrow
+                | NonMutatingUseContext::FakeBorrow
                 | NonMutatingUseContext::AddressOf
                 | NonMutatingUseContext::PlaceMention
                 | NonMutatingUseContext::Projection,
diff --git a/creusot/src/analysis/liveness_no_drop.rs b/creusot/src/analysis/liveness_no_drop.rs
index 0d481cafa3..1f1f9283d3 100644
--- a/creusot/src/analysis/liveness_no_drop.rs
+++ b/creusot/src/analysis/liveness_no_drop.rs
@@ -55,7 +55,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeLiveExceptDrop {
 
     fn call_return_effect(
         &mut self,
-        trans: &mut impl GenKill<Self::Idx>,
+        trans: &mut Self::Domain,
         _block: mir::BasicBlock,
         return_places: CallReturnPlaces<'_, 'tcx>,
     ) {
@@ -186,7 +186,7 @@ impl DefUse {
                 | NonMutatingUseContext::Copy
                 | NonMutatingUseContext::Inspect
                 | NonMutatingUseContext::Move
-                | NonMutatingUseContext::ShallowBorrow
+                | NonMutatingUseContext::FakeBorrow
                 | NonMutatingUseContext::SharedBorrow
                 | NonMutatingUseContext::PlaceMention,
             ) => Some(DefUse::Use),
diff --git a/creusot/src/analysis/not_final_places.rs b/creusot/src/analysis/not_final_places.rs
index 849c7f6a51..28219cb3e8 100644
--- a/creusot/src/analysis/not_final_places.rs
+++ b/creusot/src/analysis/not_final_places.rs
@@ -478,7 +478,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for NotFinalPlaces<'tcx> {
 
     fn call_return_effect(
         &mut self,
-        _trans: &mut impl GenKill<Self::Idx>,
+        _trans: &mut Self::Domain,
         _block: BasicBlock,
         _return_places: CallReturnPlaces<'_, 'tcx>,
     ) {
@@ -496,7 +496,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for NotFinalPlaces<'tcx> {
 
     fn before_terminator_effect(
         &mut self,
-        trans: &mut impl GenKill<Self::Idx>,
+        trans: &mut Self::Domain,
         terminator: &mir::Terminator<'tcx>,
         location: Location,
     ) {
diff --git a/creusot/src/analysis/uninit_locals.rs b/creusot/src/analysis/uninit_locals.rs
index 1ef0f8d47d..9cf8e99a70 100644
--- a/creusot/src/analysis/uninit_locals.rs
+++ b/creusot/src/analysis/uninit_locals.rs
@@ -55,7 +55,7 @@ impl<'tcx> GenKillAnalysis<'tcx> for MaybeUninitializedLocals {
 
     fn call_return_effect(
         &mut self,
-        trans: &mut impl GenKill<Self::Idx>,
+        trans: &mut Self::Domain,
         _block: BasicBlock,
         return_places: CallReturnPlaces<'_, 'tcx>,
     ) {
@@ -106,7 +106,7 @@ where
                 NonMutatingUseContext::Inspect
                 | NonMutatingUseContext::Copy
                 | NonMutatingUseContext::SharedBorrow
-                | NonMutatingUseContext::ShallowBorrow
+                | NonMutatingUseContext::FakeBorrow
                 | NonMutatingUseContext::AddressOf
                 | NonMutatingUseContext::PlaceMention
                 | NonMutatingUseContext::Projection,
diff --git a/creusot/src/backend.rs b/creusot/src/backend.rs
index f04ad83442..94c8783f5e 100644
--- a/creusot/src/backend.rs
+++ b/creusot/src/backend.rs
@@ -258,9 +258,9 @@ impl<'tcx> Why3Generator<'tcx> {
             self.translate(adt_did);
         }
 
-        let (modl, deps) = ty_inv::build_inv_module(self, inv_kind);
+        let deps = ty_inv::build_inv_module(self, inv_kind);
         self.dependencies.insert(tid, deps);
-        self.functions.insert(tid, TranslatedItem::TyInv { modl });
+        self.functions.insert(tid, TranslatedItem::TyInv {});
     }
 
     // pub(crate) fn item(&self, def_id: DefId) -> Option<&TranslatedItem> {
@@ -413,7 +413,7 @@ pub(crate) fn closure_generic_decls(
     mut def_id: DefId,
 ) -> impl Iterator<Item = Decl> + '_ {
     loop {
-        if tcx.is_closure(def_id) {
+        if tcx.is_closure_or_coroutine(def_id) {
             def_id = tcx.parent(def_id);
         } else {
             break;
diff --git a/creusot/src/backend/clone_map.rs b/creusot/src/backend/clone_map.rs
index db49c5e224..9720e26827 100644
--- a/creusot/src/backend/clone_map.rs
+++ b/creusot/src/backend/clone_map.rs
@@ -140,7 +140,7 @@ impl<'tcx> Namer<'tcx> for CloneMap<'tcx> {
     fn ty(&mut self, def_id: DefId, subst: GenericArgsRef<'tcx>) -> QName {
         let mut node = DepNode::new(self.tcx, (def_id, subst));
 
-        if self.tcx.is_closure(def_id) {
+        if self.tcx.is_closure_or_coroutine(def_id) {
             node = DepNode::Type(Ty::new_closure(self.tcx, def_id, subst));
         }
 
@@ -282,8 +282,10 @@ impl<'tcx> CloneNames<'tcx> {
     }
     fn insert(&mut self, key: DepNode<'tcx>) -> Kind {
         *self.names.entry(key).or_insert_with(|| {
-            if let DepNode::Type(ty) = key && !matches!(ty.kind(), TyKind::Alias(_, _)) {
-                let kind =  if let Some((did, _)) = key.did() {
+            if let DepNode::Type(ty) = key
+                && !matches!(ty.kind(), TyKind::Alias(_, _))
+            {
+                let kind = if let Some((did, _)) = key.did() {
                     let name = Symbol::intern(&*module_name(self.tcx, did));
                     Kind::Named(name)
                 } else {
diff --git a/creusot/src/backend/clone_map/elaborator.rs b/creusot/src/backend/clone_map/elaborator.rs
index 5d6ac35cc8..3cb767715d 100644
--- a/creusot/src/backend/clone_map/elaborator.rs
+++ b/creusot/src/backend/clone_map/elaborator.rs
@@ -289,7 +289,7 @@ impl<'tcx> Namer<'tcx> for SymNamer<'tcx> {
     fn ty(&mut self, def_id: DefId, subst: GenericArgsRef<'tcx>) -> QName {
         let mut node = DepNode::new(self.tcx, (def_id, subst));
 
-        if self.tcx.is_closure(def_id) {
+        if self.tcx.is_closure_or_coroutine(def_id) {
             node = DepNode::Type(Ty::new_closure(self.tcx, def_id, subst));
         }
 
diff --git a/creusot/src/backend/clone_map/expander.rs b/creusot/src/backend/clone_map/expander.rs
index e438c952b6..db5c69289f 100644
--- a/creusot/src/backend/clone_map/expander.rs
+++ b/creusot/src/backend/clone_map/expander.rs
@@ -214,7 +214,9 @@ impl<'a, 'tcx> Expander<'a, 'tcx> {
             TyInvKind::from_ty(ctx.tcx, ty).unwrap_or(TyInvKind::Trivial)
         };
 
-        if let TransId::TyInv(self_kind) = self.self_id && self_kind == inv_kind {
+        if let TransId::TyInv(self_kind) = self.self_id
+            && self_kind == inv_kind
+        {
             return;
         }
 
@@ -238,7 +240,8 @@ impl<'a, 'tcx> Expander<'a, 'tcx> {
 
         // Dont clone laws into the trait / impl which defines them.
         if let Some(self_item) = ctx.tcx.opt_associated_item(self_did)
-            && self_item.container_id(ctx.tcx) == item.container_id(ctx.tcx) {
+            && self_item.container_id(ctx.tcx) == item.container_id(ctx.tcx)
+        {
             return;
         }
 
diff --git a/creusot/src/backend/dependency.rs b/creusot/src/backend/dependency.rs
index 7daaac6aa9..53197b1030 100644
--- a/creusot/src/backend/dependency.rs
+++ b/creusot/src/backend/dependency.rs
@@ -212,8 +212,9 @@ fn resolve_item<'tcx>(
     param_env: ParamEnv<'tcx>,
 ) -> Dependency<'tcx> {
     let resolved = if tcx.trait_of_item(item).is_some()
-        && let Some(resolved) = traits::resolve_opt(tcx, param_env, item, substs) {
-            resolved
+        && let Some(resolved) = traits::resolve_opt(tcx, param_env, item, substs)
+    {
+        resolved
     } else {
         (item, substs)
     };
diff --git a/creusot/src/backend/optimization.rs b/creusot/src/backend/optimization.rs
index 20d5b42561..551b1b77c3 100644
--- a/creusot/src/backend/optimization.rs
+++ b/creusot/src/backend/optimization.rs
@@ -274,14 +274,16 @@ impl<'tcx> SimplePropagator<'tcx> {
         match s {
             Statement::Assignment(_, r, _) => self.visit_rvalue(r),
             Statement::Resolve(_, _, p) => {
-              if let Some(l) = p.as_symbol() && self.dead.contains(&l) {
-
-              }
+                if let Some(l) = p.as_symbol()
+                    && self.dead.contains(&l)
+                {}
             }
             Statement::Assertion { cond, msg: _ } => self.visit_term(cond),
-            Statement::Call(_, _, _, args, _) => args.iter_mut().for_each(|a| self.visit_operand(a)),
-            Statement::AssumeBorrowInv(_) => {},
-            Statement::AssertTyInv( _) => {},
+            Statement::Call(_, _, _, args, _) => {
+                args.iter_mut().for_each(|a| self.visit_operand(a))
+            }
+            Statement::AssumeBorrowInv(_) => {}
+            Statement::AssertTyInv(_) => {}
         }
     }
 
@@ -312,10 +314,12 @@ impl<'tcx> SimplePropagator<'tcx> {
     fn visit_operand(&mut self, op: &mut Operand<'tcx>) {
         match op {
             Operand::Move(p) | Operand::Copy(p) => {
-              if let Some(l) = p.as_symbol() && let Some(v) = self.prop.remove(&l) {
-                *op = v;
-              }
-            },
+                if let Some(l) = p.as_symbol()
+                    && let Some(v) = self.prop.remove(&l)
+                {
+                    *op = v;
+                }
+            }
             Operand::Constant(_) => {}
         }
     }
diff --git a/creusot/src/backend/program.rs b/creusot/src/backend/program.rs
index 521b292ab1..ebfa18f730 100644
--- a/creusot/src/backend/program.rs
+++ b/creusot/src/backend/program.rs
@@ -128,7 +128,7 @@ pub(crate) fn translate_closure<'tcx>(
     ctx: &mut Why3Generator<'tcx>,
     def_id: DefId,
 ) -> (CloneSummary<'tcx>, Module, Option<Module>) {
-    assert!(ctx.is_closure(def_id));
+    assert!(ctx.is_closure_or_coroutine(def_id));
     let (summary, func) = translate_function(ctx, def_id);
     (summary, closure_ty(ctx, def_id), func)
 }
@@ -146,7 +146,7 @@ pub(crate) fn translate_function<'tcx, 'sess>(
     };
     let body = to_why(ctx, &mut names, body_ids[0]);
 
-    if ctx.tcx.is_closure(def_id) {
+    if ctx.tcx.is_closure_or_coroutine(def_id) {
         closure_aux_defs(ctx, def_id)
     };
 
@@ -206,7 +206,7 @@ fn lower_promoted<'tcx>(
     body_id: BodyId,
 ) -> Decl {
     let promoted = promoted::translate_promoted(ctx, body_id);
-    let (sig, fmir) = promoted.unwrap_or_else(|e| e.emit(ctx.tcx.sess));
+    let (sig, fmir) = promoted.unwrap_or_else(|e| e.emit(ctx.tcx));
 
     let mut sig = sig_to_why3(ctx, names, &sig, body_id.def_id());
     sig.name = format!("promoted{:?}", body_id.promoted.unwrap().as_usize()).into();
@@ -791,7 +791,7 @@ fn func_call_to_why3<'tcx>(
     let mut args: Vec<_> = args.into_iter().map(|a| a.to_why(ctx, names, locals)).collect();
     let fname = names.value(id, subst);
 
-    let exp = if ctx.is_closure(id) {
+    let exp = if ctx.is_closure_or_coroutine(id) {
         assert!(args.len() == 2, "closures should only have two arguments (env, args)");
 
         let real_sig = ctx.signature_unclosure(subst.as_closure().sig(), Unsafety::Normal);
diff --git a/creusot/src/backend/ty.rs b/creusot/src/backend/ty.rs
index 0e1ad3eabc..c143040ec8 100644
--- a/creusot/src/backend/ty.rs
+++ b/creusot/src/backend/ty.rs
@@ -15,7 +15,7 @@ use rustc_middle::ty::{
     GenericArgsRef, ParamEnv, Ty, TyCtxt, TyKind,
 };
 use rustc_span::{Span, Symbol, DUMMY_SP};
-use rustc_type_ir::sty::TyKind::*;
+use rustc_type_ir::TyKind::*;
 use std::collections::VecDeque;
 use why3::{
     declaration::{
@@ -455,7 +455,7 @@ pub(crate) fn ty_param_names(
     mut def_id: DefId,
 ) -> impl Iterator<Item = Ident> + '_ {
     loop {
-        if tcx.is_closure(def_id) {
+        if tcx.is_closure_or_coroutine(def_id) {
             def_id = tcx.parent(def_id);
         } else {
             break;
diff --git a/creusot/src/backend/ty_inv.rs b/creusot/src/backend/ty_inv.rs
index 29e0faadcb..a1af5f0c58 100644
--- a/creusot/src/backend/ty_inv.rs
+++ b/creusot/src/backend/ty_inv.rs
@@ -18,7 +18,7 @@ use rustc_macros::{TypeFoldable, TypeVisitable};
 use rustc_middle::ty::{GenericArg, GenericArgsRef, ParamEnv, Ty, TyCtxt, TyKind};
 use rustc_span::{Symbol, DUMMY_SP};
 use why3::{
-    declaration::{Axiom, Decl, Module, TyDecl},
+    declaration::{Axiom, Decl, TyDecl},
     exp::{Exp, Trigger},
     Ident,
 };
@@ -403,7 +403,7 @@ impl<'tcx> InvariantElaborator<'tcx> {
 pub(crate) fn build_inv_module<'tcx>(
     ctx: &mut Why3Generator<'tcx>,
     inv_kind: TyInvKind,
-) -> (Module, CloneSummary<'tcx>) {
+) -> CloneSummary<'tcx> {
     let mut names = CloneMap::new(ctx.tcx, TransId::TyInv(inv_kind));
     let generics = inv_kind.generics(ctx.tcx);
     let inv_axiom =
@@ -434,7 +434,7 @@ pub(crate) fn build_inv_module<'tcx>(
 
     decls.push(Decl::Axiom(inv_axiom));
 
-    (Module { name: util::inv_module_name(ctx.tcx, inv_kind), decls }, summary)
+    summary
 }
 
 fn axiom_name(ctx: &Why3Generator<'_>, inv_kind: TyInvKind) -> Ident {
diff --git a/creusot/src/callbacks.rs b/creusot/src/callbacks.rs
index 64c510ad89..9a87179901 100644
--- a/creusot/src/callbacks.rs
+++ b/creusot/src/callbacks.rs
@@ -2,7 +2,7 @@ use rustc_borrowck::consumers::{BodyWithBorrowckFacts, ConsumerOptions};
 use rustc_driver::{Callbacks, Compilation};
 use rustc_hir::def_id::LocalDefId;
 use rustc_interface::{interface::Compiler, Config, Queries};
-use rustc_middle::ty::TyCtxt;
+use rustc_middle::{mir::dump_mir, ty::TyCtxt};
 
 use std::{cell::RefCell, collections::HashMap, thread_local};
 
@@ -35,6 +35,14 @@ impl Callbacks for ToWhy {
                 tcx.alloc_steal_mir(mir)
             };
 
+            providers.mir_drops_elaborated_and_const_checked = |tcx, def_id| {
+                let mir = (rustc_interface::DEFAULT_QUERY_PROVIDERS
+                    .mir_drops_elaborated_and_const_checked)(tcx, def_id);
+                let mut mir = mir.steal();
+                remove_ghost_closures(tcx, &mut mir);
+                tcx.alloc_steal_mir(mir)
+            };
+
             providers.mir_borrowck = |tcx, def_id| {
                 let opts = ConsumerOptions::RegionInferenceContext;
 
@@ -74,7 +82,7 @@ impl Callbacks for ToWhy {
             let _ = crate::translation::after_analysis(ctx);
         });
 
-        c.session().abort_if_errors();
+        c.sess.dcx().abort_if_errors();
 
         if self.opts.in_cargo {
             Compilation::Continue
diff --git a/creusot/src/cleanup_spec_closures.rs b/creusot/src/cleanup_spec_closures.rs
index f009d0cf70..a62ca9b0bf 100644
--- a/creusot/src/cleanup_spec_closures.rs
+++ b/creusot/src/cleanup_spec_closures.rs
@@ -3,8 +3,8 @@ use rustc_hir::def_id::DefId;
 use rustc_index::{Idx, IndexVec};
 use rustc_middle::{
     mir::{
-        visit::MutVisitor, AggregateKind, BasicBlock, BasicBlockData, Body, Local, Location,
-        Rvalue, SourceInfo, Terminator, TerminatorKind,
+        dump_mir, visit::MutVisitor, AggregateKind, BasicBlock, BasicBlockData, Body, Local,
+        Location, Rvalue, SourceInfo, StatementKind, Terminator, TerminatorKind,
     },
     ty::TyCtxt,
 };
@@ -18,11 +18,13 @@ use crate::util;
 /// To prevent the closures from intererring with the borrow checking of the surrounding environment, we replace the MIR body of the closure with an empty loop and remove all of the arguments to the closure in the surrounding MIR.
 pub(crate) fn cleanup_spec_closures<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId, body: &mut Body<'tcx>) {
     trace!("cleanup_spec_closures: {:?}", def_id);
+
     if util::no_mir(tcx, def_id) {
         trace!("replacing function body");
         *body.basic_blocks_mut() = make_loop(tcx);
         body.var_debug_info = Vec::new();
     } else {
+        // dump_mir(tcx, false, "speccleanup", &"before", &body, |_, _| Ok(()));
         let mut cleanup = NoTranslateNoMoves { tcx, unused: IndexSet::new() };
         cleanup.visit_body(body);
 
@@ -32,12 +34,11 @@ pub(crate) fn cleanup_spec_closures<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId, body
         updater.visit_body(body);
 
         body.local_decls.shrink_to_fit();
+        dump_mir(tcx, false, "speccleanup", &"after", &body, |_, _| Ok(()));
     }
 }
 
 fn cleanup_statements<'tcx>(body: &mut Body<'tcx>, unused: &IndexSet<Local>) {
-    use rustc_middle::mir::StatementKind;
-
     for data in body.basic_blocks_mut() {
         data.statements.retain(|statement| match &statement.kind {
             StatementKind::StorageLive(local) | StatementKind::StorageDead(local) => {
@@ -89,6 +90,7 @@ impl<'tcx> MutVisitor<'tcx> for NoTranslateNoMoves<'tcx> {
                             if let Some(loc) = place.as_local() {
                                 self.unused.insert(loc);
                             }
+                            // *p = Operand::Copy(place);
                         }
                     });
                     *substs = IndexVec::new();
@@ -137,3 +139,32 @@ impl<'tcx> MutVisitor<'tcx> for LocalUpdater<'tcx> {
         *l = self.map[*l].unwrap();
     }
 }
+
+pub fn remove_ghost_closures<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
+    struct RemoveGhostItems<'tcx> {
+        tcx: TyCtxt<'tcx>,
+    }
+
+    impl<'tcx> MutVisitor<'tcx> for RemoveGhostItems<'tcx> {
+        fn tcx<'a>(&'a self) -> TyCtxt<'tcx> {
+            self.tcx
+        }
+
+        fn visit_statement(
+            &mut self,
+            statement: &mut rustc_middle::mir::Statement<'tcx>,
+            _: Location,
+        ) {
+            let StatementKind::Assign(box (_, rhs)) = &statement.kind else { return };
+            let Rvalue::Aggregate(box AggregateKind::Closure(def_id, _), _) = rhs else {
+                return;
+            };
+            if util::is_no_translate(self.tcx, *def_id) || util::is_snapshot_closure(self.tcx, *def_id)
+            {
+                statement.kind = StatementKind::Nop
+            }
+        }
+    }
+
+    RemoveGhostItems { tcx }.visit_body(body);
+}
diff --git a/creusot/src/ctx.rs b/creusot/src/ctx.rs
index 69832951a8..14c0b526be 100644
--- a/creusot/src/ctx.rs
+++ b/creusot/src/ctx.rs
@@ -21,7 +21,7 @@ use crate::{
 };
 use indexmap::{IndexMap, IndexSet};
 use rustc_borrowck::consumers::BodyWithBorrowckFacts;
-use rustc_errors::{DiagnosticBuilder, DiagnosticId};
+use rustc_errors::{DiagnosticBuilder, FatalAbort};
 use rustc_hir::{
     def::DefKind,
     def_id::{DefId, LocalDefId},
@@ -168,7 +168,7 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
         if util::has_body(self, def_id) {
             if !self.terms.contains_key(&def_id) {
                 let mut term = pearlite::pearlite(self, def_id.expect_local())
-                    .unwrap_or_else(|e| e.emit(self.tcx.sess));
+                    .unwrap_or_else(|e| e.emit(self.tcx));
                 pearlite::normalize(self.tcx, self.param_env(def_id), &mut term);
 
                 self.terms.insert(def_id, term);
@@ -228,19 +228,13 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
     }
 
     pub(crate) fn crash_and_error(&self, span: Span, msg: &str) -> ! {
-        self.tcx.sess.span_fatal_with_code(
-            span,
-            msg.to_string(),
-            DiagnosticId::Error(String::from("creusot")),
-        )
+        // TODO: try to add a code back in
+        self.tcx.dcx().span_fatal(span, msg.to_string())
     }
 
-    pub(crate) fn fatal_error(&self, span: Span, msg: &str) -> DiagnosticBuilder<'tcx, !> {
-        self.tcx.sess.struct_span_fatal_with_code(
-            span,
-            msg.to_string(),
-            DiagnosticId::Error(String::from("creusot")),
-        )
+    pub(crate) fn fatal_error(&self, span: Span, msg: &str) -> DiagnosticBuilder<'tcx, FatalAbort> {
+        // TODO: try to add a code back in
+        self.tcx.dcx().struct_span_fatal(span, msg.to_string())
     }
 
     pub(crate) fn error(
@@ -248,23 +242,11 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
         span: Span,
         msg: &str,
     ) -> DiagnosticBuilder<'tcx, rustc_errors::ErrorGuaranteed> {
-        self.tcx.sess.struct_span_err_with_code(
-            span,
-            msg.to_string(),
-            DiagnosticId::Error(String::from("creusot")),
-        )
+        self.tcx.dcx().struct_span_err(span, msg.to_string())
     }
 
     pub(crate) fn warn(&self, span: Span, msg: &str) -> DiagnosticBuilder<'tcx, ()> {
-        self.tcx.sess.struct_span_warn_with_code(
-            span,
-            msg.to_string(),
-            DiagnosticId::Lint {
-                name: String::from("creusot"),
-                has_future_breakage: false,
-                is_force_warn: false,
-            },
-        )
+        self.tcx.dcx().struct_span_warn(span, msg.to_string())
     }
 
     fn add_binding_group(&mut self, def_ids: &IndexSet<DefId>) {
@@ -395,10 +377,10 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
 
     pub(crate) fn check_purity(&mut self, def_id: LocalDefId) {
         let (thir, expr) =
-            self.tcx.thir_body(def_id).unwrap_or_else(|_| Error::from(CrErr).emit(self.tcx.sess));
+            self.tcx.thir_body(def_id).unwrap_or_else(|_| Error::from(CrErr).emit(self.tcx));
         let thir = thir.borrow();
         if thir.exprs.is_empty() {
-            Error::new(self.tcx.def_span(def_id), "type checking failed").emit(self.tcx.sess);
+            Error::new(self.tcx.def_span(def_id), "type checking failed").emit(self.tcx);
         }
 
         let def_id = def_id.to_def_id();
diff --git a/creusot/src/error.rs b/creusot/src/error.rs
index 120546c709..4aea329ad8 100644
--- a/creusot/src/error.rs
+++ b/creusot/src/error.rs
@@ -1,5 +1,4 @@
-use rustc_errors::DiagnosticId;
-use rustc_session::Session;
+use rustc_middle::ty::TyCtxt;
 use rustc_span::{Span, DUMMY_SP};
 
 pub type CreusotResult<T> = Result<T, Error>;
@@ -16,8 +15,9 @@ impl Error {
         Error { span, msg: msg.into() }
     }
 
-    pub(crate) fn emit(self, sess: &Session) -> ! {
-        sess.span_fatal_with_code(self.span, self.msg, DiagnosticId::Error(String::from("creusot")))
+    pub(crate) fn emit(self, tcx: TyCtxt) -> ! {
+        // TODO: try to add a code back in
+        tcx.dcx().span_fatal(self.span, self.msg)
     }
 }
 
diff --git a/creusot/src/extended_location.rs b/creusot/src/extended_location.rs
index cfff054da4..b0eb85562b 100644
--- a/creusot/src/extended_location.rs
+++ b/creusot/src/extended_location.rs
@@ -1,6 +1,5 @@
 use rustc_middle::mir::Location;
-use rustc_mir_dataflow::{self as dataflow, Analysis, AnalysisResults, Results, ResultsCursor};
-use std::borrow::Borrow;
+use rustc_mir_dataflow::{self as dataflow, Analysis, ResultsCursor};
 
 // Dataflow locations
 #[derive(Debug, Copy, Clone)]
@@ -35,12 +34,10 @@ impl ExtendedLocation {
         }
     }
 
-    pub(crate) fn seek_to<'tcx, A, R, D>(self, cursor: &mut ResultsCursor<'_, 'tcx, A, R>)
+    pub(crate) fn seek_to<'tcx, A, D>(self, cursor: &mut ResultsCursor<'_, 'tcx, A>)
     where
         A: Analysis<'tcx, Direction = D>,
         D: Dir,
-        R: AnalysisResults<'tcx, A>,
-        R: Borrow<Results<'tcx, A>>,
     {
         use ExtendedLocation::*;
         if D::is_forward() {
diff --git a/creusot/src/lints/experimental_types.rs b/creusot/src/lints/experimental_types.rs
index c2bc6c3516..54f29c0f74 100644
--- a/creusot/src/lints/experimental_types.rs
+++ b/creusot/src/lints/experimental_types.rs
@@ -40,20 +40,20 @@ impl<'tcx> LateLintPass<'tcx> for Experimental {
         }
 
         if is_str_ty(cx, e) {
-            cx.struct_span_lint(
+            cx.opt_span_lint(
                 EXPERIMENTAL,
-                e.span,
+                Some(e.span),
                 "support for string types is limited and experimental",
-                |lint| lint,
+                |_lint| (),
             );
         }
 
         if is_dyn_ty(cx, e) {
-            cx.struct_span_lint(
+            cx.opt_span_lint(
                 EXPERIMENTAL,
-                e.span,
+                Some(e.span),
                 "support for trait objects (dyn) is limited and experimental",
-                |lint| lint,
+                |_lint| (),
             );
         }
     }
diff --git a/creusot/src/lints/resolve_trait.rs b/creusot/src/lints/resolve_trait.rs
index c90aa1199f..b4585fceb5 100644
--- a/creusot/src/lints/resolve_trait.rs
+++ b/creusot/src/lints/resolve_trait.rs
@@ -21,11 +21,11 @@ fn resolve_trait_loaded(tcx: TyCtxt) -> bool {
 impl<'tcx> LateLintPass<'tcx> for ResolveTrait {
     fn check_crate(&mut self, cx: &LateContext<'tcx>) {
         if !resolve_trait_loaded(cx.tcx) {
-            cx.struct_span_lint(
+            cx.opt_span_lint(
                 RESOLVE_TRAIT,
-                DUMMY_SP,
+                Some(DUMMY_SP),
                 "the `creusot_contracts` crate is not loaded. You will not be able to verify any code using Creusot until you do so.",
-                |lint| lint,
+                |_lint| (),
             );
         }
     }
diff --git a/creusot/src/metadata.rs b/creusot/src/metadata.rs
index 8fc502ae6e..d3a96ae1a7 100644
--- a/creusot/src/metadata.rs
+++ b/creusot/src/metadata.rs
@@ -154,7 +154,7 @@ pub(crate) fn dump_exports(ctx: &TranslationCtx, out: &Option<String>) {
     debug!("dump_exports={:?}", out_filename);
 
     dump_binary_metadata(ctx.tcx, &out_filename, ctx.metadata()).unwrap_or_else(|err| {
-        panic!("could not save metadata path=`{:?}` error={}", out_filename, err)
+        panic!("could not save metadata path=`{:?}` error={}", out_filename, err.1)
     });
 }
 
@@ -162,7 +162,7 @@ fn dump_binary_metadata<'tcx>(
     tcx: TyCtxt<'tcx>,
     path: &Path,
     dep_info: BinaryMetadata<'tcx>,
-) -> Result<(), std::io::Error> {
+) -> Result<(), (PathBuf, std::io::Error)> {
     encode_metadata(tcx, path, dep_info)
 }
 
diff --git a/creusot/src/run_why3.rs b/creusot/src/run_why3.rs
index 705c100d6a..123f7c54ee 100644
--- a/creusot/src/run_why3.rs
+++ b/creusot/src/run_why3.rs
@@ -91,7 +91,7 @@ pub(super) fn run_why3<'tcx>(ctx: &Why3Generator<'tcx>, file: Option<PathBuf>) {
                             writeln!(msg, "Term: {}", expr_to_string(&term)).unwrap();
                             let cterm = cterm_to_ast(&model.value.value_concrete_term);
                             writeln!(msg, "Concrete Term: {}", expr_to_string(&cterm)).unwrap();
-                            ctx.sess.span_note_without_error(span.unwrap_or_default(), msg)
+                            ctx.dcx().span_note(span.unwrap_or_default(), msg)
                         }
                     }
                 }
@@ -141,14 +141,16 @@ impl SpanMap {
         opts: &Options,
         span: Span,
     ) -> Option<why3::declaration::Attribute> {
-        if let Some(cmd) = &opts.why3_cmd && matches!(cmd.sub, Why3Sub::Prove) {
+        if let Some(cmd) = &opts.why3_cmd
+            && matches!(cmd.sub, Why3Sub::Prove)
+        {
             let data = span.data();
             Some(why3::declaration::Attribute::Span(
                 "rustc_span".into(),
                 data.lo.0 as usize,
                 data.hi.0 as usize,
                 self.encode_span_data((data.ctxt, data.parent)),
-                0
+                0,
             ))
         } else {
             None
@@ -202,7 +204,6 @@ fn fun<'a>(args: impl IntoIterator<Item = &'a str>, body: Expr) -> Expr {
         binder: rustc_ast::ClosureBinder::NotPresent,
         capture_clause: rustc_ast::CaptureBy::Ref,
         constness: rustc_ast::Const::No,
-        asyncness: rustc_ast::Async::No,
         movability: rustc_ast::Movability::Movable,
         fn_decl: P(rustc_ast::FnDecl {
             inputs: args
@@ -221,6 +222,7 @@ fn fun<'a>(args: impl IntoIterator<Item = &'a str>, body: Expr) -> Expr {
         body: P(body),
         fn_decl_span: DUMMY_SP,
         fn_arg_span: DUMMY_SP,
+        coroutine_kind: None,
     })))
 }
 
diff --git a/creusot/src/translated_item.rs b/creusot/src/translated_item.rs
index 7b586cfbb8..7a167de7f7 100644
--- a/creusot/src/translated_item.rs
+++ b/creusot/src/translated_item.rs
@@ -26,9 +26,7 @@ pub enum TranslatedItem {
         modl: Vec<Module>,
         accessors: IndexMap<DefId, IndexMap<DefId, Decl>>,
     },
-    TyInv {
-        modl: Module,
-    },
+    TyInv {},
 }
 
 impl<'a> TranslatedItem {
diff --git a/creusot/src/translation.rs b/creusot/src/translation.rs
index eb7886735a..27da2433ee 100644
--- a/creusot/src/translation.rs
+++ b/creusot/src/translation.rs
@@ -81,7 +81,7 @@ pub(crate) fn after_analysis(ctx: TranslationCtx) -> Result<(), Box<dyn Error>>
     debug!("after_analysis_translate: {:?}", start.elapsed());
     let start = Instant::now();
 
-    if why3.sess.has_errors().is_some() {
+    if why3.dcx().has_errors().is_some() {
         return Err(Box::new(CrErr));
     }
 
@@ -121,7 +121,9 @@ pub(crate) fn after_analysis(ctx: TranslationCtx) -> Result<(), Box<dyn Error>>
         let tcx = why3.tcx;
         let modules = why3.modules();
         let modules = modules.flat_map(|(id, item)| {
-            if let TransId::Item(did) = id && tcx.def_path_str(did).contains(matcher) {
+            if let TransId::Item(did) = id
+                && tcx.def_path_str(did).contains(matcher)
+            {
                 item.modules()
             } else {
                 Box::new(std::iter::empty())
diff --git a/creusot/src/translation/constant.rs b/creusot/src/translation/constant.rs
index 9f0c9860c3..4523478c04 100644
--- a/creusot/src/translation/constant.rs
+++ b/creusot/src/translation/constant.rs
@@ -72,9 +72,10 @@ pub(crate) fn from_ty_const<'tcx>(
 ) -> Term<'tcx> {
     // Check if a constant is builtin and thus should not be evaluated further
     // Builtin constants are given a body which panics
-    if let ConstKind::Unevaluated(u) = c.kind() &&
-       let Some(_) = get_builtin(ctx.tcx, u.def) {
-            return Term { kind: TermKind::Lit(Literal::Function(u.def, u.args)), ty: c.ty(), span}
+    if let ConstKind::Unevaluated(u) = c.kind()
+        && let Some(_) = get_builtin(ctx.tcx, u.def)
+    {
+        return Term { kind: TermKind::Lit(Literal::Function(u.def, u.args)), ty: c.ty(), span };
     };
 
     if let ConstKind::Param(_) = c.kind() {
@@ -93,7 +94,7 @@ fn try_to_bits<'tcx, C: ToBits<'tcx>>(
     c: C,
 ) -> Literal<'tcx> {
     use rustc_middle::ty::{FloatTy, IntTy, UintTy};
-    use rustc_type_ir::sty::TyKind::{Bool, Float, FnDef, Int, Uint};
+    use rustc_type_ir::TyKind::{Bool, Float, FnDef, Int, Uint};
     match ty.kind() {
         Int(ity) => {
             let bits = c.get_bits(ctx.tcx, env, ty).unwrap();
diff --git a/creusot/src/translation/external.rs b/creusot/src/translation/external.rs
index c5cb9bf3f5..1ff9132d1d 100644
--- a/creusot/src/translation/external.rs
+++ b/creusot/src/translation/external.rs
@@ -69,16 +69,26 @@ pub(crate) fn extract_extern_specs_from_item<'tcx>(
     let mut inner_subst = GenericArgs::identity_for_item(ctx.tcx, id).to_vec();
     let outer_subst = GenericArgs::identity_for_item(ctx.tcx, def_id.to_def_id());
 
+    // FIXME(xavier): Handle this better.
+    // "Host effects" are related to the wip effects feature of Rust. For the moment let's just ignore them.
+    let has_host_effect = ctx.generics_of(id).host_effect_index.is_some();
+    if has_host_effect {
+        inner_subst.pop();
+    }
     // FIXME(xavier): I don't remember the original reason for introducing this...
     let extra_parameters = inner_subst.len() - outer_subst.len();
 
     // Move Self_ to the front of the list like rustc does for real trait impls (not expressible in surface rust).
     // This only matters when we also have lifetime parameters.
     let self_pos = outer_subst.iter().position(|e| {
-        if
-        let GenericArgKind::Type(t) = e.unpack() &&
-        let TyKind::Param(t) = t.kind() &&
-        t.name.as_str().starts_with("Self") { true } else { false }
+        if let GenericArgKind::Type(t) = e.unpack()
+            && let TyKind::Param(t) = t.kind()
+            && t.name.as_str().starts_with("Self")
+        {
+            true
+        } else {
+            false
+        }
     });
 
     if let Some(ix) = self_pos {
@@ -125,7 +135,7 @@ pub(crate) fn extract_extern_specs_from_item<'tcx>(
         }
     }
 
-    errors.into_iter().for_each(|mut e| e.emit());
+    errors.into_iter().for_each(|e| e.emit());
 
     let subst = ctx.mk_args(&subst);
 
@@ -165,7 +175,7 @@ impl<'a, 'tcx> thir::visit::Visitor<'a, 'tcx> for ExtractExternItems<'a, 'tcx> {
         self.thir
     }
 
-    fn visit_expr(&mut self, expr: &Expr<'tcx>) {
+    fn visit_expr(&mut self, expr: &'a Expr<'tcx>) {
         if let ExprKind::Call { ty, .. } = expr.kind {
             if let TyKind::FnDef(id, subst) = ty.kind() {
                 self.items.insert((*id, subst));
diff --git a/creusot/src/translation/function.rs b/creusot/src/translation/function.rs
index 127f643d80..32b9ea8ec4 100644
--- a/creusot/src/translation/function.rs
+++ b/creusot/src/translation/function.rs
@@ -205,7 +205,9 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
 
             self.translate_terminator(bbd.terminator(), loc);
 
-            if let Some(resolver) = &mut self.resolver && bbd.terminator().successors().next().is_none() {
+            if let Some(resolver) = &mut self.resolver
+                && bbd.terminator().successors().next().is_none()
+            {
                 let mut resolved = resolver.need_resolve_locals_before(loc);
                 resolved.remove(Local::from_usize(0)); // do not resolve return local
                 self.resolve_locals(resolved);
@@ -336,7 +338,7 @@ impl<'body, 'tcx> BodyTranslator<'body, 'tcx> {
     }
 
     fn resolve_locals(&mut self, mut locals: BitSet<Local>) {
-        locals.subtract(&self.erased_locals.to_hybrid());
+        locals.subtract(&self.erased_locals);
 
         // TODO determine resolution order based on outlives relation
         let locals = locals.iter().collect::<Vec<_>>();
@@ -468,7 +470,7 @@ pub(crate) fn closure_contract<'tcx>(
     ctx: &mut TranslationCtx<'tcx>,
     def_id: DefId,
 ) -> ClosureContract<'tcx> {
-    let TyKind::Closure(_, subst) = ctx.tcx.type_of(def_id).instantiate_identity().kind() else {
+    let TyKind::Closure(_, subst) = ctx.type_of(def_id).instantiate_identity().kind() else {
         unreachable!()
     };
 
@@ -535,7 +537,9 @@ pub(crate) fn closure_contract<'tcx>(
 
     post_sig.inputs.push((Symbol::intern("result"), DUMMY_SP, result_ty));
 
-    let env_ty = ctx.closure_env_ty(def_id, subst, ctx.lifetimes.re_erased).unwrap().peel_refs();
+    let env_ty = ctx
+        .closure_env_ty(ctx.type_of(def_id).instantiate_identity(), kind, ctx.lifetimes.re_erased)
+        .peel_refs();
     let self_ty = env_ty;
 
     let precond = {
@@ -702,7 +706,9 @@ pub(crate) fn closure_unnest<'tcx>(
     def_id: DefId,
     subst: GenericArgsRef<'tcx>,
 ) -> Term<'tcx> {
-    let env_ty = tcx.closure_env_ty(def_id, subst, tcx.lifetimes.re_erased).unwrap().peel_refs();
+    let ty = Ty::new_closure(tcx, def_id, subst);
+    let kind = subst.as_closure().kind();
+    let env_ty = tcx.closure_env_ty(ty, kind, tcx.lifetimes.re_erased).peel_refs();
 
     let self_ = Term::var(Symbol::intern("self"), env_ty);
 
diff --git a/creusot/src/translation/function/statement.rs b/creusot/src/translation/function/statement.rs
index ac596ec0a2..2e63fd0e54 100644
--- a/creusot/src/translation/function/statement.rs
+++ b/creusot/src/translation/function/statement.rs
@@ -34,7 +34,9 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
 
                 // if the lhs local becomes resolved during the assignment,
                 // we cannot resolve it afterwards.
-                if let Some(resolved_during) = &mut resolved_during && !pl.is_indirect() {
+                if let Some(resolved_during) = &mut resolved_during
+                    && !pl.is_indirect()
+                {
                     resolved_during.remove(pl.local);
                 }
             }
@@ -52,11 +54,10 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             }
             Deinit(_) => unreachable!("Deinit unsupported"),
             PlaceMention(_) => {}
-            ConstEvalCounter => {}
-            // No assembly!
-            // LlvmInlineAsm(_) => self
-            //     .ctx
-            //     .crash_and_error(statement.source_info.span, "inline assembly is not supported"),
+            ConstEvalCounter => {} // No assembly!
+                                   // LlvmInlineAsm(_) => self
+                                   //     .ctx
+                                   //     .crash_and_error(statement.source_info.span, "inline assembly is not supported"),
         }
 
         if let Some(resolved_during) = resolved_during {
@@ -85,7 +86,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 }
             },
             Rvalue::Ref(_, ss, pl) => match ss {
-                Shared | Shallow => {
+                Shared | Fake => {
                     if self.erased_locals.contains(pl.local) {
                         return;
                     }
@@ -172,7 +173,9 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             ),
 
             Rvalue::Cast(CastKind::PointerCoercion(PointerCoercion::Unsize), op, ty) => {
-                if let Some(t) = ty.builtin_deref(true) && t.ty.is_slice() {
+                if let Some(t) = ty.builtin_deref(true)
+                    && t.ty.is_slice()
+                {
                     // treat &[T; N] to &[T] casts as normal assignments
                     RValue::Operand(self.translate_operand(op))
                 } else {
diff --git a/creusot/src/translation/function/terminator.rs b/creusot/src/translation/function/terminator.rs
index d73786d91b..0cdb141f22 100644
--- a/creusot/src/translation/function/terminator.rs
+++ b/creusot/src/translation/function/terminator.rs
@@ -95,7 +95,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
                 }
 
                 let mut func_args: Vec<_> =
-                    args.iter().map(|arg| self.translate_operand(arg)).collect();
+                    args.iter().map(|arg| self.translate_operand(&arg.node)).collect();
 
                 if func_args.is_empty() {
                     // TODO: Remove this, push the 0-ary handling down to why3 backend
@@ -167,7 +167,7 @@ impl<'tcx> BodyTranslator<'_, 'tcx> {
             FalseUnwind { real_target, .. } => {
                 self.emit_terminator(mk_goto(*real_target));
             }
-            UnwindResume | Yield { .. } | GeneratorDrop | InlineAsm { .. } => {
+            CoroutineDrop | UnwindResume | Yield { .. } | InlineAsm { .. } => {
                 unreachable!("{:?}", terminator.kind)
             }
         }
diff --git a/creusot/src/translation/pearlite.rs b/creusot/src/translation/pearlite.rs
index 5b8dedb97d..be6d4558ff 100644
--- a/creusot/src/translation/pearlite.rs
+++ b/creusot/src/translation/pearlite.rs
@@ -368,21 +368,25 @@ impl<'a, 'tcx> ThirTerm<'a, 'tcx> {
             ExprKind::Literal { lit, neg } => {
                 let lit = match lit.node {
                     LitKind::Bool(b) => Literal::Bool(b),
-                    LitKind::Int(u, lty) => match lty {
-                        LitIntType::Signed(ity) => {
-                            let val = if neg { (u as i128).wrapping_neg() } else { u as i128 };
-                            Literal::MachSigned(val, int_ty(ity))
-                        }
-                        LitIntType::Unsigned(uty) => Literal::MachUnsigned(u, uint_ty(uty)),
-                        LitIntType::Unsuffixed => match ty.kind() {
-                            TyKind::Int(ity) => {
+                    LitKind::Int(u, lty) => {
+                        let u = u.get();
+                        match lty {
+                            LitIntType::Signed(ity) => {
                                 let val = if neg { (u as i128).wrapping_neg() } else { u as i128 };
-                                Literal::MachSigned(val, *ity)
+                                Literal::MachSigned(val, int_ty(ity))
                             }
-                            TyKind::Uint(uty) => Literal::MachUnsigned(u, *uty),
-                            _ => unreachable!(),
-                        },
-                    },
+                            LitIntType::Unsigned(uty) => Literal::MachUnsigned(u, uint_ty(uty)),
+                            LitIntType::Unsuffixed => match ty.kind() {
+                                TyKind::Int(ity) => {
+                                    let val =
+                                        if neg { (u as i128).wrapping_neg() } else { u as i128 };
+                                    Literal::MachSigned(val, *ity)
+                                }
+                                TyKind::Uint(uty) => Literal::MachUnsigned(u, *uty),
+                                _ => unreachable!(),
+                            },
+                        }
+                    }
                     _ => unimplemented!("Unsupported literal"),
                 };
                 Ok(Term { ty, span, kind: TermKind::Lit(lit) })
@@ -1607,7 +1611,7 @@ fn print_thir_expr<'tcx>(
         ExprKind::Borrow { borrow_kind, arg } => {
             match borrow_kind {
                 BorrowKind::Shared => write!(fmt, "& ")?,
-                BorrowKind::Shallow => write!(fmt, "&shallow ")?,
+                BorrowKind::Fake => write!(fmt, "&fake ")?,
                 BorrowKind::Mut { .. } => write!(fmt, "&mut ")?,
             };
 
diff --git a/creusot/src/translation/pearlite/normalize.rs b/creusot/src/translation/pearlite/normalize.rs
index d448bf1ba0..dcd2b0bcae 100644
--- a/creusot/src/translation/pearlite/normalize.rs
+++ b/creusot/src/translation/pearlite/normalize.rs
@@ -70,51 +70,115 @@ fn optimize_builtin<'tcx>(
     let builtin_attr = get_builtin(tcx, def_id);
 
     if builtin_attr == Some(Symbol::intern("add_int")) {
-        Some(TermKind::Binary { op: BinOp::Add, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Add,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("sub_int")) {
-        Some(TermKind::Binary { op: BinOp::Sub, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Sub,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("mul_int")) {
-        Some(TermKind::Binary { op: BinOp::Mul, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Mul,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("div_int")) {
-        Some(TermKind::Binary { op: BinOp::Div, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Div,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("rem_int")) {
-        Some(TermKind::Binary { op: BinOp::Rem, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Rem,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("neg_int")) {
         Some(TermKind::Unary { op: pearlite::UnOp::Neg, arg: Box::new(args.remove(0)) })
     } else if builtin_attr == Some(Symbol::intern("int.Int.(<=)")) {
-        Some(TermKind::Binary { op: BinOp::Le, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Le,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("int.Int.(<)")) {
-        Some(TermKind::Binary { op: BinOp::Lt, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Lt,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("int.Int.(>=)")) {
-        Some(TermKind::Binary { op: BinOp::Ge, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Ge,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("int.Int.(>)")) {
-        Some(TermKind::Binary { op: BinOp::Gt, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Gt,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("==")) {
-        Some(TermKind::Binary { op: BinOp::Eq, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
+        Some(TermKind::Binary {
+            op: BinOp::Eq,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
     } else if builtin_attr == Some(Symbol::intern("!=")) {
-        Some(TermKind::Binary { op: BinOp::Ne, lhs: Box::new(args.remove(0)), rhs: Box::new(args.remove(0)) })
-    } else if builtin_attr == Some(Symbol::intern("prelude.UInt8.to_int")) && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind {
+        Some(TermKind::Binary {
+            op: BinOp::Ne,
+            lhs: Box::new(args.remove(0)),
+            rhs: Box::new(args.remove(0)),
+        })
+    } else if builtin_attr == Some(Symbol::intern("prelude.UInt8.to_int"))
+        && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.UInt16.to_int")) && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.UInt16.to_int"))
+        && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.UInt32.to_int")) && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.UInt32.to_int"))
+        && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.UInt64.to_int")) && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.UInt64.to_int"))
+        && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.UInt128.to_int")) && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.UInt128.to_int"))
+        && let TermKind::Lit(Literal::MachUnsigned(c, _)) = args[0].kind
+    {
         if c > isize::MAX as u128 {
             panic!("integer constant too large")
         }
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.Int8.to_int")) && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.Int8.to_int"))
+        && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.Int16.to_int")) && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.Int16.to_int"))
+        && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.Int32.to_int")) && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.Int32.to_int"))
+        && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.Int64.to_int")) && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.Int64.to_int"))
+        && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
-    } else if builtin_attr == Some(Symbol::intern("prelude.Int128.to_int")) && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind {
+    } else if builtin_attr == Some(Symbol::intern("prelude.Int128.to_int"))
+        && let TermKind::Lit(Literal::MachSigned(c, _)) = args[0].kind
+    {
         Some(TermKind::Lit(Literal::Integer(c as i128)))
     } else if builtin_attr == Some(Symbol::intern("identity")) {
         Some(args.remove(0).kind)
diff --git a/creusot/src/translation/specification.rs b/creusot/src/translation/specification.rs
index b6c3427c8c..77324c8802 100644
--- a/creusot/src/translation/specification.rs
+++ b/creusot/src/translation/specification.rs
@@ -376,29 +376,24 @@ impl<'a, 'tcx> thir::visit::Visitor<'a, 'tcx> for PurityVisitor<'a, 'tcx> {
         self.thir
     }
 
-    fn visit_expr(&mut self, expr: &thir::Expr<'tcx>) {
+    fn visit_expr(&mut self, expr: &'a thir::Expr<'tcx>) {
         match expr.kind {
             ExprKind::Call { fun, .. } => {
                 if let &ty::FnDef(func_did, _) = self.thir[fun].ty.kind() {
                     let fn_purity = self.purity(fun, func_did);
                     if !self.context.can_call(fn_purity) && !is_overloaded_item(self.tcx, func_did)
                     {
-                        self.tcx.sess.span_err_with_code(
+                        let msg =
+                            format!("called {fn_purity:?} function in {:?} context", self.context);
+
+                        self.tcx.dcx().span_err(
                             self.thir[fun].span,
-                            format!(
-                                "called {fn_purity} function {:?} in {} context",
-                                self.tcx.def_path_str(func_did),
-                                self.context,
-                            ),
-                            rustc_errors::DiagnosticId::Error(String::from("creusot")),
+                            format!("{} {:?}", msg, self.tcx.def_path_str(func_did)),
                         );
                     }
                 } else if self.context != Purity::Program {
-                    self.tcx.sess.span_fatal_with_code(
-                        expr.span,
-                        "non function call in logical context",
-                        rustc_errors::DiagnosticId::Error(String::from("creusot")),
-                    )
+                    // TODO Add a "code" back in
+                    self.tcx.dcx().span_fatal(expr.span, "non function call in logical context")
                 }
             }
             ExprKind::Closure(box ClosureExpr { closure_id, .. }) => {
@@ -409,7 +404,7 @@ impl<'a, 'tcx> thir::visit::Visitor<'a, 'tcx> for PurityVisitor<'a, 'tcx> {
                 let (thir, expr) = self
                     .tcx
                     .thir_body(closure_id)
-                    .unwrap_or_else(|_| Error::from(CrErr).emit(self.tcx.sess));
+                    .unwrap_or_else(|_| Error::from(CrErr).emit(self.tcx));
                 let thir = thir.borrow();
 
                 thir::visit::walk_expr(
diff --git a/creusot/src/translation/traits.rs b/creusot/src/translation/traits.rs
index 2b542893cf..4804ddaeb8 100644
--- a/creusot/src/translation/traits.rs
+++ b/creusot/src/translation/traits.rs
@@ -316,9 +316,12 @@ pub(crate) fn still_specializable<'tcx>(
     substs: GenericArgsRef<'tcx>,
 ) -> bool {
     if let Some(trait_id) = tcx.trait_of_item(def_id) {
-        let is_final = if let Some(ImplSource::UserDefined(ud)) = resolve_impl_source_opt(tcx, param_env, def_id, substs) {
-            let trait_def =  tcx.trait_def(trait_id);
-            let leaf = trait_def.ancestors(tcx, ud.impl_def_id).unwrap().leaf_def(tcx, def_id).unwrap();
+        let is_final = if let Some(ImplSource::UserDefined(ud)) =
+            resolve_impl_source_opt(tcx, param_env, def_id, substs)
+        {
+            let trait_def = tcx.trait_def(trait_id);
+            let leaf =
+                trait_def.ancestors(tcx, ud.impl_def_id).unwrap().leaf_def(tcx, def_id).unwrap();
 
             leaf.is_final()
         } else {
@@ -327,7 +330,9 @@ pub(crate) fn still_specializable<'tcx>(
 
         let trait_generics = substs.truncate_to(tcx, tcx.generics_of(trait_id));
         !is_final && trait_generics.still_further_specializable()
-    } else if let Some(impl_id) = tcx.impl_of_method(def_id) && tcx.trait_id_of_impl(impl_id).is_some() {
+    } else if let Some(impl_id) = tcx.impl_of_method(def_id)
+        && tcx.trait_id_of_impl(impl_id).is_some()
+    {
         let is_final = tcx.defaultness(def_id).is_final();
         let trait_ref = tcx.impl_trait_ref(impl_id).unwrap();
         !is_final && trait_ref.instantiate(tcx, substs).still_further_specializable()
diff --git a/creusot/src/util.rs b/creusot/src/util.rs
index 808a5dad66..7f073a2bf6 100644
--- a/creusot/src/util.rs
+++ b/creusot/src/util.rs
@@ -67,7 +67,9 @@ pub(crate) fn is_snapshot_closure(tcx: TyCtxt, def_id: DefId) -> bool {
 }
 
 pub(crate) fn snapshot_closure_id<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<DefId> {
-    if let TyKind::Closure(def_id, _) = ty.peel_refs().kind() && is_snapshot_closure(tcx, *def_id) {
+    if let TyKind::Closure(def_id, _) = ty.peel_refs().kind()
+        && is_snapshot_closure(tcx, *def_id)
+    {
         Some(*def_id)
     } else {
         None
@@ -151,7 +153,7 @@ pub(crate) fn why3_attrs(tcx: TyCtxt, def_id: DefId) -> Vec<why3::declaration::A
 }
 
 pub(crate) fn param_def_id(tcx: TyCtxt, def_id: LocalDefId) -> LocalDefId {
-    if is_spec(tcx, def_id.to_def_id()) && tcx.is_closure(def_id.to_def_id()) {
+    if is_spec(tcx, def_id.to_def_id()) && tcx.is_closure_or_coroutine(def_id.to_def_id()) {
         tcx.parent(def_id.to_def_id()).expect_local()
     } else {
         def_id
@@ -164,7 +166,7 @@ pub(crate) fn should_translate(tcx: TyCtxt, mut def_id: DefId) -> bool {
             return false;
         }
 
-        if tcx.is_closure(def_id) {
+        if tcx.is_closure_or_coroutine(def_id) {
             def_id = tcx.parent(def_id);
         } else {
             return true;
@@ -389,9 +391,8 @@ pub(crate) fn inputs_and_output<'tcx>(
     tcx: TyCtxt<'tcx>,
     def_id: DefId,
 ) -> (impl Iterator<Item = (symbol::Ident, Ty<'tcx>)>, Ty<'tcx>) {
-    let (inputs, output): (Box<dyn Iterator<Item = (rustc_span::symbol::Ident, _)>>, _) = match tcx
-        .type_of(def_id)
-        .instantiate_identity()
+    let ty = tcx.type_of(def_id).instantiate_identity();
+    let (inputs, output): (Box<dyn Iterator<Item = (rustc_span::symbol::Ident, _)>>, _) = match ty
         .kind()
     {
         TyKind::FnDef(..) => {
@@ -403,7 +404,7 @@ pub(crate) fn inputs_and_output<'tcx>(
         TyKind::Closure(_, subst) => {
             let sig = tcx.signature_unclosure(subst.as_closure().sig(), Unsafety::Normal);
             let sig = tcx.normalize_erasing_late_bound_regions(tcx.param_env(def_id), sig);
-            let env_ty = tcx.closure_env_ty(def_id, subst, tcx.lifetimes.re_erased).unwrap();
+            let env_ty = tcx.closure_env_ty(ty, subst.as_closure().kind(), tcx.lifetimes.re_erased);
 
             // I wish this could be called "self"
             let closure_env = (symbol::Ident::empty(), env_ty);
@@ -454,12 +455,16 @@ pub(crate) fn pre_sig_of<'tcx>(
         });
     }
 
-    if let TyKind::Closure(_, subst) = ctx.tcx.type_of(def_id).instantiate_identity().kind() {
+    let fn_ty = ctx.tcx.type_of(def_id).instantiate_identity();
+
+    if let TyKind::Closure(_, subst) = fn_ty.kind() {
         let self_ = Symbol::intern("_1");
         let mut pre_subst = closure_capture_subst(ctx.tcx, def_id, subst, None, self_);
 
         let mut s = HashMap::new();
-        let env_ty = ctx.closure_env_ty(def_id, subst, ctx.lifetimes.re_erased).unwrap();
+        let kind = subst.as_closure().kind();
+
+        let env_ty = ctx.closure_env_ty(fn_ty, kind, ctx.lifetimes.re_erased);
         s.insert(
             self_,
             if env_ty.is_ref() { Term::var(self_, env_ty).cur() } else { Term::var(self_, env_ty) },
@@ -470,8 +475,6 @@ pub(crate) fn pre_sig_of<'tcx>(
             pre.subst(&s);
         }
 
-        let kind = subst.as_closure().kind();
-
         if kind == ClosureKind::FnMut {
             let args = subst.as_closure().sig().inputs().skip_binder()[0];
             let unnest_subst =
@@ -749,7 +752,7 @@ pub(crate) fn closure_capture_subst<'tcx>(
     self_name: Symbol,
 ) -> ClosureSubst<'tcx> {
     let mut fun_def_id = def_id;
-    while tcx.is_closure(fun_def_id) {
+    while tcx.is_closure_or_coroutine(fun_def_id) {
         fun_def_id = tcx.parent(fun_def_id);
     }
 

From a257e10bbe8e5bcd4b583dcf163ab2c200a769da Mon Sep 17 00:00:00 2001
From: Xavier Denis <xldenis@gmail.com>
Date: Tue, 12 Mar 2024 13:05:06 +0100
Subject: [PATCH 66/66] update sessions

---
 creusot-contracts/src/lib.rs                  |   9 +-
 creusot-contracts/src/logic/int.rs            |   1 +
 creusot/src/callbacks.rs                      |   2 +-
 creusot/src/cleanup_spec_closures.rs          |   3 +-
 creusot/src/translation/fmir.rs               |   2 -
 creusot/tests/should_fail/array.stderr        |   2 +-
 creusot/tests/should_fail/bad_borrow.stderr   |   2 +-
 creusot/tests/should_fail/bad_law.stderr      |   4 +-
 .../bug/01_resolve_unsoundness.mlcfg          |  10 +-
 creusot/tests/should_fail/bug/211.stderr      |  10 +-
 creusot/tests/should_fail/bug/436_0.stderr    |   4 +-
 creusot/tests/should_fail/bug/436_1.stderr    |   4 +-
 creusot/tests/should_fail/bug/436_2.stderr    |   4 +-
 creusot/tests/should_fail/bug/603.stderr      |   2 +-
 .../should_fail/bug/borrowed_ghost.stderr     |   4 +-
 .../tests/should_fail/bug/specialize.mlcfg    |  10 +-
 .../should_fail/builtin_with_contract.stderr  |   4 +-
 creusot/tests/should_fail/cycle.stderr        |   4 +-
 .../tests/should_fail/ghost_mapping.stderr    |   4 +-
 .../tests/should_fail/impure_functions.stderr |   4 +-
 .../should_fail/inexhaustive_match.stderr     |   8 +-
 .../tests/should_fail/infinite_size.stderr    |   2 +-
 .../should_fail/logic_prophetic_impl.stderr   |   4 +-
 .../should_fail/non_bool_assertion.stderr     |   2 +-
 creusot/tests/should_fail/opaque.stderr       |   4 +-
 creusot/tests/should_fail/result_param.stderr |   4 +-
 .../trait_item_types_mismatch.stderr          |   4 +-
 creusot/tests/should_fail/unsafe.stderr       |   4 +-
 .../unsupported_binary_operations.stderr      |   4 +-
 creusot/tests/should_succeed/100doors.mlcfg   |  10 +-
 .../should_succeed/100doors/why3session.xml   |   2 +-
 .../should_succeed/100doors/why3shapes.gz     | Bin 589 -> 591 bytes
 creusot/tests/should_succeed/bdd.mlcfg        | 180 ++++++-----
 .../tests/should_succeed/bdd/why3session.xml  | 180 +++++------
 .../tests/should_succeed/bdd/why3shapes.gz    | Bin 14576 -> 14633 bytes
 creusot/tests/should_succeed/bug/206.mlcfg    |  10 +-
 .../should_succeed/bug/206/why3session.xml    |   2 +-
 .../should_succeed/bug/206/why3shapes.gz      | Bin 211 -> 215 bytes
 creusot/tests/should_succeed/bug/256.mlcfg    |  10 +-
 creusot/tests/should_succeed/bug/594.rs       |   2 +-
 creusot/tests/should_succeed/bug/874.mlcfg    |  12 +-
 .../should_succeed/bug/874/why3session.xml    |   2 +-
 .../should_succeed/bug/874/why3shapes.gz      | Bin 532 -> 530 bytes
 .../tests/should_succeed/bug/two_phase.mlcfg  |  10 +-
 .../bug/two_phase/why3session.xml             |   2 +-
 .../bug/two_phase/why3shapes.gz               | Bin 296 -> 296 bytes
 creusot/tests/should_succeed/cell/02.mlcfg    |  10 +-
 .../should_succeed/cell/02/why3shapes.gz      | Bin 2158 -> 2153 bytes
 .../should_succeed/closures/05_map.mlcfg      |   4 +-
 .../should_succeed/filter_positive.mlcfg      |  10 +-
 .../filter_positive/why3session.xml           |   2 +-
 .../filter_positive/why3shapes.gz             | Bin 886 -> 885 bytes
 creusot/tests/should_succeed/hashmap.mlcfg    |  10 +-
 .../should_succeed/hashmap/why3session.xml    |  62 ++--
 .../should_succeed/hashmap/why3shapes.gz      | Bin 10206 -> 10191 bytes
 .../should_succeed/heapsort_generic.mlcfg     |  10 +-
 .../heapsort_generic/why3session.xml          |  78 ++---
 .../heapsort_generic/why3shapes.gz            | Bin 9128 -> 9130 bytes
 creusot/tests/should_succeed/hillel.mlcfg     |  56 ++--
 .../should_succeed/hillel/why3session.xml     |  26 +-
 .../tests/should_succeed/hillel/why3shapes.gz | Bin 7359 -> 7552 bytes
 .../tests/should_succeed/index_range.mlcfg    |  10 +-
 .../index_range/why3session.xml               |  40 +--
 .../should_succeed/index_range/why3shapes.gz  | Bin 4417 -> 4419 bytes
 creusot/tests/should_succeed/instant.mlcfg    |  20 +-
 .../should_succeed/invariant_moves.mlcfg      |  10 +-
 .../should_succeed/iterators/01_range.mlcfg   |  54 ++--
 .../iterators/01_range/why3session.xml        |   8 +-
 .../iterators/01_range/why3shapes.gz          | Bin 962 -> 961 bytes
 .../iterators/02_iter_mut.mlcfg               |  10 +-
 .../iterators/02_iter_mut/why3session.xml     |   8 +-
 .../iterators/02_iter_mut/why3shapes.gz       | Bin 3545 -> 3539 bytes
 .../iterators/03_std_iterators.mlcfg          |  14 +-
 .../03_std_iterators/why3session.xml          |  12 +-
 .../iterators/03_std_iterators/why3shapes.gz  | Bin 6586 -> 6586 bytes
 .../should_succeed/iterators/04_skip.mlcfg    |  88 +++---
 .../iterators/04_skip/why3session.xml         |   8 +-
 .../iterators/04_skip/why3shapes.gz           | Bin 1068 -> 1069 bytes
 .../should_succeed/iterators/05_map.mlcfg     | 170 +++++------
 .../iterators/05_map/why3session.xml          |   6 +-
 .../iterators/05_map/why3shapes.gz            | Bin 5486 -> 5489 bytes
 .../iterators/06_map_precond.mlcfg            | 186 ++++++------
 .../iterators/06_map_precond/why3session.xml  |   8 +-
 .../iterators/06_map_precond/why3shapes.gz    | Bin 8887 -> 8881 bytes
 .../should_succeed/iterators/07_fuse.mlcfg    |   8 +-
 .../iterators/08_collect_extend.mlcfg         |  20 +-
 .../08_collect_extend/why3session.xml         |   8 +-
 .../iterators/08_collect_extend/why3shapes.gz | Bin 3719 -> 3713 bytes
 .../should_succeed/iterators/09_empty.mlcfg   |  52 ++--
 .../iterators/09_empty/why3session.xml        |   6 +-
 .../iterators/09_empty/why3shapes.gz          | Bin 449 -> 449 bytes
 .../should_succeed/iterators/10_once.mlcfg    |  56 ++--
 .../iterators/10_once/why3session.xml         |   4 +-
 .../iterators/10_once/why3shapes.gz           | Bin 624 -> 626 bytes
 .../should_succeed/iterators/11_repeat.mlcfg  |   8 +-
 .../should_succeed/iterators/12_zip.mlcfg     |  56 ++--
 .../should_succeed/iterators/13_cloned.mlcfg  |   6 +-
 .../should_succeed/iterators/14_copied.mlcfg  |   8 +-
 .../iterators/15_enumerate.mlcfg              |   4 +-
 creusot/tests/should_succeed/knapsack.mlcfg   |  10 +-
 .../should_succeed/knapsack/why3session.xml   |  16 +-
 .../should_succeed/knapsack/why3shapes.gz     | Bin 5320 -> 5311 bytes
 .../tests/should_succeed/knapsack_full.mlcfg  | 284 +++++++++---------
 .../knapsack_full/why3session.xml             | 104 +++----
 .../knapsack_full/why3shapes.gz               | Bin 8457 -> 8525 bytes
 .../tests/should_succeed/lang/module_paths.rs |   8 +-
 .../lang/promoted_constants.mlcfg             |  10 +-
 .../should_succeed/list_reversal_lasso.mlcfg  |  10 +-
 .../list_reversal_lasso/why3session.xml       | 187 ++++++------
 .../list_reversal_lasso/why3shapes.gz         | Bin 12978 -> 13218 bytes
 creusot/tests/should_succeed/match_int.mlcfg  |  36 +--
 .../tests/should_succeed/red_black_tree.mlcfg |  21 ++
 .../selection_sort_generic.mlcfg              |  68 +++--
 .../selection_sort_generic/why3session.xml    |  26 +-
 .../selection_sort_generic/why3shapes.gz      | Bin 4088 -> 4100 bytes
 .../tests/should_succeed/sparse_array.mlcfg   |  10 +-
 .../sparse_array/why3session.xml              |  76 ++---
 .../should_succeed/sparse_array/why3shapes.gz | Bin 4244 -> 4250 bytes
 creusot/tests/should_succeed/std_types.rs     |   2 +-
 .../should_succeed/syntax/05_pearlite.mlcfg   |  10 +-
 .../should_succeed/syntax/12_ghost_code.mlcfg |  10 +-
 .../syntax/12_ghost_code/why3shapes.gz        | Bin 362 -> 363 bytes
 .../should_succeed/syntax/13_vec_macro.mlcfg  |  10 +-
 .../syntax/13_vec_macro/why3shapes.gz         | Bin 381 -> 381 bytes
 .../should_succeed/syntax/derive_macros.mlcfg |  10 +-
 .../tests/should_succeed/take_first_mut.mlcfg |   4 +-
 .../traits/16_impl_cloning.mlcfg              |  10 +-
 .../should_succeed/traits/16_impl_cloning.rs  |   2 +-
 .../traits/16_impl_cloning/why3shapes.gz      | Bin 151 -> 150 bytes
 .../type_invariants/vec_inv.mlcfg             |  10 +-
 .../type_invariants/vec_inv/why3shapes.gz     | Bin 354 -> 355 bytes
 creusot/tests/should_succeed/vecdeque.mlcfg   |  10 +-
 .../should_succeed/vecdeque/why3session.xml   |   8 +-
 .../should_succeed/vecdeque/why3shapes.gz     | Bin 2260 -> 2261 bytes
 creusot/tests/should_succeed/vector/01.mlcfg  |  10 +-
 .../should_succeed/vector/01/why3session.xml  |   2 +-
 .../should_succeed/vector/01/why3shapes.gz    | Bin 648 -> 647 bytes
 .../should_succeed/vector/02_gnome.mlcfg      |  10 +-
 .../vector/02_gnome/why3session.xml           |   8 +-
 .../vector/02_gnome/why3shapes.gz             | Bin 2635 -> 2640 bytes
 .../vector/03_knuth_shuffle.mlcfg             |  10 +-
 .../vector/03_knuth_shuffle/why3session.xml   |   2 +-
 .../vector/03_knuth_shuffle/why3shapes.gz     | Bin 651 -> 650 bytes
 .../vector/04_binary_search.mlcfg             |  10 +-
 .../vector/04_binary_search/why3session.xml   |   2 +-
 .../vector/04_binary_search/why3shapes.gz     | Bin 467 -> 466 bytes
 .../vector/05_binary_search_generic.mlcfg     |  92 +++---
 .../05_binary_search_generic/why3session.xml  |   6 +-
 .../05_binary_search_generic/why3shapes.gz    | Bin 2603 -> 2600 bytes
 .../vector/06_knights_tour.mlcfg              | 143 ++++-----
 .../vector/06_knights_tour/why3session.xml    |  60 ++--
 .../vector/06_knights_tour/why3shapes.gz      | Bin 11308 -> 11308 bytes
 .../should_succeed/vector/07_read_write.mlcfg |  10 +-
 .../vector/07_read_write/why3session.xml      |   2 +-
 .../vector/07_read_write/why3shapes.gz        | Bin 480 -> 479 bytes
 .../should_succeed/vector/08_haystack.mlcfg   |  52 ++--
 .../vector/08_haystack/why3session.xml        |  30 +-
 .../vector/08_haystack/why3shapes.gz          | Bin 2920 -> 2916 bytes
 .../should_succeed/vector/09_capacity.mlcfg   |  10 +-
 .../vector/09_capacity/why3shapes.gz          | Bin 456 -> 457 bytes
 160 files changed, 1686 insertions(+), 1428 deletions(-)

diff --git a/creusot-contracts/src/lib.rs b/creusot-contracts/src/lib.rs
index ab030ea0a9..706e81a27e 100644
--- a/creusot-contracts/src/lib.rs
+++ b/creusot-contracts/src/lib.rs
@@ -203,7 +203,9 @@ mod macros {
     /// This means you cannot `#[open]` a body which refers to a `pub(crate)` symbol.
     pub use creusot_contracts_dummy::open;
 
-    pub use creusot_contracts_proc::Resolve;
+    pub use creusot_contracts_dummy::DeepModel;
+
+    pub use creusot_contracts_dummy::Resolve;
 }
 
 #[cfg(creusot)]
@@ -249,7 +251,6 @@ pub mod resolve;
 pub mod util;
 pub mod well_founded;
 
-pub use macros::*;
 // We add some common things at the root of the creusot-contracts library
 pub use crate::{
     logic::{IndexLogic as _, Int, OrdLogic, Seq},
@@ -296,7 +297,3 @@ macro_rules! vec {
     );
     ($($x:expr,)*) => (vec![$($x),*])
 }
-
-// #[logic]
-// #[open]
-// pub fn foo() -> bool { true }
diff --git a/creusot-contracts/src/logic/int.rs b/creusot-contracts/src/logic/int.rs
index 1a7725f5f7..4f429865ae 100644
--- a/creusot-contracts/src/logic/int.rs
+++ b/creusot-contracts/src/logic/int.rs
@@ -4,6 +4,7 @@ use crate::{
 };
 
 #[cfg_attr(creusot, rustc_diagnostic_item = "creusot_int", creusot::builtins = "prelude.Int.int")]
+#[allow(dead_code)]
 pub struct Int(*mut ());
 
 impl Int {
diff --git a/creusot/src/callbacks.rs b/creusot/src/callbacks.rs
index 9a87179901..614cd3800e 100644
--- a/creusot/src/callbacks.rs
+++ b/creusot/src/callbacks.rs
@@ -2,7 +2,7 @@ use rustc_borrowck::consumers::{BodyWithBorrowckFacts, ConsumerOptions};
 use rustc_driver::{Callbacks, Compilation};
 use rustc_hir::def_id::LocalDefId;
 use rustc_interface::{interface::Compiler, Config, Queries};
-use rustc_middle::{mir::dump_mir, ty::TyCtxt};
+use rustc_middle::ty::TyCtxt;
 
 use std::{cell::RefCell, collections::HashMap, thread_local};
 
diff --git a/creusot/src/cleanup_spec_closures.rs b/creusot/src/cleanup_spec_closures.rs
index a62ca9b0bf..9704dd1adc 100644
--- a/creusot/src/cleanup_spec_closures.rs
+++ b/creusot/src/cleanup_spec_closures.rs
@@ -159,7 +159,8 @@ pub fn remove_ghost_closures<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
             let Rvalue::Aggregate(box AggregateKind::Closure(def_id, _), _) = rhs else {
                 return;
             };
-            if util::is_no_translate(self.tcx, *def_id) || util::is_snapshot_closure(self.tcx, *def_id)
+            if util::is_no_translate(self.tcx, *def_id)
+                || util::is_snapshot_closure(self.tcx, *def_id)
             {
                 statement.kind = StatementKind::Nop
             }
diff --git a/creusot/src/translation/fmir.rs b/creusot/src/translation/fmir.rs
index a8d2c171c0..e532e5816f 100644
--- a/creusot/src/translation/fmir.rs
+++ b/creusot/src/translation/fmir.rs
@@ -8,8 +8,6 @@ use rustc_middle::{
 use rustc_span::{Span, Symbol};
 use rustc_target::abi::VariantIdx;
 
-pub use rustc_span::DUMMY_SP;
-
 #[derive(Clone, Debug)]
 pub struct Place<'tcx> {
     pub(crate) local: Symbol,
diff --git a/creusot/tests/should_fail/array.stderr b/creusot/tests/should_fail/array.stderr
index 6804624112..b46b252be3 100644
--- a/creusot/tests/should_fail/array.stderr
+++ b/creusot/tests/should_fail/array.stderr
@@ -10,7 +10,7 @@ error: Unsupported expression: Repeat
 13 | #[requires([0; 4] == x)]
    |            ^^^^^^
 
-error[creusot]: internal error
+error: internal error
 
 error: aborting due to 3 previous errors
 
diff --git a/creusot/tests/should_fail/bad_borrow.stderr b/creusot/tests/should_fail/bad_borrow.stderr
index 3463a35020..d56cfd433b 100644
--- a/creusot/tests/should_fail/bad_borrow.stderr
+++ b/creusot/tests/should_fail/bad_borrow.stderr
@@ -9,6 +9,6 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
 6 |     *a += *b;
   |     -------- first borrow later used here
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0499`.
diff --git a/creusot/tests/should_fail/bad_law.stderr b/creusot/tests/should_fail/bad_law.stderr
index 0c45878833..8d2e34c4cf 100644
--- a/creusot/tests/should_fail/bad_law.stderr
+++ b/creusot/tests/should_fail/bad_law.stderr
@@ -1,10 +1,10 @@
-error[creusot]: Laws cannot have additional generic parameters
+error: Laws cannot have additional generic parameters
  --> bad_law.rs:6:5
   |
 6 |     fn my_law<T>(x: T);
   |     ^^^^^^^^^^^^^^^^^^^
 
-error[creusot]: Expected `my_law` to be a logic function as specified by the trait declaration
+error: Expected `my_law` to be a logic function as specified by the trait declaration
   --> bad_law.rs:10:5
    |
 10 |     fn my_law<T>(_: T) {}
diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
index 3d790278c7..7562cdd61a 100644
--- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
+++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_fail/bug/211.stderr b/creusot/tests/should_fail/bug/211.stderr
index 3173bdfbd4..bbe3474416 100644
--- a/creusot/tests/should_fail/bug/211.stderr
+++ b/creusot/tests/should_fail/bug/211.stderr
@@ -5,15 +5,15 @@ error[E0004]: non-exhaustive patterns: `E::B` and `E::C` not covered
    |           ^^^ patterns `E::B` and `E::C` not covered
    |
 note: `E` defined here
-  --> 211.rs:3:5
+  --> 211.rs:1:10
    |
 1  | pub enum E {
-   |          -
+   |          ^
 2  |     A,
 3  |     B,
-   |     ^ not covered
+   |     - not covered
 4  |     C,
-   |     ^ not covered
+   |     - not covered
    = note: the matched value is of type `E`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
    |
@@ -21,6 +21,6 @@ help: ensure that all possible cases are being handled by adding a match arm wit
 12 +         E::B | E::C => todo!()
    |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0004`.
diff --git a/creusot/tests/should_fail/bug/436_0.stderr b/creusot/tests/should_fail/bug/436_0.stderr
index 4154f9c419..e8c45c99db 100644
--- a/creusot/tests/should_fail/bug/436_0.stderr
+++ b/creusot/tests/should_fail/bug/436_0.stderr
@@ -1,8 +1,8 @@
-error[creusot]: called prophetic logic function "prophecy" in logic context
+error: called Logic { prophetic: true } function in Logic { prophetic: false } context "prophecy"
   --> 436_0.rs:15:23
    |
 15 |     b.g = snapshot! { prophecy(b) + 1i32 };
    |                       ^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/bug/436_1.stderr b/creusot/tests/should_fail/bug/436_1.stderr
index dec51b306a..c8282c215d 100644
--- a/creusot/tests/should_fail/bug/436_1.stderr
+++ b/creusot/tests/should_fail/bug/436_1.stderr
@@ -1,4 +1,4 @@
-error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
+error: called Logic { prophetic: true } function in Logic { prophetic: false } context "creusot_contracts::__stubs::fin"
   --> 436_1.rs:10:5
    |
 10 |     pearlite! { *(^x).g }
@@ -6,5 +6,5 @@ error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin
    |
    = note: this error originates in the macro `pearlite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/bug/436_2.stderr b/creusot/tests/should_fail/bug/436_2.stderr
index 5a34046556..66e06a655c 100644
--- a/creusot/tests/should_fail/bug/436_2.stderr
+++ b/creusot/tests/should_fail/bug/436_2.stderr
@@ -1,8 +1,8 @@
-error[creusot]: Illegal use of the Snapshot type
+error: Illegal use of the Snapshot type
  --> 436_2.rs:6:10
   |
 6 |     Some(Snapshot<&'a mut Bad<'a>>),
   |          ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/bug/603.stderr b/creusot/tests/should_fail/bug/603.stderr
index 4cccc5e979..3e096228fa 100644
--- a/creusot/tests/should_fail/bug/603.stderr
+++ b/creusot/tests/should_fail/bug/603.stderr
@@ -15,7 +15,7 @@ error[E0277]: the trait bound `VecMap<K, V>: creusot_contracts::Default` is not
              usize
            and 22 others
 
-error[creusot]: error above
+error: error above
 
 error: aborting due to 2 previous errors
 
diff --git a/creusot/tests/should_fail/bug/borrowed_ghost.stderr b/creusot/tests/should_fail/bug/borrowed_ghost.stderr
index b2d362a0b3..76c6baf1ba 100644
--- a/creusot/tests/should_fail/bug/borrowed_ghost.stderr
+++ b/creusot/tests/should_fail/bug/borrowed_ghost.stderr
@@ -1,4 +1,4 @@
-error[creusot]: Use of borrowed variable x
+error: Use of borrowed variable x
  --> borrowed_ghost.rs:7:10
   |
 7 |     *r = snapshot! { !x.inner() }; // r = (snapshot (not (inner x)), x)
@@ -6,5 +6,5 @@ error[creusot]: Use of borrowed variable x
   |
   = note: this error originates in the macro `snapshot` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg
index 587f7d4083..78320ebb89 100644
--- a/creusot/tests/should_fail/bug/specialize.mlcfg
+++ b/creusot/tests/should_fail/bug/specialize.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_fail/builtin_with_contract.stderr b/creusot/tests/should_fail/builtin_with_contract.stderr
index 58eef5563c..6f21779170 100644
--- a/creusot/tests/should_fail/builtin_with_contract.stderr
+++ b/creusot/tests/should_fail/builtin_with_contract.stderr
@@ -6,11 +6,11 @@ warning: function `builtin_with_contract` is never used
   |
   = note: `#[warn(dead_code)]` on by default
 
-error[creusot]: cannot specify both `creusot::builtins` and a contract on the same definition
+error: cannot specify both `creusot::builtins` and a contract on the same definition
  --> builtin_with_contract.rs:7:1
   |
 7 | fn builtin_with_contract() {}
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/creusot/tests/should_fail/cycle.stderr b/creusot/tests/should_fail/cycle.stderr
index 35e423641e..fe70dfa749 100644
--- a/creusot/tests/should_fail/cycle.stderr
+++ b/creusot/tests/should_fail/cycle.stderr
@@ -6,11 +6,11 @@ warning: unused import: `creusot_contracts::*`
   |
   = note: `#[warn(unused_imports)]` on by default
 
-error[creusot]: encountered a cycle during translation: [{Item(DefId(0:5 ~ cycle[fa28]::f))}, {Item(DefId(0:6 ~ cycle[fa28]::g))}, {Item(DefId(0:5 ~ cycle[fa28]::f))}]
+error: encountered a cycle during translation: [{Item(DefId(0:5 ~ cycle[4e30]::f))}, {Item(DefId(0:6 ~ cycle[4e30]::g))}, {Item(DefId(0:5 ~ cycle[4e30]::f))}]
  --> cycle.rs:4:1
   |
 4 | pub fn f() {
   | ^^^^^^^^^^
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/creusot/tests/should_fail/ghost_mapping.stderr b/creusot/tests/should_fail/ghost_mapping.stderr
index 0a40ed1ca5..7ca25d53d6 100644
--- a/creusot/tests/should_fail/ghost_mapping.stderr
+++ b/creusot/tests/should_fail/ghost_mapping.stderr
@@ -1,4 +1,4 @@
-error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
+error: called Logic { prophetic: true } function in Logic { prophetic: false } context "creusot_contracts::__stubs::fin"
   --> ghost_mapping.rs:11:5
    |
 11 |     pearlite! { |_| ^x }
@@ -6,7 +6,7 @@ error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin
    |
    = note: this error originates in the macro `pearlite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[creusot]: called prophetic logic function "creusot_contracts::__stubs::fin" in logic context
+error: called Logic { prophetic: true } function in Logic { prophetic: false } context "creusot_contracts::__stubs::fin"
   --> ghost_mapping.rs:21:5
    |
 21 |     pearlite! { forall<_x:Int> ^y == 1i32 }
diff --git a/creusot/tests/should_fail/impure_functions.stderr b/creusot/tests/should_fail/impure_functions.stderr
index 51ca718af7..c721f9399a 100644
--- a/creusot/tests/should_fail/impure_functions.stderr
+++ b/creusot/tests/should_fail/impure_functions.stderr
@@ -1,10 +1,10 @@
-error[creusot]: called program function "std::vec::Vec::<T, A>::len" in logic context
+error: called Program function in Logic { prophetic: false } context "std::vec::Vec::<T, A>::len"
  --> impure_functions.rs:6:19
   |
 6 |     pearlite! { v.len()@ }
   |                   ^^^
 
-error[creusot]: called logic function "x" in program context
+error: called Logic { prophetic: false } function in Program context "x"
   --> impure_functions.rs:10:13
    |
 10 |     let _ = x(&Vec::<()>::new());
diff --git a/creusot/tests/should_fail/inexhaustive_match.stderr b/creusot/tests/should_fail/inexhaustive_match.stderr
index 3bc07f1411..e8100ecbd2 100644
--- a/creusot/tests/should_fail/inexhaustive_match.stderr
+++ b/creusot/tests/should_fail/inexhaustive_match.stderr
@@ -5,12 +5,12 @@ error[E0004]: non-exhaustive patterns: `Option::Some(_)` not covered
   |           ^ pattern `Option::Some(_)` not covered
   |
 note: `Option<()>` defined here
- --> inexhaustive_match.rs:2:5
+ --> inexhaustive_match.rs:1:6
   |
 1 | enum Option<T> {
-  |      ------
+  |      ^^^^^^
 2 |     Some(T),
-  |     ^^^^ not covered
+  |     ---- not covered
   = note: the matched value is of type `Option<()>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
   |
@@ -18,6 +18,6 @@ help: ensure that all possible cases are being handled by adding a match arm wit
 10~         Option::Some(_) => todo!(),
   |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0004`.
diff --git a/creusot/tests/should_fail/infinite_size.stderr b/creusot/tests/should_fail/infinite_size.stderr
index d364f2e341..c9387c6d49 100644
--- a/creusot/tests/should_fail/infinite_size.stderr
+++ b/creusot/tests/should_fail/infinite_size.stderr
@@ -12,6 +12,6 @@ help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle
 2 ~ struct Tree2(Box<Node2>);
   |
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0072`.
diff --git a/creusot/tests/should_fail/logic_prophetic_impl.stderr b/creusot/tests/should_fail/logic_prophetic_impl.stderr
index 6043a836f7..402d6fba87 100644
--- a/creusot/tests/should_fail/logic_prophetic_impl.stderr
+++ b/creusot/tests/should_fail/logic_prophetic_impl.stderr
@@ -1,8 +1,8 @@
-error[creusot]: Expected `f` to be a logic function as specified by the trait declaration
+error: Expected `f` to be a logic function as specified by the trait declaration
   --> logic_prophetic_impl.rs:11:5
    |
 11 |     fn f() {
    |     ^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/non_bool_assertion.stderr b/creusot/tests/should_fail/non_bool_assertion.stderr
index a4a3e57609..dd767348d8 100644
--- a/creusot/tests/should_fail/non_bool_assertion.stderr
+++ b/creusot/tests/should_fail/non_bool_assertion.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 5 |     proof_assert! { 1 };
   |                     ^ expected `bool`, found `Int`
 
-error[creusot]: internal error
+error: internal error
 
 error: aborting due to 2 previous errors
 
diff --git a/creusot/tests/should_fail/opaque.stderr b/creusot/tests/should_fail/opaque.stderr
index bf7c194d19..a8859efbec 100644
--- a/creusot/tests/should_fail/opaque.stderr
+++ b/creusot/tests/should_fail/opaque.stderr
@@ -1,8 +1,8 @@
-error[creusot]: Cannot make `"x::priv_symbol"` transparent in `"x::bad"` as it would call a less-visible item.
+error: Cannot make `"x::priv_symbol"` transparent in `"x::bad"` as it would call a less-visible item.
   --> opaque.rs:17:9
    |
 17 |         priv_symbol()
    |         ^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 
diff --git a/creusot/tests/should_fail/result_param.stderr b/creusot/tests/should_fail/result_param.stderr
index 823425bfaa..be444a0e04 100644
--- a/creusot/tests/should_fail/result_param.stderr
+++ b/creusot/tests/should_fail/result_param.stderr
@@ -6,11 +6,11 @@ warning: function `result_arg` is never used
   |
   = note: `#[warn(dead_code)]` on by default
 
-error[creusot]: `result` is not allowed as a parameter name
+error: `result` is not allowed as a parameter name
  --> result_param.rs:6:15
   |
 6 | fn result_arg(result: u32) {}
   |               ^^^^^^
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
diff --git a/creusot/tests/should_fail/trait_item_types_mismatch.stderr b/creusot/tests/should_fail/trait_item_types_mismatch.stderr
index 7165f39c19..1f37ed9dda 100644
--- a/creusot/tests/should_fail/trait_item_types_mismatch.stderr
+++ b/creusot/tests/should_fail/trait_item_types_mismatch.stderr
@@ -1,10 +1,10 @@
-error[creusot]: Expected implementation of trait `Trusted` for `()` to be marked as `#[trusted]`
+error: Expected implementation of trait `Trusted` for `()` to be marked as `#[trusted]`
  --> trait_item_types_mismatch.rs:7:1
   |
 7 | impl Trusted for () {}
   | ^^^^^^^^^^^^^^^^^^^
 
-error[creusot]: Expected `my_predicate` to be a predicate as specified by the trait declaration
+error: Expected `my_predicate` to be a predicate as specified by the trait declaration
   --> trait_item_types_mismatch.rs:17:5
    |
 17 |     fn my_predicate() -> bool {
diff --git a/creusot/tests/should_fail/unsafe.stderr b/creusot/tests/should_fail/unsafe.stderr
index 6d434cf550..a6991069fb 100644
--- a/creusot/tests/should_fail/unsafe.stderr
+++ b/creusot/tests/should_fail/unsafe.stderr
@@ -6,7 +6,7 @@ warning: unused import: `std::*`
   |
   = note: `#[warn(unused_imports)]` on by default
 
-error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
+error[E0133]: call to unsafe function `evil` is unsafe and requires unsafe function or block
  --> unsafe.rs:8:5
   |
 8 |     evil();
@@ -14,6 +14,6 @@ error[E0133]: call to unsafe function is unsafe and requires unsafe function or
   |
   = note: consult the function's documentation for information on how to avoid undefined behavior
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0133`.
diff --git a/creusot/tests/should_fail/unsupported_binary_operations.stderr b/creusot/tests/should_fail/unsupported_binary_operations.stderr
index 96bae836cf..946e52a769 100644
--- a/creusot/tests/should_fail/unsupported_binary_operations.stderr
+++ b/creusot/tests/should_fail/unsupported_binary_operations.stderr
@@ -18,11 +18,11 @@ warning: function `bit_xor` is never used
 11 | fn bit_xor(a: u32, b: u32) -> u32 {
    |    ^^^^^^^
 
-error[creusot]: bitwise operations are currently unsupported
+error: bitwise operations are currently unsupported
  --> unsupported_binary_operations.rs:4:5
   |
 4 |     a & b
   |     ^^^^^
 
-error: aborting due to previous error; 3 warnings emitted
+error: aborting due to 1 previous error; 3 warnings emitted
 
diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg
index 564b703489..630aa7689f 100644
--- a/creusot/tests/should_succeed/100doors.mlcfg
+++ b/creusot/tests/should_succeed/100doors.mlcfg
@@ -30,12 +30,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/100doors/why3session.xml b/creusot/tests/should_succeed/100doors/why3session.xml
index 5d2178ff19..edc61a9ecf 100644
--- a/creusot/tests/should_succeed/100doors/why3session.xml
+++ b/creusot/tests/should_succeed/100doors/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="100doors.mlcfg"/>
 <theory name="C100doors_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="1"><result status="valid" time="0.122415" steps="662386"/></proof>
+ <proof prover="1"><result status="valid" time="0.122415" steps="775965"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/100doors/why3shapes.gz b/creusot/tests/should_succeed/100doors/why3shapes.gz
index 925625dabc950eab694a87b4840e8044de23749c..8070c69fdfd83af896950357ed539878bf39e119 100644
GIT binary patch
literal 591
zcmV-V0<irbiwFP!00000|CLiskJ>;Cz4I$_+ZMFaOy(m=wHzX(Xt?xL`MAg=Lx~!a
zZ31lj@9Rt$AS{d2OY+7ZKR<iyFVmpg;+yS)qiwsgslNp}n0}q?e`8r6IR}<`%z%5G
zK<Hr%!ovuphZ>ZJ3bcn3A`b<`*#uwaSlRmLev2fcs+#xJt|@HAAi;gJD(gM&@DEE}
zz=tc#-W)>WDMR2FvA{_zzO_wp$Zbc`L!8Zk3*ZX4cA?Azs*)>jl4q0frf_*pBt6A7
zxnq{&j1k)1+x{;BPjs%HFqOa9<6`x_sqF$k>x0xeXVic*Ek)P1g;1S<6d=NM;1nTd
zSatSOHl+qOYWvV$(A1XR=Fd|0-ke|jOPtdeG|vd(fs9%{ITy#-^;t%vlgxTmt95gz
zi|+BwCAPL}s-xwgnajs;-L!4<Zi}bguM&T>2kT1%6%OZ3Sz`q%!Lp!lua178;%s@E
zRu!k8bpl^O$-6E=j@0W}*{XZr+SU?T^zq(3(iDksb;Rm$C+L*-)k%AB&yi32TGC;!
zRFn>D*C#l4^?smh1cm6^2U8lK$Ip=S(Ib8EIx6Kv5B-&(grg;Kf`)UjhM@S+^_bAO
zGBy?%Qc!=}*EQ_6ChNGaJ7F#rZA5ZgmrVY*E;m3R<DOE+<!Q9sRK3h^FEi#6KHksE
zM$vFT+$b4km$96{BG@!-u$fE>nQI+KMG~)bRJ>T{cB2Zm##q>bDG_jOxH4QCE({M1
d=Y}(rnAk){8)c*shOCB7{sDG#!tv7u004&{DmwrG

literal 589
zcmV-T0<!%diwFP!00000|CLisZ`&{oz2{f>)~&?=(fYE7_Fx1sl*>*7j|<pDS&cb%
zXD8|Q??=l~QnzV<UF;`Pe0-$HPq#_`M9;oY4!-NFw)vWv<o5Gy_nWHb0Dz*5SRh24
zV;W(GGD3?gLW4R&jV3~cHbRM6Iivdrs(tfw_e3nBuG^R8wq5&LU{1SsSv5P_(jQTT
zfOl6GgE_@KQl<!Ju?Q@dp1XFvU-_P;r*wCRAQ3cz385kat`c-Ksgp@YQ@VIfq$0&@
z^1!U787=wk^X@N$NOY>6F_%Bz(R}%>ZTy@*>Vq;X5Zr(hEk`%L!&D!Ek|@(+<di9u
zRQLWvHmyfCZu{6?G~AZK7SBoz-W8nv3wq!$8Ymgjo{dJ`1Q*cV>$9?xlPU*Q%g1)#
zto!RX7u5N_tq&g1h>%avW7~D@i(lVte^vCo+xu7=>U2DBs)lORIaO=^4(j-aIx82)
zY1LWrQ77mJYIV^i*-=D2OJDadPrma^X5ZhtL|PCNE)P`iF9aR){s_{p+zaHlLoLO)
zSK1ci+6@U#UA-I_8o?pv?SpAUU#8Eng2^Mj^9Cv%M34PdsAZsKagv8~w5F(G?0Uv%
zTA7#%OgU({9qSr*+pu+7*M+c<iZ>#ETbIiJx2`ZisIq}lWz})C!c^TqyuB<$NO*le
z&l|<VeRZRhEze^)!+El4yJRz)t%MND>Wr9D3JIC8Ae6~$wzd{FCIRC>J5Ua!gVX^y
b5H5F_v(7l}l#`CFPR#xRI3!vs(**zkm(U=M

diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg
index d9d5f152f6..b427162346 100644
--- a/creusot/tests/should_succeed/bdd.mlcfg
+++ b/creusot/tests/should_succeed/bdd.mlcfg
@@ -213,7 +213,7 @@ end
 module Bdd_Node_Type
   use export Bdd_Bdd_Type
 end
-module Bdd_Impl13_AssertReceiverIsTotalEq
+module Bdd_Impl12_AssertReceiverIsTotalEq
   use Bdd_Node_Type as Bdd_Node_Type
   use prelude.Borrow
   let rec cfg assert_receiver_is_total_eq [#"../bdd.rs" 90 9 90 11] [@cfg:stackify] [@cfg:subregion_analysis] (self : Bdd_Node_Type.t_node) : ()
@@ -274,7 +274,7 @@ module Bdd_NodeLog_Type
     | C_If uint64 uint64 uint64
     
 end
-module Bdd_Impl14_Eq
+module Bdd_Impl13_Eq
   use Bdd_Bdd_Type as Bdd_Bdd_Type
   use Bdd_NodeLog_Type as Bdd_NodeLog_Type
   use Bdd_Node_Type as Bdd_Node_Type
@@ -488,7 +488,7 @@ module Bdd_Impl0_Clone
   }
   
 end
-module Bdd_Impl15_Clone
+module Bdd_Impl14_Clone
   use prelude.Borrow
   use Bdd_Bdd_Type as Bdd_Bdd_Type
   use prelude.UInt64
@@ -573,7 +573,7 @@ module Bdd_Impl15_Clone
   }
   
 end
-module Bdd_Impl19_AssertReceiverIsTotalEq
+module Bdd_Impl17_AssertReceiverIsTotalEq
   use Bdd_Bdd_Type as Bdd_Bdd_Type
   use prelude.Borrow
   let rec cfg assert_receiver_is_total_eq [#"../bdd.rs" 104 15 104 17] [@cfg:stackify] [@cfg:subregion_analysis] (self : Bdd_Bdd_Type.t_bdd) : ()
@@ -3270,7 +3270,7 @@ module Bdd_Impl11_Not
   BB1 {
     switch (_10)
       | Core_Option_Option_Type.C_Some _ -> goto BB2
-      | _ -> goto BB5
+      | _ -> goto BB4
       end
   }
   BB2 {
@@ -3284,25 +3284,19 @@ module Bdd_Impl11_Not
     goto BB18
   }
   BB4 {
-    assert { [@expl:type invariant] inv0 self };
-    assume { resolve0 self };
-    assert { [#"../bdd.rs" 504 47 506 9] false };
-    absurd
-  }
-  BB5 {
     switch (Bdd_Bdd_Type.bdd_0 x)
-      | Bdd_Node_Type.C_False -> goto BB6
-      | Bdd_Node_Type.C_True -> goto BB7
-      | Bdd_Node_Type.C_If _ _ _ -> goto BB8
+      | Bdd_Node_Type.C_False -> goto BB5
+      | Bdd_Node_Type.C_True -> goto BB6
+      | Bdd_Node_Type.C_If _ _ _ -> goto BB7
       end
   }
-  BB6 {
+  BB5 {
     goto BB11
   }
-  BB7 {
+  BB6 {
     goto BB9
   }
-  BB8 {
+  BB7 {
     [#"../bdd.rs" 510 17 510 18] v <- Bdd_Node_Type.if_v (Bdd_Bdd_Type.bdd_0 x);
     [#"../bdd.rs" 510 20 510 26] childt <- Bdd_Node_Type.if_childt (Bdd_Bdd_Type.bdd_0 x);
     [#"../bdd.rs" 510 28 510 34] childf <- Bdd_Node_Type.if_childf (Bdd_Bdd_Type.bdd_0 x);
@@ -3313,6 +3307,12 @@ module Bdd_Impl11_Not
     _25 <- any borrowed (Bdd_Context_Type.t_context);
     goto BB13
   }
+  BB8 {
+    assert { [@expl:type invariant] inv0 self };
+    assume { resolve0 self };
+    assert { [#"../bdd.rs" 507 22 507 26] false };
+    absurd
+  }
   BB9 {
     [#"../bdd.rs" 508 20 508 24] _19 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 508 20 508 24] self <- { self with current = ( ^ _19) ; };
@@ -3653,7 +3653,7 @@ module Bdd_Impl11_And
     ensures { [#"../bdd.rs" 464 14 464 37] UInt64.to_int x <= leastvar0 result }
     
   function cmp_log0 (self : int) (o : int) : Core_Cmp_Ordering_Type.t_ordering =
-    [#"../../../../creusot-contracts/src/logic/ord.rs" 137 12 146 17] if self < o then
+    [#"../../../../creusot-contracts/src/logic/ord.rs" 140 16 146 17] if self < o then
       Core_Cmp_Ordering_Type.C_Less
     else
       if self = o then Core_Cmp_Ordering_Type.C_Equal else Core_Cmp_Ordering_Type.C_Greater
@@ -3784,7 +3784,7 @@ module Bdd_Impl11_And
     assume { resolve0 _16 };
     switch (_12)
       | Core_Option_Option_Type.C_Some _ -> goto BB2
-      | _ -> goto BB5
+      | _ -> goto BB4
       end
   }
   BB2 {
@@ -3795,54 +3795,57 @@ module Bdd_Impl11_And
     [#"../bdd.rs" 529 19 529 21] _0 <- r;
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
-    goto BB35
+    goto BB36
   }
   BB4 {
-    assert { [#"../bdd.rs" 528 52 530 9] false };
-    absurd
-  }
-  BB5 {
     [#"../bdd.rs" 531 22 531 34] _23 <- (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b);
     switch (let (a, _) = _23 in a)
-      | Bdd_Node_Type.C_True -> goto BB7
-      | _ -> goto BB6
+      | Bdd_Node_Type.C_True -> goto BB6
+      | _ -> goto BB5
       end
   }
-  BB6 {
+  BB5 {
     switch (let (_, a) = _23 in a)
-      | Bdd_Node_Type.C_True -> goto BB9
-      | _ -> goto BB8
+      | Bdd_Node_Type.C_True -> goto BB8
+      | _ -> goto BB7
       end
   }
-  BB7 {
+  BB6 {
     goto BB15
   }
-  BB8 {
+  BB7 {
     switch (let (a, _) = _23 in a)
-      | Bdd_Node_Type.C_False -> goto BB10
-      | _ -> goto BB11
+      | Bdd_Node_Type.C_False -> goto BB9
+      | _ -> goto BB10
       end
   }
-  BB9 {
+  BB8 {
     goto BB16
   }
-  BB10 {
+  BB9 {
     goto BB17
   }
-  BB11 {
+  BB10 {
     switch (let (_, a) = _23 in a)
-      | Bdd_Node_Type.C_False -> goto BB12
+      | Bdd_Node_Type.C_False -> goto BB11
       | Bdd_Node_Type.C_If _ _ _ -> goto BB13
-      | _ -> goto BB38
+      | _ -> goto BB12
       end
   }
-  BB12 {
+  BB11 {
     goto BB17
   }
+  BB12 {
+    assert { [@expl:type invariant] inv0 self };
+    assume { resolve1 self };
+    assume { resolve2 _23 };
+    assert { [#"../bdd.rs" 531 22 531 34] false };
+    absurd
+  }
   BB13 {
     switch (let (a, _) = _23 in a)
       | Bdd_Node_Type.C_If _ _ _ -> goto BB14
-      | _ -> goto BB39
+      | _ -> goto BB12
       end
   }
   BB14 {
@@ -3860,12 +3863,12 @@ module Bdd_Impl11_And
   BB15 {
     assume { resolve2 _23 };
     [#"../bdd.rs" 532 25 532 26] r1 <- b;
-    goto BB33
+    goto BB34
   }
   BB16 {
     assume { resolve2 _23 };
     [#"../bdd.rs" 533 25 533 26] r1 <- a;
-    goto BB33
+    goto BB34
   }
   BB17 {
     assume { resolve2 _23 };
@@ -3877,7 +3880,7 @@ module Bdd_Impl11_And
     goto BB18
   }
   BB18 {
-    goto BB33
+    goto BB34
   }
   BB19 {
     switch (_42)
@@ -3887,7 +3890,7 @@ module Bdd_Impl11_And
       end
   }
   BB20 {
-    goto BB26
+    goto BB27
   }
   BB21 {
     [#"../bdd.rs" 552 24 552 30] v <- va;
@@ -3896,21 +3899,27 @@ module Bdd_Impl11_And
     assume { inv1 ( ^ _67) };
     [#"../bdd.rs" 553 33 553 59] _66 <- ([#"../bdd.rs" 553 33 553 59] and _67 childta childtb);
     _67 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB29
+    goto BB30
   }
   BB22 {
-    goto BB23
+    goto BB24
   }
   BB23 {
+    assert { [@expl:type invariant] inv0 self };
+    assume { resolve1 self };
+    assert { [#"../bdd.rs" 540 22 540 33] false };
+    absurd
+  }
+  BB24 {
     [#"../bdd.rs" 542 24 542 30] v <- vb;
     [#"../bdd.rs" 543 33 543 37] _49 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 543 33 543 37] self <- { self with current = ( ^ _49) ; };
     assume { inv1 ( ^ _49) };
     [#"../bdd.rs" 543 33 543 53] _48 <- ([#"../bdd.rs" 543 33 543 53] and _49 a childtb);
     _49 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB24
+    goto BB25
   }
-  BB24 {
+  BB25 {
     [#"../bdd.rs" 543 24 543 53] childt <- _48;
     _48 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 544 33 544 37] _53 <- Borrow.borrow_mut ( * self);
@@ -3918,24 +3927,24 @@ module Bdd_Impl11_And
     assume { inv1 ( ^ _53) };
     [#"../bdd.rs" 544 33 544 53] _52 <- ([#"../bdd.rs" 544 33 544 53] and _53 a childfb);
     _53 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB25
+    goto BB26
   }
-  BB25 {
+  BB26 {
     [#"../bdd.rs" 544 24 544 53] childf <- _52;
     _52 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] ());
-    goto BB31
+    goto BB32
   }
-  BB26 {
+  BB27 {
     [#"../bdd.rs" 547 24 547 30] v <- va;
     [#"../bdd.rs" 548 33 548 37] _58 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 548 33 548 37] self <- { self with current = ( ^ _58) ; };
     assume { inv1 ( ^ _58) };
     [#"../bdd.rs" 548 33 548 53] _57 <- ([#"../bdd.rs" 548 33 548 53] and _58 childta b);
     _58 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB27
+    goto BB28
   }
-  BB27 {
+  BB28 {
     [#"../bdd.rs" 548 24 548 53] childt <- _57;
     _57 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 549 33 549 37] _62 <- Borrow.borrow_mut ( * self);
@@ -3943,15 +3952,15 @@ module Bdd_Impl11_And
     assume { inv1 ( ^ _62) };
     [#"../bdd.rs" 549 33 549 53] _61 <- ([#"../bdd.rs" 549 33 549 53] and _62 childfa b);
     _62 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB28
+    goto BB29
   }
-  BB28 {
+  BB29 {
     [#"../bdd.rs" 549 24 549 53] childf <- _61;
     _61 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] ());
-    goto BB31
+    goto BB32
   }
-  BB29 {
+  BB30 {
     [#"../bdd.rs" 553 24 553 59] childt <- _66;
     _66 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 554 33 554 37] _71 <- Borrow.borrow_mut ( * self);
@@ -3959,62 +3968,51 @@ module Bdd_Impl11_And
     assume { inv1 ( ^ _71) };
     [#"../bdd.rs" 554 33 554 59] _70 <- ([#"../bdd.rs" 554 33 554 59] and _71 childfa childfb);
     _71 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB30
+    goto BB31
   }
-  BB30 {
+  BB31 {
     [#"../bdd.rs" 554 24 554 59] childf <- _70;
     _70 <- any Bdd_Bdd_Type.t_bdd;
     [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] ());
-    goto BB31
+    goto BB32
   }
-  BB31 {
+  BB32 {
     [#"../bdd.rs" 557 16 557 20] _74 <- Borrow.borrow_mut ( * self);
     [#"../bdd.rs" 557 16 557 20] self <- { self with current = ( ^ _74) ; };
     assume { inv1 ( ^ _74) };
     [#"../bdd.rs" 557 16 557 44] r1 <- ([#"../bdd.rs" 557 16 557 44] node0 _74 v childt childf);
     _74 <- any borrowed (Bdd_Context_Type.t_context);
-    goto BB32
-  }
-  BB32 {
     goto BB33
   }
   BB33 {
+    goto BB34
+  }
+  BB34 {
     [#"../bdd.rs" 560 8 560 21] _79 <- Borrow.borrow_final (Bdd_Context_Type.context_and_memo ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5);
     [#"../bdd.rs" 560 8 560 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 =  * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 ( ^ _79) x5) ; };
     [#"../bdd.rs" 560 26 560 32] _80 <- (a, b);
     [#"../bdd.rs" 560 8 560 36] _78 <- ([#"../bdd.rs" 560 8 560 36] add0 _79 _80 r1);
     _79 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd));
     _80 <- any (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd);
-    goto BB34
+    goto BB35
   }
-  BB34 {
+  BB35 {
     assert { [@expl:type invariant] inv0 self };
     assume { resolve1 self };
     [#"../bdd.rs" 561 8 561 9] _0 <- r1;
-    goto BB35
+    goto BB36
   }
-  BB35 {
+  BB36 {
     return _0
   }
-  BB37 {
-    goto BB21
-  }
   BB38 {
-    assume { resolve2 _23 };
-    assert { [@expl:type invariant] inv0 self };
-    assume { resolve1 self };
-    goto BB4
+    goto BB20
   }
   BB39 {
-    assume { resolve2 _23 };
-    assert { [@expl:type invariant] inv0 self };
-    assume { resolve1 self };
-    goto BB4
+    goto BB20
   }
   BB40 {
-    assert { [@expl:type invariant] inv0 self };
-    assume { resolve1 self };
-    goto BB4
+    goto BB21
   }
   
 end
@@ -4186,18 +4184,12 @@ module Bdd_Impl2
    -> UInt64.to_int result = hash_log0 (deep_model0 self))
 end
 module Bdd_Impl12
-  
-end
-module Bdd_Impl18
-  
-end
-module Bdd_Impl13
   goal assert_receiver_is_total_eq_refn : [#"../bdd.rs" 90 9 90 11] true
 end
-module Bdd_Impl19
+module Bdd_Impl17
   goal assert_receiver_is_total_eq_refn : [#"../bdd.rs" 104 15 104 17] true
 end
-module Bdd_Impl14
+module Bdd_Impl13
   use Bdd_Node_Type as Bdd_Node_Type
   predicate invariant0 (self : Bdd_Node_Type.t_node) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
@@ -4269,7 +4261,7 @@ module Bdd_Impl7
    -> (forall result : bool . result = (shallow_model0 self = shallow_model0 other)
    -> result = (deep_model0 self = deep_model0 other))
 end
-module Bdd_Impl15
+module Bdd_Impl14
   use Bdd_Node_Type as Bdd_Node_Type
   predicate invariant1 (self : Bdd_Node_Type.t_node) =
     [#"../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
@@ -4321,10 +4313,10 @@ module Bdd_Impl0
   goal clone'_refn : [#"../bdd.rs" 109 4 109 27] forall self : Bdd_Bdd_Type.t_bdd . inv0 self
    -> (forall result : Bdd_Bdd_Type.t_bdd . result = self  -> inv1 result /\ result = self)
 end
-module Bdd_Impl16
+module Bdd_Impl15
   
 end
-module Bdd_Impl17
+module Bdd_Impl16
   
 end
 module Bdd_Impl3
diff --git a/creusot/tests/should_succeed/bdd/why3session.xml b/creusot/tests/should_succeed/bdd/why3session.xml
index f964ead7ce..23f722c495 100644
--- a/creusot/tests/should_succeed/bdd/why3session.xml
+++ b/creusot/tests/should_succeed/bdd/why3session.xml
@@ -17,9 +17,9 @@
  <proof prover="6"><result status="valid" time="0.003136" steps="539"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl14_Eq" proved="true">
+<theory name="Bdd_Impl13_Eq" proved="true">
  <goal name="eq&#39;vc" expl="VC for eq" proved="true">
- <proof prover="2"><result status="valid" time="0.127345" steps="431"/></proof>
+ <proof prover="2"><result status="valid" time="0.028391" steps="431"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl0_Clone" proved="true">
@@ -27,9 +27,9 @@
  <proof prover="6"><result status="valid" time="0.002978" steps="427"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl15_Clone" proved="true">
+<theory name="Bdd_Impl14_Clone" proved="true">
  <goal name="clone&#39;&#39;vc" expl="VC for clone&#39;" proved="true">
- <proof prover="2"><result status="valid" time="0.009700" steps="29"/></proof>
+ <proof prover="2"><result status="valid" time="0.009551" steps="29"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl1_Hash" proved="true">
@@ -595,55 +595,27 @@
   <goal name="and&#39;vc.25" expl="precondition" proved="true">
   <proof prover="2"><result status="valid" time="0.060713" steps="106"/></proof>
   </goal>
-  <goal name="and&#39;vc.26" expl="type invariant" proved="true">
-  <proof prover="2"><result status="valid" time="0.016388" steps="40"/></proof>
-  </goal>
-  <goal name="and&#39;vc.27" expl="type invariant" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="and&#39;vc.27.0" expl="type invariant" proved="true">
-   <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.27.0.0" expl="type invariant" proved="true">
-    <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.27.0.0.0" expl="type invariant" proved="true">
-     <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.27.0.0.0.0" expl="type invariant" proved="true">
-      <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.026674" steps="5461"/></proof>
-      </goal>
-     </transf>
-     </goal>
-    </transf>
-    </goal>
-   </transf>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="and&#39;vc.28" expl="assertion" proved="true">
-  <proof prover="6" timelimit="1"><result status="valid" time="0.085307" steps="5938"/></proof>
-  </goal>
-  <goal name="and&#39;vc.29" expl="unreachable point" proved="true">
-  <proof prover="2"><result status="valid" time="0.020772" steps="37"/></proof>
-  </goal>
-  <goal name="and&#39;vc.30" expl="precondition" proved="true">
+  <goal name="and&#39;vc.26" expl="precondition" proved="true">
   <proof prover="0"><result status="valid" time="0.099568" steps="252339"/></proof>
   </goal>
-  <goal name="and&#39;vc.31" expl="precondition" proved="true">
+  <goal name="and&#39;vc.27" expl="precondition" proved="true">
   <proof prover="6" timelimit="1"><result status="valid" time="0.059750" steps="8663"/></proof>
   </goal>
-  <goal name="and&#39;vc.32" expl="precondition" proved="true">
+  <goal name="and&#39;vc.28" expl="precondition" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="and&#39;vc.32.0" expl="precondition" proved="true">
+   <goal name="and&#39;vc.28.0" expl="precondition" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.32.0.0" expl="precondition" proved="true">
+    <goal name="and&#39;vc.28.0.0" expl="precondition" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.32.0.0.0" expl="precondition" proved="true">
+     <goal name="and&#39;vc.28.0.0.0" expl="precondition" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.32.0.0.0.0" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.0.0.0.0" expl="precondition" proved="true">
       <proof prover="6" timelimit="1"><result status="valid" time="0.370095" steps="42349"/></proof>
       </goal>
-      <goal name="and&#39;vc.32.0.0.0.1" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.0.0.0.1" expl="precondition" proved="true">
       <proof prover="0"><result status="valid" time="0.240882" steps="516338"/></proof>
       </goal>
-      <goal name="and&#39;vc.32.0.0.0.2" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.0.0.0.2" expl="precondition" proved="true">
       <proof prover="0"><result status="valid" time="0.343153" steps="494027"/></proof>
       </goal>
      </transf>
@@ -652,19 +624,19 @@
     </goal>
    </transf>
    </goal>
-   <goal name="and&#39;vc.32.1" expl="precondition" proved="true">
+   <goal name="and&#39;vc.28.1" expl="precondition" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.32.1.0" expl="precondition" proved="true">
+    <goal name="and&#39;vc.28.1.0" expl="precondition" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.32.1.0.0" expl="precondition" proved="true">
+     <goal name="and&#39;vc.28.1.0.0" expl="precondition" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.32.1.0.0.0" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.1.0.0.0" expl="precondition" proved="true">
       <proof prover="0"><result status="valid" time="0.112833" steps="318662"/></proof>
       </goal>
-      <goal name="and&#39;vc.32.1.0.0.1" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.1.0.0.1" expl="precondition" proved="true">
       <proof prover="0"><result status="valid" time="0.050164" steps="308781"/></proof>
       </goal>
-      <goal name="and&#39;vc.32.1.0.0.2" expl="precondition" proved="true">
+      <goal name="and&#39;vc.28.1.0.0.2" expl="precondition" proved="true">
       <proof prover="0"><result status="valid" time="0.101796" steps="379717"/></proof>
       </goal>
      </transf>
@@ -675,34 +647,62 @@
    </goal>
   </transf>
   </goal>
-  <goal name="and&#39;vc.33" expl="precondition" proved="true">
+  <goal name="and&#39;vc.29" expl="precondition" proved="true">
   <proof prover="0"><result status="valid" time="0.042079" steps="140794"/></proof>
   </goal>
-  <goal name="and&#39;vc.34" expl="precondition" proved="true">
+  <goal name="and&#39;vc.30" expl="type invariant" proved="true">
+  <transf name="split_vc" proved="true" >
+   <goal name="and&#39;vc.30.0" expl="type invariant" proved="true">
+   <transf name="split_vc" proved="true" >
+    <goal name="and&#39;vc.30.0.0" expl="type invariant" proved="true">
+    <proof prover="2"><result status="valid" time="0.009827" steps="38"/></proof>
+    </goal>
+    <goal name="and&#39;vc.30.0.1" expl="type invariant" proved="true">
+    <transf name="split_vc" proved="true" >
+     <goal name="and&#39;vc.30.0.1.0" expl="type invariant" proved="true">
+     <transf name="split_vc" proved="true" >
+      <goal name="and&#39;vc.30.0.1.0.0" expl="type invariant" proved="true">
+      <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.026674" steps="5440"/></proof>
+      </goal>
+     </transf>
+     </goal>
+    </transf>
+    </goal>
+   </transf>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="and&#39;vc.31" expl="assertion" proved="true">
+  <proof prover="6" timelimit="1"><result status="valid" time="0.085307" steps="5914"/></proof>
+  </goal>
+  <goal name="and&#39;vc.32" expl="unreachable point" proved="true">
+  <proof prover="2"><result status="valid" time="0.020772" steps="32"/></proof>
+  </goal>
+  <goal name="and&#39;vc.33" expl="precondition" proved="true">
   <proof prover="0"><result status="valid" time="0.034477" steps="46150"/></proof>
   </goal>
-  <goal name="and&#39;vc.35" expl="precondition" proved="true">
+  <goal name="and&#39;vc.34" expl="precondition" proved="true">
   <proof prover="2"><result status="valid" time="0.014341" steps="51"/></proof>
   </goal>
-  <goal name="and&#39;vc.36" expl="precondition" proved="true">
+  <goal name="and&#39;vc.35" expl="precondition" proved="true">
   <proof prover="2"><result status="valid" time="0.137980" steps="52"/></proof>
   </goal>
-  <goal name="and&#39;vc.37" expl="type invariant" proved="true">
+  <goal name="and&#39;vc.36" expl="type invariant" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="and&#39;vc.37.0" expl="type invariant" proved="true">
+   <goal name="and&#39;vc.36.0" expl="type invariant" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.37.0.0" expl="type invariant" proved="true">
+    <goal name="and&#39;vc.36.0.0" expl="type invariant" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.37.0.0.0" expl="type invariant" proved="true">
+     <goal name="and&#39;vc.36.0.0.0" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.37.0.0.0.0" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.0.0.0.0" expl="type invariant" proved="true">
       <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="1.022186" steps="88549"/></proof>
       </goal>
      </transf>
      </goal>
-     <goal name="and&#39;vc.37.0.0.1" expl="type invariant" proved="true">
+     <goal name="and&#39;vc.36.0.0.1" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.37.0.0.1.0" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.0.0.1.0" expl="type invariant" proved="true">
       <proof prover="6" memlimit="2000"><result status="valid" time="1.106945" steps="83156"/></proof>
       </goal>
      </transf>
@@ -711,19 +711,19 @@
     </goal>
    </transf>
    </goal>
-   <goal name="and&#39;vc.37.1" expl="type invariant" proved="true">
+   <goal name="and&#39;vc.36.1" expl="type invariant" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.37.1.0" expl="type invariant" proved="true">
+    <goal name="and&#39;vc.36.1.0" expl="type invariant" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.37.1.0.0" expl="type invariant" proved="true">
+     <goal name="and&#39;vc.36.1.0.0" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.37.1.0.0.0" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.1.0.0.0" expl="type invariant" proved="true">
       <proof prover="6" timelimit="10" memlimit="2000"><result status="valid" time="2.235251" steps="171085"/></proof>
       </goal>
-      <goal name="and&#39;vc.37.1.0.0.1" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.1.0.0.1" expl="type invariant" proved="true">
       <proof prover="6" timelimit="10" memlimit="4000"><result status="valid" time="3.025925" steps="220111"/></proof>
       </goal>
-      <goal name="and&#39;vc.37.1.0.0.2" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.1.0.0.2" expl="type invariant" proved="true">
       <proof prover="6" memlimit="2000"><result status="valid" time="2.671487" steps="201897"/></proof>
       </goal>
      </transf>
@@ -732,16 +732,16 @@
     </goal>
    </transf>
    </goal>
-   <goal name="and&#39;vc.37.2" expl="type invariant" proved="true">
+   <goal name="and&#39;vc.36.2" expl="type invariant" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.37.2.0" expl="type invariant" proved="true">
+    <goal name="and&#39;vc.36.2.0" expl="type invariant" proved="true">
     <transf name="split_vc" proved="true" >
-     <goal name="and&#39;vc.37.2.0.0" expl="type invariant" proved="true">
+     <goal name="and&#39;vc.36.2.0.0" expl="type invariant" proved="true">
      <proof prover="6" memlimit="2000"><result status="valid" time="1.233999" steps="109950"/></proof>
      </goal>
-     <goal name="and&#39;vc.37.2.0.1" expl="type invariant" proved="true">
+     <goal name="and&#39;vc.36.2.0.1" expl="type invariant" proved="true">
      <transf name="split_vc" proved="true" >
-      <goal name="and&#39;vc.37.2.0.1.0" expl="type invariant" proved="true">
+      <goal name="and&#39;vc.36.2.0.1.0" expl="type invariant" proved="true">
       <proof prover="6" memlimit="2000"><result status="valid" time="1.875914" steps="150636"/></proof>
       </goal>
      </transf>
@@ -752,45 +752,45 @@
    </goal>
   </transf>
   </goal>
-  <goal name="and&#39;vc.38" expl="postcondition" proved="true">
+  <goal name="and&#39;vc.37" expl="postcondition" proved="true">
   <proof prover="0"><result status="valid" time="0.337344" steps="604217"/></proof>
   </goal>
-  <goal name="and&#39;vc.39" expl="postcondition" proved="true">
+  <goal name="and&#39;vc.38" expl="postcondition" proved="true">
   <proof prover="0"><result status="valid" time="0.073766" steps="278977"/></proof>
   </goal>
-  <goal name="and&#39;vc.40" expl="postcondition" proved="true">
+  <goal name="and&#39;vc.39" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="and&#39;vc.40.0" expl="postcondition" proved="true">
+   <goal name="and&#39;vc.39.0" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.40.0.0" expl="postcondition" proved="true">
+    <goal name="and&#39;vc.39.0.0" expl="postcondition" proved="true">
     <proof prover="0"><result status="valid" time="0.089271" steps="161164"/></proof>
     </goal>
-    <goal name="and&#39;vc.40.0.1" expl="postcondition" proved="true">
+    <goal name="and&#39;vc.39.0.1" expl="postcondition" proved="true">
     <proof prover="6" timelimit="1"><result status="valid" time="0.482601" steps="74098"/></proof>
     </goal>
    </transf>
    </goal>
-   <goal name="and&#39;vc.40.1" expl="postcondition" proved="true">
+   <goal name="and&#39;vc.39.1" expl="postcondition" proved="true">
    <proof prover="6" timelimit="1"><result status="valid" time="0.731618" steps="87565"/></proof>
    </goal>
-   <goal name="and&#39;vc.40.2" expl="postcondition" proved="true">
+   <goal name="and&#39;vc.39.2" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
-    <goal name="and&#39;vc.40.2.0" expl="postcondition" proved="true">
+    <goal name="and&#39;vc.39.2.0" expl="postcondition" proved="true">
     <proof prover="0"><result status="valid" time="0.072442" steps="224146"/></proof>
     </goal>
-    <goal name="and&#39;vc.40.2.1" expl="postcondition" proved="true">
+    <goal name="and&#39;vc.39.2.1" expl="postcondition" proved="true">
     <proof prover="6" timelimit="1"><result status="valid" time="0.641319" steps="70623"/></proof>
     </goal>
    </transf>
    </goal>
   </transf>
   </goal>
-  <goal name="and&#39;vc.41" expl="postcondition" proved="true">
+  <goal name="and&#39;vc.40" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
-   <goal name="and&#39;vc.41.0" expl="postcondition" proved="true">
+   <goal name="and&#39;vc.40.0" expl="postcondition" proved="true">
    <proof prover="0"><result status="valid" time="0.226651" steps="418425"/></proof>
    </goal>
-   <goal name="and&#39;vc.41.1" expl="postcondition" proved="true">
+   <goal name="and&#39;vc.40.1" expl="postcondition" proved="true">
    <proof prover="0"><result status="valid" time="0.070438" steps="228897"/></proof>
    </goal>
   </transf>
@@ -813,19 +813,19 @@
  <proof prover="6"><result status="valid" time="0.003589" steps="439"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl13" proved="true">
+<theory name="Bdd_Impl12" proved="true">
  <goal name="assert_receiver_is_total_eq_refn" proved="true">
- <proof prover="6"><result status="valid" time="0.002133" steps="27"/></proof>
+ <proof prover="2"><result status="valid" time="0.005117" steps="0"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl19" proved="true">
+<theory name="Bdd_Impl17" proved="true">
  <goal name="assert_receiver_is_total_eq_refn" proved="true">
- <proof prover="2"><result status="valid" time="0.010356" steps="0"/></proof>
+ <proof prover="2"><result status="valid" time="0.005209" steps="0"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl14" proved="true">
+<theory name="Bdd_Impl13" proved="true">
  <goal name="eq_refn" proved="true">
- <proof prover="6"><result status="valid" time="0.003799" steps="437"/></proof>
+ <proof prover="6"><result status="valid" time="0.002133" steps="437"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl7" proved="true">
@@ -833,9 +833,9 @@
  <proof prover="6"><result status="valid" time="0.003839" steps="439"/></proof>
  </goal>
 </theory>
-<theory name="Bdd_Impl15" proved="true">
+<theory name="Bdd_Impl14" proved="true">
  <goal name="clone&#39;_refn" proved="true">
- <proof prover="2"><result status="valid" time="0.011794" steps="12"/></proof>
+ <proof prover="6"><result status="valid" time="0.003799" steps="633"/></proof>
  </goal>
 </theory>
 <theory name="Bdd_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/bdd/why3shapes.gz b/creusot/tests/should_succeed/bdd/why3shapes.gz
index 94b63552160bdd76f2cdcdf136491c8d8f68096e..744decffafeb4241454118989e159e5840a6a232 100644
GIT binary patch
delta 13765
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

delta 13706
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

diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg
index 11aa875188..982aa2ab45 100644
--- a/creusot/tests/should_succeed/bug/206.mlcfg
+++ b/creusot/tests/should_succeed/bug/206.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/bug/206/why3session.xml b/creusot/tests/should_succeed/bug/206/why3session.xml
index efc26c5c54..b407b3d775 100644
--- a/creusot/tests/should_succeed/bug/206/why3session.xml
+++ b/creusot/tests/should_succeed/bug/206/why3session.xml
@@ -6,7 +6,7 @@
 <file format="mlcfg" proved="true">
 <path name=".."/><path name="206.mlcfg"/>
 <theory name="C206_U2_Impl" proved="true">
- <goal name="postcondition" proved="true">
+ <goal name="vc_u2" proved="true">
  <proof prover="0"><result status="valid" time="0.006573" steps="2"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/bug/206/why3shapes.gz b/creusot/tests/should_succeed/bug/206/why3shapes.gz
index 1710daa6af2b6a122483ae176037cff81564276c..374517f9efc3f9a39c9dabbd85b8d1a05f5e5e30 100644
GIT binary patch
literal 215
zcmV;|04V<-iwFP!00000|80)JZo)7SMDP9z9}6e1lh^^3LsbcxAMiEW*lUQC#38XL
z{reikiRQ4{)#%O4er)-2!HE`rqj~A#xaW#*H!NMT8*gC6k>Te7dm7K_f*I}m_|pv0
zQ!gxFicL2r9Plo_o`!$O=^^KRd_@W?bL8QTLu~S_ij0OS{Wi}p*NwJV6?5Y$G5gI!
zoH^YYE0qquCaA%?06{C2&w?s)=nz`TOH&wWzz9~fwN#<<rB)7{)4tt-08xrvHcB73
RHp)~l_zxrCmF7eN008q{XHozF

literal 211
zcmV;^04)C>iwFP!00000|80)T3c@fDMfdrNEY;PdNs}nL5JBP(WLu_Ws)e>u8+`n|
zQCw*k!@%L(J2PAG@q}j@`Hik)8;2Fwd@*O~g6(h<9`+2^8|-K}rW0nh>*BrYW1tSa
zz!a-?NZ8{8wx7VCa(Lss_uoqJMXucZc!*V=Nyw-_r)Tx~aysbcB+M5NiTNFG;+4~b
zv05uxD=P}qGyx=_(WO=zgEmyxWVmwD6;3!{a#?0q=&)242vtyxwS>ZkQW6;A#%Wi6
N<rlr8QI<pj0016PWnlmS

diff --git a/creusot/tests/should_succeed/bug/256.mlcfg b/creusot/tests/should_succeed/bug/256.mlcfg
index a8c2f35f0e..f4369f9877 100644
--- a/creusot/tests/should_succeed/bug/256.mlcfg
+++ b/creusot/tests/should_succeed/bug/256.mlcfg
@@ -35,12 +35,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/bug/594.rs b/creusot/tests/should_succeed/bug/594.rs
index 3ad0672196..4f4e2f532b 100644
--- a/creusot/tests/should_succeed/bug/594.rs
+++ b/creusot/tests/should_succeed/bug/594.rs
@@ -21,7 +21,7 @@ pub fn test_closure() {
     let _b = (cl2)((0, 4));
 }
 
-pub struct T(u32);
+pub struct T(pub u32);
 
 // #[ensures(result == x)]
 // pub fn test_struct_pat(T(x): T) {
diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg
index a8283c3378..8ce0e46c61 100644
--- a/creusot/tests/should_succeed/bug/874.mlcfg
+++ b/creusot/tests/should_succeed/bug/874.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -51,7 +57,7 @@ module Alloc_Vec_IntoIter_IntoIter_Type
   use Core_Marker_PhantomData_Type as Core_Marker_PhantomData_Type
   use Core_Ptr_NonNull_NonNull_Type as Core_Ptr_NonNull_NonNull_Type
   type t_intoiter 't 'a =
-    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) opaque_ptr opaque_ptr
+    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) opaque_ptr
     
 end
 module Alloc_Boxed_Box_Type
diff --git a/creusot/tests/should_succeed/bug/874/why3session.xml b/creusot/tests/should_succeed/bug/874/why3session.xml
index 01992b39ef..03e58888cf 100644
--- a/creusot/tests/should_succeed/bug/874/why3session.xml
+++ b/creusot/tests/should_succeed/bug/874/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="874.mlcfg"/>
 <theory name="C874_CanExtend" proved="true">
  <goal name="can_extend&#39;vc" expl="VC for can_extend" proved="true">
- <proof prover="3"><result status="valid" time="0.039819" steps="719"/></proof>
+ <proof prover="3"><result status="valid" time="0.039819" steps="718"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/874/why3shapes.gz b/creusot/tests/should_succeed/bug/874/why3shapes.gz
index f4bf1f6df69cccf583e6a6da93084bda9876aa53..53f6d90f05c30372606e57f072361a9a1af251f4 100644
GIT binary patch
literal 530
zcmV+t0`2`DiwFP!00000|8-Kya-%R1z4H~^X2!XwwL)q*xKgI%AJB1JvQQFNVQ@h4
zWd44dEoH#IK<oAPy8Hdy#O=Gi_%^=!rajfwb1dV{uPA)jQ+1Vw<dMBJb@AzZOAOej
zCqoT4V&A#N_-BTXZ#KT^_=f#WHX9Oe%3&=wYap#ZU&22l$9$QOOoUOB$xSku%%qb^
z4Rl<8XSVd!TX?rPR$11659hk@CH4Xv>cgoD_H4h%w$EP2^lbr+sVv%bvN3=?Zov)k
zd5i2$z^TCRz3!cNKkOVhcFD3OJDRQ#+-Bq3y1e?%y|)>D4NdZK44SM+U|cdsFihp!
zVLqz*8p=?KH8T5&!$|(48)+CBgQb(5>&*x2%g}a!SVP>2CBz(GLe#M(1dc8t;vl~r
zw68p$%KkBwqd4a<MbI$3#Ek|~al~#6gROP-`BM7e3(`MvO1xh1&EZnF0sCMm-Hy5*
z3_b>;@EF<ccH42!gSTrpE7NprX}?m@Gt7IN8_N3iZqP803@B#9_u=5);b3(*@_jhc
z*Fc4)j}8avV%Z4L#o-Ww#o-VlZXgbc0X0zsb%!FTB}I@EMUZ_Bl(%?DQ7kEnl|&F)
zN(7-!B9VECU+X4zwmSH);Hx5v5;)2<C5)%9jtiHlqm))z=9PfrXl)Es185*R)rnSG
UYN5Gi8c|K6|9E$d=p6+B0MIuHoB#j-

literal 532
zcmV+v0_*)BiwFP!00000|8-JLbDJ;_z4I%$wRJ99NeIZ4gC}D~{sTJJqX;?i3<d`j
zH~sfr1Z0e`FR*(1^>+9D+{FF6zSus#+O9vf&2uc`&9BIP=u>kQij<MQbZzx%Y)=&E
zrzb@fSIK^GC)1xPKE2uWrqdhtH`#1VyeWsZ*rI{Z_Iz>wl$i2GIWb98I-6W&v&mFG
zn^eKT^>?9b+q}7Vjbqhy`}c5eD_dhP(5^k48mG_ti)?-NI>xsJH0H8s)7i!V_P7OC
zz?UtGI{~K(zxTQi-u<|9;Mk=oLUuG?A-K)X_HBK&gL|(F{3@E2(-<^ck-)fYiC|b-
zZpZm(>T9Hm3anA+PaH<@AHzuF$QUe)7+i1GX<NH~0FpJtO%g)P@DQSgg%B7TLc~CM
zJE*U`oJ#*ul%qJ8Fhx)?yu^(LQE^0X6oaic?fFt$XDi~LI3-@s+3s*@dxw26lx`<o
zj|QItQFx5(cDwDg=g~W~Ta@Vrw$!gQ@eE6Eb48h7?*<J8*@$8`d>;<(9S&B9Bj1N3
zz6L5Ze{?v=gJmN?gTo;N!Ql`hW+V=of^?<`=^cuYh7>`}6hZhJDDUJU#U!MdtR#X^
zC=rAPiA3rpKDJ$KbaSv@&NfvPkreWy$nwgNqXGT;nx{e^3Fnz5HlsWSDgh)AnafP3
WQpiMd$t0qZME?P~;DnzY1polni~h<0

diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg
index ba27a6c998..5afb45319f 100644
--- a/creusot/tests/should_succeed/bug/two_phase.mlcfg
+++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/bug/two_phase/why3session.xml b/creusot/tests/should_succeed/bug/two_phase/why3session.xml
index 2c8674f0a4..c539ff1337 100644
--- a/creusot/tests/should_succeed/bug/two_phase/why3session.xml
+++ b/creusot/tests/should_succeed/bug/two_phase/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="two_phase.mlcfg"/>
 <theory name="TwoPhase_Test" proved="true">
  <goal name="test&#39;vc" expl="VC for test" proved="true">
- <proof prover="0"><result status="valid" time="0.019451" steps="131"/></proof>
+ <proof prover="0"><result status="valid" time="0.019451" steps="132"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/bug/two_phase/why3shapes.gz b/creusot/tests/should_succeed/bug/two_phase/why3shapes.gz
index de6062b9b90953822c8ef341095e0a54dd5e4cf9..7958141099a71d5e2d3b5e63781201301051ded8 100644
GIT binary patch
literal 296
zcmV+@0oVQ?iwFP!00000|8-BxZo?oDy!$J-we<;XVsO<QtV$M^dfsELO-vG00<Ddb
ze110%SL*A;>@YJsd!MsuhwpY`2RlwKhDTPh{2@yp=)yq)Z!>&aqPJn2c1Tk1<FVhz
z!TJ&err5iXaE~Y6TnxV?-I=Dhy+xK#%&>rRh63aaIV@=Ba*lRku&3U~ty^<^h3d~L
z{C~bn9gcR2{$M%O9R+`HNSPX^5Z6DQ8br}tYu<nWO@5j{h_?HxNYkIoNygjedXnHT
zm|yKRuHrbxqaE({Z<p;G7tqrMZh-2XORLo-p9qCpoBH!lLqtw<PNFu0XSRtWOLj_G
uCUvQ`t*T+gWxZKziAq_CwOXlK<6>aSRAynMDNSL7;n^oR9dh{g0RR9;pN~ZV

literal 296
zcmV+@0oVQ?iwFP!00000|8-BxZi6royz>>lwdG_R0;XyXs1h<#&wDIdz)7q+b_-UL
z&+q0zrM^y{9nZ|p-luHd;k%jH!A!Fa{*e_deMsU5T7SraHwiwi(HXyuJ0z)d;n?lN
zXj}#YW9Y1pxW^N(FNR-|_Ds{;+#)lO3zU#8P(Z#w4lCNZUZSlZ&8c%?YX^?6Q2bei
z|IfFv#mUUU9Sn!6rQq)kDO2I>!|>CoK*;)9^9BSc^3w!DH0@VKn*Ll)GTzkJlLUXk
z^lGoL57QKmX1v?KUAAwmM@JXf5sGsztu8P5M3lHSu{;0NM5HvQBx(|PW}7gvXy%wC
uqD0XvuBs~U)rc##8Mx|YUPzQu3?(adp;tQBnU-2;o_qp*OID!v0RR9nK9Dv5

diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg
index da3c5b19a9..c65fe965dc 100644
--- a/creusot/tests/should_succeed/cell/02.mlcfg
+++ b/creusot/tests/should_succeed/cell/02.mlcfg
@@ -97,12 +97,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/cell/02/why3shapes.gz b/creusot/tests/should_succeed/cell/02/why3shapes.gz
index 89c80ad8e1be8b41116739485dd659bfb0def7a2..00882d9e3be5b8d62f1ae984767d1725c990b1d8 100644
GIT binary patch
literal 2153
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

literal 2158
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

diff --git a/creusot/tests/should_succeed/closures/05_map.mlcfg b/creusot/tests/should_succeed/closures/05_map.mlcfg
index 1df63b3c67..0b3bb07e05 100644
--- a/creusot/tests/should_succeed/closures/05_map.mlcfg
+++ b/creusot/tests/should_succeed/closures/05_map.mlcfg
@@ -282,10 +282,10 @@ module C05Map_Impl0_Next
     goto BB6
   }
   BB4 {
-    assert { [@expl:type invariant] inv1 _2 };
-    assume { resolve0 _2 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
+    assert { [@expl:type invariant] inv1 _2 };
+    assume { resolve0 _2 };
     assert { [#"../05_map.rs" 18 14 18 30] false };
     absurd
   }
diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg
index 1d6f0c122e..5461997934 100644
--- a/creusot/tests/should_succeed/filter_positive.mlcfg
+++ b/creusot/tests/should_succeed/filter_positive.mlcfg
@@ -86,12 +86,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/filter_positive/why3session.xml b/creusot/tests/should_succeed/filter_positive/why3session.xml
index 5ddae2cb75..8d1abbb75a 100644
--- a/creusot/tests/should_succeed/filter_positive/why3session.xml
+++ b/creusot/tests/should_succeed/filter_positive/why3session.xml
@@ -23,7 +23,7 @@
 </theory>
 <theory name="FilterPositive_M" proved="true">
  <goal name="m&#39;vc" expl="VC for m" proved="true">
- <proof prover="0"><result status="valid" time="0.034295" steps="131194"/></proof>
+ <proof prover="0"><result status="valid" time="0.034295" steps="123909"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/filter_positive/why3shapes.gz b/creusot/tests/should_succeed/filter_positive/why3shapes.gz
index 0db3cef9ee62f0eab0b5f2cbb0caab3064eb9e1f..878d0edfabb9ccbb2064f22ffb75294bd095ee75 100644
GIT binary patch
literal 885
zcmV-*1B(0~iwFP!00000|BX~zZ`w)_e)q57t>+}Fw6k{~g-QqonfGcRiza5BI2fD*
zCTahDXV*5x2HFbb9nXAo+4*Mt&)wwkf^YsXdH4H6S?~Uv=*iu`$-Kd@`=g)Z1AeC8
zYYte36U!MsOmo)C5%UMg0;_}Xju!s~n|f958hrK*HmxhcuK=gy|C;#iTk~TT%S>>J
zyW@6M7pu4Wz#Mbncv%j0_}M{Ddc41`r$Wz5AYe4)jEeX&4KWu9U3`!!6hgHQH5+V}
zm$>`biYwSz?9`?M1nKqEsZQ=}o362cRl=3VJrHseOQSQP*E6R)xHTiqJ(i(nav@{o
zchAjBtTz-_F2{_OIZK-VvE02I#}=KaL)%(WIo^xXiCz>=_9Azx7s2U85-RPo63tar
zf2_9k+E?IApLvVl*(^F-K$bzxoasX{XBXo^NgWWcFdCIKFwbZv07k=dW;q)di1R|=
z*4R%>2p%(5e!IohuQ=qB?>!#M-7{t94uk{gK+)nH-zv}k<be0&5{d{;_|W>d?K&?O
zsQ1P}dZDzW3}X<@p(&$DaGd@yo(0l|HG$>m-W-C3Q9wF7zDU`Q38`WWS_j9?C~B`y
z$MkU?2mhDf2|3WGHwJ|BB~HogxLuHhM?!1)Df(C<_55Auun04>da94R_2JUGoEPmH
z%|lG%xazhlz6m`WCJ=fQLgnxnH_!=1SbB~=e1sCb^_4k$j2K!G@i=SuMu-{G6<6<A
z9X<6_53eiex&htg;L)FtR)27(LAlT-1SewZzPEy1?QKZ*xR}lH)^18W;`kOr*C;<_
zmp3LwvFlVT=43jiTBbuLr1~Az!8)K?S|<a!RE(4I#5uibIpSQ)Q7oB<w(k9*uHHR;
z%|wW!1wPgLef{CrpSByPEEeSsE2lY@YkEc^G<O<W<|z@(ZZ#UeIeopkk_@NZD_<Qx
zUi_ZshVF2IyB2gXY-6V`@3&amZ*VdAUA#)-=98k{Pqs<omGIPN&FO2IGUeA2Q!b1$
zMyyq#^9f`uDJ)Z3L7G~d3a+^l!kSzfn=)NMt_UPDo-hr@*uv+=8*7l~Rx2T`UxTN}
z=m{nXhT1+Ah4%omP(DQsU~&W|EikTtqNN$w3`_<(1C@cyKxDu(fDBlcW;QdK&Q$Uf
LCu+s^6$t<UA;qz2

literal 886
zcmV-+1Bv_}iwFP!00000|BY1Lj@nENz0Xr{*LGKx#`B+Qsf5s?aQ|s88@XY!n<bDf
zgx&V-KhGpk5}>U>8OJ{U86P_z?<V_aeD(Xuo8RrLX8UELCwHHcd5iz;4t|ag_?dn$
z1z;6UtY-KyEm$W<%wHf2toOb@I{a5`o4ne#_~ct`J6D2V0Zz&PCGnfr_E#RuOmK?Z
z!zORa{I%IL#~e6bRYM(qc2JNW@2~5r(DM=q7!3uZBEC*T%tb;MA7l!JP_0AF8r$V1
z?mo8S3U(GdweA5ydO3BfmwVf~Z|pynaHVk%gj~nc=uGJK%&7=&?MQQvRj8R<$XNUB
zQ~Mn24aHT<F=JK1lJ*By+c)Fbq8D{&TPG^VkD_$qC<-T!B6sR2g42s6RN7}Hn(MlG
z&o|A=*Wk=C^9FyiS#-F7EQ6Xka}3FxU5p1MbwIqrXjIa`JfoQa7!Avr<!oFa&I^G%
z<8fj_@R+gon+@i_<B(6W^SH0JPn4ZI5DugRMT>KItv&mj1KyKMC?YuFL+9VM>%3T?
z-Wvz$h0>BTj6pPqri>=Rar(n}7DyY`1eT+Fa|jkj0qN}dB4sxwq>3%*92_^Js7HM|
zrjPSD_`m&5$bmk+F(8~TaY|;#?Sdpc5L(L*(Z>?0=kL0JMVO)ddvn;X_LtV>yzJI!
z9%35DRlim7P3YM$fzYE6s({D1flesG(sT6TBb4BsuPoSO#L$X}$62>GLd=k^n7?6t
z@YGX1ysn_@26Uf;M}IzA{lT3E<wBPboQSE9y%p?gZ$q-j#cYnZc2n9B$F~@|M)@hb
zyfG<?U8h<xC(|+2G95A@)t{&i)&bShIvL2NVw{vG&go6d5$9TtV#y-3b?5g@{pRUw
zCPEx7@O!h{HSd1)VY7D1Vp(mmcA8_gqGu#RbElzWo)W?AR-^Ho)7P6T$#BY@`+EQW
z>~}ObbcYMvwV;Dx8$0!Rzs1u2fQ!NJ;#CqipOnpRvPlxJgr_!ZPG8HEDZi4Ka$%G)
zVx>x5Odw-PX_?Xr($v~iaLttv))dm%l<5)*MIe#!glRCwmcB6FScAN<S_x_W3Oq$d
zPcTU^!$m1m<CV84C1_iuO0Tp+kjkfmO(4y{W?(YV8K?|o1|kEV0c60kG_#q>bf%L3
M0U8uFWEBYj03)=$$N&HU

diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg
index 80e8169fbe..aaf2da7a66 100644
--- a/creusot/tests/should_succeed/hashmap.mlcfg
+++ b/creusot/tests/should_succeed/hashmap.mlcfg
@@ -77,12 +77,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/hashmap/why3session.xml b/creusot/tests/should_succeed/hashmap/why3session.xml
index 59f0b1a1a5..f8ce4b4682 100644
--- a/creusot/tests/should_succeed/hashmap/why3session.xml
+++ b/creusot/tests/should_succeed/hashmap/why3session.xml
@@ -39,7 +39,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="34"/></proof>
   </goal>
   <goal name="add&#39;vc.6" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="257"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="259"/></proof>
   </goal>
   <goal name="add&#39;vc.7" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="360"/></proof>
@@ -57,7 +57,7 @@
   <proof prover="3"><result status="valid" time="0.037622" steps="117"/></proof>
   </goal>
   <goal name="add&#39;vc.12" expl="loop invariant init" proved="true">
-  <proof prover="2"><result status="valid" time="0.117533" steps="127988"/></proof>
+  <proof prover="2"><result status="valid" time="0.117533" steps="128002"/></proof>
   </goal>
   <goal name="add&#39;vc.13" expl="loop invariant init" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="163"/></proof>
@@ -69,7 +69,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="168"/></proof>
   </goal>
   <goal name="add&#39;vc.16" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="560"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="548"/></proof>
   </goal>
   <goal name="add&#39;vc.17" expl="loop invariant init" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="130"/></proof>
@@ -99,19 +99,19 @@
   <proof prover="2"><result status="valid" time="0.046695" steps="140146"/></proof>
   </goal>
   <goal name="add&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.336146" steps="40989"/></proof>
+  <proof prover="1"><result status="valid" time="0.168621" steps="41174"/></proof>
   </goal>
   <goal name="add&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.224426" steps="28870"/></proof>
+  <proof prover="1"><result status="valid" time="0.224426" steps="29055"/></proof>
   </goal>
   <goal name="add&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.030000" steps="328951"/></proof>
+  <proof prover="2"><result status="valid" time="0.030000" steps="328955"/></proof>
   </goal>
   <goal name="add&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.239705" steps="28878"/></proof>
+  <proof prover="1"><result status="valid" time="0.239705" steps="29063"/></proof>
   </goal>
   <goal name="add&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.074204" steps="335943"/></proof>
+  <proof prover="2"><result status="valid" time="0.074204" steps="332559"/></proof>
   </goal>
   <goal name="add&#39;vc.31" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.023273" steps="235"/></proof>
@@ -152,14 +152,14 @@
      <goal name="add&#39;vc.40.0.1.0" expl="VC for add" proved="true">
      <transf name="inline_goal" proved="true" >
       <goal name="add&#39;vc.40.0.1.0.0" expl="VC for add" proved="true">
-      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="3.067385" steps="71094"/></proof>
+      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="3.067385" steps="71307"/></proof>
       </goal>
      </transf>
      </goal>
     </transf>
     </goal>
     <goal name="add&#39;vc.40.0.2" expl="VC for add" proved="true">
-    <proof prover="1"><result status="valid" time="0.516297" steps="47106"/></proof>
+    <proof prover="1"><result status="valid" time="0.211758" steps="47291"/></proof>
     </goal>
    </transf>
    </goal>
@@ -204,21 +204,21 @@
      <goal name="add&#39;vc.50.0.1.0" expl="VC for add" proved="true">
      <transf name="inline_goal" proved="true" >
       <goal name="add&#39;vc.50.0.1.0.0" expl="VC for add" proved="true">
-      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.896837" steps="20340"/></proof>
+      <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.896837" steps="19973"/></proof>
       </goal>
      </transf>
      </goal>
     </transf>
     </goal>
     <goal name="add&#39;vc.50.0.2" expl="VC for add" proved="true">
-    <proof prover="3"><result status="valid" time="0.162916" steps="3693"/></proof>
+    <proof prover="3"><result status="valid" time="0.162916" steps="3781"/></proof>
     </goal>
    </transf>
    </goal>
   </transf>
   </goal>
   <goal name="add&#39;vc.51" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.082778" steps="347021"/></proof>
+  <proof prover="2"><result status="valid" time="0.082778" steps="347027"/></proof>
   </goal>
   <goal name="add&#39;vc.52" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
@@ -235,7 +235,7 @@
         <goal name="add&#39;vc.52.0.0.0.0.0.0" expl="postcondition" proved="true">
         <transf name="split_all_full" proved="true" >
          <goal name="add&#39;vc.52.0.0.0.0.0.0.0" expl="postcondition" proved="true">
-         <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="1.278036" steps="32026"/></proof>
+         <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.909392" steps="23946"/></proof>
          </goal>
         </transf>
         </goal>
@@ -250,7 +250,7 @@
    </transf>
    </goal>
    <goal name="add&#39;vc.52.1" expl="postcondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.314198" steps="9100"/></proof>
+   <proof prover="3"><result status="valid" time="0.314198" steps="9167"/></proof>
    </goal>
   </transf>
   </goal>
@@ -282,7 +282,7 @@
   <proof prover="3"><result status="valid" time="0.030365" steps="26"/></proof>
   </goal>
   <goal name="get&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.047542" steps="247"/></proof>
+  <proof prover="3"><result status="valid" time="0.047542" steps="239"/></proof>
   </goal>
   <goal name="get&#39;vc.8" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.034683" steps="50"/></proof>
@@ -336,7 +336,7 @@
   <proof prover="3"><result status="valid" time="0.036566" steps="42"/></proof>
   </goal>
   <goal name="get&#39;vc.25" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.204543" steps="22492"/></proof>
+  <proof prover="1"><result status="valid" time="0.204543" steps="22677"/></proof>
   </goal>
   <goal name="get&#39;vc.26" expl="postcondition" proved="true">
   <proof prover="3"><result status="valid" time="0.030945" steps="58"/></proof>
@@ -375,7 +375,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="36"/></proof>
   </goal>
   <goal name="resize&#39;vc.9" expl="loop invariant init" proved="true">
-  <proof prover="1"><result status="valid" time="0.110000" steps="17318"/></proof>
+  <proof prover="1"><result status="valid" time="0.110000" steps="17500"/></proof>
   </goal>
   <goal name="resize&#39;vc.10" expl="loop invariant init" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="51"/></proof>
@@ -393,7 +393,7 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="79"/></proof>
   </goal>
   <goal name="resize&#39;vc.15" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.030000" steps="119862"/></proof>
+  <proof prover="2"><result status="valid" time="0.030000" steps="119856"/></proof>
   </goal>
   <goal name="resize&#39;vc.16" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="87"/></proof>
@@ -426,13 +426,13 @@
   <proof prover="3"><result status="valid" time="0.020000" steps="134"/></proof>
   </goal>
   <goal name="resize&#39;vc.26" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="718"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="715"/></proof>
   </goal>
   <goal name="resize&#39;vc.27" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="405"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="410"/></proof>
   </goal>
   <goal name="resize&#39;vc.28" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.143185" steps="505"/></proof>
+  <proof prover="3"><result status="valid" time="0.143185" steps="513"/></proof>
   </goal>
   <goal name="resize&#39;vc.29" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.057361" steps="162"/></proof>
@@ -462,19 +462,19 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="132"/></proof>
   </goal>
   <goal name="resize&#39;vc.38" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.186472" steps="2170"/></proof>
+  <proof prover="3"><result status="valid" time="0.186472" steps="2168"/></proof>
   </goal>
   <goal name="resize&#39;vc.39" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.191667" steps="2020"/></proof>
+  <proof prover="3"><result status="valid" time="0.191667" steps="2023"/></proof>
   </goal>
   <goal name="resize&#39;vc.40" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.283013" steps="34981"/></proof>
+  <proof prover="1"><result status="valid" time="0.133882" steps="35166"/></proof>
   </goal>
   <goal name="resize&#39;vc.41" expl="loop invariant preservation" proved="true">
   <proof prover="2"><result status="valid" time="0.030000" steps="122836"/></proof>
   </goal>
   <goal name="resize&#39;vc.42" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.187169" steps="1945"/></proof>
+  <proof prover="3"><result status="valid" time="0.187169" steps="1949"/></proof>
   </goal>
   <goal name="resize&#39;vc.43" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="150"/></proof>
@@ -483,19 +483,19 @@
   <proof prover="3"><result status="valid" time="0.059040" steps="99"/></proof>
   </goal>
   <goal name="resize&#39;vc.45" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.197998" steps="5701"/></proof>
+  <proof prover="3"><result status="valid" time="0.197998" steps="5637"/></proof>
   </goal>
   <goal name="resize&#39;vc.46" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.010000" steps="308"/></proof>
+  <proof prover="3"><result status="valid" time="0.010000" steps="306"/></proof>
   </goal>
   <goal name="resize&#39;vc.47" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.220708" steps="25324"/></proof>
+  <proof prover="1"><result status="valid" time="0.220708" steps="25509"/></proof>
   </goal>
   <goal name="resize&#39;vc.48" expl="loop invariant preservation" proved="true">
   <proof prover="3"><result status="valid" time="0.020000" steps="149"/></proof>
   </goal>
   <goal name="resize&#39;vc.49" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="325"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="324"/></proof>
   </goal>
   <goal name="resize&#39;vc.50" expl="loop invariant preservation" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="104"/></proof>
@@ -514,7 +514,7 @@
 </theory>
 <theory name="Hashmap_Main" proved="true">
  <goal name="main&#39;vc" expl="VC for main" proved="true">
- <proof prover="2"><result status="valid" time="0.104287" steps="246197"/></proof>
+ <proof prover="2"><result status="valid" time="0.104287" steps="258233"/></proof>
  </goal>
 </theory>
 <theory name="Hashmap_Impl0" proved="true">
diff --git a/creusot/tests/should_succeed/hashmap/why3shapes.gz b/creusot/tests/should_succeed/hashmap/why3shapes.gz
index 89987a474ea690ac720e62de0610ddded9b10a50..2c28e59a524de8313dfdf058efca34ea0a60c421 100644
GIT binary patch
delta 10185
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
DZyN$e

delta 10200
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
S0@$F8Kl}f3g*OUo0|5Z+^3e?d

diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg
index 19e26134ea..33847019ce 100644
--- a/creusot/tests/should_succeed/heapsort_generic.mlcfg
+++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg
@@ -181,12 +181,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3session.xml b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
index 690890b9a9..01f99d27a7 100644
--- a/creusot/tests/should_succeed/heapsort_generic/why3session.xml
+++ b/creusot/tests/should_succeed/heapsort_generic/why3session.xml
@@ -32,7 +32,7 @@
   <proof prover="5"><result status="valid" time="0.016734" steps="66"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.5" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.019680" steps="105"/></proof>
+  <proof prover="5"><result status="valid" time="0.019680" steps="104"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.6" expl="loop invariant init" proved="true">
   <proof prover="5"><result status="valid" time="0.031433" steps="278"/></proof>
@@ -50,13 +50,13 @@
   <proof prover="2"><result status="valid" time="0.039010" steps="168965"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.11" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.034036" steps="416"/></proof>
+  <proof prover="5"><result status="valid" time="0.034036" steps="417"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.12" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.035707" steps="448"/></proof>
+  <proof prover="5"><result status="valid" time="0.035707" steps="447"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.13" expl="integer overflow" proved="true">
-  <proof prover="5"><result status="valid" time="0.043446" steps="511"/></proof>
+  <proof prover="5"><result status="valid" time="0.043446" steps="515"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.14" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.050653" steps="486"/></proof>
@@ -74,7 +74,7 @@
   <proof prover="5"><result status="valid" time="0.021657" steps="144"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.041698" steps="178364"/></proof>
+  <proof prover="2"><result status="valid" time="0.041698" steps="178360"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.20" expl="precondition" proved="true">
   <proof prover="2"><result status="valid" time="0.039960" steps="171392"/></proof>
@@ -98,7 +98,7 @@
   <proof prover="5"><result status="valid" time="0.019246" steps="102"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.27" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.439627" steps="78180"/></proof>
+  <proof prover="3"><result status="valid" time="0.229099" steps="78330"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.28" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.025269" steps="65"/></proof>
@@ -110,7 +110,7 @@
   <proof prover="5"><result status="valid" time="0.015883" steps="43"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.061332" steps="297"/></proof>
+  <proof prover="5"><result status="valid" time="0.061332" steps="298"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.32" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.024699" steps="71"/></proof>
@@ -131,10 +131,10 @@
   <proof prover="5"><result status="valid" time="0.025544" steps="85"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.068048" steps="389"/></proof>
+  <proof prover="5"><result status="valid" time="0.068048" steps="388"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.39" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.473313" steps="82298"/></proof>
+  <proof prover="3"><result status="valid" time="0.242699" steps="82483"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.40" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.026685" steps="105"/></proof>
@@ -143,20 +143,20 @@
   <proof prover="5"><result status="valid" time="0.026065" steps="107"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.42" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.077758" steps="441"/></proof>
+  <proof prover="5"><result status="valid" time="0.077758" steps="440"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.43" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.506906" steps="85003"/></proof>
+  <proof prover="3"><result status="valid" time="0.269807" steps="86486"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.591638" steps="67382"/></proof>
+  <proof prover="3"><result status="valid" time="0.302663" steps="67567"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.45" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.45.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.45.0.0" expl="loop invariant preservation" proved="true">
-    <proof prover="0"><result status="valid" time="1.471645" steps="203095"/></proof>
+    <proof prover="0"><result status="valid" time="1.471645" steps="215900"/></proof>
     </goal>
    </transf>
    </goal>
@@ -165,10 +165,10 @@
     <goal name="sift_down&#39;vc.45.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="sift_down&#39;vc.45.1.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="3.351503" steps="368269"/></proof>
+     <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="2.038489" steps="368458"/></proof>
      </goal>
      <goal name="sift_down&#39;vc.45.1.0.1" expl="loop invariant preservation" proved="true">
-     <proof prover="0" timelimit="10"><result status="valid" time="1.538140" steps="349823"/></proof>
+     <proof prover="0" timelimit="10"><result status="valid" time="1.538140" steps="321267"/></proof>
      </goal>
     </transf>
     </goal>
@@ -181,7 +181,7 @@
    <goal name="sift_down&#39;vc.46.0" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.46.0.0" expl="loop invariant preservation" proved="true">
-    <proof prover="3"><result status="valid" time="0.938938" steps="108822"/></proof>
+    <proof prover="3"><result status="valid" time="0.597162" steps="109007"/></proof>
     </goal>
    </transf>
    </goal>
@@ -190,12 +190,12 @@
     <goal name="sift_down&#39;vc.46.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="sift_down&#39;vc.46.1.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="3"><result status="valid" time="0.716238" steps="81135"/></proof>
+     <proof prover="3"><result status="valid" time="0.390807" steps="81312"/></proof>
      </goal>
      <goal name="sift_down&#39;vc.46.1.0.1" expl="loop invariant preservation" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="sift_down&#39;vc.46.1.0.1.0" expl="loop invariant preservation" proved="true">
-      <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.318427" steps="145146"/></proof>
+      <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="0.856921" steps="128095"/></proof>
       </goal>
      </transf>
      </goal>
@@ -208,10 +208,10 @@
   <goal name="sift_down&#39;vc.47" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.47.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.961927" steps="82473"/></proof>
+   <proof prover="3"><result status="valid" time="0.501024" steps="82658"/></proof>
    </goal>
    <goal name="sift_down&#39;vc.47.1" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.842804" steps="80867"/></proof>
+   <proof prover="3"><result status="valid" time="0.395238" steps="81017"/></proof>
    </goal>
   </transf>
   </goal>
@@ -222,7 +222,7 @@
     <goal name="sift_down&#39;vc.48.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="sift_down&#39;vc.48.0.0.0" expl="loop invariant preservation" proved="true">
-     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.869049" steps="90310"/></proof>
+     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.460618" steps="90460"/></proof>
      </goal>
     </transf>
     </goal>
@@ -236,7 +236,7 @@
      <proof prover="2"><result status="valid" time="0.051307" steps="186215"/></proof>
      </goal>
      <goal name="sift_down&#39;vc.48.1.0.1" expl="loop invariant preservation" proved="true">
-     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.854658" steps="95658"/></proof>
+     <proof prover="3" timelimit="10" memlimit="2000"><result status="valid" time="0.506186" steps="95808"/></proof>
      </goal>
     </transf>
     </goal>
@@ -250,14 +250,14 @@
   <goal name="sift_down&#39;vc.50" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="sift_down&#39;vc.50.0" expl="postcondition" proved="true">
-   <proof prover="5"><result status="valid" time="0.203016" steps="2145"/></proof>
+   <proof prover="5"><result status="valid" time="0.203016" steps="2147"/></proof>
    </goal>
    <goal name="sift_down&#39;vc.50.1" expl="postcondition" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="sift_down&#39;vc.50.1.0" expl="postcondition" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="sift_down&#39;vc.50.1.0.0" expl="postcondition" proved="true">
-     <proof prover="3"><result status="valid" time="0.824943" steps="107127"/></proof>
+     <proof prover="3"><result status="valid" time="0.500745" steps="107277"/></proof>
      </goal>
     </transf>
     </goal>
@@ -266,10 +266,10 @@
      <goal name="sift_down&#39;vc.50.1.1.0" expl="postcondition" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="sift_down&#39;vc.50.1.1.0.0" expl="postcondition" proved="true">
-      <proof prover="3"><result status="valid" time="0.831382" steps="101731"/></proof>
+      <proof prover="3"><result status="valid" time="0.506429" steps="101916"/></proof>
       </goal>
       <goal name="sift_down&#39;vc.50.1.1.0.1" expl="postcondition" proved="true">
-      <proof prover="3"><result status="valid" time="0.903259" steps="105590"/></proof>
+      <proof prover="3"><result status="valid" time="0.507719" steps="105775"/></proof>
       </goal>
      </transf>
      </goal>
@@ -280,13 +280,13 @@
   </transf>
   </goal>
   <goal name="sift_down&#39;vc.51" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.045758" steps="177698"/></proof>
+  <proof prover="2"><result status="valid" time="0.045758" steps="177761"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.52" expl="postcondition" proved="true">
   <proof prover="5"><result status="valid" time="0.055685" steps="468"/></proof>
   </goal>
   <goal name="sift_down&#39;vc.53" expl="postcondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.201430" steps="2779"/></proof>
+  <proof prover="5"><result status="valid" time="0.201430" steps="1916"/></proof>
   </goal>
  </transf>
  </goal>
@@ -313,7 +313,7 @@
   <proof prover="5"><result status="valid" time="0.010000" steps="249"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.6" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.163234" steps="625"/></proof>
+  <proof prover="5"><result status="valid" time="0.163234" steps="627"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.7" expl="loop invariant init" proved="true">
   <proof prover="5"><result status="valid" time="0.050000" steps="113"/></proof>
@@ -334,13 +334,13 @@
   <proof prover="5"><result status="valid" time="0.080000" steps="224"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="5"><result status="valid" time="0.060000" steps="151"/></proof>
+  <proof prover="5"><result status="valid" time="0.060000" steps="150"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.14" expl="type invariant" proved="true">
   <proof prover="5"><result status="valid" time="0.051245" steps="146"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.15" expl="postcondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.180000" steps="1382"/></proof>
+  <proof prover="5"><result status="valid" time="0.180000" steps="1384"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.16" expl="postcondition" proved="true">
   <proof prover="5"><result status="valid" time="0.070000" steps="159"/></proof>
@@ -364,10 +364,10 @@
   <proof prover="5"><result status="valid" time="0.036699" steps="186"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.23" expl="assertion" proved="true">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="1.156512" steps="300766"/></proof>
+  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="1.156512" steps="300823"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.319274" steps="51073"/></proof>
+  <proof prover="0"><result status="valid" time="0.319274" steps="51148"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.25" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.060000" steps="93"/></proof>
@@ -379,10 +379,10 @@
   <proof prover="5"><result status="valid" time="0.036609" steps="201"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.160000" steps="788"/></proof>
+  <proof prover="5"><result status="valid" time="0.160000" steps="785"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="5"><result status="valid" time="0.151073" steps="1833"/></proof>
+  <proof prover="5"><result status="valid" time="0.151073" steps="1822"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.30" expl="loop invariant preservation" proved="true">
   <proof prover="5"><result status="valid" time="0.130000" steps="214"/></proof>
@@ -398,7 +398,7 @@
       <goal name="heap_sort&#39;vc.31.0.0.0.0" expl="loop invariant preservation" proved="true">
       <transf name="split_vc" proved="true" >
        <goal name="heap_sort&#39;vc.31.0.0.0.0.0" expl="loop invariant preservation" proved="true">
-       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="2.053087" steps="432103"/></proof>
+       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="2.053087" steps="432102"/></proof>
        </goal>
       </transf>
       </goal>
@@ -411,7 +411,7 @@
   </transf>
   </goal>
   <goal name="heap_sort&#39;vc.32" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.444174" steps="60851"/></proof>
+  <proof prover="3"><result status="valid" time="0.266323" steps="61036"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.33" expl="integer overflow" proved="true">
   <proof prover="5"><result status="valid" time="0.050000" steps="132"/></proof>
@@ -420,10 +420,10 @@
   <proof prover="5"><result status="valid" time="0.046440" steps="133"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="0" memlimit="2000"><result status="valid" time="0.241869" steps="31590"/></proof>
+  <proof prover="0" memlimit="2000"><result status="valid" time="0.241869" steps="31665"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.36" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.070000" steps="187"/></proof>
+  <proof prover="5"><result status="valid" time="0.070000" steps="188"/></proof>
   </goal>
   <goal name="heap_sort&#39;vc.37" expl="precondition" proved="true">
   <proof prover="5"><result status="valid" time="0.030000" steps="165"/></proof>
diff --git a/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz b/creusot/tests/should_succeed/heapsort_generic/why3shapes.gz
index e11d0258e0003122492c1958b120ec81d106e452..a41b99bf4e4de921f2fe7cb3139d86252b2e6427 100644
GIT binary patch
literal 9130
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

literal 9128
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

diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg
index 7778b45d1b..c76af90cd2 100644
--- a/creusot/tests/should_succeed/hillel.mlcfg
+++ b/creusot/tests/should_succeed/hillel.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -1097,11 +1103,11 @@ module Hillel_InsertUnique
     goto BB18
   }
   BB17 {
-    assert { [@expl:type invariant] inv4 _28 };
-    assume { resolve6 _28 };
     assume { resolve8 iter };
     assert { [@expl:type invariant] inv6 elem };
     assume { resolve9 elem };
+    assert { [@expl:type invariant] inv4 _28 };
+    assume { resolve6 _28 };
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve10 vec };
     assert { [#"../hillel.rs" 84 4 84 111] false };
@@ -1759,7 +1765,7 @@ end
 module Hillel_Score_Impl
   use prelude.Int
   function abs_diff0 (self : int) (other : int) : int =
-    [#"../../../../creusot-contracts/src/logic/int.rs" 50 4 50 12] if self < other then other - self else self - other
+    [#"../../../../creusot-contracts/src/logic/int.rs" 51 4 51 12] if self < other then other - self else self - other
   val abs_diff0 (self : int) (other : int) : int
     ensures { result = abs_diff0 self other }
     
@@ -2029,7 +2035,7 @@ module Hillel_Fulcrum
   axiom inv0 : forall x : Core_Slice_Iter_Iter_Type.t_iter uint32 . inv0 x = true
   use prelude.Snapshot
   function abs_diff1 (self : int) (other : int) : int =
-    [#"../../../../creusot-contracts/src/logic/int.rs" 50 4 50 12] if self < other then other - self else self - other
+    [#"../../../../creusot-contracts/src/logic/int.rs" 51 4 51 12] if self < other then other - self else self - other
   val abs_diff1 (self : int) (other : int) : int
     ensures { result = abs_diff1 self other }
     
@@ -2323,56 +2329,54 @@ module Hillel_Fulcrum
     return _0
   }
   BB20 {
-    goto BB21
+    goto BB22
   }
   BB21 {
+    assert { [#"../hillel.rs" 171 4 171 58] false };
+    absurd
+  }
+  BB22 {
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _50;
     [#"../hillel.rs" 171 4 171 58] _55 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
-    goto BB22
+    goto BB23
   }
-  BB22 {
+  BB23 {
     [#"../hillel.rs" 171 4 171 58] produced1 <- _55;
     _55 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem1;
     [#"../hillel.rs" 177 32 177 43] _60 <- total - sum;
     [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 sum _60);
     _60 <- any uint32;
-    goto BB23
+    goto BB24
   }
-  BB23 {
+  BB24 {
     [#"../hillel.rs" 178 11 178 26] _64 <- dist < min_dist;
     switch (_64)
-      | False -> goto BB25
-      | True -> goto BB24
+      | False -> goto BB26
+      | True -> goto BB25
       end
   }
-  BB24 {
+  BB25 {
     [#"../hillel.rs" 179 12 179 21] min_i <- i;
     [#"../hillel.rs" 180 12 180 27] min_dist <- dist;
     [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] ());
-    goto BB26
+    goto BB27
   }
-  BB25 {
+  BB26 {
     [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] ());
-    goto BB26
+    goto BB27
   }
-  BB26 {
+  BB27 {
     [#"../hillel.rs" 183 17 183 18] _70 <- i;
     [#"../hillel.rs" 183 15 183 19] _71 <- Slice.length s;
     [#"../hillel.rs" 183 15 183 19] _72 <- _70 < _71;
     assert { [@expl:index in bounds] [#"../hillel.rs" 183 15 183 19] _72 };
-    goto BB27
+    goto BB28
   }
-  BB27 {
+  BB28 {
     [#"../hillel.rs" 183 8 183 19] sum <- sum + Slice.get s _70;
     [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] ());
     goto BB16
   }
-  BB29 {
-    goto BB9
-  }
-  BB30 {
-    goto BB9
-  }
   
 end
diff --git a/creusot/tests/should_succeed/hillel/why3session.xml b/creusot/tests/should_succeed/hillel/why3session.xml
index 7a4e081fc7..40de0b593a 100644
--- a/creusot/tests/should_succeed/hillel/why3session.xml
+++ b/creusot/tests/should_succeed/hillel/why3session.xml
@@ -10,12 +10,12 @@
 <path name=".."/><path name="hillel.mlcfg"/>
 <theory name="Hillel_RightPad" proved="true">
  <goal name="right_pad&#39;vc" expl="VC for right_pad" proved="true">
- <proof prover="4"><result status="valid" time="0.130000" steps="958"/></proof>
+ <proof prover="4"><result status="valid" time="0.130000" steps="966"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_LeftPad" proved="true">
  <goal name="left_pad&#39;vc" expl="VC for left_pad" proved="true">
- <proof prover="4"><result status="valid" time="0.179477" steps="3185"/></proof>
+ <proof prover="4"><result status="valid" time="0.179477" steps="3197"/></proof>
  </goal>
 </theory>
 <theory name="Hillel_SubsetPush_Impl" proved="true">
@@ -63,7 +63,7 @@
   <proof prover="4"><result status="valid" time="0.016424" steps="62"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.12" expl="assertion" proved="true">
-  <proof prover="4"><result status="valid" time="0.060000" steps="801"/></proof>
+  <proof prover="4"><result status="valid" time="0.060000" steps="802"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.13" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.019755" steps="78"/></proof>
@@ -84,7 +84,7 @@
   <proof prover="4"><result status="valid" time="0.019742" steps="83"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.19" expl="assertion" proved="true">
-  <proof prover="4"><result status="valid" time="0.090000" steps="1627"/></proof>
+  <proof prover="4"><result status="valid" time="0.090000" steps="1625"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.20" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.020540" steps="91"/></proof>
@@ -105,7 +105,7 @@
   <proof prover="4"><result status="valid" time="0.010000" steps="706"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.129146" steps="837"/></proof>
+  <proof prover="4"><result status="valid" time="0.129146" steps="832"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.27" expl="type invariant" proved="true">
   <proof prover="4"><result status="valid" time="0.016069" steps="95"/></proof>
@@ -120,12 +120,12 @@
   <proof prover="4"><result status="valid" time="0.010016" steps="102"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.31" expl="assertion" proved="true">
-  <proof prover="4"><result status="valid" time="0.067612" steps="1460"/></proof>
+  <proof prover="4"><result status="valid" time="0.067612" steps="1479"/></proof>
   </goal>
   <goal name="insert_unique&#39;vc.32" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="insert_unique&#39;vc.32.0" expl="postcondition" proved="true">
-   <proof prover="4"><result status="valid" time="0.107459" steps="2587"/></proof>
+   <proof prover="4"><result status="valid" time="0.107459" steps="2588"/></proof>
    </goal>
    <goal name="insert_unique&#39;vc.32.1" expl="postcondition" proved="true">
    <proof prover="4"><result status="valid" time="0.008016" steps="109"/></proof>
@@ -133,17 +133,21 @@
   </transf>
   </goal>
   <goal name="insert_unique&#39;vc.33" expl="postcondition" proved="true">
-  <proof prover="1" timelimit="1"><result status="valid" time="0.584221" steps="1471077"/></proof>
+  <transf name="remove" proved="true" arg1="abs,uint64&#39;maxInt,uint64&#39;minInt,uint64&#39;eq,max_uint64,length1,radix,to_int,min_unsigned,in_bounds,singleton,cons,(++),get_id,borrow_logic,slice&#39;eq,id1,max0,invariant8,produces_trans0,produces_refl0,is_unique0,deep_model4,resolve5,into_iter_pre0,subset_push0,Abs_le,Abs_pos,Div_mod,Div_bound,Mod_bound,Div_sign_pos,Div_sign_neg,Mod_sign_pos,Mod_sign_neg,Rounds_toward_zero,Div_1,Mod_1,Div_inf,Mod_inf,Div_mult,Mod_mult,uint64&#39;inj,to_int_in_bounds,extensionality,zero_unsigned_is_zero,length_nonnegative,(==)&#39;spec&#39;0,set&#39;spec,set&#39;spec&#39;0,set&#39;spec&#39;1,set&#39;def,([&lt;-])&#39;def,singleton&#39;spec,singleton&#39;spec&#39;0,cons&#39;spec,cons&#39;spec&#39;0,cons&#39;spec&#39;1,snoc&#39;spec&#39;0,([..])&#39;spec,([..])&#39;spec&#39;0,([..])&#39;def,([_..])&#39;def,([.._])&#39;def,(++)&#39;spec,inner_spec,slice&#39;invariant,slice&#39;inj,slice_ext,length&#39;def,get&#39;def,some_0&#39;def,inv15,inv14,inv13,inv12,inv111,inv10,inv9,shallow_model3_spec,inv7,inv6,inv5,inv4,shallow_model5_spec,produces_trans0_spec,produces_refl0_spec,inv3,inv2,inv0,subset_push0_spec,Requires2,Requires1,Requires,H9,Assume5,H8,Assert2,Assume4,Ensures8,Assert1,Assume3,Ensures5,Assume2,H6,Assert,Assume1,H4,H2,Ensures3,H1,Ensures1,Assume,Ensures">
+   <goal name="insert_unique&#39;vc.33.0" expl="postcondition" proved="true">
+   <proof prover="1" timelimit="0.037067"><result status="valid" time="0.052825" steps="178057"/></proof>
+   </goal>
+  </transf>
   </goal>
   <goal name="insert_unique&#39;vc.34" expl="postcondition" proved="true">
   <transf name="remove" proved="true" arg1="zero,one,(-),(&gt;),(&lt;=),(&gt;=),abs,uint64&#39;maxInt,uint64&#39;minInt,max_uint64,length1,radix,to_int,min_unsigned,in_bounds,singleton,cons,(++),id,mAX&#39;5,index_logic3,shallow_model6,produces,produces_trans,produces_refl,is_unique,deep_model2,deep_model1,resolve5,shallow_model1,completed,index_logic,into_iter_post,into_iter_pre,shallow_model,subset_push,Assoc1,Unit_def_l,Unit_def_r,Inv_def_l,Inv_def_r,Comm1,Assoc,Mul_distr_l,Mul_distr_r,Comm,Unitary,NonTrivialRing,Refl,Trans,Antisymm,Total,ZeroLessOne,CompatOrderAdd,CompatOrderMult,Abs_le,Abs_pos,Div_mod,Div_bound,Mod_bound,Div_sign_pos,Div_sign_neg,Mod_sign_pos,Mod_sign_neg,Rounds_toward_zero,Div_1,Mod_1,Div_inf,Mod_inf,Div_mult,Mod_mult,to_int_in_bounds,extensionality,zero_unsigned_is_zero,(==)&#39;spec,(==)&#39;spec&#39;0,create&#39;spec&#39;0,empty&#39;def,set&#39;spec,set&#39;spec&#39;0,set&#39;spec&#39;1,([&lt;-])&#39;def,singleton&#39;spec,singleton&#39;spec&#39;0,cons&#39;spec,cons&#39;spec&#39;0,cons&#39;spec&#39;1,([..])&#39;spec,([..])&#39;spec&#39;0,([..])&#39;def,([_..])&#39;def,([.._])&#39;def,(++)&#39;spec,(++)&#39;spec&#39;0,(++)&#39;spec&#39;1,new_spec,slice&#39;invariant,slice_ext,length&#39;def,get&#39;def,some_0&#39;def,inv_trivial15,inv_trivial14,inv_trivial13,inv_trivial12,inv_trivial11,inv_trivial10,inv_trivial9,inv_trivial7,inv_trivial6,inv_trivial5,inv_trivial4,shallow_model_spec1,to_ref_seq_spec,produces_trans_spec,produces_refl_spec,inv_trivial3,inv_trivial2,inv_trivial1,inv_trivial,shallow_model_spec,subset_push_spec">
    <goal name="insert_unique&#39;vc.34.0" expl="postcondition" proved="true">
-   <proof prover="1"><result status="valid" time="0.027065" steps="146451"/></proof>
+   <proof prover="1"><result status="valid" time="0.027065" steps="146570"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="insert_unique&#39;vc.35" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.163990" steps="23770"/></proof>
+  <proof prover="0"><result status="valid" time="0.163990" steps="23952"/></proof>
   </goal>
  </transf>
  </goal>
@@ -152,7 +156,7 @@
  <goal name="unique&#39;vc" expl="VC for unique" proved="true">
  <transf name="remove" proved="true" arg1="zero,one,(-),(&gt;),(&lt;=),(&gt;=),abs,uint64&#39;maxInt,uint64&#39;minInt,max_uint64,length1,radix,min_unsigned,in_bounds,singleton,cons,snoc,(++),mAX&#39;7,index_logic2,resolve4,Assoc1,Unit_def_l,Unit_def_r,Inv_def_l,Inv_def_r,Comm1,Assoc,Mul_distr_l,Mul_distr_r,Comm,Unitary,NonTrivialRing,Refl,Trans,Antisymm,Total,ZeroLessOne,CompatOrderAdd,CompatOrderMult,Abs_le,Abs_pos,Div_mod,Div_bound,Mod_bound,Div_sign_pos,Div_sign_neg,Mod_sign_pos,Mod_sign_neg,Rounds_toward_zero,Div_1,Mod_1,Div_inf,Mod_inf,Div_mult,Mod_mult,to_int_in_bounds,extensionality,zero_unsigned_is_zero,set&#39;spec,set&#39;spec&#39;0,set&#39;spec&#39;1,([&lt;-])&#39;def,singleton&#39;spec,singleton&#39;spec&#39;0,cons&#39;spec,cons&#39;spec&#39;0,cons&#39;spec&#39;1,([..])&#39;spec,([_..])&#39;def,([.._])&#39;def,(++)&#39;spec,(++)&#39;spec&#39;0,(++)&#39;spec&#39;1,inner_spec,slice&#39;invariant,slice_ext">
   <goal name="unique&#39;vc.0" expl="VC for unique" proved="true">
-  <proof prover="1"><result status="valid" time="0.165112" steps="1045430"/></proof>
+  <proof prover="1"><result status="valid" time="0.165112" steps="629781"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/hillel/why3shapes.gz b/creusot/tests/should_succeed/hillel/why3shapes.gz
index ab2d15f69fba80e0ae6c5f1975e26687b1dd5672..0431318f81b271fb2175f9d9eff997ad644d48c9 100644
GIT binary patch
literal 7552
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
WC}Ww4y$pX=H2*)GPLq(`p#T8oQm7sP

literal 7359
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

diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg
index 173769d29d..f68ae48b56 100644
--- a/creusot/tests/should_succeed/index_range.mlcfg
+++ b/creusot/tests/should_succeed/index_range.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/index_range/why3session.xml b/creusot/tests/should_succeed/index_range/why3session.xml
index 108d138d7e..3857a39796 100644
--- a/creusot/tests/should_succeed/index_range/why3session.xml
+++ b/creusot/tests/should_succeed/index_range/why3session.xml
@@ -9,12 +9,12 @@
 <path name=".."/><path name="index_range.mlcfg"/>
 <theory name="IndexRange_CreateArr" proved="true">
  <goal name="create_arr&#39;vc" expl="VC for create_arr" proved="true">
- <proof prover="0"><result status="valid" time="0.308684" steps="706608"/></proof>
+ <proof prover="0"><result status="valid" time="0.308684" steps="706918"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRange" proved="true">
  <goal name="test_range&#39;vc" expl="VC for test_range" proved="true">
- <proof prover="0" timelimit="5"><result status="valid" time="0.271640" steps="1012960"/></proof>
+ <proof prover="0" timelimit="5"><result status="valid" time="0.792057" steps="2207559"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeTo" proved="true">
@@ -93,31 +93,31 @@
   <proof prover="3"><result status="valid" time="0.017629" steps="212"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.24" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.055844" steps="762"/></proof>
+  <proof prover="3"><result status="valid" time="0.055844" steps="765"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.25" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.011609" steps="135"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.26" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.028291" steps="725"/></proof>
+  <proof prover="3"><result status="valid" time="0.028291" steps="727"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.27" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.023533" steps="286"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.28" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.085769" steps="918"/></proof>
+  <proof prover="3"><result status="valid" time="0.085769" steps="917"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.026927" steps="358"/></proof>
+  <proof prover="3"><result status="valid" time="0.026927" steps="359"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.30" expl="index in bounds" proved="true">
-  <proof prover="3"><result status="valid" time="0.095159" steps="408"/></proof>
+  <proof prover="3"><result status="valid" time="0.095159" steps="409"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.31" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.038629" steps="421"/></proof>
+  <proof prover="3"><result status="valid" time="0.038629" steps="420"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.32" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.080546" steps="2567"/></proof>
+  <proof prover="3"><result status="valid" time="0.080546" steps="2571"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.33" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.012073" steps="3985"/></proof>
@@ -135,13 +135,13 @@
   <proof prover="3"><result status="valid" time="0.030057" steps="224"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.040842" steps="443"/></proof>
+  <proof prover="3"><result status="valid" time="0.040842" steps="444"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.39" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.029806" steps="445"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.40" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.117944" steps="2065"/></proof>
+  <proof prover="3"><result status="valid" time="0.117944" steps="2071"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.41" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.018043" steps="231"/></proof>
@@ -156,7 +156,7 @@
   <proof prover="3"><result status="valid" time="0.040729" steps="456"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.45" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.088526" steps="2480"/></proof>
+  <proof prover="3"><result status="valid" time="0.088526" steps="2487"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.46" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.012573" steps="4076"/></proof>
@@ -171,7 +171,7 @@
   <proof prover="3"><result status="valid" time="0.073584" steps="464"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.50" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.139415" steps="2370"/></proof>
+  <proof prover="3"><result status="valid" time="0.139415" steps="2376"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.51" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.012386" steps="4103"/></proof>
@@ -183,10 +183,10 @@
   <proof prover="3"><result status="valid" time="0.080859" steps="474"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.54" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.056447" steps="476"/></proof>
+  <proof prover="3"><result status="valid" time="0.056447" steps="475"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.55" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.042777" steps="1137"/></proof>
+  <proof prover="3"><result status="valid" time="0.042777" steps="1136"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.56" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.017446" steps="251"/></proof>
@@ -195,7 +195,7 @@
   <proof prover="3"><result status="valid" time="0.034534" steps="250"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.58" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.055926" steps="490"/></proof>
+  <proof prover="3"><result status="valid" time="0.055926" steps="491"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.59" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.041801" steps="512"/></proof>
@@ -204,7 +204,7 @@
   <proof prover="3"><result status="valid" time="0.073526" steps="1184"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.61" expl="unreachable point" proved="true">
-  <proof prover="3"><result status="valid" time="0.016324" steps="261"/></proof>
+  <proof prover="3"><result status="valid" time="0.016324" steps="262"/></proof>
   </goal>
   <goal name="test_range_to&#39;vc.62" expl="assertion" proved="true">
   <proof prover="3"><result status="valid" time="0.023059" steps="492"/></proof>
@@ -217,17 +217,17 @@
 </theory>
 <theory name="IndexRange_TestRangeFrom" proved="true">
  <goal name="test_range_from&#39;vc" expl="VC for test_range_from" proved="true">
- <proof prover="0" timelimit="5"><result status="valid" time="0.411818" steps="1481789"/></proof>
+ <proof prover="0" timelimit="5"><result status="valid" time="1.255205" steps="5603161"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeFull" proved="true">
  <goal name="test_range_full&#39;vc" expl="VC for test_range_full" proved="true">
- <proof prover="0"><result status="valid" time="0.039072" steps="181162"/></proof>
+ <proof prover="0"><result status="valid" time="0.039072" steps="180149"/></proof>
  </goal>
 </theory>
 <theory name="IndexRange_TestRangeToInclusive" proved="true">
  <goal name="test_range_to_inclusive&#39;vc" expl="VC for test_range_to_inclusive" proved="true">
- <proof prover="0"><result status="valid" time="0.621854" steps="2085144"/></proof>
+ <proof prover="0"><result status="valid" time="0.280171" steps="1220362"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/index_range/why3shapes.gz b/creusot/tests/should_succeed/index_range/why3shapes.gz
index 87bd26a6c9eca465bfa0f489339059a70b91b7b3..4f7f35d875bf330ab904162c93f23dbe31c92508 100644
GIT binary patch
literal 4419
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
JfD$Qq007f^k=y_P

literal 4417
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
HDR=+?Kw7Zc

diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg
index 8fe5cb9827..354e8555f5 100644
--- a/creusot/tests/should_succeed/instant.mlcfg
+++ b/creusot/tests/should_succeed/instant.mlcfg
@@ -5,31 +5,31 @@ module Core_Option_Option_Type
     | C_Some 't
     
 end
-module Std_Sys_Unix_Time_Nanoseconds_Type
+module Std_Sys_Pal_Unix_Time_Nanoseconds_Type
   use prelude.UInt32
   use prelude.Int
   type t_nanoseconds  =
     | C_Nanoseconds uint32
     
 end
-module Std_Sys_Unix_Time_Timespec_Type
-  use Std_Sys_Unix_Time_Nanoseconds_Type as Std_Sys_Unix_Time_Nanoseconds_Type
+module Std_Sys_Pal_Unix_Time_Timespec_Type
+  use Std_Sys_Pal_Unix_Time_Nanoseconds_Type as Std_Sys_Pal_Unix_Time_Nanoseconds_Type
   use prelude.Int64
   use prelude.Int
   type t_timespec  =
-    | C_Timespec int64 (Std_Sys_Unix_Time_Nanoseconds_Type.t_nanoseconds)
+    | C_Timespec int64 (Std_Sys_Pal_Unix_Time_Nanoseconds_Type.t_nanoseconds)
     
 end
-module Std_Sys_Unix_Time_Inner_Instant_Type
-  use Std_Sys_Unix_Time_Timespec_Type as Std_Sys_Unix_Time_Timespec_Type
+module Std_Sys_Pal_Unix_Time_Instant_Type
+  use Std_Sys_Pal_Unix_Time_Timespec_Type as Std_Sys_Pal_Unix_Time_Timespec_Type
   type t_instant  =
-    | C_Instant (Std_Sys_Unix_Time_Timespec_Type.t_timespec)
+    | C_Instant (Std_Sys_Pal_Unix_Time_Timespec_Type.t_timespec)
     
 end
 module Std_Time_Instant_Type
-  use Std_Sys_Unix_Time_Inner_Instant_Type as Std_Sys_Unix_Time_Inner_Instant_Type
+  use Std_Sys_Pal_Unix_Time_Instant_Type as Std_Sys_Pal_Unix_Time_Instant_Type
   type t_instant  =
-    | C_Instant (Std_Sys_Unix_Time_Inner_Instant_Type.t_instant)
+    | C_Instant (Std_Sys_Pal_Unix_Time_Instant_Type.t_instant)
     
 end
 module Core_Time_Nanoseconds_Type
@@ -175,7 +175,7 @@ module Instant_TestInstant
     
   axiom inv1 : forall x : Core_Option_Option_Type.t_option (Std_Time_Instant_Type.t_instant) . inv1 x = true
   function cmp_log1 (self : int) (o : int) : Core_Cmp_Ordering_Type.t_ordering =
-    [#"../../../../creusot-contracts/src/logic/ord.rs" 137 12 146 17] if self < o then
+    [#"../../../../creusot-contracts/src/logic/ord.rs" 140 16 146 17] if self < o then
       Core_Cmp_Ordering_Type.C_Less
     else
       if self = o then Core_Cmp_Ordering_Type.C_Equal else Core_Cmp_Ordering_Type.C_Greater
diff --git a/creusot/tests/should_succeed/invariant_moves.mlcfg b/creusot/tests/should_succeed/invariant_moves.mlcfg
index a259216d05..913f0b7e66 100644
--- a/creusot/tests/should_succeed/invariant_moves.mlcfg
+++ b/creusot/tests/should_succeed/invariant_moves.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg
index 1b7d68ae79..534314e5a9 100644
--- a/creusot/tests/should_succeed/iterators/01_range.mlcfg
+++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg
@@ -319,40 +319,40 @@ module C01Range_SumRange
 end
 module C01Range_Impl0
   use prelude.IntSize
-  use seq.Seq
-  predicate invariant3 (self : Seq.seq isize) =
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option isize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant3 (self : Seq.seq isize) : bool
+  val invariant3 (self : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq isize)
-  val inv3 (_x : Seq.seq isize) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option isize)
+  val inv3 (_x : Core_Option_Option_Type.t_option isize) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq isize . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option isize) =
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option isize . inv3 x = true
+  use C01Range_Range_Type as C01Range_Range_Type
+  use prelude.Borrow
+  predicate invariant2 (self : borrowed (C01Range_Range_Type.t_range)) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant2 (self : Core_Option_Option_Type.t_option isize) : bool
+  val invariant2 (self : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Core_Option_Option_Type.t_option isize)
-  val inv2 (_x : Core_Option_Option_Type.t_option isize) : bool
+  predicate inv2 (_x : borrowed (C01Range_Range_Type.t_range))
+  val inv2 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option isize . inv2 x = true
-  use C01Range_Range_Type as C01Range_Range_Type
-  use prelude.Borrow
-  predicate invariant1 (self : borrowed (C01Range_Range_Type.t_range)) =
+  axiom inv2 : forall x : borrowed (C01Range_Range_Type.t_range) . inv2 x = true
+  use seq.Seq
+  predicate invariant1 (self : Seq.seq isize) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
-  val invariant1 (self : borrowed (C01Range_Range_Type.t_range)) : bool
+  val invariant1 (self : Seq.seq isize) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (C01Range_Range_Type.t_range))
-  val inv1 (_x : borrowed (C01Range_Range_Type.t_range)) : bool
+  predicate inv1 (_x : Seq.seq isize)
+  val inv1 (_x : Seq.seq isize) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (C01Range_Range_Type.t_range) . inv1 x = true
+  axiom inv1 : forall x : Seq.seq isize . inv1 x = true
   predicate invariant0 (self : C01Range_Range_Type.t_range) =
     [#"../../../../../creusot-contracts/src/invariant.rs" 8 8 8 12] true
   val invariant0 (self : C01Range_Range_Type.t_range) : bool
@@ -365,6 +365,7 @@ module C01Range_Impl0
   axiom inv0 : forall x : C01Range_Range_Type.t_range . inv0 x = true
   use seq.Seq
   use seq.Seq
+  use seq.Seq
   use prelude.Int
   predicate resolve0 (self : borrowed (C01Range_Range_Type.t_range)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
@@ -389,19 +390,18 @@ module C01Range_Impl0
   val produces0 [#"../01_range.rs" 31 4 31 64] (self : C01Range_Range_Type.t_range) (visited : Seq.seq isize) (o : C01Range_Range_Type.t_range) : bool
     ensures { result = produces0 self visited o }
     
-  use seq.Seq
-  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self
-   -> (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv1 self
+  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../01_range.rs" 57 4 57 39] forall self : borrowed (C01Range_Range_Type.t_range) . inv2 self
    -> (forall result : Core_Option_Option_Type.t_option isize . match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end
-   -> inv2 result /\ match result with
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../01_range.rs" 51 4 51 90] forall a : C01Range_Range_Type.t_range . forall ab : Seq.seq isize . forall b : C01Range_Range_Type.t_range . forall bc : Seq.seq isize . forall c : C01Range_Range_Type.t_range . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
-   -> produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../01_range.rs" 44 4 44 26] forall self : C01Range_Range_Type.t_range . inv0 self
+   -> (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3session.xml b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
index 55decb1253..558313af22 100644
--- a/creusot/tests/should_succeed/iterators/01_range/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/01_range/why3session.xml
@@ -31,14 +31,14 @@
  </goal>
 </theory>
 <theory name="C01Range_Impl0" proved="true">
- <goal name="produces_refl_refn" proved="true">
- <proof prover="0"><result status="valid" time="0.016725" steps="0"/></proof>
+ <goal name="produces_trans_refn" proved="true">
+ <proof prover="0"><result status="valid" time="0.013647" steps="14"/></proof>
  </goal>
  <goal name="next_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.013215" steps="112"/></proof>
  </goal>
- <goal name="produces_trans_refn" proved="true">
- <proof prover="0"><result status="valid" time="0.013647" steps="14"/></proof>
+ <goal name="produces_refl_refn" proved="true">
+ <proof prover="0"><result status="valid" time="0.016725" steps="0"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz b/creusot/tests/should_succeed/iterators/01_range/why3shapes.gz
index ab4736a75224ac52842fe9f76d9bf6456cc607d6..96e2bd440faf5a301e0b33d5b2098af83d18e983 100644
GIT binary patch
literal 961
zcmV;y13vs8iwFP!00000|D{$-Z{s!)zUx=`wrzp}9KKoXE?^iDWMI)lTku$eBB`uV
zTS_G-+y46wDcO;{PJp65Si_lb9vpr{>4&@3@YOxVVf7OGVc)esujK0P$HG1JU3m6!
zAa00<#>L~)>7OhXS=?o>In25Hd*^Cbd*`<ceNxUfBc|9m-yNS0@e~8G#BFxJbZwl$
z?oc`G+ebunt)=dd4En7*Mr&ca*|<*@&I-PEeH^;OOC(mW(V|`5^?mm(h7ZR-5%sHU
zAEQ-Px@O<H1BTiMOCAvF_U%dX5BP7DyMJA|KDq1$6i%rY4-c0(HYrjXevNu?r8^99
zsx9qkRvB@>_s`L?<jM9EGO66>Pj4sw&Jx>@Q<ZCM!oJ<r-E$j;_iJC4zD@O!Yg9Q_
zbQ-HP31t3vm1SAj&8q48RU7|46)EwQe{Ms!Znr<he#R(_d4G>EX8DXgmR>6eVrV&c
z6eC@&D2vlySlA1(vMdr|C|I=}pTNp9=RVF!K+T*Hi6E)8(Qt_E<LN8f+t^!*##gqE
zI)IDO0unLj2AxwHOLe(j5RU5ksbNVT%JuCd&Bh!@St`pcN!P}2mWmt|pOz7PF!xgu
z##$}KUVWUe#X9ZxVntKAKD&d<8ptm23Q8`XpejQzk+8lC<RY;z>DVw#lBTYRu|S3~
zD4mDEJ$;!EInDc`Zor}5A()iYgyS|dYbdtUl-tGK0qWM}f!f!=EL|TNH{Bm5cMx<|
zk20QE?rZXu7C6caVgP%C7-(1!1H?PT0D+;;#Ng$6nM1#kLSJQ|?`5Dk+vg19sL@1}
zaVW;ULS_z-aYgLd4s*UG@SMh`XrCaTFLfwfpJ#S>KJN0UPeaCVpeGS4IE#5U&r`@2
zW6Bdz1YXK|dsADk=W5i+xk7&DcoQ)-Vr)5BF|FmaR?}LS>9>3*@msXwGge7t55I6~
z49%?A{<kP<83p^DJIJqkHC}0adrLX`kmOS|K{nhA6B}rxGSCP^8`;z%fC&vZE2v0;
ziXcc$Bn77>kJ^K(4G1QE(6tH(qJ=b(23ZFXghZ`Da~-HK4FoT|pkc);R!E^8F+Qrg
z5t55qQA0h$_d8K0V&IjmL}6-G1J$u+Txl;tLmDa?rd$ny)e_S|1*9^Su2jJZ)dqv9
zNL=HC5D-1*JTPFC2jj3dkQImucm=EiTDaOU!Wq#)6Rz>|LdIGmRXr!hIVF>aT6j<n
jTnPn%Fdc=K_>H0)#f+~7Gr?yMz3})KL@PYTDG2}old;6H

literal 962
zcmV;z13mm7iwFP!00000|D{z;Z{s!)z3W%_wrz|89DcLdUBECR$iSk9w&1Y_DN<RZ
zwv<Xvw*B`VQnDjuod89Bu!b{lW**5m(hqm5;j4R$!|FNq!=Y<`Udh$nkA-{eyYN)U
zfw&<a8y8QH=YO(UWOJXh<}l~hYv;W4wX1gve{#+}Bc|B8x;s4{<2eRmiQDdf>DoAh
z-Jx?hv=4~rT1(v@8T4Csiq^tzyLF!|TpWDk`Z#pQ=SZyHU_?9L^?mm(h7YGd5%sHU
zAEH%Oy5`WjBbGV@OYRZs4((a;5BP7DTfeMapHlV%8t25NhWl$Bn;fYPe~r3#r8^FB
z;+A$aV@BNX{Zq6oWwOJBOfL8N)7y=|i^MkMR^<i{;n41V_tb{reeO%@yTp&YMwKI@
z^T^U9kon&%%d)WBRnzsWHvWAsQsb%rJceoA{&0@{Oi@^Ky+#<be5M{tUpok5XgN<5
zqg<^hi}PPd?3q|u7D+G^tlEuFVC6+~ALk;VX0C`NkVI_^9Ao=%{)+K7_LgGsMXjR`
z;2N}mLd?BE=a$A&UG5fwqk4X8NU4T$bNfnjFxOF*$}(Hhweg#!B3H$yWdtA0{gjN6
ztEG5WALnbaN&CG<F;s3Y>EN;latgeFQc6wGm7&*4$nOfdTI@@@HY}5@=~To>kYNo<
z=Ou7YU*<zj^S-DXaH#hPCgn8YxXr8@ipOcn-QwK=>ekBxy)T7XdVOTv^!_mU1VLx_
zXyc9Lb4|I@0!Mox3}9~v0|N_TfOtn3Ah7gB7`)spd+0Y>=vN)+dmSjw_NBu(YBULD
z9Ex$Tkd*^uToF4Shq=5Z@Ses)(RG4+zVcAGzRc|KblT@ppN5R#Ku;zzxR`l1FH^`C
zW6Gy7T}<=UiG6bpFPC2me(SRN?5-u=DZk#d*o=h4?!Q%0%PJ!qNNg5lQR)IeD|&a+
zTW;oV^vStHewTO?F<s>-8a8c+Bw${vX|2ojD~cw_hS$Qx1{$dhG{VqEHeLiUq2Xo)
z6)DgW1o1>ta9Z-HYf#>RV6qO{tAHR{NE2z0K7b%3Y7Ls}K!s@_)S?zNta!x=DYPS|
zj><Pea^V#<v}X8yC(1-DypokDj8`70j-GL)YY`gKP|+~uJOt(?wu1^tWhz~%f`#ZJ
zjiRn==YllUGmkAmYNlui5xIe^KvcjhU=`4UD$aGJ_?2T^Dtt=El%~eZsL-QRhFWAa
kP7os+pwTy+=q6}^G@=oj;i=?90=>xi7k{E6b}0z}03Pby)&Kwi

diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
index 1e4507a389..57a12dd85c 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg
@@ -525,12 +525,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
index 5841a8d79d..427502c37f 100644
--- a/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/02_iter_mut/why3session.xml
@@ -67,7 +67,7 @@
 </theory>
 <theory name="C02IterMut_IterMut" proved="true">
  <goal name="iter_mut&#39;vc" expl="VC for iter_mut" proved="true">
- <proof prover="1"><result status="valid" time="0.046575" steps="94210"/></proof>
+ <proof prover="1"><result status="valid" time="0.046575" steps="94212"/></proof>
  </goal>
 </theory>
 <theory name="C02IterMut_AllZero" proved="true">
@@ -95,16 +95,16 @@
   <proof prover="4"><result status="valid" time="0.010000" steps="59"/></proof>
   </goal>
   <goal name="all_zero&#39;vc.7" expl="postcondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.099677" steps="1375"/></proof>
+  <proof prover="4"><result status="valid" time="0.099677" steps="1365"/></proof>
   </goal>
   <goal name="all_zero&#39;vc.8" expl="loop invariant preservation" proved="true">
   <proof prover="4"><result status="valid" time="0.010000" steps="56"/></proof>
   </goal>
   <goal name="all_zero&#39;vc.9" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.041605" steps="640"/></proof>
+  <proof prover="4"><result status="valid" time="0.041605" steps="650"/></proof>
   </goal>
   <goal name="all_zero&#39;vc.10" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.150551" steps="754"/></proof>
+  <proof prover="4"><result status="valid" time="0.150551" steps="766"/></proof>
   </goal>
   <goal name="all_zero&#39;vc.11" expl="unreachable point" proved="true">
   <proof prover="4"><result status="valid" time="0.010000" steps="59"/></proof>
diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz b/creusot/tests/should_succeed/iterators/02_iter_mut/why3shapes.gz
index 6619ebf0d87c389cc1c329efe62aeb640a473b47..a8943ec22988bc33a672128210e016862555c65c 100644
GIT binary patch
literal 3539
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
N`5%2E7#Ni^003Xs3G4s>

literal 3545
zcmV;~4JPs*iwFP!00000|J_<yZ(F$)e%G(?TU!SOc(}8e6fle$6fo^W3*1Kw<Rx!L
zs3Uo7#Yy|?d$`<9x{{sAESLr}5yj;@hi5-j{&;=${DXUp&sQ(;>3O@~{pCttUH@ry
z_|a{5FT5dlb;ug%hqR&n5E^#3a^Jmo4{`V5@Pk9Fhll;=&BuL+572OT*l)JGgZt>d
zkQ?{@bbT8dev?U^tgQ=Kez&?kxZBP85TE}3>CiMH?{`mIw>ywVWIpf{`54$hsvkcc
zHqY@#(x^q=a6a*K?LNfAe0!r2FvKsLhy90b3+_5it=)Gxzl45+w{J<K?-Jbo0-Tw{
z-KVJpXD-2+yL?GHUtAZFE4=FC(>{D^<1=y3@u73^<Ky8!d6@T<*;St1Wc{uNbq>lL
zR5>d06+N6PP$UJ4x<gzt1vxc^dO#MEy(-K7NWNblpxED|*hk%)zs+>7EAKNYK|!ZD
z$Q+;Q1fT(Wtd%^O^nyzZiUFva0eaWtL&iTfAwco+V<XCw8J{oWvmT!h`0SiXgE(W;
zAo{bS%Fwk{M82&PzE0Euac*i&9yg{l;|%`sY45UPiQA%X5@*}pE<WMrcm2M1?_7a<
z%ei(@l*ix=$hrx^2mJE~T0D?tF5kv{uLHSkIZN!^|7z^~pT#y<h;20c{+lFEzE<*N
zQ6@{kUuj_^tCW15N=cUKFYHlMCmzn8onN0g{rV&@)a>HceGI7+e%(izbsu(0fuM5A
zIg=Go4i^iAw2t`&vb~6twROp9a9kkJNs^Ea&3wqQW)Ufs_4SPy>l-=NH#GyHcQ^W`
zjIJA9D<0kNOQw7-LNA*GoHIk5$9yvNCX#YSn#|S(%S3u>f-@eP0O%a`zD!=obY#qQ
z`R-~dy^@k%v(j^|k#DtOx0tpjy1==9bsGTJ@x%}DX^Tc061V9iZD^qY<YHzx?!M%b
z1Lx4P_D@gy&oTVr<G&{x?h|CU-MNQyG!ZETvlXW0Qt+g~<5O(+yRbcAnY+3@F*e+t
z;SO$#UryH2?M^Ker_Ud{u8015#$gL+OV01O9(KG>n&U^hoUC4-toCP7T>sjCjLq2#
z=Q45eYS)*R?=LT3Pr#9df9!YBZAhs)`$16_tPcNqj8}utuG~|6-aouVQkM~YLn_9~
zwfm2c5AhH~t#Tjt&xcX3{oZtC_XVcGuA0~LcJ~3#?{~P2JZ6mBW7MAG^QTi4cHi$U
z0>)e2*80obOd*R?90R7=5sqfxWIY%{tOq$X(AWN;Zu&tgj=?mbhk{YxEL(MA^_*4X
z+OqP_9=fiFE?70Lzhc#ON3v=PCssYIUZ1S?XD?cH;{AeEUs}GuynH<YuPRL%xT#&0
zsOj%M4^cnrT;NJ5IdCPNW7taN{w#3fL`D#$C3s&p@zVf`8(Zi@z->e6G0a_WJJ?V(
zw^!Z%>1r3h9EQY4#>59>V^1&TZT3puPFHGJk;=(hHCJ|=xB0BO<2A?fzLOburt%g`
zO}Q=~ckAN~a=0k+h>YTNy_XzsD{>Qj=8D)DU%X;k$1BoW9UQN%2N}+<$R=0h4XZ^6
z8;cMz>OzjXQ0EzCSi8>{J>`d`8oxBueUCq~MA^AQl;v9CVjVNTcJgJmgt1^C#~UFR
z7B${Mw*BH!tamLo35S$c8=^%4G|!CD()1D0-1LKFE0ke4soszSPoAVR7tQggI;Ji@
zmjW#ALv@nD5iwf#-luDz$`M_U@SsbCK7vQo3NH)1%<!NwSd4zI26$OrTcyA1UYQ#F
zq1C^rKzdGrD7h-IO?-I%j6o$y?&SFg0Tw`S90G1$+{34ZLzV7*X6?eh44$HG37;v@
z^~%m_-T3{dU3gwT_&wV2Ki%#_y!-U<us)1&mu3mEW2w_#>ZAym6iMc1oI&a^NWHJA
z^3x5u>#dQDfd&01RmIgu^%z&w7)57Y$Je}+p7uNaLmVFi;(b$!fn<1U>|73GpK^{K
z#}55cbW7_f1+&BmZ;E%xukL=>+q)nBi*!HyCv-o0sryl-`x$DvWN+`@p`B*e?B6l#
zK<8JVG9&sK-p{c06h`y_Q|OE<=Ja$aL2{5OK>9e>)Zo|WQ!q85f~oJ8oAj9WGW2G$
zZ^-i0%e>{fPwS=8ddb^gY5~8I=bi?k99qn-_1IC^*oZf5;|ccIIWno^Isv!k%Z&qc
z+5JOsyZCvsYkNqGRkmd@%k~5gH$Lq5k7J{PqjY#I>C4N@K&N~ikmn?mmANf`x@|9`
z`ToRJb<+EJ4Ll&?mjy22%`Cz3xz{LS;)6Cncu`p9x_>99{p<J!^V|uQ=>$#6139+r
zbxiYU)|nNolg2DfPa3HTIJRXV`bPlBhJYVKH`$jQXz-T|`Q?lqzswYPx;O}Q{!p5n
zDCw@}rF5(5JNBf{_+>-p%$5yw%HpJrEzc+ODU!S2_mj87W8Kdh;df`$xkN4#dj&96
zc*h%XE}IT}#dOLKAFos3^DDbQr>SM=Oqah=7&nu=d2)sFJJ<&6x)dp1L7GOEWX~q6
zcvhUCqDox-0y(gzL&N*W7q;Nv^f(MX;{N#b;>rWa8-1T1VV(~}^!2zvvpILGPrIk+
z+8>;Mh*yt$Jdoen7F{3})J&IP!t}W&thWiK&pwzJtg`@<u7dLQp*sHUxhpkXG+Y(7
zxS9zBmnt`0AvZ^IZm1cyP0}zEH^<#66O&$r=Ps7ZC6j2F$#p3+xmZn{@iOAc_!`b~
z>588X*Z7e<fcK(ocrJ4$-`T{jaTS-cO!IN$@=X5qhMRFye_=BbKOPvu1#THe@O>(R
z5)6)tC>SjaLQ<ibLSW4LeiF3trZrr5pBt9nws5LMLi~PLSBEv#Fxgk-OwJ$M7+-p9
z!`YFXNY!)RS039Ctagfw53NKRzMttWPi74;?AnX;5qbLJ%}P75Y+H;rqUKLA&!4zd
zMJ?cxZ818db!uCs7(PQD(P<@5kI46Rub>ynPiawoLZ0TH7k7<SRPC40D>wg*Py6AQ
z7dk$A{9ONrL@u{X;_|;Cq4nR8(5C)qPKTd;=<u^oc{^F`cFZE<q%q6Aj>#?P{8w0W
z@+;!(#QaCY(?-V}bx$cGnv2bonf6Y(G@7l}P7@o2`71VEe8r~IM{!=7?co)h_3zbe
z{nc3FELP#Vv~qPY?~iETAJO&lbnoxbKP8<aq>hf2o@{+~W$G>YIf3P8jL94?8wYyB
zgH}H?yn2X!=7`?U1bUbLtX81B>qr|MV_JYGozOaZ$y(hhDUH6;R#|C<<(64$!IG6=
zQ3Izsa3i_qhH34cHzx8(gI58MFku;;9g5T$C!=$m80nFOX`NFZAiB_E7)*z_rP@+u
zskBsBieK?GJw^(KdLu&c#CIK+!Bf@=rg;Fb4OJ>3u{R+ZP|$Kmc%U71R1qbpq$Ea=
zrW3#siJE033YHQJ#)7t>EJzE&0=K{{AUIec7Rx)~RM1QiMgu6NLl7O4v=y2VrL{?{
zl5Zh^*N@z^0d+@shlspu3G<j2d<)uTS-`gt@VYgk<62NcHG!BU)QZlbnnl++aV4dd
zC{z58Th1(}mV@QQGGiGMSC+{YQ^H3>U2C-DjvDBkM!j*NIO}-eSAtoAssSsA<;HSt
zxw2fo0^3EVjWdBW02UQ;N2%_l@dh;0-d_o21)8p~f`2u*XX&O=c-1N5MIa=!zGcCi
zz#;{CCBaIB)jypCnwmh5Xk{b>i1#QA8anA^l&)(7WD>**^G#F?@brT@nl(_VHDhSo
znnX`fMwE9nQ(;!pZ=%u#A*l#FVnB$#<G?6hNpxPwpada_3L<}_#GGik;jN1TV^$Oq
zeam&MjUL^&rPN$0W)-yxtRhw#E47tsrHFQ2bUX%5lnc;yig%sVOc}2M&`FrpG||;y
zHL=QAg;7sgC9M)x@fF$=Q@#zNRYExQ1~mSbdSQH&K6Kp`Aoqam8(|H%hFL?c0c(iW
zrrtwqtCiK#YGE~B$q*!00%B*t5lqs?aT%H51S6S|Ect{n)@W;#HD80=8c!U9E_xpn
z!{|VxB!RbG%UYrWO~^p{|IyV+@^$i4NJR!1_mN5)RObj25d|Sr%;*R@xx4~`!G)k~
z2!<De@rCf8i?-k$rmmy_G&*WfWQw8-g)SQ9wIh|b`K9Q$Eh>$4j(W|!;?Z^9qklOf
zTOAaJ-b_D-Qlx>w^cUm>D{^i~lr4DhEoNe42u3T+%!;&~5n1Ia)TdaVf_;kiDcq-c
zp922R&r)=X1M<{%7->XsfndErDSD8PETDa3KmbfeKvTX!QZ#)hzb1>GMbCWOVb&0l
z;J1!-Eynz)Jo=_-3yVmWilV^ZmR-~%MHZcrlA(fI>X-+L)f$sRs$eh(AwL){0plfL
zzyyXoU?m1DWp$*F<qu#v04&`F_hDTCSQz{UcTw7C2zZ-_pPk{Jd%**79fsyMVAYxL
z!r}LFA7Q!<Eh)5|vexN<Dco=jPoWJlgs#62(&4n&((mVP&=IUKWy_><M!7b*NpKyc
zq7W0R$GfG%kypR??Q|eD^&SfwNu)s8nNG?U4UMOQ-nodiFksCADHdY2iHRPt{s57b
zfda-7q$K+ou(0Sl8ijO<5|%R=!!p%JO}g9_0G2PW;&{e{C!!TtZvdjjw&kfz<y2@a
T`eeqDujBj=4*aHql`{YUGn?$<

diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
index 5149049415..fe20388f12 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg
@@ -333,9 +333,9 @@ module C03StdIterators_SliceIter
     goto BB11
   }
   BB10 {
+    assume { resolve6 iter };
     assert { [@expl:type invariant] inv3 _17 };
     assume { resolve4 _17 };
-    assume { resolve6 iter };
     assert { [#"../03_std_iterators.rs" 8 4 8 38] false };
     absurd
   }
@@ -365,12 +365,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -713,9 +719,9 @@ module C03StdIterators_VecIter
     goto BB10
   }
   BB9 {
+    assume { resolve6 iter };
     assert { [@expl:type invariant] inv3 _16 };
     assume { resolve4 _16 };
-    assume { resolve6 iter };
     assert { [#"../03_std_iterators.rs" 19 4 19 38] false };
     absurd
   }
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml b/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
index d5bf13f43f..77bf4a6974 100644
--- a/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/03_std_iterators/why3session.xml
@@ -15,12 +15,12 @@
 </theory>
 <theory name="C03StdIterators_VecIter" proved="true">
  <goal name="vec_iter&#39;vc" expl="VC for vec_iter" proved="true">
- <proof prover="1"><result status="valid" time="0.068472" steps="1842"/></proof>
+ <proof prover="1"><result status="valid" time="0.068472" steps="1847"/></proof>
  </goal>
 </theory>
 <theory name="C03StdIterators_AllZero" proved="true">
  <goal name="all_zero&#39;vc" expl="VC for all_zero" proved="true">
- <proof prover="1"><result status="valid" time="0.435601" steps="3814"/></proof>
+ <proof prover="1"><result status="valid" time="0.435601" steps="3816"/></proof>
  </goal>
 </theory>
 <theory name="C03StdIterators_SkipTake" proved="true">
@@ -46,7 +46,7 @@
   <proof prover="1"><result status="valid" time="0.010000" steps="91"/></proof>
   </goal>
   <goal name="counter&#39;vc.3" expl="precondition" proved="true">
-  <proof prover="5"><result status="valid" time="0.059895" steps="213346"/></proof>
+  <proof prover="5"><result status="valid" time="0.059895" steps="213049"/></proof>
   </goal>
   <goal name="counter&#39;vc.4" expl="precondition" proved="true">
   <proof prover="1"><result status="valid" time="0.020000" steps="388"/></proof>
@@ -61,13 +61,13 @@
   <proof prover="1"><result status="valid" time="0.028332" steps="24"/></proof>
   </goal>
   <goal name="counter&#39;vc.8" expl="assertion" proved="true">
-  <proof prover="1"><result status="valid" time="0.212152" steps="615"/></proof>
+  <proof prover="1"><result status="valid" time="0.212152" steps="616"/></proof>
   </goal>
   <goal name="counter&#39;vc.9" expl="assertion" proved="true">
-  <proof prover="5"><result status="valid" time="0.050000" steps="288501"/></proof>
+  <proof prover="5"><result status="valid" time="0.050000" steps="288507"/></proof>
   </goal>
   <goal name="counter&#39;vc.10" expl="assertion" proved="true">
-  <proof prover="5"><result status="valid" time="0.118193" steps="404342"/></proof>
+  <proof prover="5"><result status="valid" time="0.118193" steps="404231"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators/why3shapes.gz b/creusot/tests/should_succeed/iterators/03_std_iterators/why3shapes.gz
index 5f8ccc8da40e2d0a9239ce394fa3ddc309beee1d..879ed203666ef14438ba27b8f9de30c2d0316cd9 100644
GIT binary patch
literal 6586
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

literal 6586
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

diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
index a1dfe94650..4cc39b1bca 100644
--- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg
@@ -558,50 +558,48 @@ module C04Skip_Impl0
     
   axiom inv4 : forall x : borrowed i . inv4 x = true
   type item0
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option item0)
-  val invariant3 (self : Core_Option_Option_Type.t_option item0) : bool
+  use seq.Seq
+  predicate invariant3 (self : Seq.seq item0)
+  val invariant3 (self : Seq.seq item0) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option item0)
-  val inv3 (_x : Core_Option_Option_Type.t_option item0) : bool
+  predicate inv3 (_x : Seq.seq item0)
+  val inv3 (_x : Seq.seq item0) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option item0 . inv3 x = true
+  axiom inv3 : forall x : Seq.seq item0 . inv3 x = true
   use C04Skip_Skip_Type as C04Skip_Skip_Type
-  predicate invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i))
-  val invariant2 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  predicate invariant2 (self : C04Skip_Skip_Type.t_skip i)
+  val invariant2 (self : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
-  val inv2 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+  predicate inv2 (_x : C04Skip_Skip_Type.t_skip i)
+  val inv2 (_x : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 x = true
-  use seq.Seq
-  predicate invariant1 (self : Seq.seq item0)
-  val invariant1 (self : Seq.seq item0) : bool
+  axiom inv2 : forall x : C04Skip_Skip_Type.t_skip i . inv2 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant1 (self : Core_Option_Option_Type.t_option item0)
+  val invariant1 (self : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Seq.seq item0)
-  val inv1 (_x : Seq.seq item0) : bool
+  predicate inv1 (_x : Core_Option_Option_Type.t_option item0)
+  val inv1 (_x : Core_Option_Option_Type.t_option item0) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Seq.seq item0 . inv1 x = true
-  predicate invariant0 (self : C04Skip_Skip_Type.t_skip i)
-  val invariant0 (self : C04Skip_Skip_Type.t_skip i) : bool
+  axiom inv1 : forall x : Core_Option_Option_Type.t_option item0 . inv1 x = true
+  predicate invariant0 (self : borrowed (C04Skip_Skip_Type.t_skip i))
+  val invariant0 (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = invariant0 self }
     
-  predicate inv0 (_x : C04Skip_Skip_Type.t_skip i)
-  val inv0 (_x : C04Skip_Skip_Type.t_skip i) : bool
+  predicate inv0 (_x : borrowed (C04Skip_Skip_Type.t_skip i))
+  val inv0 (_x : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
     ensures { result = inv0 _x }
     
-  axiom inv0 : forall x : C04Skip_Skip_Type.t_skip i . inv0 x = true
+  axiom inv0 : forall x : borrowed (C04Skip_Skip_Type.t_skip i) . inv0 x = true
+  use seq.Seq
+  use seq.Seq
   use seq.Seq
-  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
-  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
-    ensures { result = completed1 self }
-    
   predicate resolve0 (self : item0)
   val resolve0 (self : item0) : bool
     ensures { result = resolve0 self }
@@ -614,35 +612,37 @@ module C04Skip_Impl0
   use prelude.Int
   use seq.Seq
   use prelude.UIntSize
-  predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
-    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv1 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s
-     -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
-  val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
-    ensures { result = completed0 self }
-    
-  use seq.Seq
-  use seq.Seq
-  use seq.Seq
   predicate produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i)
     
    =
-    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv1 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+    [#"../04_skip.rs" 37 8 44 9] visited = Seq.empty  /\ self = o \/ UIntSize.to_int (C04Skip_Skip_Type.skip_n o) = 0 /\ Seq.length visited > 0 /\ (exists s : Seq.seq item0 . inv3 s /\ Seq.length s = UIntSize.to_int (C04Skip_Skip_Type.skip_n self) /\ produces1 (C04Skip_Skip_Type.skip_iter self) (Seq.(++) s visited) (C04Skip_Skip_Type.skip_iter o) /\ (forall i : int . 0 <= i /\ i < Seq.length s
      -> resolve0 (Seq.get s i)))
   val produces0 [#"../04_skip.rs" 36 4 36 64] (self : C04Skip_Skip_Type.t_skip i) (visited : Seq.seq item0) (o : C04Skip_Skip_Type.t_skip i) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
-   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv2 self
-   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv3 result /\ match result with
+  use seq.Seq
+  predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
+  val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
+    ensures { result = completed1 self }
+    
+  predicate completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) =
+    [#"../04_skip.rs" 23 8 31 9] UIntSize.to_int (C04Skip_Skip_Type.skip_n ( ^ self)) = 0 /\ (exists i : borrowed i . exists s : Seq.seq item0 . inv4 i /\ inv3 s /\ Seq.length s <= UIntSize.to_int (C04Skip_Skip_Type.skip_n ( * self)) /\ produces1 (C04Skip_Skip_Type.skip_iter ( * self)) s ( * i) /\ (forall i : int . 0 <= i /\ i < Seq.length s
+     -> resolve0 (Seq.get s i)) /\ completed1 i /\  ^ i = C04Skip_Skip_Type.skip_iter ( ^ self))
+  val completed0 [#"../04_skip.rs" 22 4 22 35] (self : borrowed (C04Skip_Skip_Type.t_skip i)) : bool
+    ensures { result = completed0 self }
+    
+  goal next_refn : [#"../04_skip.rs" 63 4 63 41] forall self : borrowed (C04Skip_Skip_Type.t_skip i) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option item0 . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end
-   -> inv3 result /\ match result with
+   -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_refl_refn : [#"../04_skip.rs" 50 4 50 26] forall self : C04Skip_Skip_Type.t_skip i . inv2 self
+   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../04_skip.rs" 57 4 57 90] forall a : C04Skip_Skip_Type.t_skip i . forall ab : Seq.seq item0 . forall b : C04Skip_Skip_Type.t_skip i . forall bc : Seq.seq item0 . forall c : C04Skip_Skip_Type.t_skip i . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
index 5d9c28b4cc..0c1f8d3819 100644
--- a/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/04_skip/why3session.xml
@@ -26,14 +26,14 @@
  </goal>
 </theory>
 <theory name="C04Skip_Impl0" proved="true">
- <goal name="produces_trans_refn" proved="true">
- <proof prover="1"><result status="valid" time="0.013593" steps="2"/></proof>
+ <goal name="next_refn" proved="true">
+ <proof prover="1"><result status="valid" time="0.018475" steps="2"/></proof>
  </goal>
  <goal name="produces_refl_refn" proved="true">
  <proof prover="1"><result status="valid" time="0.009950" steps="2"/></proof>
  </goal>
- <goal name="next_refn" proved="true">
- <proof prover="1"><result status="valid" time="0.018475" steps="2"/></proof>
+ <goal name="produces_trans_refn" proved="true">
+ <proof prover="1"><result status="valid" time="0.013593" steps="2"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz b/creusot/tests/should_succeed/iterators/04_skip/why3shapes.gz
index 4d9473f44805c38ae98c7f4e116aace602a0fce5..4137c8e3fe8f267cf6e7e752ca8f2ec33900e5ea 100644
GIT binary patch
literal 1069
zcmV+|1k(E-iwFP!00000|D{z+Z{s!)zWZ1Bwr%#p;hV+gAOtaJpy;Iqk2NTYN{n@+
z)ONDlf8XIlmh24*6m<ZH{P@lAn+L}~-K|g0{xzP~@9}urkHar(xxV{(b^gomhj;48
zrY^z3X60XxWA_%~2^{sGKRf1xliR{9|G|m6=XKBOo^BV`ycjOrp)Y=Qf%5U?_58O}
z)m}|Xh|>!q@uzs`3pXz_y`Za%?s9-j*O0W+B%=BjRV%N1R`;~-VJVdr!-cz~{z|*7
z+Aq18v#74LdsO0m>)YVN_6kqn5}7zTIA8SnM9Dx~fp%hqdZC#ss8a>YQaL&;Ws+W&
zB2}O)F~VudX7%)1z0)a=#sQ|FWQt9T1WpL4h^c^HgoUS*`ND1TNv>`JRx=80a?2K-
z$>-hx6kdV>)jaqxzPujdId*s={lo6JafoxF{9Qs%`{4;W<KRI1KMU{o@g+KRv3<Z#
zUx9D_9wEm`<B#z)9^RvHOgFV>^fx^58-F;(f9Lr>j&IR%XpqKXUriE-0Hc9CHg&P}
z_x^1^oF)H+-x<nA#4+>OlrWiDhKcPdZo?!PCZcngoMM=nSHhf}u?*+SwQtAcar_p$
zPcL5+@$3FIpE{;|zaRX;G4T5izaQ(dbLpNORig0}MMAhg;puLFj>k;Mc(zR6l&9^*
zV_77yBrCb|=W&PO7dJ!p5$4n~WOniU?l3;>111KaC-%q}{Pu@9Je{BMe27OpX#AIZ
zWN@}=mg8d<SD9cgCO6WPn9sLvt30gEt<a0V$BSAFi8OUE=2|l12W+g|-7^hGib|){
zII2r=@Xe+cI_<jH`?tfHU^%G#6?IXWsp_g^>2S(sNpwy;qK=BG1XTE^c;4mHQY}R8
zE>!+O6F8chhfbBk$AZ=%ubKdgAPj<BZXy`Nb3E?TZPTS71FhGRxw`1=k_UXXrl}9x
zB&S##OjqJ;n)Eau>VRcG^vTLSto!k}9^&`&WvY>Rs=++f=sZf;JV|h<T+NRU-_`P2
zDNM}#sAMg(-2OK&`eQGfnuhXIMbdm;%tukjqu71~ZkpxK9R0x-r?^a0cl#l_d@bo`
z+o>g>5@qt=)E|txS9L#)zUvGAm#0notX7=_5@aj7E=Cao1EN|2T<ey#S_Qh6R#<MC
zr4}q%F+sQz#t6_vC`lA_K{FD(!hUA7MLH1V8>_8CJ~18w2m{axLj~7DP}zB@K+%pV
zb;}3SdLvZd^|I$GNa=ahs*5Tzl%?dFa!XMRwG=ER7K{aLL0LdY!UDIzETC3c$w+jd
z!~|m^?*J8aJ%rE++IEI3gI6<Rsj*aBsw|b3iWT6C^|523<G$Bzi!$)fNCFIcqq<}S
nw?>kA@KR$YTGgv)2-QmT99V#^4>?FiZ;k!|uX*8=I0^s&LU<w&

literal 1068
zcmV+{1k?K;iwFP!00000|D{z;Z{s!)z57@Awrz6Z@SDZvAOtaJpy;Iqk84mAl^E+t
zsqG}&f8U`<S(0lMDC&buKE4^g`OxU6yY=bCzs1w~BOXutzWZe@*LOd!&VTxS_dy-m
zlqERWto+-tZ{9;ZfusKZ-Z3Yf+-7F}2Pev&mpv<cx}90`Y&dg=zWCw-<>Twy`7fu6
zy&9Der)NasPw~)Z?ywx_8C?zNZU}Jh8j^OJL=@kmXys+k%AS@z%%!qyICGcOFSN^|
z{gRt0i)x|WqZ03HUk4wy3p{~yWaJFN`K-?;$^g^_s7FR97n-SpI#n<)m80WQCh2)8
zQU&r7BOI4(Qcsuaolbc)4lo5dQ*2x$a70K!Oab&PEIb{}XKs^EvbYIY$tbYVEt_>F
zpLzpOcn$_s_2@(Y`gVxt*x-rukGtRcE>4B=cL_c1yJzI|odfN^W!~@oYjo&h`-s1`
z0H6K=A;(GOkMYzWKB90;SEXn4C!Y9?Kb+#f^ZXyj_vkoONaL_CCJ97<(LkQ6ve^0u
z|Gw|el7GSH01ZaOG4oXAFqxT$iR~$_!z36cqEnchVweLjhdDZ913X-=ecd0A{by{x
zynau_@B6pm)G_7TediC3f!{ayd@9GzrF({`5{;)Q62konPj~xsJPw2bA1u?8^0d8p
z%!>r(WF>e0-0v{_?4}!hgekQQnN9q$JM_={fQiA^6MN(<KK&tf&*v9B@8S^;D*yEX
z8JumZ`S_T`6(*RA$(8gZ=Kk7kk%!f}7JBjbbWw{Tk*W;Fp_YvJ4jXIe?umvYMWs_}
z9M!ov_|B#lI_;X+`uD?`U^%G#6?IWLP}QPj>2S<uPV|s?L>(1l38?VT@w^*ObF~n;
zyHNR!CU7)04;?FoFAG|OTr>e>K^O$N+(a;jmw4Q#+r~>l23oEqQ+3hVB@g)4nyS3m
zCOO60V7d}#Q>9n)u?$%Dk3Lzs$93Bu*IoQ^zDzYTO*NRN8l6T7n<fcgOdyeFolLW7
zdlQ}aRQk9%H3w9plt4tOzbt!I_PXqs7yK_zoAg^ok;kam-U2tH-);HdtQHgW=46=<
z7KN=bjg>45zaQKG=0)H3vZ>}DYns%p8VMxGS~N|JA_N9R)daZKHLJA>bS<s0+%iio
zSh8Y*a3zcppovhDC}@IaBzT4W%xH~tAjmgXTZMdLJOmI1pcaM-u7#ko@lt`J4O8lx
z52p4;sJ3Zk%T<ul^Qcu5Rb(hj$u;Gcq8Mr^SV}Ay3)+IRfR2O(Zh=`qt+3KUg|@Eo
zlP;N5t&)v0q6x9lhI11LUd@Q5#!_vmvQ%0sRv3!ptY!=tm(s}Cs<wrQX#ozHpkxHs
mMvYd$sR*@TQ3%-*8Ms%BNhU%QwM<6z+UReFDdw>_3IG6Uz7`$;

diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg
index 52521644c0..5653837255 100644
--- a/creusot/tests/should_succeed/iterators/05_map.mlcfg
+++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg
@@ -1496,10 +1496,10 @@ module C05Map_Impl0_Next
     goto BB5
   }
   BB4 {
-    assert { [@expl:type invariant] inv1 _3 };
-    assume { resolve0 _3 };
     assert { [@expl:type invariant] inv3 self };
     assume { resolve2 self };
+    assert { [@expl:type invariant] inv1 _3 };
+    assume { resolve0 _3 };
     assert { [#"../05_map.rs" 61 14 61 30] false };
     absurd
   }
@@ -1850,86 +1850,62 @@ module C05Map_Impl0
     ensures { result = inv9 _x }
     
   axiom inv9 : forall x : i . inv9 x = true
-  type item0
-  predicate invariant8 (self : item0)
-  val invariant8 (self : item0) : bool
+  use seq.Seq
+  predicate invariant8 (self : Seq.seq (borrowed f))
+  val invariant8 (self : Seq.seq (borrowed f)) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : item0)
-  val inv8 (_x : item0) : bool
+  predicate inv8 (_x : Seq.seq (borrowed f))
+  val inv8 (_x : Seq.seq (borrowed f)) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : item0 . inv8 x = true
-  predicate invariant7 (self : borrowed f)
-  val invariant7 (self : borrowed f) : bool
+  axiom inv8 : forall x : Seq.seq (borrowed f) . inv8 x = true
+  type item0
+  predicate invariant7 (self : Seq.seq item0)
+  val invariant7 (self : Seq.seq item0) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : borrowed f)
-  val inv7 (_x : borrowed f) : bool
+  predicate inv7 (_x : Seq.seq item0)
+  val inv7 (_x : Seq.seq item0) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : borrowed f . inv7 x = true
-  predicate invariant6 (self : b)
-  val invariant6 (self : b) : bool
+  axiom inv7 : forall x : Seq.seq item0 . inv7 x = true
+  predicate invariant6 (self : item0)
+  val invariant6 (self : item0) : bool
     ensures { result = invariant6 self }
     
-  predicate inv6 (_x : b)
-  val inv6 (_x : b) : bool
+  predicate inv6 (_x : item0)
+  val inv6 (_x : item0) : bool
     ensures { result = inv6 _x }
     
-  axiom inv6 : forall x : b . inv6 x = true
-  use seq.Seq
-  predicate invariant5 (self : Seq.seq (borrowed f))
-  val invariant5 (self : Seq.seq (borrowed f)) : bool
+  axiom inv6 : forall x : item0 . inv6 x = true
+  predicate invariant5 (self : borrowed f)
+  val invariant5 (self : borrowed f) : bool
     ensures { result = invariant5 self }
     
-  predicate inv5 (_x : Seq.seq (borrowed f))
-  val inv5 (_x : Seq.seq (borrowed f)) : bool
+  predicate inv5 (_x : borrowed f)
+  val inv5 (_x : borrowed f) : bool
     ensures { result = inv5 _x }
     
-  axiom inv5 : forall x : Seq.seq (borrowed f) . inv5 x = true
-  predicate invariant4 (self : Seq.seq item0)
-  val invariant4 (self : Seq.seq item0) : bool
+  axiom inv5 : forall x : borrowed f . inv5 x = true
+  predicate invariant4 (self : b)
+  val invariant4 (self : b) : bool
     ensures { result = invariant4 self }
     
-  predicate inv4 (_x : Seq.seq item0)
-  val inv4 (_x : Seq.seq item0) : bool
+  predicate inv4 (_x : b)
+  val inv4 (_x : b) : bool
     ensures { result = inv4 _x }
     
-  axiom inv4 : forall x : Seq.seq item0 . inv4 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option b)
-  val invariant3 (self : Core_Option_Option_Type.t_option b) : bool
+  axiom inv4 : forall x : b . inv4 x = true
+  predicate invariant3 (self : Seq.seq b)
+  val invariant3 (self : Seq.seq b) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option b)
-  val inv3 (_x : Core_Option_Option_Type.t_option b) : bool
+  predicate inv3 (_x : Seq.seq b)
+  val inv3 (_x : Seq.seq b) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option b . inv3 x = true
-  use C05Map_Map_Type as C05Map_Map_Type
-  predicate invariant2 (self : borrowed (C05Map_Map_Type.t_map i b f))
-  val invariant2 (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
-    ensures { result = invariant2 self }
-    
-  predicate inv0 (_x : C05Map_Map_Type.t_map i b f)
-  val inv0 (_x : C05Map_Map_Type.t_map i b f) : bool
-    ensures { result = inv0 _x }
-    
-  predicate inv2 (_x : borrowed (C05Map_Map_Type.t_map i b f))
-  val inv2 (_x : borrowed (C05Map_Map_Type.t_map i b f)) : bool
-    ensures { result = inv2 _x }
-    
-  axiom inv2 : forall x : borrowed (C05Map_Map_Type.t_map i b f) . inv2 x = (inv0 ( * x) /\ inv0 ( ^ x))
-  predicate invariant1 (self : Seq.seq b)
-  val invariant1 (self : Seq.seq b) : bool
-    ensures { result = invariant1 self }
-    
-  predicate inv1 (_x : Seq.seq b)
-  val inv1 (_x : Seq.seq b) : bool
-    ensures { result = inv1 _x }
-    
-  axiom inv1 : forall x : Seq.seq b . inv1 x = true
+  axiom inv3 : forall x : Seq.seq b . inv3 x = true
   predicate precondition0 (self : f) (_2 : item0)
   val precondition0 (self : f) (_2 : item0) : bool
     ensures { result = precondition0 self _2 }
@@ -1941,7 +1917,7 @@ module C05Map_Impl0
   use seq.Seq
   predicate next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) =
     [#"../05_map.rs" 75 8 77 9] forall i : i . forall e : item0 . inv9 i
-     -> inv8 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
+     -> inv6 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e)
   val next_precondition0 [#"../05_map.rs" 74 4 74 50] (iter : i) (func : f) : bool
     ensures { result = next_precondition0 iter func }
     
@@ -1956,11 +1932,11 @@ module C05Map_Impl0
     
   predicate preservation0 [#"../05_map.rs" 81 4 81 45] (iter : i) (func : f) =
     [#"../05_map.rs" 82 8 89 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
-     -> inv6 b
-     -> inv7 f
-     -> inv8 e2
-     -> inv8 e1
-     -> inv4 s
+     -> inv4 b
+     -> inv5 f
+     -> inv6 e2
+     -> inv6 e1
+     -> inv7 s
      -> unnest0 func ( * f)
      -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
      -> precondition0 ( * f) (e1)  -> postcondition_mut0 f (e1) b  -> precondition0 ( ^ f) (e2)
@@ -1977,14 +1953,38 @@ module C05Map_Impl0
   val reinitialize0 [#"../05_map.rs" 93 4 93 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
-  predicate invariant0 [#"../05_map.rs" 131 4 131 30] (self : C05Map_Map_Type.t_map i b f) =
+  use C05Map_Map_Type as C05Map_Map_Type
+  predicate invariant2 [#"../05_map.rs" 131 4 131 30] (self : C05Map_Map_Type.t_map i b f) =
     [#"../05_map.rs" 133 12 135 57] reinitialize0 () /\ preservation0 (C05Map_Map_Type.map_iter self) (C05Map_Map_Type.map_func self) /\ next_precondition0 (C05Map_Map_Type.map_iter self) (C05Map_Map_Type.map_func self)
-  val invariant0 [#"../05_map.rs" 131 4 131 30] (self : C05Map_Map_Type.t_map i b f) : bool
-    ensures { result = invariant0 self }
+  val invariant2 [#"../05_map.rs" 131 4 131 30] (self : C05Map_Map_Type.t_map i b f) : bool
+    ensures { result = invariant2 self }
     
-  axiom inv0 : forall x : C05Map_Map_Type.t_map i b f . inv0 x = (invariant0 x /\ match x with
+  predicate inv2 (_x : C05Map_Map_Type.t_map i b f)
+  val inv2 (_x : C05Map_Map_Type.t_map i b f) : bool
+    ensures { result = inv2 _x }
+    
+  axiom inv2 : forall x : C05Map_Map_Type.t_map i b f . inv2 x = (invariant2 x /\ match x with
     | C05Map_Map_Type.C_Map iter func -> true
     end)
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant1 (self : Core_Option_Option_Type.t_option b)
+  val invariant1 (self : Core_Option_Option_Type.t_option b) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv1 (_x : Core_Option_Option_Type.t_option b)
+  val inv1 (_x : Core_Option_Option_Type.t_option b) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : Core_Option_Option_Type.t_option b . inv1 x = true
+  predicate invariant0 (self : borrowed (C05Map_Map_Type.t_map i b f))
+  val invariant0 (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
+    ensures { result = invariant0 self }
+    
+  predicate inv0 (_x : borrowed (C05Map_Map_Type.t_map i b f))
+  val inv0 (_x : borrowed (C05Map_Map_Type.t_map i b f)) : bool
+    ensures { result = inv0 _x }
+    
+  axiom inv0 : forall x : borrowed (C05Map_Map_Type.t_map i b f) . inv0 x = (inv2 ( * x) /\ inv2 ( ^ x))
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -1998,7 +1998,7 @@ module C05Map_Impl0
   predicate produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+    [#"../05_map.rs" 42 8 53 9] unnest0 (C05Map_Map_Type.map_func self) (C05Map_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C05Map_Map_Type.map_iter self) s (C05Map_Map_Type.map_iter succ) /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
      ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C05Map_Map_Type.map_func self = C05Map_Map_Type.map_func succ
     else
@@ -2008,40 +2008,40 @@ module C05Map_Impl0
   val produces0 [@inline:trivial] [#"../05_map.rs" 41 4 41 67] (self : C05Map_Map_Type.t_map i b f) (visited : Seq.seq b) (succ : C05Map_Map_Type.t_map i b f) : bool
     ensures { result = produces0 self visited succ }
     
+  use seq.Seq
   predicate produces_one0 [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f)
     
    =
-    [#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv7 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv8 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)
+    [#"../05_map.rs" 118 8 123 9] exists f : borrowed f . inv5 f /\  * f = C05Map_Map_Type.map_func self /\  ^ f = C05Map_Map_Type.map_func succ /\ (exists e : item0 . inv6 e /\ produces1 (C05Map_Map_Type.map_iter self) (Seq.singleton e) (C05Map_Map_Type.map_iter succ) /\ precondition0 ( * f) (e) /\ postcondition_mut0 f (e) visited)
   val produces_one0 [#"../05_map.rs" 117 4 117 57] (self : C05Map_Map_Type.t_map i b f) (visited : b) (succ : C05Map_Map_Type.t_map i b f) : bool
-    requires {[#"../05_map.rs" 117 20 117 24] inv0 self}
-    requires {[#"../05_map.rs" 117 26 117 33] inv6 visited}
-    requires {[#"../05_map.rs" 117 38 117 42] inv0 succ}
+    requires {[#"../05_map.rs" 117 20 117 24] inv2 self}
+    requires {[#"../05_map.rs" 117 26 117 33] inv4 visited}
+    requires {[#"../05_map.rs" 117 38 117 42] inv2 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv0 self)
-   -> ([#"../05_map.rs" 117 26 117 33] inv6 visited)
-   -> ([#"../05_map.rs" 117 38 117 42] inv0 succ)
+  axiom produces_one0_spec : forall self : C05Map_Map_Type.t_map i b f, visited : b, succ : C05Map_Map_Type.t_map i b f . ([#"../05_map.rs" 117 20 117 24] inv2 self)
+   -> ([#"../05_map.rs" 117 26 117 33] inv4 visited)
+   -> ([#"../05_map.rs" 117 38 117 42] inv2 succ)
    -> ([#"../05_map.rs" 116 14 116 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
   predicate completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) =
     [#"../05_map.rs" 23 8 23 75] completed1 (Borrow.borrow_logic (C05Map_Map_Type.map_iter ( * self)) (C05Map_Map_Type.map_iter ( ^ self)) (Borrow.inherit_id (Borrow.get_id self) 1)) /\ C05Map_Map_Type.map_func ( * self) = C05Map_Map_Type.map_func ( ^ self)
   val completed0 [#"../05_map.rs" 22 4 22 35] (self : borrowed (C05Map_Map_Type.t_map i b f)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
-  goal produces_trans_refn : [#"../05_map.rs" 36 4 36 90] forall a : C05Map_Map_Type.t_map i b f . forall ab : Seq.seq b . forall b : C05Map_Map_Type.t_map i b f . forall bc : Seq.seq b . forall c : C05Map_Map_Type.t_map i b f . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
-   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
-  goal next_refn : [#"../05_map.rs" 60 4 60 44] forall self : borrowed (C05Map_Map_Type.t_map i b f) . inv2 self
-   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option b . inv3 result /\ match result with
+  goal next_refn : [#"../05_map.rs" 60 4 60 44] forall self : borrowed (C05Map_Map_Type.t_map i b f) . inv0 self
+   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces_one0 ( * self) v ( ^ self)
     end
-   -> inv3 result /\ match result with
+   -> inv1 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_refl_refn : [#"../05_map.rs" 29 4 29 26] forall self : C05Map_Map_Type.t_map i b f . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../05_map.rs" 36 4 36 90] forall a : C05Map_Map_Type.t_map i b f . forall ab : Seq.seq b . forall b : C05Map_Map_Type.t_map i b f . forall bc : Seq.seq b . forall c : C05Map_Map_Type.t_map i b f . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../05_map.rs" 29 4 29 26] forall self : C05Map_Map_Type.t_map i b f . inv2 self
+   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C05Map_Impl2
   type i
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3session.xml b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
index d034b22593..f26de167ed 100644
--- a/creusot/tests/should_succeed/iterators/05_map/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/05_map/why3session.xml
@@ -185,12 +185,12 @@
  </goal>
 </theory>
 <theory name="C05Map_Impl0" proved="true">
+ <goal name="next_refn" proved="true">
+ <proof prover="5"><result status="valid" time="0.010000" steps="1050"/></proof>
+ </goal>
  <goal name="produces_trans_refn" proved="true">
  <proof prover="5"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
- <goal name="next_refn" proved="true">
- <proof prover="5"><result status="valid" time="0.010000" steps="1014"/></proof>
- </goal>
  <goal name="produces_refl_refn" proved="true">
  <proof prover="5"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
diff --git a/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz b/creusot/tests/should_succeed/iterators/05_map/why3shapes.gz
index 82337df990a01f6482b8777a21fe1e65c8dee345..035bfbf58aeac9146c69cf2d9df8885d1c7e7c46 100644
GIT binary patch
delta 4540
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
aTutKu&0$h<lW6m=qWyma!9r(_SpWdT*v69p

delta 4512
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

diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
index d51b3bc37c..fc92ee89eb 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
+++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg
@@ -1910,10 +1910,10 @@ module C06MapPrecond_Impl0_Next
     goto BB5
   }
   BB4 {
-    assert { [@expl:type invariant] inv1 _3 };
-    assume { resolve0 _3 };
     assert { [@expl:type invariant] inv4 self };
     assume { resolve2 self };
+    assert { [@expl:type invariant] inv1 _3 };
+    assume { resolve0 _3 };
     assert { [#"../06_map_precond.rs" 64 14 64 30] false };
     absurd
   }
@@ -3425,60 +3425,84 @@ module C06MapPrecond_Impl0
     ensures { result = inv9 _x }
     
   axiom inv9 : forall x : i . inv9 x = true
-  predicate invariant8 (self : Seq.seq (borrowed f))
-  val invariant8 (self : Seq.seq (borrowed f)) : bool
+  predicate invariant8 (self : item0)
+  val invariant8 (self : item0) : bool
     ensures { result = invariant8 self }
     
-  predicate inv8 (_x : Seq.seq (borrowed f))
-  val inv8 (_x : Seq.seq (borrowed f)) : bool
+  predicate inv8 (_x : item0)
+  val inv8 (_x : item0) : bool
     ensures { result = inv8 _x }
     
-  axiom inv8 : forall x : Seq.seq (borrowed f) . inv8 x = true
-  predicate invariant7 (self : Seq.seq item0)
-  val invariant7 (self : Seq.seq item0) : bool
+  axiom inv8 : forall x : item0 . inv8 x = true
+  predicate invariant7 (self : borrowed f)
+  val invariant7 (self : borrowed f) : bool
     ensures { result = invariant7 self }
     
-  predicate inv7 (_x : Seq.seq item0)
-  val inv7 (_x : Seq.seq item0) : bool
+  predicate inv7 (_x : borrowed f)
+  val inv7 (_x : borrowed f) : bool
     ensures { result = inv7 _x }
     
-  axiom inv7 : forall x : Seq.seq item0 . inv7 x = true
-  predicate invariant6 (self : item0)
-  val invariant6 (self : item0) : bool
+  axiom inv7 : forall x : borrowed f . inv7 x = true
+  predicate invariant6 (self : b)
+  val invariant6 (self : b) : bool
     ensures { result = invariant6 self }
     
-  predicate inv6 (_x : item0)
-  val inv6 (_x : item0) : bool
+  predicate inv6 (_x : b)
+  val inv6 (_x : b) : bool
     ensures { result = inv6 _x }
     
-  axiom inv6 : forall x : item0 . inv6 x = true
-  predicate invariant5 (self : borrowed f)
-  val invariant5 (self : borrowed f) : bool
+  axiom inv6 : forall x : b . inv6 x = true
+  predicate invariant5 (self : Seq.seq (borrowed f))
+  val invariant5 (self : Seq.seq (borrowed f)) : bool
     ensures { result = invariant5 self }
     
-  predicate inv5 (_x : borrowed f)
-  val inv5 (_x : borrowed f) : bool
+  predicate inv5 (_x : Seq.seq (borrowed f))
+  val inv5 (_x : Seq.seq (borrowed f)) : bool
     ensures { result = inv5 _x }
     
-  axiom inv5 : forall x : borrowed f . inv5 x = true
-  predicate invariant4 (self : b)
-  val invariant4 (self : b) : bool
+  axiom inv5 : forall x : Seq.seq (borrowed f) . inv5 x = true
+  predicate invariant4 (self : Seq.seq item0)
+  val invariant4 (self : Seq.seq item0) : bool
     ensures { result = invariant4 self }
     
-  predicate inv4 (_x : b)
-  val inv4 (_x : b) : bool
+  predicate inv4 (_x : Seq.seq item0)
+  val inv4 (_x : Seq.seq item0) : bool
     ensures { result = inv4 _x }
     
-  axiom inv4 : forall x : b . inv4 x = true
-  predicate invariant3 (self : Seq.seq b)
-  val invariant3 (self : Seq.seq b) : bool
+  axiom inv4 : forall x : Seq.seq item0 . inv4 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option b)
+  val invariant3 (self : Core_Option_Option_Type.t_option b) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq b)
-  val inv3 (_x : Seq.seq b) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option b)
+  val inv3 (_x : Core_Option_Option_Type.t_option b) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq b . inv3 x = true
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option b . inv3 x = true
+  use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
+  predicate invariant2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
+  val invariant2 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
+    ensures { result = invariant2 self }
+    
+  predicate inv0 (_x : C06MapPrecond_Map_Type.t_map i b f item0)
+  val inv0 (_x : C06MapPrecond_Map_Type.t_map i b f item0) : bool
+    ensures { result = inv0 _x }
+    
+  predicate inv2 (_x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
+  val inv2 (_x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
+    ensures { result = inv2 _x }
+    
+  axiom inv2 : forall x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv2 x = (inv0 ( * x) /\ inv0 ( ^ x))
+  predicate invariant1 (self : Seq.seq b)
+  val invariant1 (self : Seq.seq b) : bool
+    ensures { result = invariant1 self }
+    
+  predicate inv1 (_x : Seq.seq b)
+  val inv1 (_x : Seq.seq b) : bool
+    ensures { result = inv1 _x }
+    
+  axiom inv1 : forall x : Seq.seq b . inv1 x = true
   predicate precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0)))
   val precondition0 (self : f) (_2 : (item0, Snapshot.snap_ty (Seq.seq item0))) : bool
     ensures { result = precondition0 self _2 }
@@ -3491,7 +3515,7 @@ module C06MapPrecond_Impl0
   use seq.Seq
   predicate next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) =
     [#"../06_map_precond.rs" 84 8 88 9] forall i : i . forall e : item0 . inv9 i
-     -> inv6 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
+     -> inv8 e  -> produces1 iter (Seq.singleton e) i  -> precondition0 func (e, Snapshot.new produced)
   val next_precondition0 [#"../06_map_precond.rs" 83 4 83 74] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     ensures { result = next_precondition0 iter func produced }
     
@@ -3507,11 +3531,11 @@ module C06MapPrecond_Impl0
     
   predicate preservation0 [#"../06_map_precond.rs" 105 4 105 45] (iter : i) (func : f) =
     [#"../06_map_precond.rs" 106 8 113 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
-     -> inv4 b
-     -> inv5 f
-     -> inv6 e2
-     -> inv6 e1
-     -> inv7 s
+     -> inv6 b
+     -> inv7 f
+     -> inv8 e2
+     -> inv8 e1
+     -> inv4 s
      -> unnest0 func ( * f)
      -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
      -> precondition0 ( * f) (e1, Snapshot.new s)
@@ -3522,11 +3546,11 @@ module C06MapPrecond_Impl0
   use seq.Seq
   predicate preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) =
     [#"../06_map_precond.rs" 94 8 101 9] forall i : i . forall b : b . forall f : borrowed f . forall e2 : item0 . forall e1 : item0 . forall s : Seq.seq item0 . inv9 i
-     -> inv4 b
-     -> inv5 f
-     -> inv6 e2
-     -> inv6 e1
-     -> inv7 s
+     -> inv6 b
+     -> inv7 f
+     -> inv8 e2
+     -> inv8 e1
+     -> inv4 s
      -> unnest0 func ( * f)
      -> produces1 iter (Seq.snoc (Seq.snoc s e1) e2) i
      -> precondition0 ( * f) (e1, Snapshot.new (Seq.(++) produced s))
@@ -3535,12 +3559,12 @@ module C06MapPrecond_Impl0
   val preservation_inv0 [#"../06_map_precond.rs" 93 4 93 73] (iter : i) (func : f) (produced : Seq.seq item0) : bool
     requires {[#"../06_map_precond.rs" 93 24 93 28] inv9 iter}
     requires {[#"../06_map_precond.rs" 93 33 93 37] inv10 func}
-    requires {[#"../06_map_precond.rs" 93 42 93 50] inv7 produced}
+    requires {[#"../06_map_precond.rs" 93 42 93 50] inv4 produced}
     ensures { result = preservation_inv0 iter func produced }
     
   axiom preservation_inv0_spec : forall iter : i, func : f, produced : Seq.seq item0 . ([#"../06_map_precond.rs" 93 24 93 28] inv9 iter)
    -> ([#"../06_map_precond.rs" 93 33 93 37] inv10 func)
-   -> ([#"../06_map_precond.rs" 93 42 93 50] inv7 produced)
+   -> ([#"../06_map_precond.rs" 93 42 93 50] inv4 produced)
    -> ([#"../06_map_precond.rs" 92 4 92 83] produced = Seq.empty 
    -> preservation_inv0 iter func produced = preservation0 iter func)
   use prelude.Snapshot
@@ -3555,54 +3579,28 @@ module C06MapPrecond_Impl0
   val reinitialize0 [#"../06_map_precond.rs" 117 4 117 29] (_1 : ()) : bool
     ensures { result = reinitialize0 _1 }
     
-  use C06MapPrecond_Map_Type as C06MapPrecond_Map_Type
-  predicate invariant2 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
+  predicate invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) =
     [#"../06_map_precond.rs" 159 12 161 73] reinitialize0 () /\ preservation_inv0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) /\ next_precondition0 (C06MapPrecond_Map_Type.map_iter self) (C06MapPrecond_Map_Type.map_func self) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self))
-  val invariant2 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
-    ensures { result = invariant2 self }
-    
-  predicate inv2 (_x : C06MapPrecond_Map_Type.t_map i b f item0)
-  val inv2 (_x : C06MapPrecond_Map_Type.t_map i b f item0) : bool
-    ensures { result = inv2 _x }
+  val invariant0 [#"../06_map_precond.rs" 157 4 157 30] (self : C06MapPrecond_Map_Type.t_map i b f item0) : bool
+    ensures { result = invariant0 self }
     
-  axiom inv2 : forall x : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 x = (invariant2 x /\ match x with
+  axiom inv0 : forall x : C06MapPrecond_Map_Type.t_map i b f item0 . inv0 x = (invariant0 x /\ match x with
     | C06MapPrecond_Map_Type.C_Map iter func produced -> true
     end)
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant1 (self : Core_Option_Option_Type.t_option b)
-  val invariant1 (self : Core_Option_Option_Type.t_option b) : bool
-    ensures { result = invariant1 self }
-    
-  predicate inv1 (_x : Core_Option_Option_Type.t_option b)
-  val inv1 (_x : Core_Option_Option_Type.t_option b) : bool
-    ensures { result = inv1 _x }
-    
-  axiom inv1 : forall x : Core_Option_Option_Type.t_option b . inv1 x = true
-  predicate invariant0 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
-  val invariant0 (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
-    ensures { result = invariant0 self }
-    
-  predicate inv0 (_x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
-  val inv0 (_x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
-    ensures { result = inv0 _x }
-    
-  axiom inv0 : forall x : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv0 x = (inv2 ( * x) /\ inv2 ( ^ x))
-  use seq.Seq
-  use seq.Seq
   use seq.Seq
+  use prelude.Snapshot
   use seq.Seq
   use seq_ext.SeqExt
   use seq.Seq
   use seq.Seq
   use prelude.Int
   use seq.Seq
-  use prelude.Snapshot
   use seq.Seq
   use seq.Seq
   predicate produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv7 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv8 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
+    [#"../06_map_precond.rs" 44 8 56 9] unnest0 (C06MapPrecond_Map_Type.map_func self) (C06MapPrecond_Map_Type.map_func succ) /\ (exists s : Seq.seq item0 . inv4 s /\ Seq.length s = Seq.length visited /\ produces1 (C06MapPrecond_Map_Type.map_iter self) s (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.(++) (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) s /\ (exists fs : Seq.seq (borrowed f) . inv5 fs /\ Seq.length fs = Seq.length visited /\ (forall i : int . 1 <= i /\ i < Seq.length fs
      ->  ^ Seq.get fs (i - 1) =  * Seq.get fs i) /\ (if Seq.length visited = 0 then
       C06MapPrecond_Map_Type.map_func self = C06MapPrecond_Map_Type.map_func succ
     else
@@ -3612,20 +3610,19 @@ module C06MapPrecond_Impl0
   val produces0 [@inline:trivial] [#"../06_map_precond.rs" 43 4 43 67] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : Seq.seq b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
     ensures { result = produces0 self visited succ }
     
-  use seq.Seq
   predicate produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0)
     
    =
-    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv5 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv6 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
+    [#"../06_map_precond.rs" 143 8 149 9] exists f : borrowed f . inv7 f /\  * f = C06MapPrecond_Map_Type.map_func self /\  ^ f = C06MapPrecond_Map_Type.map_func succ /\ (exists e : item0 . inv8 e /\ produces1 (C06MapPrecond_Map_Type.map_iter self) (Seq.singleton e) (C06MapPrecond_Map_Type.map_iter succ) /\ Snapshot.inner (C06MapPrecond_Map_Type.map_produced succ) = Seq.snoc (Snapshot.inner (C06MapPrecond_Map_Type.map_produced self)) e /\ precondition0 ( * f) (e, C06MapPrecond_Map_Type.map_produced self) /\ postcondition_mut0 f (e, C06MapPrecond_Map_Type.map_produced self) visited)
   val produces_one0 [#"../06_map_precond.rs" 142 4 142 57] (self : C06MapPrecond_Map_Type.t_map i b f item0) (visited : b) (succ : C06MapPrecond_Map_Type.t_map i b f item0) : bool
-    requires {[#"../06_map_precond.rs" 142 20 142 24] inv2 self}
-    requires {[#"../06_map_precond.rs" 142 26 142 33] inv4 visited}
-    requires {[#"../06_map_precond.rs" 142 38 142 42] inv2 succ}
+    requires {[#"../06_map_precond.rs" 142 20 142 24] inv0 self}
+    requires {[#"../06_map_precond.rs" 142 26 142 33] inv6 visited}
+    requires {[#"../06_map_precond.rs" 142 38 142 42] inv0 succ}
     ensures { result = produces_one0 self visited succ }
     
-  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv2 self)
-   -> ([#"../06_map_precond.rs" 142 26 142 33] inv4 visited)
-   -> ([#"../06_map_precond.rs" 142 38 142 42] inv2 succ)
+  axiom produces_one0_spec : forall self : C06MapPrecond_Map_Type.t_map i b f item0, visited : b, succ : C06MapPrecond_Map_Type.t_map i b f item0 . ([#"../06_map_precond.rs" 142 20 142 24] inv0 self)
+   -> ([#"../06_map_precond.rs" 142 26 142 33] inv6 visited)
+   -> ([#"../06_map_precond.rs" 142 38 142 42] inv0 succ)
    -> ([#"../06_map_precond.rs" 141 14 141 68] produces_one0 self visited succ = produces0 self (Seq.singleton visited) succ)
   predicate completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0))
    =
@@ -3633,20 +3630,23 @@ module C06MapPrecond_Impl0
   val completed0 [#"../06_map_precond.rs" 21 4 21 35] (self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0)) : bool
     ensures { result = completed0 self }
     
-  goal next_refn : [#"../06_map_precond.rs" 63 4 63 44] forall self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv0 self
-   -> inv0 self /\ (forall result : Core_Option_Option_Type.t_option b . inv1 result /\ match result with
+  use seq.Seq
+  use seq.Seq
+  use seq.Seq
+  goal produces_refl_refn : [#"../06_map_precond.rs" 31 4 31 26] forall self : C06MapPrecond_Map_Type.t_map i b f item0 . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
+  goal produces_trans_refn : [#"../06_map_precond.rs" 38 4 38 90] forall a : C06MapPrecond_Map_Type.t_map i b f item0 . forall ab : Seq.seq b . forall b : C06MapPrecond_Map_Type.t_map i b f item0 . forall bc : Seq.seq b . forall c : C06MapPrecond_Map_Type.t_map i b f item0 . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../06_map_precond.rs" 63 4 63 44] forall self : borrowed (C06MapPrecond_Map_Type.t_map i b f item0) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option b . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces_one0 ( * self) v ( ^ self)
     end
-   -> inv1 result /\ match result with
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../06_map_precond.rs" 38 4 38 90] forall a : C06MapPrecond_Map_Type.t_map i b f item0 . forall ab : Seq.seq b . forall b : C06MapPrecond_Map_Type.t_map i b f item0 . forall bc : Seq.seq b . forall c : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b
-   -> inv2 c /\ inv3 bc /\ inv2 b /\ inv3 ab /\ inv2 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../06_map_precond.rs" 31 4 31 26] forall self : C06MapPrecond_Map_Type.t_map i b f item0 . inv2 self
-   -> inv2 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C06MapPrecond_Impl2
   type i
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
index d9a3e4b7c8..d8b13b8927 100644
--- a/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/06_map_precond/why3session.xml
@@ -378,14 +378,14 @@
  </goal>
 </theory>
 <theory name="C06MapPrecond_Impl0" proved="true">
- <goal name="next_refn" proved="true">
- <proof prover="0"><result status="valid" time="0.079489" steps="1234"/></proof>
+ <goal name="produces_refl_refn" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
  <goal name="produces_trans_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
- <goal name="produces_refl_refn" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
+ <goal name="next_refn" proved="true">
+ <proof prover="0"><result status="valid" time="0.079489" steps="1235"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz b/creusot/tests/should_succeed/iterators/06_map_precond/why3shapes.gz
index efce9065d954f0c90795b607235e53df03c1032e..2a032774999c748244df12e02ed6337d395bde99 100644
GIT binary patch
delta 8221
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
PO)&mHTic3sQ=|X@yuaU#

delta 8250
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

diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
index 142a681ac2..32f660efa8 100644
--- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
+++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg
@@ -667,6 +667,8 @@ module C07Fuse_Impl0
     
   axiom inv0 : forall x : C07Fuse_Fuse_Type.t_fuse i . inv0 x = true
   use seq.Seq
+  use seq.Seq
+  use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -676,13 +678,11 @@ module C07Fuse_Impl0
   val completed0 [#"../07_fuse.rs" 16 4 16 35] (self : borrowed (C07Fuse_Fuse_Type.t_fuse i)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   predicate produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i)
   val produces1 [#"../common.rs" 8 4 8 65] (self : i) (visited : Seq.seq item0) (o : i) : bool
     ensures { result = produces1 self visited o }
     
-  use seq.Seq
   predicate produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i)
     
    =
@@ -696,8 +696,6 @@ module C07Fuse_Impl0
   val produces0 [#"../07_fuse.rs" 25 4 25 65] (self : C07Fuse_Fuse_Type.t_fuse i) (prod : Seq.seq item0) (other : C07Fuse_Fuse_Type.t_fuse i) : bool
     ensures { result = produces0 self prod other }
     
-  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
   goal produces_trans_refn : [#"../07_fuse.rs" 62 4 62 90] forall a : C07Fuse_Fuse_Type.t_fuse i . forall ab : Seq.seq item0 . forall b : C07Fuse_Fuse_Type.t_fuse i . forall bc : Seq.seq item0 . forall c : C07Fuse_Fuse_Type.t_fuse i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
    -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
    -> produces0 a (Seq.(++) ab bc) c)
@@ -710,6 +708,8 @@ module C07Fuse_Impl0
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_refl_refn : [#"../07_fuse.rs" 55 4 55 26] forall self : C07Fuse_Fuse_Type.t_fuse i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
 module C07Fuse_Impl1
   type i
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
index dde7de6ec0..17cec339b9 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg
@@ -28,12 +28,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -387,12 +393,12 @@ module C08CollectExtend_Extend
     goto BB14
   }
   BB13 {
-    assert { [@expl:type invariant] inv5 _17 };
-    assume { resolve4 _17 };
     assert { [@expl:type invariant] inv3 iter1 };
     assume { resolve5 iter1 };
     assert { [@expl:type invariant] inv7 vec };
     assume { resolve6 vec };
+    assert { [@expl:type invariant] inv5 _17 };
+    assume { resolve4 _17 };
     assert { [#"../08_collect_extend.rs" 27 4 27 35] false };
     absurd
   }
@@ -764,12 +770,12 @@ module C08CollectExtend_Collect
     goto BB15
   }
   BB14 {
-    assert { [@expl:type invariant] inv4 _15 };
-    assume { resolve3 _15 };
     assert { [@expl:type invariant] inv2 iter1 };
     assume { resolve4 iter1 };
     assert { [@expl:type invariant] inv5 res };
     assume { resolve5 res };
+    assert { [@expl:type invariant] inv4 _15 };
+    assume { resolve3 _15 };
     assert { [#"../08_collect_extend.rs" 45 4 45 40] false };
     absurd
   }
@@ -837,7 +843,7 @@ module Alloc_Vec_IntoIter_IntoIter_Type
   use Core_Marker_PhantomData_Type as Core_Marker_PhantomData_Type
   use Core_Ptr_NonNull_NonNull_Type as Core_Ptr_NonNull_NonNull_Type
   type t_intoiter 't 'a =
-    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) opaque_ptr opaque_ptr
+    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) opaque_ptr
     
 end
 module C08CollectExtend_ExtendIndex
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend/why3session.xml b/creusot/tests/should_succeed/iterators/08_collect_extend/why3session.xml
index 1272e78d25..106d904224 100644
--- a/creusot/tests/should_succeed/iterators/08_collect_extend/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/08_collect_extend/why3session.xml
@@ -51,7 +51,7 @@
   <proof prover="0"><result status="valid" time="0.018691" steps="68"/></proof>
   </goal>
   <goal name="extend&#39;vc.14" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.010000" steps="193"/></proof>
+  <proof prover="0"><result status="valid" time="0.010000" steps="192"/></proof>
   </goal>
   <goal name="extend&#39;vc.15" expl="type invariant" proved="true">
   <proof prover="0"><result status="valid" time="0.013205" steps="68"/></proof>
@@ -75,7 +75,7 @@
   <proof prover="0"><result status="valid" time="0.010000" steps="96"/></proof>
   </goal>
   <goal name="extend&#39;vc.22" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.046107" steps="755"/></proof>
+  <proof prover="0"><result status="valid" time="0.046107" steps="758"/></proof>
   </goal>
   <goal name="extend&#39;vc.23" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.010000" steps="65"/></proof>
@@ -144,7 +144,7 @@
   <proof prover="0"><result status="valid" time="0.010000" steps="302"/></proof>
   </goal>
   <goal name="collect&#39;vc.19" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.020000" steps="366"/></proof>
+  <proof prover="0"><result status="valid" time="0.020000" steps="364"/></proof>
   </goal>
   <goal name="collect&#39;vc.20" expl="unreachable point" proved="true">
   <proof prover="0"><result status="valid" time="0.010000" steps="55"/></proof>
@@ -154,7 +154,7 @@
 </theory>
 <theory name="C08CollectExtend_ExtendIndex" proved="true">
  <goal name="extend_index&#39;vc" expl="VC for extend_index" proved="true">
- <proof prover="0"><result status="valid" time="0.040000" steps="434"/></proof>
+ <proof prover="0"><result status="valid" time="0.040000" steps="437"/></proof>
  </goal>
 </theory>
 <theory name="C08CollectExtend_CollectExample" proved="true">
diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend/why3shapes.gz b/creusot/tests/should_succeed/iterators/08_collect_extend/why3shapes.gz
index c9201d300e485336ad215ba3692bfcba031c4ced..0ad26e67a490c08f44e59a21af476039f8261885 100644
GIT binary patch
literal 3713
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

literal 3719
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

diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
index a7619981a9..5277971fac 100644
--- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg
+++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg
@@ -123,37 +123,37 @@ module C09Empty_Impl0_Next
 end
 module C09Empty_Impl0
   type t
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
-  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
+  use seq.Seq
+  predicate invariant3 (self : Seq.seq t)
+  val invariant3 (self : Seq.seq t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
-  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv3 (_x : Seq.seq t)
+  val inv3 (_x : Seq.seq t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
-  use C09Empty_Empty_Type as C09Empty_Empty_Type
-  use prelude.Borrow
-  predicate invariant2 (self : borrowed (C09Empty_Empty_Type.t_empty t))
-  val invariant2 (self : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
+  axiom inv3 : forall x : Seq.seq t . inv3 x = true
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant2 (self : Core_Option_Option_Type.t_option t)
+  val invariant2 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : borrowed (C09Empty_Empty_Type.t_empty t))
-  val inv2 (_x : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
+  predicate inv2 (_x : Core_Option_Option_Type.t_option t)
+  val inv2 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 x = true
-  use seq.Seq
-  predicate invariant1 (self : Seq.seq t)
-  val invariant1 (self : Seq.seq t) : bool
+  axiom inv2 : forall x : Core_Option_Option_Type.t_option t . inv2 x = true
+  use C09Empty_Empty_Type as C09Empty_Empty_Type
+  use prelude.Borrow
+  predicate invariant1 (self : borrowed (C09Empty_Empty_Type.t_empty t))
+  val invariant1 (self : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : Seq.seq t)
-  val inv1 (_x : Seq.seq t) : bool
+  predicate inv1 (_x : borrowed (C09Empty_Empty_Type.t_empty t))
+  val inv1 (_x : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : Seq.seq t . inv1 x = true
+  axiom inv1 : forall x : borrowed (C09Empty_Empty_Type.t_empty t) . inv1 x = true
   predicate invariant0 (self : C09Empty_Empty_Type.t_empty t)
   val invariant0 (self : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = invariant0 self }
@@ -164,6 +164,7 @@ module C09Empty_Impl0
     
   axiom inv0 : forall x : C09Empty_Empty_Type.t_empty t . inv0 x = true
   use seq.Seq
+  use seq.Seq
   predicate resolve0 (self : borrowed (C09Empty_Empty_Type.t_empty t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
@@ -174,7 +175,6 @@ module C09Empty_Impl0
   val completed0 [#"../09_empty.rs" 15 4 15 35] (self : borrowed (C09Empty_Empty_Type.t_empty t)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   use seq.Seq
   predicate produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t)
@@ -184,18 +184,18 @@ module C09Empty_Impl0
   val produces0 [#"../09_empty.rs" 21 4 21 64] (self : C09Empty_Empty_Type.t_empty t) (visited : Seq.seq t) (o : C09Empty_Empty_Type.t_empty t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
-   -> inv1 bc /\ inv1 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
   goal produces_refl_refn : [#"../09_empty.rs" 28 4 28 26] forall self : C09Empty_Empty_Type.t_empty t . inv0 self
    -> (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv2 self
-   -> (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
+  goal next_refn : [#"../09_empty.rs" 41 4 41 35] forall self : borrowed (C09Empty_Empty_Type.t_empty t) . inv1 self
+   -> (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end
-   -> inv3 result /\ match result with
+   -> inv2 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_trans_refn : [#"../09_empty.rs" 35 4 35 90] forall a : C09Empty_Empty_Type.t_empty t . forall ab : Seq.seq t . forall b : C09Empty_Empty_Type.t_empty t . forall bc : Seq.seq t . forall c : C09Empty_Empty_Type.t_empty t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv3 bc /\ inv3 ab /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
 end
diff --git a/creusot/tests/should_succeed/iterators/09_empty/why3session.xml b/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
index b2efc3e268..6401fbd274 100644
--- a/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/09_empty/why3session.xml
@@ -21,15 +21,15 @@
  </goal>
 </theory>
 <theory name="C09Empty_Impl0" proved="true">
- <goal name="produces_trans_refn" proved="true">
- <proof prover="0"><result status="valid" time="0.000000" steps="14"/></proof>
- </goal>
  <goal name="produces_refl_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
  <goal name="next_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="0"/></proof>
  </goal>
+ <goal name="produces_trans_refn" proved="true">
+ <proof prover="0"><result status="valid" time="0.000000" steps="14"/></proof>
+ </goal>
 </theory>
 </file>
 </why3session>
diff --git a/creusot/tests/should_succeed/iterators/09_empty/why3shapes.gz b/creusot/tests/should_succeed/iterators/09_empty/why3shapes.gz
index 5854ddd4b430aeaded38a1e99c69b243a46ce6ad..088a39e76a63cad321e41b348eec039a116b506c 100644
GIT binary patch
literal 449
zcmV;y0Y3g8iwFP!00000|CNwIuiGFHgzx+cAKT;t3mB->LlnufFTGUa*rx^7uaOcv
zjnk<8_XRtR94Uv^7q7?P3_E<-RMU4n(^TE)G9AX@Q&m@+j||V3G5w4*ah&MbBc0CI
z-}A`k@ojdo>km8(H|}|}b|7xIhyg>y*gfe*Tq}Q>5`yK|JcP)WSlI0`j;HgHu9UbJ
zxPSXH4zvo`WN|tS@0l0}FY((9eH~BaJ#_fl!`;(#c%f-L-YDlZ%<rpyyi^1Iy5393
zQeqjQ5X&e$G>?{Y-O{V&QoQP3iOtd_5A3OfdeuR#I@Gy?dUVjcWg*@DUy6C1vTP;F
zR!>WBw_bbWZTC`bc569n^;)P4vRkfD-`}SDH%I>Y<m3fh67Ju&DGy^c1&rL(<W#Ry
z?Z8Qe!s@_5IvIE+TFz`Vq<StnYBVNUi_iz<f-%UQk|9H~1;&j-3l0gmt%Y%QbX*He
zwnyN?Ql(p!F|DlvBW%!^w9+VrQxL4qhvtK&$!UVOuC=XcYlhA$)QX}5P)P=f2`HyZ
r;s~afg%%H*6M^B*L5P}oA0V3o^-<fP66#cFc+h_UHB|efrUL)~u~OeE

literal 449
zcmV;y0Y3g8iwFP!00000|CNzXkDD+M#qWFyj@|6V|2?j>hbR()OD~mt>}qTe+eitd
zA&uH^UmMbhNIA3!iQ)M-k2k}oO+9_b6HWD%&eMJzKG&w+yi|BPkLhQmiQz<t9_e_x
z{GQ8dF5l;_>hc5k!<Bi~tUC~2Ul9X_h_QRni?~+)GQ|YT(OiUBEw*C2!#EyK2f9#V
zp5yNQ%Q(==V3WmZKYV0j9K6JDGxT*llJ}y+H!p5IO^0Wi#>17ePgD6_-H+#bpkJ5U
z5V8!hl%fzz$-QXqQ_A&}Ugash_SQr9RBg6vIcsJun1XDVPw3mzcK_Cq4<9;N0T+kc
zJ2d5bOgsNKuexVq)7^ZV>S5#R*~Zms<0fxh-8a6(kzRNI=VG6`EU83ERT&BxnKk58
zuaj}YNrfDAU_v?>Sj}5jLA0cLCK+n9HUXgMgL1)IWKPMDA=!$GS%)ATl3-xCbtXEd
zIVR{)Fb-7fR%HxB3e>xxok|iEWi!k%A`gkOBC{K3t!tsRt*K<6q6tV+GaZ>BKnpVJ
rU_oiE0Se9UG$;Y!a$ZdNjtWddt^tj<QTCh)E$;Lm@L>CrrUL)~@#NW{

diff --git a/creusot/tests/should_succeed/iterators/10_once.mlcfg b/creusot/tests/should_succeed/iterators/10_once.mlcfg
index 41a028fcd6..5608fd49d5 100644
--- a/creusot/tests/should_succeed/iterators/10_once.mlcfg
+++ b/creusot/tests/should_succeed/iterators/10_once.mlcfg
@@ -217,37 +217,37 @@ module C10Once_Impl0
     ensures { result = inv4 _x }
     
   axiom inv4 : forall x : t . inv4 x = true
-  use seq.Seq
-  predicate invariant3 (self : Seq.seq t)
-  val invariant3 (self : Seq.seq t) : bool
+  use Core_Option_Option_Type as Core_Option_Option_Type
+  predicate invariant3 (self : Core_Option_Option_Type.t_option t)
+  val invariant3 (self : Core_Option_Option_Type.t_option t) : bool
     ensures { result = invariant3 self }
     
-  predicate inv3 (_x : Seq.seq t)
-  val inv3 (_x : Seq.seq t) : bool
+  predicate inv3 (_x : Core_Option_Option_Type.t_option t)
+  val inv3 (_x : Core_Option_Option_Type.t_option t) : bool
     ensures { result = inv3 _x }
     
-  axiom inv3 : forall x : Seq.seq t . inv3 x = true
-  use Core_Option_Option_Type as Core_Option_Option_Type
-  predicate invariant2 (self : Core_Option_Option_Type.t_option t)
-  val invariant2 (self : Core_Option_Option_Type.t_option t) : bool
+  axiom inv3 : forall x : Core_Option_Option_Type.t_option t . inv3 x = true
+  use C10Once_Once_Type as C10Once_Once_Type
+  use prelude.Borrow
+  predicate invariant2 (self : borrowed (C10Once_Once_Type.t_once t))
+  val invariant2 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = invariant2 self }
     
-  predicate inv2 (_x : Core_Option_Option_Type.t_option t)
-  val inv2 (_x : Core_Option_Option_Type.t_option t) : bool
+  predicate inv2 (_x : borrowed (C10Once_Once_Type.t_once t))
+  val inv2 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = inv2 _x }
     
-  axiom inv2 : forall x : Core_Option_Option_Type.t_option t . inv2 x = true
-  use C10Once_Once_Type as C10Once_Once_Type
-  use prelude.Borrow
-  predicate invariant1 (self : borrowed (C10Once_Once_Type.t_once t))
-  val invariant1 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
+  axiom inv2 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv2 x = true
+  use seq.Seq
+  predicate invariant1 (self : Seq.seq t)
+  val invariant1 (self : Seq.seq t) : bool
     ensures { result = invariant1 self }
     
-  predicate inv1 (_x : borrowed (C10Once_Once_Type.t_once t))
-  val inv1 (_x : borrowed (C10Once_Once_Type.t_once t)) : bool
+  predicate inv1 (_x : Seq.seq t)
+  val inv1 (_x : Seq.seq t) : bool
     ensures { result = inv1 _x }
     
-  axiom inv1 : forall x : borrowed (C10Once_Once_Type.t_once t) . inv1 x = true
+  axiom inv1 : forall x : Seq.seq t . inv1 x = true
   predicate invariant0 (self : C10Once_Once_Type.t_once t)
   val invariant0 (self : C10Once_Once_Type.t_once t) : bool
     ensures { result = invariant0 self }
@@ -259,6 +259,7 @@ module C10Once_Impl0
   axiom inv0 : forall x : C10Once_Once_Type.t_once t . inv0 x = true
   use seq.Seq
   use seq.Seq
+  use seq.Seq
   predicate resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) =
     [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve0 (self : borrowed (C10Once_Once_Type.t_once t)) : bool
@@ -269,7 +270,6 @@ module C10Once_Impl0
   val completed0 [#"../10_once.rs" 15 4 15 35] (self : borrowed (C10Once_Once_Type.t_once t)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
   use seq.Seq
   predicate produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t)
     
@@ -278,18 +278,18 @@ module C10Once_Impl0
   val produces0 [#"../10_once.rs" 21 4 21 64] (self : C10Once_Once_Type.t_once t) (visited : Seq.seq t) (o : C10Once_Once_Type.t_once t) : bool
     ensures { result = produces0 self visited o }
     
-  goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
-  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv1 self
-   -> inv1 self /\ (forall result : Core_Option_Option_Type.t_option t . inv2 result /\ match result with
+  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
+   -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
+   -> produces0 a (Seq.(++) ab bc) c)
+  goal next_refn : [#"../10_once.rs" 44 4 44 35] forall self : borrowed (C10Once_Once_Type.t_once t) . inv2 self
+   -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end
-   -> inv2 result /\ match result with
+   -> inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
-  goal produces_trans_refn : [#"../10_once.rs" 38 4 38 90] forall a : C10Once_Once_Type.t_once t . forall ab : Seq.seq t . forall b : C10Once_Once_Type.t_once t . forall bc : Seq.seq t . forall c : C10Once_Once_Type.t_once t . inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
-   -> inv0 c /\ inv3 bc /\ inv0 b /\ inv3 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
-   -> produces0 a (Seq.(++) ab bc) c)
+  goal produces_refl_refn : [#"../10_once.rs" 31 4 31 26] forall self : C10Once_Once_Type.t_once t . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/10_once/why3session.xml b/creusot/tests/should_succeed/iterators/10_once/why3session.xml
index 04d21c9212..a4d1cb9ffe 100644
--- a/creusot/tests/should_succeed/iterators/10_once/why3session.xml
+++ b/creusot/tests/should_succeed/iterators/10_once/why3session.xml
@@ -25,13 +25,13 @@
  </goal>
 </theory>
 <theory name="C10Once_Impl0" proved="true">
- <goal name="produces_refl_refn" proved="true">
+ <goal name="produces_trans_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
  <goal name="next_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.010000" steps="0"/></proof>
  </goal>
- <goal name="produces_trans_refn" proved="true">
+ <goal name="produces_refl_refn" proved="true">
  <proof prover="0"><result status="valid" time="0.000000" steps="0"/></proof>
  </goal>
 </theory>
diff --git a/creusot/tests/should_succeed/iterators/10_once/why3shapes.gz b/creusot/tests/should_succeed/iterators/10_once/why3shapes.gz
index 464974532355ea56d0430608159195c25afc1186..961a920272a5db2e86aaca3f58bad0b59b70861a 100644
GIT binary patch
literal 626
zcmV-&0*(D2iwFP!00000|D{t+kJ>O4yysWs))p>){&pn}2q_9u)gCJOxU1)n?4m+K
zfo|J>Uptr*5SOZ4Y{oP5#?LSBXZ7(F_wiW2#lvwk^dD<k&puSA@3`sTz>=nHiG`-Z
z{b2|{d^{37#%+gjw?F+Jx9gEJZmSV}9&L-5UVR|@TrBC0CE|RJ=+Jre>l-|SQ{=)K
zYvQ;9X37Y-0=NsqmxAmXgI;4mj&VuEnrc<9OO`A2!*0Kgrx=LkxO)CP^l=hnmcZkt
ze@Tp?w*dGwvc3+xXp?@8hj<*eZ;@Dij%4++tZQ5(hBeJOqBTogB)Kd_J|%CtJO`EK
z7EgJ%uo~TPI1E2yc(?nO=wEstM`gF^ahn2cg5^y)usLH^Nh?yRMLrbC?lm4Zr{_(;
zmzWpJJ>&p0D^?chRNR#0ys7M}?uJ9%$6u$?FMe$(yEc?w8w$Chm)`Q}Yo{3Vd5Wd2
zSwBRZ<rGesngS|QmS<m4nkvhGwVXDa+!gpQrzZcZo4F8==0Z&7LZ#Ocf5+l%&C*-`
zn~Q$z(v%?)>$2YUc>EUg=>xF2+`7zQ(pC_n1k-sZsp482<XmV0iggi02vD<@w$PG_
zX~_t8+BrdFCnIs-5yALCRZ`1DRIO}9%PR%SOG&9@;5dyg7zJ9RFkAsMQctObQ)wL4
zBFcbN5e0-G<YLhQm>O6MDFC!UTGQ$Zl@~-Qz`(fIj1wb?V@`GfIz^06-e6kLEvOb`
z3!(*HxlTCW@jyTYln#aW2s%W9UAiPU`I6*bq?n;W2hC)P%$3w0G*CuEmxNw)Sp@f@
MKad?d7+(bd0Gz-m>Hq)$

literal 624
zcmV-$0+0P4iwFP!00000|D{q*kJB&^z2{ft2DBHCzm3#GRVi{M1P3G^cQuZk-HJ9T
zZCT*oW2Y|3u6jZAV*6#@n>TOzeo>#F@fgqbOFW%-L;tas_2NTy`Hs8(1srM0l{jcB
zJf4Q|qm5^R=eX}M9*&pa<8?dMjMr*JA4l0jrjrh2otq?mC5gCPB6{>Kw%b>D2It7F
zX6%XM37AVpz!$*ZD%#SJO*ZIc1G0^qBi2-#GA>zfupJJ^eZ0g#9LLS$=b?`?8;b;<
zcl}eU7<vbQ4`bEW;SgQoZ}Ak*!~P`_r>~ZrUYB!=t5o4kbG7Kq8dr%fOOsDYTduE0
zWtrk3-&RheA5N#?XAJKS-%|OPzKtWZ+x56l26n;mrhIVOV`fPwQma+|D3aWBJnb%z
zyMRwIAC9+>4J@44IG}TKQ=Idra+|svPIVuDT}obj3Y1NO(kW2Lf!?y^^KB;^<Nw5o
z?LDwrUpb=WBl2Em+YtA*A!gf9DHHK`8B>=3rlRkwG-ZvVgd^Tewp^ybwKLnhXkyRc
zgsC~8a>;G_^)*^q-m1KHdB1M(UrJ5>RTYFN!E~*cRB^2haxSz0#kvS01gM#%7A&cl
zmW*((y%$7wG7=9hBA7N%mDn;BDl4t9yi%ZADJhi<Jg3nIqd;pEhAUu3>Uk;QR2omU
zh%z8mL;)cPxmol8rUqsq82}5!8mlWqO%hIm9u!h90YZ?J`;JkjB#%iOj0J5$S&$Zl
z1zv&ThJ~P&LFgd1!Dy~p2;DdUc6mthmgGUkh?JTTNJj%VU7|{+SR!|^Rha~DNq+$7
K^Zh+v1pom3Bqb*R

diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
index 5fec98b9d4..5b92f0b5aa 100644
--- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
+++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg
@@ -237,6 +237,8 @@ module C11Repeat_Impl0
     
   axiom inv0 : forall x : C11Repeat_Repeat_Type.t_repeat a . inv0 x = true
   use seq.Seq
+  use seq.Seq
+  use seq.Seq
   predicate completed0 [#"../11_repeat.rs" 17 4 17 35] (self : borrowed (C11Repeat_Repeat_Type.t_repeat a)) =
     [#"../11_repeat.rs" 18 20 18 25] false
   val completed0 [#"../11_repeat.rs" 17 4 17 35] (self : borrowed (C11Repeat_Repeat_Type.t_repeat a)) : bool
@@ -245,7 +247,6 @@ module C11Repeat_Impl0
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use seq.Seq
   use prelude.Int
   predicate produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a)
     
@@ -255,9 +256,6 @@ module C11Repeat_Impl0
   val produces0 [#"../11_repeat.rs" 23 4 23 64] (self : C11Repeat_Repeat_Type.t_repeat a) (visited : Seq.seq a) (o : C11Repeat_Repeat_Type.t_repeat a) : bool
     ensures { result = produces0 self visited o }
     
-  use seq.Seq
-  goal produces_refl_refn : [#"../11_repeat.rs" 33 4 33 26] forall self : C11Repeat_Repeat_Type.t_repeat a . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
   goal produces_trans_refn : [#"../11_repeat.rs" 40 4 40 90] forall a : C11Repeat_Repeat_Type.t_repeat a . forall ab : Seq.seq a . forall b : C11Repeat_Repeat_Type.t_repeat a . forall bc : Seq.seq a . forall c : C11Repeat_Repeat_Type.t_repeat a . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
    -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
    -> produces0 a (Seq.(++) ab bc) c)
@@ -270,4 +268,6 @@ module C11Repeat_Impl0
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_refl_refn : [#"../11_repeat.rs" 33 4 33 26] forall self : C11Repeat_Repeat_Type.t_repeat a . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
index dc52d5c888..26ed28f4bb 100644
--- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg
+++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg
@@ -603,6 +603,10 @@ module C12Zip_Impl0_Next
     goto BB6
   }
   BB4 {
+    assert { [@expl:type invariant] inv2 self };
+    assume { resolve1 self };
+    assert { [@expl:type invariant] inv1 _4 };
+    assume { resolve0 _4 };
     assert { [#"../12_zip.rs" 55 22 55 35] false };
     absurd
   }
@@ -612,7 +616,7 @@ module C12Zip_Impl0_Next
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
     [#"../12_zip.rs" 56 27 56 31] _0 <- Core_Option_Option_Type.C_None;
-    goto BB20
+    goto BB21
   }
   BB6 {
     goto BB7
@@ -634,7 +638,7 @@ module C12Zip_Impl0_Next
       end
   }
   BB9 {
-    goto BB11
+    goto BB12
   }
   BB10 {
     [#"../12_zip.rs" 61 17 61 18] y1 <- Core_Option_Option_Type.some_0 _10;
@@ -643,67 +647,61 @@ module C12Zip_Impl0_Next
     assume { resolve2 _10 };
     [#"../12_zip.rs" 61 23 61 24] y <- y1;
     y1 <- any item1;
-    goto BB12
+    goto BB13
   }
   BB11 {
+    assert { [@expl:type invariant] inv5 x };
+    assume { resolve3 x };
+    assert { [@expl:type invariant] inv4 _10 };
+    assume { resolve2 _10 };
+    assert { [#"../12_zip.rs" 59 22 59 35] false };
+    absurd
+  }
+  BB12 {
     assert { [@expl:type invariant] inv4 _10 };
     assume { resolve2 _10 };
     assert { [@expl:type invariant] inv5 x };
     assume { resolve3 x };
     [#"../12_zip.rs" 60 27 60 31] _0 <- Core_Option_Option_Type.C_None;
-    goto BB19
-  }
-  BB12 {
-    goto BB13
+    goto BB20
   }
   BB13 {
-    [#"../12_zip.rs" 63 13 63 19] _15 <- (x, y);
-    x <- any item0;
-    y <- any item1;
     goto BB14
   }
   BB14 {
+    [#"../12_zip.rs" 63 13 63 19] _15 <- (x, y);
+    x <- any item0;
+    y <- any item1;
     goto BB15
   }
   BB15 {
-    [#"../12_zip.rs" 63 8 63 20] _0 <- Core_Option_Option_Type.C_Some _15;
-    _15 <- any (item0, item1);
     goto BB16
   }
   BB16 {
+    [#"../12_zip.rs" 63 8 63 20] _0 <- Core_Option_Option_Type.C_Some _15;
+    _15 <- any (item0, item1);
     goto BB17
   }
   BB17 {
     goto BB18
   }
   BB18 {
-    goto BB22
+    goto BB19
   }
   BB19 {
-    goto BB21
+    goto BB23
   }
   BB20 {
-    goto BB21
+    goto BB22
   }
   BB21 {
     goto BB22
   }
   BB22 {
-    return _0
-  }
-  BB30 {
-    assert { [@expl:type invariant] inv1 _4 };
-    assume { resolve0 _4 };
-    assert { [@expl:type invariant] inv2 self };
-    assume { resolve1 self };
-    goto BB4
+    goto BB23
   }
-  BB31 {
-    assert { [@expl:type invariant] inv4 _10 };
-    assume { resolve2 _10 };
-    assert { [@expl:type invariant] inv5 x };
-    assume { resolve3 x };
-    goto BB4
+  BB23 {
+    return _0
   }
   
 end
diff --git a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
index 4b4056760f..dd0060cdd3 100644
--- a/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
+++ b/creusot/tests/should_succeed/iterators/13_cloned.mlcfg
@@ -447,7 +447,6 @@ module C13Cloned_Impl0
   use seq.Seq
   use seq.Seq
   use seq.Seq
-  use seq.Seq
   use prelude.Int
   use seq.Seq
   use seq.Seq
@@ -463,11 +462,12 @@ module C13Cloned_Impl0
   val produces0 [#"../13_cloned.rs" 28 4 28 64] (self : C13Cloned_Cloned_Type.t_cloned i) (visited : Seq.seq t) (o : C13Cloned_Cloned_Type.t_cloned i) : bool
     ensures { result = produces0 self visited o }
     
+  use seq.Seq
+  goal produces_refl_refn : [#"../13_cloned.rs" 39 4 39 26] forall self : C13Cloned_Cloned_Type.t_cloned i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
   goal produces_trans_refn : [#"../13_cloned.rs" 46 4 46 90] forall a : C13Cloned_Cloned_Type.t_cloned i . forall ab : Seq.seq t . forall b : C13Cloned_Cloned_Type.t_cloned i . forall bc : Seq.seq t . forall c : C13Cloned_Cloned_Type.t_cloned i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
    -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
    -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../13_cloned.rs" 39 4 39 26] forall self : C13Cloned_Cloned_Type.t_cloned i . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
   goal next_refn : [#"../13_cloned.rs" 52 4 52 35] forall self : borrowed (C13Cloned_Cloned_Type.t_cloned i) . inv2 self
    -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
diff --git a/creusot/tests/should_succeed/iterators/14_copied.mlcfg b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
index 2ea11a6d0b..01083f76d5 100644
--- a/creusot/tests/should_succeed/iterators/14_copied.mlcfg
+++ b/creusot/tests/should_succeed/iterators/14_copied.mlcfg
@@ -434,6 +434,8 @@ module C14Copied_Impl0
     
   axiom inv0 : forall x : C14Copied_Copied_Type.t_copied i . inv0 x = true
   use seq.Seq
+  use seq.Seq
+  use seq.Seq
   predicate completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i)
   val completed1 [#"../common.rs" 11 4 11 36] (self : borrowed i) : bool
     ensures { result = completed1 self }
@@ -443,8 +445,6 @@ module C14Copied_Impl0
   val completed0 [#"../14_copied.rs" 22 4 22 35] (self : borrowed (C14Copied_Copied_Type.t_copied i)) : bool
     ensures { result = completed0 self }
     
-  use seq.Seq
-  use seq.Seq
   use seq.Seq
   use seq.Seq
   use seq.Seq
@@ -466,8 +466,6 @@ module C14Copied_Impl0
   goal produces_trans_refn : [#"../14_copied.rs" 46 4 46 90] forall a : C14Copied_Copied_Type.t_copied i . forall ab : Seq.seq t . forall b : C14Copied_Copied_Type.t_copied i . forall bc : Seq.seq t . forall c : C14Copied_Copied_Type.t_copied i . inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b
    -> inv0 c /\ inv1 bc /\ inv0 b /\ inv1 ab /\ inv0 a /\ produces0 b bc c /\ produces0 a ab b /\ (forall result : () . produces0 a (Seq.(++) ab bc) c
    -> produces0 a (Seq.(++) ab bc) c)
-  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self
-   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
   goal next_refn : [#"../14_copied.rs" 52 4 52 35] forall self : borrowed (C14Copied_Copied_Type.t_copied i) . inv2 self
    -> inv2 self /\ (forall result : Core_Option_Option_Type.t_option t . inv3 result /\ match result with
     | Core_Option_Option_Type.C_None -> completed0 self
@@ -477,4 +475,6 @@ module C14Copied_Impl0
     | Core_Option_Option_Type.C_None -> completed0 self
     | Core_Option_Option_Type.C_Some v -> produces0 ( * self) (Seq.singleton v) ( ^ self)
     end)
+  goal produces_refl_refn : [#"../14_copied.rs" 39 4 39 26] forall self : C14Copied_Copied_Type.t_copied i . inv0 self
+   -> inv0 self /\ (forall result : () . produces0 self (Seq.empty ) self  -> produces0 self (Seq.empty ) self)
 end
diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
index f507b4d8d0..a11fcd7b95 100644
--- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
+++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg
@@ -466,10 +466,10 @@ module C15Enumerate_Impl0_Next
     goto BB6
   }
   BB4 {
-    assert { [@expl:type invariant] inv1 _3 };
-    assume { resolve0 _3 };
     assert { [@expl:type invariant] inv2 self };
     assume { resolve1 self };
+    assert { [@expl:type invariant] inv1 _3 };
+    assume { resolve0 _3 };
     assert { [#"../15_enumerate.rs" 54 14 54 30] false };
     absurd
   }
diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg
index e3d59d12e9..a41e8db657 100644
--- a/creusot/tests/should_succeed/knapsack.mlcfg
+++ b/creusot/tests/should_succeed/knapsack.mlcfg
@@ -106,12 +106,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/knapsack/why3session.xml b/creusot/tests/should_succeed/knapsack/why3session.xml
index b63e834524..35af7bc97c 100644
--- a/creusot/tests/should_succeed/knapsack/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack/why3session.xml
@@ -43,10 +43,10 @@
   <proof prover="4"><result status="valid" time="0.014523" steps="49"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.7" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.012191" steps="288"/></proof>
+  <proof prover="4"><result status="valid" time="0.012191" steps="290"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.8" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.034418" steps="150430"/></proof>
+  <proof prover="0"><result status="valid" time="0.034418" steps="150438"/></proof>
   <proof prover="4"><result status="valid" time="0.040132" steps="209"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.9" expl="precondition" proved="true">
@@ -148,14 +148,14 @@
   <proof prover="4"><result status="valid" time="0.026674" steps="90"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.38" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.046638" steps="206120"/></proof>
-  <proof prover="4"><result status="valid" time="0.540940" steps="6475"/></proof>
+  <proof prover="0"><result status="valid" time="0.046638" steps="205609"/></proof>
+  <proof prover="4"><result status="valid" time="0.540940" steps="6540"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.39" expl="loop invariant preservation" proved="true">
   <proof prover="4"><result status="valid" time="0.014308" steps="96"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.40" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.037301" steps="162436"/></proof>
+  <proof prover="0"><result status="valid" time="0.037301" steps="162258"/></proof>
   <proof prover="4"><result status="valid" time="0.047101" steps="427"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.41" expl="precondition" proved="true">
@@ -251,7 +251,7 @@
   <proof prover="4"><result status="valid" time="0.013464" steps="128"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.69" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.057712" steps="982"/></proof>
+  <proof prover="4"><result status="valid" time="0.057712" steps="992"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.70" expl="precondition" proved="true">
   <proof prover="0"><result status="valid" time="0.015254" steps="11932"/></proof>
@@ -311,10 +311,10 @@
   <proof prover="0"><result status="valid" time="0.041703" steps="163861"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.88" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.064285" steps="190766"/></proof>
+  <proof prover="0"><result status="valid" time="0.064285" steps="190588"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.89" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.034712" steps="196874"/></proof>
+  <proof prover="0"><result status="valid" time="0.034712" steps="195057"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/knapsack/why3shapes.gz b/creusot/tests/should_succeed/knapsack/why3shapes.gz
index 62583679649c0875459fc0923fa91e7ed7e23630..86b2531a685aa1143b9df0369bcbff266536a344 100644
GIT binary patch
literal 5311
zcmV;w6hP}AiwFP!00000|Lr~7ZX3sv@A?Y8o!uM+=&I`L;wXS%*ciVr_!yzD2@_fL
zT8fqY{Z>!UjAkfOW)#~I=>(S8oUX20*R`jG{MUEqw?F&$`S$!{{&2hA-2BhEKL75&
z&-{hI+gz=0?pEmE`QOJcVjRHRSN>v!{NRnhzRmp@{QrLVEwAX3ztMV_sE_=A{BOKS
z%YQW-voG-a&6~5;tMjt?aL#nj?*7lOZ$65Zcysp3|8NmS6g`Uig&A4j<#)IKd%uq0
z@1uCT^XVniYhTtpWE|~tcy^s{e!Ba)tr@2KiD7(y*)uTU?78o0{Ju@c|9k7n_x!AB
zr+<8PpVvSAeCL14cMGsN$VY$8__rW-igg(BzbN}*MCJ<m;v3K#(ZZH~I7G?!I~HE>
z46By;SnuLt{dS=Lc1Hg!zk7f8$5rnlgKdJT##zw}NO<!4dUJpEZj<u0TunR7Hq&%v
zAA$5FK(FA<h*Ym|8mkpeW4V&km{w{U<4R9sSea=oR(2e_l^ch41!5eV6-;EA1KckQ
ztbiT~qaVZc(kLE`Xn8F6qooz7M`+Dsm>w-FYZ98rlh6!c_LE=+>?0Cj9s~6>IC4!&
z<ME_5SmC5Ku|n1w+t526;R<Pma=mVGp+527^Rvh+WQ_~6C-p<_G1(c^&Zsb(-zKup
z3l>mp%@=iC?e&Mox>_NdnyHS^+Xbp-_WZ04cy>@I&s+{Ox+;37o(C_9AliQw?m_JX
zTl3kA9fGcJQvUtwdh^pdV#BvWJ1t_a`0G>DM>cs6=bp>stFZa)Cf)LmJY<{&V`uyz
z|CB$RZ#erEMqGDz276_nSlgRn6ld>0<hZ#>>pRY#b^T78_g7{V{mNFTnbdW1g)TN(
z-2>bxnQM|shI>fN{tDnJwd_>@udCcI1qHDOXlG#XA>ZB&+c$9|w!{)Ms1*rjzRE{p
zwqg*FL=#ZWR-CnXT|fT)wC#P8#k1?p=KVS2_aD~&=8i|}yR#waLp9m;0XTX-cG&iw
z?cSq@p5SM}v?A!$`DxZiCBvIh=ymUj9KJ?p947AX`-%Je$L!7QuIAc9rCnEK@5IiX
zYqQTnydqi=?nB&W`*6lUk3<>uftNkRl;YOo1ig7PD(Ff7`p@%K^4%2Q`rY{JHvYNH
z3J$j`m>bqJQ~_UR7h!uFpTiiJU~;xe{Gc%+_cJ0JBkF)uMe5C5WmlZDpER@!1`&H3
zsv5rLksEPX(H6`JS@9`CJF6-GA>aOXeOIG#Es=(=4ZPfq)yK|Y@ynqubTHtY<c=^k
z!}y8xxDzGp4t-bFF7+ShT`ZFtfJT+GhBnt9^TMjm?*4e6AJWhS1P}R|b$i7H#pd>I
zQBhRHmFzsFf4`*vD5L*^yFjM(q5|wI8$J@xo_SVWV|_2MzjCb(f;Qrqc{dCP;cx`m
zS&ICEyDAZ}3uwXs4P?QNUPi*&{5*O>{koY{pG3s0+a{eDhXW6|G?@hoGcBV9)Qs{c
zm-CNqlwllB(r<6Ymh3a}o`kHz>q)v{e3*DW@S(ymaQ!7Gar*H^6{{b=-P(SBytIY^
zTCSVt4aZH>`eAl-yxtbqcQ8I4-G)8u$6C}5=8D7kVms0`Ab)$aiOVV5CVJG9ZTH{y
z_~b$>^JqP5*y{RMrSbl18BUjKy<E_|oWz{eu~@meTq<?*EY9}PynL3{F6Wz2QS=j=
ze)t`K4oRh*A=a(Cd~(|_|C9+edP4dQUJiCxM}NkKEBwVUq|3o?>gZsHtH6!vjhwiU
zhjYPUVKd0hBQ^1$F8@qStKb(6YNNO9L_dzamy1Y#IR*R6hhX1$V$^1su7d-TM+Lj6
zvm3k3h<%*A2E(v+k>j7PoVFT2?$mGdhmXGH)t&i&N2NJdQ(GChHjhtb&^0VF=pJCk
zti}vlM^&k9^q}_k{631Yf5X0M-7WeTX$pFhpR2#neSe`3?=SS5?S2)W*KmBXew3xM
zD>D0AnL67#2(!O~Fs*~Ik6Rf#v@*>6_v7q+e6AM${Xn1|mG4)`HsI%=w<32KJqBzV
za|@YAmAL0NcVDUl|6Cq|hkFRlJ>(g>z^`Gp&*AHHnhgAPo57WYl@#*>0SP@NDfa3`
z_NSW+c))>xgr=!0Qp+}TkrnS@_gVC?a;pShl&O0=u=V54agDn`TIQiX^U&9GhMweS
z@+(<Sllb?+ekJiy=D}wg^q0y!ER|eI+UvsoY%^8bZ>rQx_2E6$qyhQdLp0nMXRD>Q
zQmT&K*1O%k?a0y*hQ$viKefl(b(UUQ<<`*vE*j=1*ZM03Q@^ZW(JtRVuGZCf>Ttj8
z{C9%-E9s^NxeosXQ|^H&x3?L+f1=UbK7i5qXV%WNP**;Z&5egI8W(!l4a`4gQbZf>
zeut&ZBc_J)^}DmX(K?!$9j;3$CtbGTQyVPh^Q(sMSbX=F;#!a4Q<Xvw^sE|TK>vcO
zgPx-oQ5Q7be2t1=el&E&D(ug72JD;JwX7O5rlD#LzEZ>C%Dk<H!@Z~>G5b$U_Bilx
zPQsJzykkzD4i7Aiyqk_n#PX<Qmn%058IDL;A>$DVERRU`h2Y^}q>l7NQy)fCKb%kT
zHeJc41Fkg2Bay8$kv#!rI1%YbcH+Sv#)BOWNXT9OmCQO~>CYVI(ecMIX3Y)Ah+Vbf
z{H)$=IjC!B`uj}Nu-<?WQ^9(buW#>v&L6VavwS<wO|0z>gZ=c*xq+Ga@!4*IRmb*e
zz>&_64Ya?!)rJ@Sax)^~dNTFjInZ47!~P+Ea1FZo@L_YG)4$&R+9NW)tZ)2vo%AE<
z6KSbtE^Qu&o5wnZJ&U$O-j8khzUwTFxt;nRczD9t2Z~i6`bof%&W{bUzZ}<wRbP6k
zuj+cEwsg~$p5&(<e)`()%>MUM_m8`xd)x(b&@tR+Y=)lMetelG0k)fj#qktA^Lz@w
z^7+*EVS`i$78SDH31Ikz(4$gRy}>+H6)UBu3)Ou|Ha*|%MfE=0+gbkS^(!SG4&zsP
z$jdyKu3$5a**eqb2aBZ3NcLm`M)Z0&{#`G8Rz~f5-NTQ^mDmH-yWsrH$k+Xg9v-X|
zy>1u9O@C9|(DD_}N;8(q$}n2K-Qi~o>99wED+8}D$IGxV&$LzGWu{#j(ZDb2NV{QS
z9nLdt-I-;ktu<c{-gBnSL{XbhP}I7CU-TpOKymTzW~JpWimEM?D^0JrHdoUkC^5?s
z7Mlp;CPI&+K55wak$62$iuvoBM{-wFY|w0BW~JN~6UuE_m|`Z{4lCO)dg|^3gTH=r
z`KsN$HTG@Y70WjA=IwMpqPoIx2e(y4y>m==ENVeLxJfULrGeV+Uib+Qu=MspcedSY
zuJ|s;!P{M);Pg&UaC$ZVVZ*OC{{5|wzY4fYf83m%S#m*e`9qXR2~bukk%O}mEJ{uK
z96E8P1lf$HkV?)4mt&@sd{kc8SiFemvZD^qLP6z~&qUh9Y)a52Ci2l`RIU_tj;K3C
z)uHXsboC35Wrw^NJA@8J2d)F#f$2bZpgNEpPzTrnbRas{+0JyjQ)gO`0_%e*1xsYY
z#3fonL&+#@1)US~L>*yA(2?lSeGaNA=M;sC$;OP%YmzAl#mWM&l><B{(~<5-eQv_q
zi5MWqKoC?Z!Ly|YVSVzl2qPO|?4;<(b!5K)2UIl3sGZHy@{R`3iUgnvg^dEUstT9P
z0end&fFw7$p#%kFjTM|xN<?7{nZm|usv4NQq%X{e#t=bfMJC7q+}}bd(n=`|XfHsV
zOV>%;N#;g(Qgu>(d7hBiCfFR3K&_D-(}5M%Ibo56lcDmYuv5?}@zt5LhCo3QNn>IU
zr37q5WL=^nm9f5O&UVUliosQ<WT)ust1y_9Q3_>B>_eC`A+o7g7tau>a;ah9Qj4BT
z_jfRwOU%VeA(8=O*$9OWf<tWf(G~-82nSkqT6UT`jbE3)1ThMopn#D@8WSlpyH0WZ
z6fP<=@@G5E3-sT|C<2FbblFDfxa4s*Npc1=azGCe!@#KFf6y7xY4-w{F3tp?V0{fa
zh>qRfCut%VAFOHDM;{|QLobbQ9XUa}5`;8RjF1pm{isxqij!OKUPir0)*S~>XG-Rh
z2tx*=z$YX5vl!`xr*jLHq!pcE8F-cHjDC4yD3d*47D7ZRGP|S8z==~ClV!{<oLkvh
z>MS0EFtHY)Cb6S>@DS0<9IcTtq!=)oz9O-@v+4!QKw2e>B7nEf$LMqctC5&}EL_&6
z8h@<qta;gDpv;_)yaWkoB9|SUJVSCtMa}-M#1KZ0K@xTcp@O#toz}7tvX`SyIdQZq
zzHNv*5@AZTf%`U6QG^<&iZ+t#b@YS+vcej*9RI`qw|MdLcu-tVShlJJlAuroZI$Fa
zEfW`OqI$gJe{@t*QAsKm$;DEktRe{Sxns_jpC@Nx?>tU-P92+I1-VHlXJr&d1Rkac
ziMK9kl?hsL<&IP~lVU<+LJ`T9Xq-18*NCljOx&jT6}YoUD_)K!sO%i?5*SdPD0vYO
zk_oBUoU3>s>LOm{j!?i9sIWz9;}oXA)n^G@gklJS+W^S12`G+R$XF|G4Nx4HM_d*a
z?r9<^Rf;N7szFFRenDOI5oEHd$dVP5AZ6B0)a?Zw?I0*45R5_4@d|3W5uunxkl=s>
z3iL6hB5Xp%#fl$7>Pg5Ntn!L0FGU<ylL{^*k-Y~Nh&vc9hEnWQ#C1XjZ3I^|S|`aa
z8)D`Z100l;!)%%jGbT|#_3;bLsWRJ8-87g)IasZ@`%zq;8sViaP2f`#nhPRSHhHg%
zx86~3IXLcNUGlum=^-SanBdMs;yNNAI#5(BViA(}o$Gj8e0H@Lfx5ab@7LGwH7~i-
zQ359P+E{jRZusj_5?A<IXBT9B=_Yi)`xQ;aQxTo2A}Cm}LXqTdzzS<cijtI<B$79X
zgCgX&p^PZe5$7~hf{g`pb{2gI-g$DI0Of;g*wa^rO3^?}(kSKGNRXQ>fKY6-iHsy!
zdwi()D#C9?DbYppDiu}(NhD4gDry%@F(n0s`5dsW<Asd(<%(e;1<c8@AVKj4%8;Y-
z+ELU9g-e_!hCBjMNJ(jZBCUbj{-|?Awl1g#>&c^Qd7LQ#lla?>M`T?pV_Z@)+riqT
zZ8k+3wx#Lrzzg9PO?{PBGB`>)8|S$MR$42N0=d~~RUy74j)jMkI7VR<T)9fF>S`sM
zF)0GHzJ+fl#r<0QWSTF4?VJ%2*afrTKFd(i++U^OjB`R6EBlw-ysRpkUZe!dW|3+U
zRj5FcLT26p>nvnviu3)Y0${RGQwGrsmqrKl$(LfBGH5voN@+MIrdXn^UfZM@???c<
zfvTwV3m1#|cT#iW1|NMi0g@I1iPO5vR*Te&#VoLYH@Vyq2*sRN@AkrH$>JDcxq^3C
zto8g8u?a<sn<60bNTefDN<fg5k}f6$b}vfR3ZscWE9e87sy~dgmz1$Ghrld?tcc}H
z7SAwmIoFz!6N+QGOf<%DED;h*OrftZ6)#nI%wlGbDP|o5Ivb@$$;Fi+1L&2~mV7I=
zstnaQk6TvA+$0$88LW#|$YPDsA_&Z}C=A?A_Oh}!LJcuWos8VPpE?Jj*jr`FiBmZy
zD(D6Gk=lkPca1+SY1G?lRcL!E3b6HMHn)a`duPWk&Cw}gfXo#m$sE$409;054X31o
z;&ovbU6x*RGv&1rfouDevX)loc9y~n0&@tuiciNVrb$9MA1T|ALQYY$)Tt!lh0;>0
z_DWKpgs9xE)wa?U4BP^7ujV<NWo^BnWQ7l74|F2pY9ed2!Bk)2VJcc`$D3ULkP5l_
z=-;ISH~zq#KXB`R<l;ia{+(Umx)>p&4VuFkI9spf6w{6ls;DO<vgNQ`QdGt#7aU>H
zSrS__dd|~>$OcYMY|4QsdgKm)z<3$C=}|Tb;k@LTDKZ;gZtzsZ=Gr;~^G;lCA%#)`
z3yeBMRiv$dE;NtSrzN_tcS@3tEKWArLd=P*mC-xRg=le)BKK*DZ<Lc@xv64*=V~<7
zGDJwOO--=Qy4G5mDmEiA^3=pH9)e@BtyQKTq8VKxab@NNcbFn#3v(5dIaL*auYV#&
zUUC7RHAeP^9I`<fgUTw4rUG^9YA~uq2{I!0AhI||ITDww!DU<TLaL?)_bsR*WaRcN
zxG18H(s<My9}+nWRTIwiF~Rb>da7i_DXXGL$~gxukaXc7!PziaG}&2+>@lsbxAZNj
zqUwQjBS=h+%U^4CG$lEwu-JN{Kb1yS9<!JN$jMp)QcS1<kdG?Xzmo<CRtZ{^LdPv?
zk*VJ25n5x3$VGmjSPJ_-w{%GccvSivx42qnX`PauomEk;r!Oq6O-1QoGPNSt)}Jb>
zI(Bhw;uKzQoO+jqfs#p>tey5;+nbE7wCP1X8IfJRcj~RyIsgZ&5~_ha&Rhnva{i%d
zJuR{8n*!&Rktwr9M_}jmp%@o*-S{l0*CUQUUHxPnj*&Q~VJi{a#D2LV${dqPF>^7(
zDW^s#6v_u=bI!@9{uVVj#^Ka4i)kzup`u{M7#)|N^^hqGuecsffh&(D=1GVeF}jc?
zB#rgGIjZQr)+H4qh03;Fo_6+B#C0(UBZCWIvQk2!HoVOgYndIA=yNTK`omNNlMzfu
zFd@N|L?u;exnoxYnUuAc(HXBim7+N<d9Jt$B|=WiO%3*2Pz5)ZmTRu0fY=&P=cIzA
z2q9{PJRXzPH=+)$6-9wAkQ9NPB^T+)`$#2brRyy+#>;4s@gO7OsKGx>2r4Be#n@1|
zQ&*E0lr0HJDn*SVn&i0yiz!&H?_?Cy9RXx?-?*+qLc>NS1*?b~cx%X66@|t`^$%BK
zuPZJj7;WYKAH9wBB%y)moDfnvmLqYs1%Xg{FGDc6eMe!q*fzYM|3`sm=&a8rdkP{@
zu77k~|98sLO0q&Lr3S;RKUg)$>itK3vm=<qy^JwAgZIvw9ChEaMzp!!tCTyhh+rl5
Rj~?fG{C^Lf?=YW%001VJSPlRH

literal 5320
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
aB}(vnuZUn}_KzO7_4xm0=(;4IfdBxs<ZCtn

diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg
index 38603afc65..484edcce8c 100644
--- a/creusot/tests/should_succeed/knapsack_full.mlcfg
+++ b/creusot/tests/should_succeed/knapsack_full.mlcfg
@@ -247,12 +247,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -527,9 +533,9 @@ module KnapsackFull_Knapsack01Dyn
     ensures { result = inv6 _x }
     
   axiom inv6 : forall x : usize . inv6 x = true
-  predicate inv3 (_x : Seq.seq (KnapsackFull_Item_Type.t_item name))
-  val inv3 (_x : Seq.seq (KnapsackFull_Item_Type.t_item name)) : bool
-    ensures { result = inv3 _x }
+  predicate inv4 (_x : Seq.seq (KnapsackFull_Item_Type.t_item name))
+  val inv4 (_x : Seq.seq (KnapsackFull_Item_Type.t_item name)) : bool
+    ensures { result = inv4 _x }
     
   use seq.Seq
   predicate inv5 (_x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
@@ -543,30 +549,30 @@ module KnapsackFull_Knapsack01Dyn
     ensures { result = shallow_model4 self }
     
   axiom shallow_model4_spec : forall self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . ([#"../../../../creusot-contracts/src/std/vec.rs" 19 21 19 25] inv5 self)
-   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv3 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
+   -> ([#"../../../../creusot-contracts/src/std/vec.rs" 19 4 19 36] inv4 (shallow_model4 self)) && ([#"../../../../creusot-contracts/src/std/vec.rs" 18 14 18 41] Seq.length (shallow_model4 self) <= UIntSize.to_int max1)
   predicate invariant5 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
    =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv3 (shallow_model4 self)
+    [#"../../../../creusot-contracts/src/std/vec.rs" 60 20 60 41] inv4 (shallow_model4 self)
   val invariant5 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = invariant5 self }
     
   axiom inv5 : forall x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . inv5 x = true
-  predicate invariant4 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
-    
-  val invariant4 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
+  predicate invariant4 (self : Seq.seq (KnapsackFull_Item_Type.t_item name))
+  val invariant4 (self : Seq.seq (KnapsackFull_Item_Type.t_item name)) : bool
     ensures { result = invariant4 self }
     
-  predicate inv4 (_x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
-  val inv4 (_x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
-    ensures { result = inv4 _x }
+  axiom inv4 : forall x : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 x = true
+  predicate invariant3 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
     
-  axiom inv4 : forall x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . inv4 x = true
-  predicate invariant3 (self : Seq.seq (KnapsackFull_Item_Type.t_item name))
-  val invariant3 (self : Seq.seq (KnapsackFull_Item_Type.t_item name)) : bool
+  val invariant3 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
     ensures { result = invariant3 self }
     
-  axiom inv3 : forall x : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 x = true
+  predicate inv3 (_x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
+  val inv3 (_x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
+    ensures { result = inv3 _x }
+    
+  axiom inv3 : forall x : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global) . inv3 x = true
   use seq.Seq
   predicate inv2 (_x : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize)
   val inv2 (_x : Core_Ops_Range_RangeInclusive_Type.t_rangeinclusive usize) : bool
@@ -731,45 +737,6 @@ module KnapsackFull_Knapsack01Dyn
     requires {inv1 value}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 78 26 78 51] shallow_model4 ( ^ self) = Seq.snoc (shallow_model10 self) value }
     
-  predicate resolve6 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
-    
-  val resolve6 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
-    ensures { result = resolve6 self }
-    
-  predicate resolve8 (self : usize) =
-    [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
-  val resolve8 (self : usize) : bool
-    ensures { result = resolve8 self }
-    
-  function index_logic5 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : int) : usize
-    
-   =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 20 8 20 31] Seq.get (shallow_model3 self) ix
-  val index_logic5 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : int) : usize
-    ensures { result = index_logic5 self ix }
-    
-  predicate resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
-     -> resolve8 (index_logic5 self i)
-  val resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
-    ensures { result = resolve7 self }
-    
-  use seq.Seq
-  function index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
-    
-   =
-    [#"../../../../creusot-contracts/src/logic/ops.rs" 20 8 20 31] Seq.get (shallow_model1 self) ix
-  val index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
-    ensures { result = index_logic0 self ix }
-    
-  predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
-    
-   =
-    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
-     -> resolve7 (index_logic0 self i)
-  val resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) : bool
-    ensures { result = resolve5 self }
-    
   use seq.Seq
   predicate subseq_rev0 [#"../knapsack_full.rs" 48 0 48 67] (s1 : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i1 : int) (s2 : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i2 : int)
     
@@ -803,11 +770,11 @@ module KnapsackFull_Knapsack01Dyn
   )
   val sum_weights0 [#"../knapsack_full.rs" 27 0 27 56] (s : Seq.seq (KnapsackFull_Item_Type.t_item name)) (i : int) : int
     requires {[#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s}
-    requires {[#"../knapsack_full.rs" 27 21 27 22] inv3 s}
+    requires {[#"../knapsack_full.rs" 27 21 27 22] inv4 s}
     ensures { result = sum_weights0 s i }
     
   axiom sum_weights0_spec : forall s : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int . ([#"../knapsack_full.rs" 25 11 25 33] 0 <= i /\ i <= Seq.length s)
-   -> ([#"../knapsack_full.rs" 27 21 27 22] inv3 s)  -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
+   -> ([#"../knapsack_full.rs" 27 21 27 22] inv4 s)  -> ([#"../knapsack_full.rs" 26 10 26 21] sum_weights0 s i >= 0)
   function index_logic2 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : KnapsackFull_Item_Type.t_item name
     
    =
@@ -819,6 +786,45 @@ module KnapsackFull_Knapsack01Dyn
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 71 26 71 44] Seq.length (shallow_model4 result) = 0 }
     ensures { inv5 result }
     
+  predicate resolve6 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global))
+    
+  val resolve6 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : bool
+    ensures { result = resolve6 self }
+    
+  predicate resolve8 (self : usize) =
+    [#"../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true
+  val resolve8 (self : usize) : bool
+    ensures { result = resolve8 self }
+    
+  function index_logic5 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : int) : usize
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 20 8 20 31] Seq.get (shallow_model3 self) ix
+  val index_logic5 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (ix : int) : usize
+    ensures { result = index_logic5 self ix }
+    
+  predicate resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) =
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model3 self)
+     -> resolve8 (index_logic5 self i)
+  val resolve7 (self : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) : bool
+    ensures { result = resolve7 self }
+    
+  use seq.Seq
+  function index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
+    
+   =
+    [#"../../../../creusot-contracts/src/logic/ops.rs" 20 8 20 31] Seq.get (shallow_model1 self) ix
+  val index_logic0 [@inline:trivial] (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) (ix : int) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
+    ensures { result = index_logic0 self ix }
+    
+  predicate resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global))
+    
+   =
+    [#"../../../../creusot-contracts/src/std/vec.rs" 51 8 51 85] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 self)
+     -> resolve7 (index_logic0 self i)
+  val resolve5 (self : Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)) : bool
+    ensures { result = resolve5 self }
+    
   predicate resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) =
     [#"../../../../creusot-contracts/src/resolve.rs" 25 20 25 34]  ^ self =  * self
   val resolve4 (self : borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global))) : bool
@@ -1005,7 +1011,7 @@ module KnapsackFull_Knapsack01Dyn
     
   val index0 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) (index : usize) : KnapsackFull_Item_Type.t_item name
     requires {[#"../../../../creusot-contracts/src/std/vec.rs" 141 27 141 46] in_bounds0 index (shallow_model0 self)}
-    requires {inv4 self}
+    requires {inv3 self}
     requires {inv6 index}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 142 26 142 54] has_value0 index (shallow_model0 self) result }
     ensures { inv1 result }
@@ -1048,7 +1054,7 @@ module KnapsackFull_Knapsack01Dyn
   axiom m0_spec : forall items : Seq.seq (KnapsackFull_Item_Type.t_item name), i : int, w : int . ([#"../knapsack_full.rs" 60 11 60 37] 0 <= i /\ i <= Seq.length items)
    -> ([#"../knapsack_full.rs" 61 11 61 17] 0 <= w)
    -> ([#"../knapsack_full.rs" 66 11 66 16] inv11 items)
-   -> ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s
+   -> ([#"../knapsack_full.rs" 63 0 65 2] forall j : int . forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 s
    -> 0 <= j /\ j <= Seq.length s /\ subseq_rev0 s j items i /\ sum_weights0 s j <= w
    -> sum_values0 s j <= m0 items i w) && ([#"../knapsack_full.rs" 62 10 62 21] m0 items i w >= 0)
   use prelude.Snapshot
@@ -1082,7 +1088,7 @@ module KnapsackFull_Knapsack01Dyn
     ensures { inv8 result }
     
   val len0 (self : Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global)) : usize
-    requires {inv4 self}
+    requires {inv3 self}
     ensures { [#"../../../../creusot-contracts/src/std/vec.rs" 75 26 75 48] UIntSize.to_int result = Seq.length (shallow_model0 self) }
     
   val from_elem0 (elem : usize) (n : usize) : Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)
@@ -1097,10 +1103,10 @@ module KnapsackFull_Knapsack01Dyn
     requires {[#"../knapsack_full.rs" 78 11 78 33] UIntSize.to_int max_weight < 10000000}
     requires {[#"../knapsack_full.rs" 79 0 79 86] forall i : int . 0 <= i /\ i < Seq.length (shallow_model0 items)
      -> UIntSize.to_int (KnapsackFull_Item_Type.item_value (index_logic4 items i)) <= 10000000}
-    requires {[#"../knapsack_full.rs" 85 28 85 33] inv4 items}
+    requires {[#"../knapsack_full.rs" 85 28 85 33] inv3 items}
     ensures { [#"../knapsack_full.rs" 80 10 80 60] sum_weights0 (shallow_model4 result) (Seq.length (shallow_model4 result)) <= UIntSize.to_int max_weight }
     ensures { [#"../knapsack_full.rs" 81 10 81 54] subseq_rev0 (shallow_model4 result) 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) }
-    ensures { [#"../knapsack_full.rs" 82 0 84 2] forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 s
+    ensures { [#"../knapsack_full.rs" 82 0 84 2] forall s : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 s
      -> subseq_rev0 s 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) /\ sum_weights0 s (Seq.length s) <= UIntSize.to_int max_weight
      -> sum_values0 s (Seq.length s) <= sum_values0 (shallow_model4 result) (Seq.length (shallow_model4 result)) }
     ensures { [#"../knapsack_full.rs" 85 75 85 91] inv5 result }
@@ -1253,12 +1259,15 @@ module KnapsackFull_Knapsack01Dyn
   }
   BB15 {
     [#"../knapsack_full.rs" 119 49 119 60] _104 <- ([#"../knapsack_full.rs" 119 49 119 60] len0 items);
-    goto BB49
+    goto BB50
   }
   BB16 {
     goto BB18
   }
   BB17 {
+    assume { resolve5 best_value };
+    assert { [@expl:type invariant] inv3 items };
+    assume { resolve6 items };
     assert { [#"../knapsack_full.rs" 88 4 88 55] false };
     absurd
   }
@@ -1349,79 +1358,88 @@ module KnapsackFull_Knapsack01Dyn
     goto BB12
   }
   BB34 {
-    goto BB35
+    goto BB36
   }
   BB35 {
+    assert { [@expl:type invariant] inv1 it };
+    assume { resolve1 it };
+    assume { resolve5 best_value };
+    assert { [@expl:type invariant] inv3 items };
+    assume { resolve6 items };
+    assert { [#"../knapsack_full.rs" 98 8 98 59] false };
+    absurd
+  }
+  BB36 {
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _58;
     [#"../knapsack_full.rs" 98 8 98 59] _63 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
-    goto BB36
+    goto BB37
   }
-  BB36 {
+  BB37 {
     [#"../knapsack_full.rs" 98 8 98 59] produced1 <- _63;
     _63 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- __creusot_proc_iter_elem1;
     [#"../knapsack_full.rs" 111 38 111 51] _67 <- KnapsackFull_Item_Type.item_weight it > w;
     switch (_67)
-      | False -> goto BB40
-      | True -> goto BB37
+      | False -> goto BB41
+      | True -> goto BB38
       end
   }
-  BB37 {
-    [#"../knapsack_full.rs" 112 26 112 29] _72 <- ([#"../knapsack_full.rs" 112 26 112 29] index1 best_value i);
-    goto BB38
-  }
   BB38 {
-    [#"../knapsack_full.rs" 112 29 112 32] _70 <- ([#"../knapsack_full.rs" 112 29 112 32] index2 _72 w);
+    [#"../knapsack_full.rs" 112 26 112 29] _72 <- ([#"../knapsack_full.rs" 112 26 112 29] index1 best_value i);
     goto BB39
   }
   BB39 {
-    [#"../knapsack_full.rs" 112 16 112 32] _66 <- _70;
-    goto BB46
+    [#"../knapsack_full.rs" 112 29 112 32] _70 <- ([#"../knapsack_full.rs" 112 29 112 32] index2 _72 w);
+    goto BB40
   }
   BB40 {
-    [#"../knapsack_full.rs" 114 30 114 33] _79 <- ([#"../knapsack_full.rs" 114 30 114 33] index1 best_value i);
-    goto BB41
+    [#"../knapsack_full.rs" 112 16 112 32] _66 <- _70;
+    goto BB47
   }
   BB41 {
-    [#"../knapsack_full.rs" 114 33 114 36] _77 <- ([#"../knapsack_full.rs" 114 33 114 36] index2 _79 w);
+    [#"../knapsack_full.rs" 114 30 114 33] _79 <- ([#"../knapsack_full.rs" 114 30 114 33] index1 best_value i);
     goto BB42
   }
   BB42 {
-    [#"../knapsack_full.rs" 114 48 114 51] _87 <- ([#"../knapsack_full.rs" 114 48 114 51] index1 best_value i);
+    [#"../knapsack_full.rs" 114 33 114 36] _77 <- ([#"../knapsack_full.rs" 114 33 114 36] index2 _79 w);
     goto BB43
   }
   BB43 {
+    [#"../knapsack_full.rs" 114 48 114 51] _87 <- ([#"../knapsack_full.rs" 114 48 114 51] index1 best_value i);
+    goto BB44
+  }
+  BB44 {
     [#"../knapsack_full.rs" 114 52 114 65] _90 <- w - KnapsackFull_Item_Type.item_weight it;
     [#"../knapsack_full.rs" 114 51 114 66] _85 <- ([#"../knapsack_full.rs" 114 51 114 66] index2 _87 _90);
     _90 <- any usize;
-    goto BB44
+    goto BB45
   }
-  BB44 {
+  BB45 {
     [#"../knapsack_full.rs" 114 38 114 77] _83 <- _85 + KnapsackFull_Item_Type.item_value it;
     [#"../knapsack_full.rs" 114 16 114 78] _66 <- ([#"../knapsack_full.rs" 114 16 114 78] max0 _77 _83);
     _83 <- any usize;
-    goto BB45
-  }
-  BB45 {
     goto BB46
   }
   BB46 {
+    goto BB47
+  }
+  BB47 {
     [#"../knapsack_full.rs" 111 12 111 22] _97 <- Borrow.borrow_mut best_value;
     [#"../knapsack_full.rs" 111 12 111 22] best_value <-  ^ _97;
     [#"../knapsack_full.rs" 111 23 111 28] _98 <- i + ([#"../knapsack_full.rs" 111 27 111 28] (1 : usize));
     [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 _98);
     _97 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global));
     _98 <- any usize;
-    goto BB47
+    goto BB48
   }
-  BB47 {
+  BB48 {
     [#"../knapsack_full.rs" 111 12 111 29] _95 <- Borrow.borrow_final ( * _96) (Borrow.get_id _96);
     [#"../knapsack_full.rs" 111 12 111 29] _96 <- { _96 with current = ( ^ _95) ; };
     [#"../knapsack_full.rs" 111 29 111 32] _94 <- ([#"../knapsack_full.rs" 111 29 111 32] index_mut1 _95 w);
     _95 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global));
-    goto BB48
+    goto BB49
   }
-  BB48 {
+  BB49 {
     [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = _66 ; };
     _66 <- any usize;
     assume { resolve3 _94 };
@@ -1429,17 +1447,14 @@ module KnapsackFull_Knapsack01Dyn
     [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] ());
     goto BB30
   }
-  BB49 {
+  BB50 {
     [#"../knapsack_full.rs" 119 30 119 61] result <- ([#"../knapsack_full.rs" 119 30 119 61] with_capacity0 _104);
     _104 <- any usize;
-    goto BB50
-  }
-  BB50 {
-    [#"../knapsack_full.rs" 120 26 120 36] left_weight <- max_weight;
-    [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 items);
     goto BB51
   }
   BB51 {
+    [#"../knapsack_full.rs" 120 26 120 36] left_weight <- max_weight;
+    [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 items);
     goto BB52
   }
   BB52 {
@@ -1452,113 +1467,102 @@ module KnapsackFull_Knapsack01Dyn
     goto BB55
   }
   BB55 {
+    goto BB56
+  }
+  BB56 {
     invariant { [#"../knapsack_full.rs" 123 16 123 34] UIntSize.to_int j <= Seq.length (shallow_model0 items) };
     invariant { [#"../knapsack_full.rs" 124 16 124 43] UIntSize.to_int left_weight <= UIntSize.to_int max_weight };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 r
      -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
      -> index_logic2 result i = Seq.get r i) /\ sum_weights0 r (Seq.length (shallow_model4 result)) <= UIntSize.to_int left_weight
      -> sum_weights0 r 0 <= UIntSize.to_int max_weight };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 r
      -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
      -> index_logic2 result i = Seq.get r i) /\ sum_values0 r (Seq.length (shallow_model4 result)) = m0 (shallow_model0 items) (UIntSize.to_int j) (UIntSize.to_int left_weight)
      -> sum_values0 r 0 = m0 (shallow_model0 items) (Seq.length (shallow_model0 items)) (UIntSize.to_int max_weight) };
-    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv3 r
+    invariant { [#"../knapsack_full.rs" 123 4 123 36] forall r : Seq.seq (KnapsackFull_Item_Type.t_item name) . inv4 r
      -> Seq.length (shallow_model4 result) <= Seq.length r /\ (forall i : int . 0 <= i /\ i < Seq.length (shallow_model4 result)
      -> index_logic2 result i = Seq.get r i) /\ subseq_rev0 r (Seq.length (shallow_model4 result)) (shallow_model0 items) (UIntSize.to_int j)
      -> subseq_rev0 r 0 (shallow_model0 items) (Seq.length (shallow_model0 items)) };
-    goto BB56
+    goto BB57
   }
-  BB56 {
+  BB57 {
     [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 11] (0 : usize)) < j;
     switch (_115)
-      | False -> goto BB67
-      | True -> goto BB57
+      | False -> goto BB68
+      | True -> goto BB58
       end
   }
-  BB57 {
+  BB58 {
     [#"../knapsack_full.rs" 141 8 141 14] j <- j - ([#"../knapsack_full.rs" 141 13 141 14] (1 : usize));
     [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 items j);
-    goto BB58
+    goto BB59
   }
-  BB58 {
+  BB59 {
     [#"../knapsack_full.rs" 142 17 142 26] it1 <- _118;
     assert { [@expl:type invariant] inv1 _118 };
     assume { resolve1 _118 };
     [#"../knapsack_full.rs" 143 22 143 27] _127 <- j + ([#"../knapsack_full.rs" 143 26 143 27] (1 : usize));
     [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 best_value _127);
     _127 <- any usize;
-    goto BB59
-  }
-  BB59 {
-    [#"../knapsack_full.rs" 143 28 143 41] _123 <- ([#"../knapsack_full.rs" 143 28 143 41] index2 _125 left_weight);
     goto BB60
   }
   BB60 {
-    [#"../knapsack_full.rs" 143 55 143 58] _133 <- ([#"../knapsack_full.rs" 143 55 143 58] index1 best_value j);
+    [#"../knapsack_full.rs" 143 28 143 41] _123 <- ([#"../knapsack_full.rs" 143 28 143 41] index2 _125 left_weight);
     goto BB61
   }
   BB61 {
-    [#"../knapsack_full.rs" 143 58 143 71] _131 <- ([#"../knapsack_full.rs" 143 58 143 71] index2 _133 left_weight);
+    [#"../knapsack_full.rs" 143 55 143 58] _133 <- ([#"../knapsack_full.rs" 143 55 143 58] index1 best_value j);
     goto BB62
   }
   BB62 {
+    [#"../knapsack_full.rs" 143 58 143 71] _131 <- ([#"../knapsack_full.rs" 143 58 143 71] index2 _133 left_weight);
+    goto BB63
+  }
+  BB63 {
     [#"../knapsack_full.rs" 143 11 143 71] _121 <- _123 <> _131;
     switch (_121)
-      | False -> goto BB65
-      | True -> goto BB63
+      | False -> goto BB66
+      | True -> goto BB64
       end
   }
-  BB63 {
+  BB64 {
     [#"../knapsack_full.rs" 144 12 144 18] _138 <- Borrow.borrow_mut result;
     [#"../knapsack_full.rs" 144 12 144 18] result <-  ^ _138;
     assume { inv5 ( ^ _138) };
     [#"../knapsack_full.rs" 144 12 144 27] _137 <- ([#"../knapsack_full.rs" 144 12 144 27] push0 _138 it1);
     _138 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global));
-    goto BB64
+    goto BB65
   }
-  BB64 {
+  BB65 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
     [#"../knapsack_full.rs" 145 12 145 36] left_weight <- left_weight - KnapsackFull_Item_Type.item_weight it1;
     [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] ());
-    goto BB66
+    goto BB67
   }
-  BB65 {
+  BB66 {
     assert { [@expl:type invariant] inv1 it1 };
     assume { resolve1 it1 };
     [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] ());
-    goto BB66
-  }
-  BB66 {
-    goto BB55
+    goto BB67
   }
   BB67 {
+    goto BB56
+  }
+  BB68 {
     assume { resolve5 best_value };
-    assert { [@expl:type invariant] inv4 items };
+    assert { [@expl:type invariant] inv3 items };
     assume { resolve6 items };
     [#"../knapsack_full.rs" 149 4 149 10] _0 <- result;
     result <- any Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global);
-    goto BB68
-  }
-  BB68 {
     goto BB69
   }
   BB69 {
-    return _0
-  }
-  BB74 {
-    assume { resolve5 best_value };
-    assert { [@expl:type invariant] inv4 items };
-    assume { resolve6 items };
-    goto BB17
+    goto BB70
   }
-  BB75 {
-    assert { [@expl:type invariant] inv1 it };
-    assume { resolve1 it };
-    assume { resolve5 best_value };
-    assert { [@expl:type invariant] inv4 items };
-    assume { resolve6 items };
-    goto BB17
+  BB70 {
+    return _0
   }
   
 end
diff --git a/creusot/tests/should_succeed/knapsack_full/why3session.xml b/creusot/tests/should_succeed/knapsack_full/why3session.xml
index 98c4ca0ed8..c07fb1345f 100644
--- a/creusot/tests/should_succeed/knapsack_full/why3session.xml
+++ b/creusot/tests/should_succeed/knapsack_full/why3session.xml
@@ -76,16 +76,16 @@
   <proof prover="6"><result status="valid" time="0.024395" steps="344"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="6"><result status="valid" time="0.018805" steps="175"/></proof>
+  <proof prover="6"><result status="valid" time="0.018805" steps="176"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.14" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.016312" steps="80"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014599" steps="58"/></proof>
+  <proof prover="1"><result status="valid" time="0.013598" steps="13760"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.013598" steps="13792"/></proof>
+  <proof prover="6"><result status="valid" time="0.011820" steps="66"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.17" expl="loop invariant init" proved="true">
   <proof prover="6"><result status="valid" time="0.012700" steps="68"/></proof>
@@ -109,7 +109,7 @@
   <proof prover="6"><result status="valid" time="0.061701" steps="739"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.24" expl="postcondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.078676" steps="451634"/></proof>
+  <proof prover="1"><result status="valid" time="0.078676" steps="451626"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.25" expl="postcondition" proved="true">
   <proof prover="1"><result status="valid" time="0.034538" steps="186361"/></proof>
@@ -124,10 +124,10 @@
   <proof prover="1"><result status="valid" time="0.040548" steps="180466"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.29" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.011820" steps="79"/></proof>
+  <proof prover="6"><result status="valid" time="0.066507" steps="79"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.30" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.012444" steps="183519"/></proof>
+  <proof prover="1"><result status="valid" time="0.014097" steps="183519"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.31" expl="type invariant" proved="true">
   <proof prover="6"><result status="valid" time="0.017596" steps="84"/></proof>
@@ -139,7 +139,7 @@
   <proof prover="6"><result status="valid" time="0.018504" steps="88"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.34" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.016999" steps="151"/></proof>
+  <proof prover="6"><result status="valid" time="0.017609" steps="151"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.35" expl="precondition" proved="true">
   <proof prover="1"><result status="valid" time="0.035641" steps="184339"/></proof>
@@ -151,16 +151,16 @@
   <proof prover="6"><result status="valid" time="0.017476" steps="94"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.38" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017854" steps="161"/></proof>
+  <proof prover="6"><result status="valid" time="0.014143" steps="161"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.39" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.055707" steps="96"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.40" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.017609" steps="167"/></proof>
+  <proof prover="6"><result status="valid" time="0.016999" steps="167"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.41" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.014097" steps="184850"/></proof>
+  <proof prover="1"><result status="valid" time="0.012444" steps="184850"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.42" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.013470" steps="184"/></proof>
@@ -169,22 +169,22 @@
   <proof prover="6"><result status="valid" time="0.015952" steps="102"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.44" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.014143" steps="175"/></proof>
+  <proof prover="6"><result status="valid" time="0.017854" steps="175"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.45" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.014203" steps="108"/></proof>
+  <proof prover="6"><result status="valid" time="0.013722" steps="108"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.46" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.018274" steps="186154"/></proof>
+  <proof prover="1"><result status="valid" time="0.018274" steps="186150"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.47" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.014302" steps="116"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.48" expl="type invariant" proved="true">
-  <proof prover="6"><result status="valid" time="0.013722" steps="116"/></proof>
+  <proof prover="6"><result status="valid" time="0.014203" steps="116"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.49" expl="integer overflow" proved="true">
-  <proof prover="1"><result status="valid" time="0.145125" steps="662252"/></proof>
+  <proof prover="1"><result status="valid" time="0.145125" steps="662244"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.50" expl="loop invariant preservation" proved="true">
   <proof prover="6"><result status="valid" time="0.020488" steps="120"/></proof>
@@ -193,22 +193,22 @@
   <proof prover="6"><result status="valid" time="0.024641" steps="486"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.52" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.406472" steps="1300948"/></proof>
+  <proof prover="1"><result status="valid" time="0.406472" steps="1230760"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.53" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="1.701983" steps="15514028"/></proof>
+  <proof prover="1"><result status="valid" time="0.669028" steps="4123010"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.54" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.303310" steps="1098886"/></proof>
+  <proof prover="1"><result status="valid" time="0.303310" steps="1098260"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.55" expl="precondition" proved="true">
   <proof prover="1"><result status="valid" time="0.043258" steps="183857"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.56" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.066507" steps="72"/></proof>
+  <proof prover="6"><result status="valid" time="0.014599" steps="72"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.57" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.021841" steps="108"/></proof>
+  <proof prover="1"><result status="valid" time="0.014478" steps="171606"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.58" expl="type invariant" proved="true">
   <proof prover="6"><result status="valid" time="0.014931" steps="76"/></proof>
@@ -253,59 +253,55 @@
   <proof prover="1"><result status="valid" time="0.018851" steps="50848"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.72" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.128749" steps="24083"/></proof>
+  <proof prover="0"><result status="valid" time="0.128749" steps="24265"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.73" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.238214" steps="803478"/></proof>
+  <proof prover="1"><result status="valid" time="0.238214" steps="803473"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.74" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.014586" steps="119"/></proof>
+  <proof prover="6"><result status="valid" time="0.026553" steps="119"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.75" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.060599" steps="161"/></proof>
+  <proof prover="6"><result status="valid" time="0.049064" steps="161"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.76" expl="loop invariant preservation" proved="true">
-  <transf name="split_vc" proved="true" >
-   <goal name="knapsack01_dyn&#39;vc.76.0" expl="loop invariant preservation" proved="true">
-   <proof prover="6"><result status="valid" time="0.085910" steps="1228"/></proof>
-   </goal>
-  </transf>
+  <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.205650" steps="1227"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.77" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.257253" steps="29565"/></proof>
+  <proof prover="1"><result status="valid" time="0.041231" steps="189391"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.78" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.048816" steps="220164"/></proof>
+  <proof prover="1"><result status="valid" time="0.048551" steps="220166"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.79" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034266" steps="190394"/></proof>
+  <proof prover="6"><result status="valid" time="0.018515" steps="188"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.80" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.015843" steps="189"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.81" expl="precondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.372058" steps="57183"/></proof>
+  <proof prover="2"><result status="valid" time="0.372058" steps="57258"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.82" expl="precondition" proved="true">
   <proof prover="1"><result status="valid" time="0.032934" steps="14799"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.83" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.040623" steps="196"/></proof>
+  <proof prover="1"><result status="valid" time="0.035028" steps="190721"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.84" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.048551" steps="220783"/></proof>
+  <proof prover="6"><result status="valid" time="0.099321" steps="1375"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.85" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.018515" steps="201"/></proof>
+  <proof prover="1"><result status="valid" time="0.034240" steps="190944"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.86" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.107794" steps="24793"/></proof>
+  <proof prover="0"><result status="valid" time="0.107794" steps="24975"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.87" expl="integer overflow" proved="true">
   <proof prover="6"><result status="valid" time="0.022286" steps="265"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.88" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.355222" steps="1282481"/></proof>
+  <proof prover="1"><result status="valid" time="0.355222" steps="1282472"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.89" expl="precondition" proved="true">
   <proof prover="1"><result status="valid" time="0.035633" steps="14856"/></proof>
@@ -314,19 +310,19 @@
   <proof prover="1"><result status="valid" time="0.035417" steps="191345"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.91" expl="integer overflow" proved="true">
-  <proof prover="1"><result status="valid" time="0.362721" steps="1266367"/></proof>
+  <proof prover="1"><result status="valid" time="0.362721" steps="1266230"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.92" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.099321" steps="1315"/></proof>
+  <proof prover="1"><result status="valid" time="0.048816" steps="220198"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.93" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.034240" steps="190434"/></proof>
+  <proof prover="1"><result status="valid" time="0.034266" steps="190434"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.94" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.014478" steps="190509"/></proof>
+  <proof prover="6"><result status="valid" time="0.021841" steps="189"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.95" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.346653" steps="1238840"/></proof>
+  <proof prover="1"><result status="valid" time="0.346653" steps="1238613"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.96" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.022194" steps="135"/></proof>
@@ -338,7 +334,7 @@
   <proof prover="6"><result status="valid" time="0.070200" steps="950"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.99" expl="precondition" proved="true">
-  <proof prover="6"><result status="valid" time="0.148180" steps="925"/></proof>
+  <proof prover="6"><result status="valid" time="0.148180" steps="924"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.100" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.020097" steps="170"/></proof>
@@ -347,34 +343,38 @@
   <proof prover="1"><result status="valid" time="0.035901" steps="194336"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.102" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.342224" steps="44227"/></proof>
+  <proof prover="0"><result status="valid" time="0.192092" steps="44412"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.103" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.015268" steps="202"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.104" expl="precondition" proved="true">
-  <proof prover="1"><result status="valid" time="0.035028" steps="196636"/></proof>
+  <proof prover="6"><result status="valid" time="0.040623" steps="202"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.105" expl="loop invariant preservation" proved="true">
   <proof prover="1"><result status="valid" time="0.035649" steps="199105"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.106" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.263423" steps="36598"/></proof>
+  <proof prover="0"><result status="valid" time="0.263423" steps="36783"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.107" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.026553" steps="232"/></proof>
+  <proof prover="6"><result status="valid" time="0.014586" steps="232"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.108" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.049064" steps="1043"/></proof>
+  <proof prover="6"><result status="valid" time="0.060599" steps="1043"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.109" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.205650" steps="3492"/></proof>
+  <transf name="split_vc" proved="true" >
+   <goal name="knapsack01_dyn&#39;vc.109.0" expl="loop invariant preservation" proved="true">
+   <proof prover="6"><result status="valid" time="0.664418" steps="10196"/></proof>
+   </goal>
+  </transf>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.110" expl="loop invariant preservation" proved="true">
-  <proof prover="1" timelimit="5"><result status="valid" time="0.778141" steps="2429797"/></proof>
+  <proof prover="1" timelimit="5"><result status="valid" time="0.778141" steps="2427964"/></proof>
   </goal>
   <goal name="knapsack01_dyn&#39;vc.111" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.733632" steps="2244080"/></proof>
+  <proof prover="0"><result status="valid" time="1.143127" steps="224157"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/knapsack_full/why3shapes.gz b/creusot/tests/should_succeed/knapsack_full/why3shapes.gz
index 6ee9fa461999ce4d64d4b42f6f9c4f310a580536..c622b5b72b76d11df8271a1ed29aba72c59f1b37 100644
GIT binary patch
literal 8525
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
HW&{BMe0Ko&

literal 8457
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

diff --git a/creusot/tests/should_succeed/lang/module_paths.rs b/creusot/tests/should_succeed/lang/module_paths.rs
index f5af6af454..3e67b9f7df 100644
--- a/creusot/tests/should_succeed/lang/module_paths.rs
+++ b/creusot/tests/should_succeed/lang/module_paths.rs
@@ -3,16 +3,16 @@ extern crate creusot_contracts;
 // Check that module paths are properly printed in MLCFG.
 
 mod a {
-    pub struct T(u32);
+    pub struct T(pub u32);
 }
 
-pub struct S(a::T);
+pub struct S(pub a::T);
 
 mod b {
-    pub struct O(u32);
+    pub struct O(pub u32);
 
     pub mod c {
-        pub struct T(::a::T);
+        pub struct T(pub ::a::T);
 
         #[allow(dead_code)]
         pub struct U(super::O);
diff --git a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
index 1d67e27da7..e60a514d43 100644
--- a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
+++ b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg
@@ -124,12 +124,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
index fcb18f2ac9..b40e7ca542 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
+++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
index 514616e7cc..64db59eac9 100644
--- a/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
+++ b/creusot/tests/should_succeed/list_reversal_lasso/why3session.xml
@@ -10,36 +10,36 @@
 <path name=".."/><path name="list_reversal_lasso.mlcfg"/>
 <theory name="ListReversalLasso_Impl1_Index" proved="true">
  <goal name="index&#39;vc" expl="VC for index" proved="true">
- <proof prover="4"><result status="valid" time="0.100000" steps="9466"/></proof>
+ <proof prover="4"><result status="valid" time="0.100000" steps="9648"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl2_IndexMut" proved="true">
  <goal name="index_mut&#39;vc" expl="VC for index_mut" proved="true">
- <proof prover="4"><result status="valid" time="0.130000" steps="16821"/></proof>
+ <proof prover="4"><result status="valid" time="0.130000" steps="17003"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_ListReversalSafe" proved="true">
  <goal name="list_reversal_safe&#39;vc" expl="VC for list_reversal_safe" proved="true">
- <proof prover="4" timelimit="5"><result status="valid" time="0.433615" steps="57146"/></proof>
+ <proof prover="4" timelimit="5"><result status="valid" time="0.212017" steps="57328"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_ListReversalList" proved="true">
  <goal name="list_reversal_list&#39;vc" expl="VC for list_reversal_list" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="list_reversal_list&#39;vc.0" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.090000" steps="9657"/></proof>
+  <proof prover="4"><result status="valid" time="0.090000" steps="9839"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.1" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.080000" steps="9317"/></proof>
+  <proof prover="4"><result status="valid" time="0.080000" steps="9499"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.2" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.100000" steps="11257"/></proof>
+  <proof prover="4"><result status="valid" time="0.100000" steps="11439"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.3" expl="postcondition" proved="true">
   <proof prover="6"><result status="valid" time="0.070000" steps="1767"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.110000" steps="13091"/></proof>
+  <proof prover="4"><result status="valid" time="0.110000" steps="13273"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.5" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.019600" steps="77"/></proof>
@@ -54,7 +54,7 @@
   <proof prover="6"><result status="valid" time="0.020939" steps="74"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.9" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.110000" steps="12814"/></proof>
+  <proof prover="4"><result status="valid" time="0.110000" steps="12996"/></proof>
   </goal>
   <goal name="list_reversal_list&#39;vc.10" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
@@ -66,13 +66,13 @@
      <proof prover="6"><result status="valid" time="0.070918" steps="369"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.1" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.100356" steps="824"/></proof>
+     <proof prover="6"><result status="valid" time="0.100356" steps="823"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.2" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.083977" steps="524"/></proof>
+     <proof prover="6"><result status="valid" time="0.083977" steps="523"/></proof>
      </goal>
      <goal name="list_reversal_list&#39;vc.10.0.0.3" expl="VC for list_reversal_list" proved="true">
-     <proof prover="6"><result status="valid" time="0.099827" steps="207"/></proof>
+     <proof prover="6"><result status="valid" time="0.099827" steps="206"/></proof>
      </goal>
     </transf>
     </goal>
@@ -81,7 +81,7 @@
   </transf>
   </goal>
   <goal name="list_reversal_list&#39;vc.11" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="0.360444" steps="4480"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="0.360444" steps="4482"/></proof>
   </goal>
  </transf>
  </goal>
@@ -90,19 +90,19 @@
  <goal name="list_reversal_loop&#39;vc" expl="VC for list_reversal_loop" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="list_reversal_loop&#39;vc.0" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.080000" steps="9309"/></proof>
+  <proof prover="4"><result status="valid" time="0.080000" steps="9491"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.1" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.110000" steps="10131"/></proof>
+  <proof prover="4"><result status="valid" time="0.110000" steps="10313"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.2" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.080000" steps="10209"/></proof>
+  <proof prover="4"><result status="valid" time="0.080000" steps="10391"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.3" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.140000" steps="12391"/></proof>
+  <proof prover="4"><result status="valid" time="0.140000" steps="12573"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.4" expl="assertion" proved="true">
-  <proof prover="6"><result status="valid" time="0.135870" steps="2143"/></proof>
+  <proof prover="6"><result status="valid" time="0.135870" steps="2144"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.5" expl="postcondition" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
@@ -115,7 +115,7 @@
       <goal name="list_reversal_loop&#39;vc.5.0.0.0.0" expl="postcondition" proved="true">
       <transf name="split_all_full" proved="true" >
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.0" expl="VC for list_reversal_loop" proved="true">
-       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.621148" steps="100781"/></proof>
+       <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.621148" steps="100836"/></proof>
        </goal>
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1" expl="VC for list_reversal_loop" proved="true">
        <transf name="split_vc" proved="true" >
@@ -124,10 +124,10 @@
          <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0" expl="VC for list_reversal_loop" proved="true">
          <transf name="split_all_full" proved="true" >
           <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0.0" expl="VC for list_reversal_loop" proved="true">
-          <proof prover="6"><result status="valid" time="0.065729" steps="246"/></proof>
+          <proof prover="6"><result status="valid" time="0.065729" steps="245"/></proof>
           </goal>
           <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.1.0.0.1" expl="VC for list_reversal_loop" proved="true">
-          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.715400" steps="112790"/></proof>
+          <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.715400" steps="112865"/></proof>
           </goal>
          </transf>
          </goal>
@@ -140,7 +140,7 @@
         <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.2.0" expl="VC for list_reversal_loop" proved="true">
         <transf name="inline_goal" proved="true" >
          <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.2.0.0" expl="VC for list_reversal_loop" proved="true">
-         <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.612459" steps="97326"/></proof>
+         <proof prover="0" timelimit="30" memlimit="4000"><result status="valid" time="0.612459" steps="97401"/></proof>
          </goal>
         </transf>
         </goal>
@@ -149,7 +149,7 @@
        <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.3" expl="VC for list_reversal_loop" proved="true">
        <transf name="split_vc" proved="true" >
         <goal name="list_reversal_loop&#39;vc.5.0.0.0.0.3.0" expl="VC for list_reversal_loop" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="2.757621" steps="58001"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="1.849704" steps="40839"/></proof>
         </goal>
        </transf>
        </goal>
@@ -167,7 +167,7 @@
   <proof prover="6"><result status="valid" time="0.020000" steps="236"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.150000" steps="17812"/></proof>
+  <proof prover="4"><result status="valid" time="0.150000" steps="17994"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.8" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.033165" steps="85"/></proof>
@@ -182,7 +182,7 @@
   <proof prover="6"><result status="valid" time="0.038181" steps="79"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.12" expl="loop invariant preservation" proved="true">
-  <proof prover="4" timelimit="5"><result status="valid" time="0.080000" steps="11530"/></proof>
+  <proof prover="4" timelimit="5"><result status="valid" time="0.080000" steps="11712"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.13" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
@@ -190,26 +190,26 @@
    <proof prover="6"><result status="valid" time="0.022487" steps="290"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.1" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.028169" steps="92032"/></proof>
+   <proof prover="1"><result status="valid" time="0.028169" steps="92031"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.2" expl="loop invariant preservation" proved="true">
    <proof prover="6"><result status="valid" time="0.032291" steps="503"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.3" expl="loop invariant preservation" proved="true">
-   <proof prover="6"><result status="valid" time="0.043839" steps="704"/></proof>
+   <proof prover="6"><result status="valid" time="0.043839" steps="706"/></proof>
    </goal>
    <goal name="list_reversal_loop&#39;vc.13.4" expl="loop invariant preservation" proved="true">
    <transf name="inline_goal" proved="true" >
     <goal name="list_reversal_loop&#39;vc.13.4.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_loop&#39;vc.13.4.0.0" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.119170" steps="662"/></proof>
+     <proof prover="6"><result status="valid" time="0.119170" steps="665"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.1" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.156515" steps="2100"/></proof>
+     <proof prover="6"><result status="valid" time="0.156515" steps="2107"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.2" expl="VC for list_reversal_loop" proved="true">
-     <proof prover="6"><result status="valid" time="0.041175" steps="505"/></proof>
+     <proof prover="6"><result status="valid" time="0.041175" steps="506"/></proof>
      </goal>
      <goal name="list_reversal_loop&#39;vc.13.4.0.3" expl="VC for list_reversal_loop" proved="true">
      <proof prover="6"><result status="valid" time="0.130458" steps="300"/></proof>
@@ -221,10 +221,10 @@
   </transf>
   </goal>
   <goal name="list_reversal_loop&#39;vc.14" expl="loop invariant preservation" proved="true">
-  <proof prover="6"><result status="valid" time="0.324983" steps="4876"/></proof>
+  <proof prover="6"><result status="valid" time="0.324983" steps="4859"/></proof>
   </goal>
   <goal name="list_reversal_loop&#39;vc.15" expl="loop invariant preservation" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="1.128802" steps="15620"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="1.128802" steps="15625"/></proof>
   </goal>
  </transf>
  </goal>
@@ -233,23 +233,23 @@
  <goal name="list_reversal_lasso&#39;vc" expl="VC for list_reversal_lasso" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="list_reversal_lasso&#39;vc.0" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.144436" steps="10640"/></proof>
+  <proof prover="4"><result status="valid" time="0.144436" steps="10825"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.1" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.175411" steps="13364"/></proof>
+  <proof prover="4"><result status="valid" time="0.054545" steps="13549"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.2" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.191540" steps="14251"/></proof>
+  <proof prover="4"><result status="valid" time="0.059630" steps="14436"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.3" expl="loop invariant init" proved="true">
-  <proof prover="4"><result status="valid" time="0.150000" steps="15798"/></proof>
+  <proof prover="4"><result status="valid" time="0.150000" steps="15983"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.4" expl="postcondition" proved="true">
   <transf name="unfold" proved="true" arg1="lasso0">
    <goal name="list_reversal_lasso&#39;vc.4.0" expl="VC for list_reversal_lasso" proved="true">
    <transf name="split_vc" proved="true" >
     <goal name="list_reversal_lasso&#39;vc.4.0.0" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="4"><result status="valid" time="0.131381" steps="16138"/></proof>
+    <proof prover="4"><result status="valid" time="0.131381" steps="16323"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.4.0.1" expl="VC for list_reversal_lasso" proved="true">
     <proof prover="6"><result status="valid" time="0.040167" steps="405"/></proof>
@@ -257,10 +257,10 @@
     <goal name="list_reversal_lasso&#39;vc.4.0.2" expl="VC for list_reversal_lasso" proved="true">
     <transf name="replace" proved="true" arg1="mid" arg2="mid1">
      <goal name="list_reversal_lasso&#39;vc.4.0.2.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.354144" steps="43376"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.215518" steps="43451"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.4.0.2.1" expl="equality hypothesis" proved="true">
-     <proof prover="6"><result status="valid" time="0.038061" steps="470"/></proof>
+     <proof prover="6"><result status="valid" time="0.038061" steps="469"/></proof>
      </goal>
     </transf>
     </goal>
@@ -271,7 +271,7 @@
       <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="split_all_full" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.043054" steps="540"/></proof>
+       <proof prover="6"><result status="valid" time="0.043054" steps="538"/></proof>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.1" expl="VC for list_reversal_lasso" proved="true">
        <proof prover="6"><result status="valid" time="0.061661" steps="712"/></proof>
@@ -281,21 +281,21 @@
         <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.2.0" expl="VC for list_reversal_lasso" proved="true">
         <transf name="inline_goal" proved="true" >
          <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-         <proof prover="4" timelimit="30" memlimit="4000"><result status="valid" time="1.762701" steps="201662"/></proof>
+         <proof prover="4" timelimit="30" memlimit="4000"><result status="valid" time="0.932647" steps="201871"/></proof>
          </goal>
         </transf>
         </goal>
        </transf>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.4.0.3.0.0.3" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6"><result status="valid" time="0.041484" steps="412"/></proof>
+       <proof prover="6"><result status="valid" time="0.041484" steps="411"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.4.0.3.1" expl="equality hypothesis" proved="true">
-     <proof prover="6"><result status="valid" time="0.037707" steps="470"/></proof>
+     <proof prover="6"><result status="valid" time="0.037707" steps="469"/></proof>
      </goal>
     </transf>
     </goal>
@@ -304,7 +304,7 @@
   </transf>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="6" timelimit="5"><result status="valid" time="0.085851" steps="1067"/></proof>
+  <proof prover="6" timelimit="5"><result status="valid" time="0.085851" steps="1066"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.6" expl="precondition" proved="true">
   <proof prover="6"><result status="valid" time="0.038848" steps="91"/></proof>
@@ -319,14 +319,14 @@
   <proof prover="6"><result status="valid" time="0.038466" steps="78"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.10" expl="loop invariant preservation" proved="true">
-  <proof prover="4" timelimit="5"><result status="valid" time="0.231123" steps="17698"/></proof>
+  <proof prover="4" timelimit="5"><result status="valid" time="0.064603" steps="17883"/></proof>
   </goal>
   <goal name="list_reversal_lasso&#39;vc.11" expl="loop invariant preservation" proved="true">
   <transf name="inline_goal" proved="true" >
    <goal name="list_reversal_lasso&#39;vc.11.0" expl="loop invariant preservation" proved="true">
    <transf name="split_all_full" proved="true" >
     <goal name="list_reversal_lasso&#39;vc.11.0.0" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.078949" steps="680"/></proof>
+    <proof prover="6"><result status="valid" time="0.078949" steps="677"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.1" expl="VC for list_reversal_lasso" proved="true">
     <transf name="split_vc" proved="true" >
@@ -338,7 +338,7 @@
        <proof prover="6"><result status="valid" time="0.118556" steps="346"/></proof>
        </goal>
        <goal name="list_reversal_lasso&#39;vc.11.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.098632" steps="1106"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.098632" steps="1107"/></proof>
        </goal>
       </transf>
       </goal>
@@ -347,7 +347,7 @@
     </transf>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.2" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.058259" steps="769"/></proof>
+    <proof prover="6"><result status="valid" time="0.058259" steps="771"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.3" expl="VC for list_reversal_lasso" proved="true">
     <proof prover="6"><result status="valid" time="0.086437" steps="351"/></proof>
@@ -356,21 +356,21 @@
     <proof prover="6"><result status="valid" time="0.084219" steps="99"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.5" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="0"><result status="valid" time="1.036602" steps="146470"/></proof>
+    <proof prover="0"><result status="valid" time="1.036602" steps="146545"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.6" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.167591" steps="680"/></proof>
+    <proof prover="6"><result status="valid" time="0.167591" steps="679"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.7" expl="VC for list_reversal_lasso" proved="true">
     <proof prover="6"><result status="valid" time="0.030601" steps="303"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.8" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.131043" steps="628"/></proof>
+    <proof prover="6"><result status="valid" time="0.131043" steps="626"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.9" expl="VC for list_reversal_lasso" proved="true">
     <transf name="split_vc" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.11.0.9.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.162694" steps="1987"/></proof>
+     <proof prover="6"><result status="valid" time="0.162694" steps="2363"/></proof>
      </goal>
     </transf>
     </goal>
@@ -378,7 +378,7 @@
     <proof prover="6"><result status="valid" time="0.155330" steps="2095"/></proof>
     </goal>
     <goal name="list_reversal_lasso&#39;vc.11.0.11" expl="VC for list_reversal_lasso" proved="true">
-    <proof prover="6"><result status="valid" time="0.139036" steps="684"/></proof>
+    <proof prover="6"><result status="valid" time="0.139036" steps="688"/></proof>
     </goal>
    </transf>
    </goal>
@@ -391,13 +391,13 @@
     <goal name="list_reversal_lasso&#39;vc.12.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.086807" steps="1239"/></proof>
+     <proof prover="6"><result status="valid" time="0.086807" steps="1209"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="2.511568" steps="305755"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="2.511568" steps="305830"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.075475" steps="942"/></proof>
+     <proof prover="6"><result status="valid" time="0.075475" steps="1193"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.0.0.3" expl="VC for list_reversal_lasso" proved="true">
      <proof prover="6"><result status="valid" time="0.023413" steps="331"/></proof>
@@ -411,24 +411,24 @@
     <goal name="list_reversal_lasso&#39;vc.12.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.1.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.120000" steps="972"/></proof>
+     <proof prover="6"><result status="valid" time="0.120000" steps="973"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="5"><result status="valid" time="0.204464" steps="2394"/></proof>
+     <proof prover="6" timelimit="5"><result status="valid" time="0.464352" steps="6695"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.2" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="list_reversal_lasso&#39;vc.12.1.0.2.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.12.1.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.334367" steps="4544"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.334367" steps="5509"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.1.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.084522" steps="899"/></proof>
+     <proof prover="6"><result status="valid" time="0.084522" steps="896"/></proof>
      </goal>
     </transf>
     </goal>
@@ -439,16 +439,16 @@
     <goal name="list_reversal_lasso&#39;vc.12.2.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.12.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.088090" steps="1209"/></proof>
+     <proof prover="6"><result status="valid" time="0.088090" steps="1217"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.293937" steps="56097"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.293937" steps="56172"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.182226" steps="2544"/></proof>
+     <proof prover="6"><result status="valid" time="0.182226" steps="2571"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.12.2.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.147772" steps="419"/></proof>
+     <proof prover="6"><result status="valid" time="0.147772" steps="418"/></proof>
      </goal>
     </transf>
     </goal>
@@ -463,7 +463,7 @@
     <goal name="list_reversal_lasso&#39;vc.13.0.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.577339" steps="8398"/></proof>
+     <proof prover="6" timelimit="5" memlimit="2000"><result status="valid" time="0.577339" steps="8447"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.1" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
@@ -472,10 +472,10 @@
        <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0" expl="VC for list_reversal_lasso" proved="true">
        <transf name="split_all_full" proved="true" >
         <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6"><result status="valid" time="0.045678" steps="342"/></proof>
+        <proof prover="6"><result status="valid" time="0.045678" steps="341"/></proof>
         </goal>
         <goal name="list_reversal_lasso&#39;vc.13.0.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="6.317379" steps="88589"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="2.544750" steps="47178"/></proof>
         </goal>
        </transf>
        </goal>
@@ -484,10 +484,10 @@
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.147455" steps="2136"/></proof>
+     <proof prover="6"><result status="valid" time="0.147455" steps="2046"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.0.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.267606" steps="49571"/></proof>
+     <proof prover="0"><result status="valid" time="0.267606" steps="49646"/></proof>
      </goal>
     </transf>
     </goal>
@@ -498,7 +498,7 @@
     <goal name="list_reversal_lasso&#39;vc.13.1.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.1.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.088310" steps="1142"/></proof>
+     <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.088310" steps="1141"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.1.0.1" expl="VC for list_reversal_lasso" proved="true">
      <transf name="split_vc" proved="true" >
@@ -507,10 +507,10 @@
        <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0" expl="VC for list_reversal_lasso" proved="true">
        <transf name="split_all_full" proved="true" >
         <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0.0" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6"><result status="valid" time="0.060000" steps="347"/></proof>
+        <proof prover="6"><result status="valid" time="0.060000" steps="346"/></proof>
         </goal>
         <goal name="list_reversal_lasso&#39;vc.13.1.0.1.0.0.1" expl="VC for list_reversal_lasso" proved="true">
-        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="1.006947" steps="12601"/></proof>
+        <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.750985" steps="10298"/></proof>
         </goal>
        </transf>
        </goal>
@@ -523,14 +523,14 @@
       <goal name="list_reversal_lasso&#39;vc.13.1.0.2.0" expl="VC for list_reversal_lasso" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="list_reversal_lasso&#39;vc.13.1.0.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.542984" steps="7320"/></proof>
+       <proof prover="6" timelimit="30" memlimit="4000"><result status="valid" time="0.542984" steps="6696"/></proof>
        </goal>
       </transf>
       </goal>
      </transf>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.1.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.062914" steps="727"/></proof>
+     <proof prover="6"><result status="valid" time="0.062914" steps="728"/></proof>
      </goal>
     </transf>
     </goal>
@@ -541,16 +541,16 @@
     <goal name="list_reversal_lasso&#39;vc.13.2.0" expl="loop invariant preservation" proved="true">
     <transf name="split_all_full" proved="true" >
      <goal name="list_reversal_lasso&#39;vc.13.2.0.0" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.066484" steps="865"/></proof>
+     <proof prover="6"><result status="valid" time="0.066484" steps="862"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.1" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.322550" steps="60363"/></proof>
+     <proof prover="0"><result status="valid" time="0.322550" steps="60438"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.2" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="6"><result status="valid" time="0.268209" steps="3628"/></proof>
+     <proof prover="6"><result status="valid" time="0.268209" steps="3095"/></proof>
      </goal>
      <goal name="list_reversal_lasso&#39;vc.13.2.0.3" expl="VC for list_reversal_lasso" proved="true">
-     <proof prover="0"><result status="valid" time="0.261809" steps="31531"/></proof>
+     <proof prover="0"><result status="valid" time="0.261809" steps="31606"/></proof>
      </goal>
     </transf>
     </goal>
@@ -590,16 +590,33 @@
   <proof prover="6"><result status="valid" time="0.015015" steps="112"/></proof>
   </goal>
   <goal name="vc_find_lasso_aux.5" proved="true">
-  <proof prover="1"><result status="valid" time="0.044759" steps="73704"/></proof>
+  <proof prover="1"><result status="valid" time="0.044759" steps="73689"/></proof>
   </goal>
   <goal name="vc_find_lasso_aux.6" proved="true">
   <proof prover="6"><result status="valid" time="0.009561" steps="26"/></proof>
   </goal>
   <goal name="vc_find_lasso_aux.7" proved="true">
-  <proof prover="1"><result status="valid" time="0.349219" steps="1873063"/></proof>
+  <transf name="inline_goal" proved="true" >
+   <goal name="vc_find_lasso_aux.7.0" proved="true">
+   <transf name="split_all_full" proved="true" >
+    <goal name="vc_find_lasso_aux.7.0.0" proved="true">
+    <proof prover="6"><result status="valid" time="0.011559" steps="92"/></proof>
+    </goal>
+    <goal name="vc_find_lasso_aux.7.0.1" proved="true">
+    <proof prover="6"><result status="valid" time="0.015396" steps="136"/></proof>
+    </goal>
+    <goal name="vc_find_lasso_aux.7.0.2" proved="true">
+    <proof prover="6"><result status="valid" time="0.025817" steps="305"/></proof>
+    </goal>
+    <goal name="vc_find_lasso_aux.7.0.3" proved="true">
+    <proof prover="6"><result status="valid" time="0.025164" steps="261"/></proof>
+    </goal>
+   </transf>
+   </goal>
+  </transf>
   </goal>
   <goal name="vc_find_lasso_aux.8" proved="true">
-  <proof prover="1"><result status="valid" time="0.021420" steps="76263"/></proof>
+  <proof prover="1"><result status="valid" time="0.021420" steps="76248"/></proof>
   </goal>
   <goal name="vc_find_lasso_aux.9" proved="true">
   <proof prover="6"><result status="valid" time="0.010000" steps="26"/></proof>
@@ -623,13 +640,13 @@
      <proof prover="6"><result status="valid" time="0.081749" steps="416"/></proof>
      </goal>
      <goal name="vc_find_lasso_aux.13.0.0.1" proved="true">
-     <proof prover="6"><result status="valid" time="0.040206" steps="1661"/></proof>
+     <proof prover="6"><result status="valid" time="0.148050" steps="1669"/></proof>
      </goal>
      <goal name="vc_find_lasso_aux.13.0.0.2" proved="true">
-     <proof prover="6"><result status="valid" time="0.069856" steps="1100"/></proof>
+     <proof prover="6"><result status="valid" time="0.069856" steps="1101"/></proof>
      </goal>
      <goal name="vc_find_lasso_aux.13.0.0.3" proved="true">
-     <proof prover="6"><result status="valid" time="0.035975" steps="1663"/></proof>
+     <proof prover="6"><result status="valid" time="0.035975" steps="1660"/></proof>
      </goal>
     </transf>
     </goal>
@@ -641,14 +658,14 @@
   <proof prover="1"><result status="valid" time="0.062282" steps="6224"/></proof>
   </goal>
   <goal name="vc_find_lasso_aux.15" proved="true">
-  <proof prover="1"><result status="valid" time="0.050405" steps="226542"/></proof>
+  <proof prover="1"><result status="valid" time="0.050405" steps="226516"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl4_FindLasso_Impl" proved="true">
  <goal name="vc_find_lasso" proved="true">
- <proof prover="4" timelimit="5"><result status="valid" time="0.156412" steps="12390"/></proof>
+ <proof prover="4" timelimit="5"><result status="valid" time="0.038509" steps="12572"/></proof>
  </goal>
 </theory>
 <theory name="ListReversalLasso_Impl1" proved="true">
diff --git a/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz b/creusot/tests/should_succeed/list_reversal_lasso/why3shapes.gz
index e39d51327def515e87b7115db7fa356c0984e1d3..1797cf0409ced9e5aaba30aaa6db6111493ba202 100644
GIT binary patch
literal 13218
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%0ArPNOsSxq$fmN?
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
U(Oh?s)bR!XKmB;pZysy`0AUNcrT_o{

literal 12978
zcmV;jGEL1NiwFP!00000|LuL*Z(GUL=ezz2zkM@q1gL!(qz4cT2sDsM9_9ldTc|Zr
z#w|ORJMH}U^E-DTFYm%dB4yd?M$;nitvYq;)Y)tMA8+40{3CoS4{!cmK0n-jy#HTs
z%$v9W^XkjL!rlG9)tcR0g+KosK9u{vfB8p1(GMR!{(k%G$6P+}H4k4t-rn7R3BQJ~
z?7FEiDe|5k%Qe60K+3h~zlyc&zw))}zp}MPn?J9)z^`1s-hTM__q)W_Zf)N;kJp^v
zG~WQ7wcps<-@I=@`s)BZZ~q-W{8rf7?&8DN1|_fC7VUN0oT0zB@#Amz`C+cc`*8p9
z{{FWQA8tQ=`P|^~m+<cP|CC=pe*Vwe++3~Sy{R8RziE(NBo;eNEH)(8yYTZ)_roth
zUC7;MZ<}ZD{|XXVe7W91w0n!*E@1R-E!4InRD7|V9+dlq2=+7n2tLKo(yO<VSA+^i
z?{j(h_~G9L<Hk2X*jk9e5AKIQ42`Z3A%6V)`Qz^;|JSeouWh*A-G>ir?!sNhzYP-z
zz7`ET&@;ip-^-WV=52=(VbK-kegqMKI*7V~sM}(0&20~n+YLnBLd27|o1$h6QTGsK
zQ(Lyh^qQ*;M74n^JBW(@>5764M9<V*ERG`D@(bb#QRql{TRuGe{*Ur`DiJ6(18}bl
zH7)+q;Iv$d;J&3EjD*ea6E;+81$&2>J?k~?wnQ~VKXbFoy;Rk&T~A){#yz@xM-=V}
zZ4z%O?ZDJ#xBAWdsrcAk>AwB-w=WxowMR3~2|J$`cDB`wj5OoBFX1M9cqrl5^6Ty0
z!|m?{_yB=lOKuq0OoW^p@XFsBjtTUf&6N<0N<aph5{<a9R(oz`(oaQW?dBwHAQ!vx
z5B8o)e)F)=QBc!@PqCx-d$p9<87N5BQbD<+rdm1uh2(UKCubWWp5hC_%%REIeo^nZ
za#zqhsWv-8J+*EyW_HwQ^XxA@XM=e5Cj9s3-%2Ya{;v7aaSIGU;!Y`Jm10&}=C$Ug
zQ%>`*2)W<DqDK7}{@qiEIz|6T`qB5a{fkHQd^%-Q2otfOUEoo(cJ$h{uR)1<xKkS^
z*NQ5t1-Npp>9yW6zFs2K0l*6gZ8XG(yN55gp9{HB;lu4isAc2voTw_~ys8jeRUx)c
z6yG{gjGU-IcmT8TP(IY~0nhKt=kNfJDtw;pIlZ|L_vQD*8Z6ri_dT{<{cF5}cyuqX
zK79Q62|DrL;qzU%|AKFKU)q*$AIjgSt+zB>06kOjb7%=!Mgaaas=5eqh%6s=iyv$p
zCHOqv)4H8JboI91uNtxG9(P~p*#~}vC@z&E0JmK4%Kd@DZLzD3OVy$@*Xdh!BF*P1
z3H90z;S}E0r;iU`(#QLJ_XTmr91frPlW}N!O%$T<Z^JDN(%Zh*KQ~`S?qpMBIE?+k
zU5zwCQ}6@7`t-RBda-D>hCXvwcfR1z4{5Nu+O@2_eY&>058t*A$+7|~a<Hc8k^|F`
zfz8yW-jIo$zW!zK8b#q1G%z~8rr)hc)jz}^J|-*gytNkkrYM1PEzk`(w*l8a#GffR
z*MkG#zUY*P2v2<mHu~HWLHG1iE#w|$p|%ugg-z%Q$|%%RK!?64DQbFk)p~^=W~H&M
ze6$v7iXWp|mJ7~nm;L1z`RbRpgL_zOQ{ps6Z>sI#^@gNxd)T+|2)iG>o7;?2KM34)
zHBhj_7F^c+=mAj?B8=^S3;;1c{0WwARXmk$TeoCZ!%v%$OHGM;L9d2JN$fSYVr*@p
zfF8={e}`59Z9I$vp2M;SB8DEw`;C9GNzrT)G=ucaG0JSO*0V=yJvYY;Zomv~mKog5
z)rg3D=-rOn9ZB?9HHc35eqK-=V&46uUlaS$8lOQU<jMbe8@>-le*=E)ZzhD9g|v(P
zPiv2Y9qMRdtoaf@s%4_`uoccm=yzcqqWXi-s0ixsD}%Ue+NR(6)r>ra`2^1Gh31Yx
z>ZS=i4^o%2F?l%~(3ek5OPU0_vtZvJMU?BO@aM$3h(!l?Di_nbC;Mm<pznG|ajhwK
z-htNTcy${lZxey6vq%GcC=DU}xcV$IjYXlq(vO~Bk0DAsg0xt%AEWtqX<L(eB>h^p
z$rI^@Mq$lmYO~qWuB92~V}u$0kWCr0mb%ReBJ88|2L7eoW|!#@dM#C-ag(Y`xd}Z0
zBt-*At)<)mk_{k9(JXHPNlMZ7fH>~}N#4{Qr(<QGjulOkNOb)K;7vMKZql)$OUFv0
zcUM$UI<fzbLA71tMA$xCBE~rv(dS%*Xxi+G>9yFTS2rFS-gYTqO2qU<<rt#qA+k1s
z+!hm*oa!O+4MeudbHCjbrR4QEE5@7r(^`$ar1oK}K4DsCa(487Usg=<-K>~hEGTxf
zVz$eQ`58QUmmVFzeA~X9$%@$~mrpstaaPRssl$ez{Y(wYo2&4@$J!E+0XaEyd5b|x
z;-?uUyOWj(`^wJb8Fo^C4>L-9qU&~RB$nn?|Ex_3pAR=UYc;}Wf;g_78YcYE>Zu>P
zbMFs~>tfbwZ%%65;00m4--qHbIdu%z@@F2|CNJ~2v8AflZ7@AMynHgg$C6;+!Yqx!
zI8c6nVjA$t*{J;uHc{m%$voR9^IDaMzu|5MDmjTi{S+SV?*IOweEE1krBC0hhu`8u
z`PXmdK9vFMjQiHQonuP;DG-B9K%>8;%O4P*_UW<n;<Gjj_|V+m3_f_=IN4?dr!^cj
zeSZoc{!D4jaU%z7%?iftF|Ex?;{=7-=<cN`l}BLm<W%%Q!Rx}g^RZ=O=LfiP{muz>
zAzcCAYe%1)ugT@S6V0f>DZSlH84R*egiQDI-1_V|WWG59*N>#zj<V?roVy3l(F$b(
z{=By5XUI<T+i_k^PUw0WOL|6#KQ%`90*dEut7^{(c`n8K2cf@TLa*)l2~F!zE<k7~
zl8X@f@;a(<_Ww!d=${ub&VOxq@SmHc`&sSWnE_q`%e6bd*`lPLYqG$XWR0EqkF$e!
zgNc|wsQnDop5$IGqp|%3G`7Et#`c%d*w@eDyY9~Go}FKO!!FMf#SY{1?aHn*^3S<@
zkk|#x<oPwBUP@!>`81Yp(^z_*A@t2lNE08Em|92^-?HoZ<l1Rz;${lz5^UOMVEcuI
zdy-2Z_(H;T&PhMI@caFZwyWL_E_Bq#E_Br0+P{T4#qrw4#U=UUwT*gqm5-iV@}>8$
zZPbIcjcTU$U~QwCX>q%@al1yWTiGYKEBm@tWNNyyPi|KBsjw|dfJ6&)15Rwg$!<~F
z6r9+Alc6vA?FE`T;vX&3P3`NBDq}EDo&airUN%qMtpWA@(7LwO&CqU_t+o&GXF9Z-
zWvilHwn|02HK6WQ4020^$BuJbd#S6B9oYuzu?uGB3(n8r?JxgJ&ot-J__KQNmzJ^i
zsJ=~!(-d)2ZI3SAti5&p>eueaV9BiCti2Utv-Z~Z*metJH-JP7X!BzLNbRh>g-Y$$
z-nI)#Z=qwC*4|3KyB74&suFQ^A`>qO!{a6j8(5E>D?C!T4}#xMuYpIj^t#vdSM#d@
z7S_ssUh0`RYE8lk>y#HgnDIL0B@bq1ow6RRQ+BiKly$RC`RBtunT;0G)LjOwY2`)o
z&cN(L*Es{w#h!cDBTvB1$2o1*U?$F?mS=jv4`bD*tHu~~YnG?|++Dl847yvmyjWmo
z)$*j7*{7pb%!{DiA>0nEU!KxpX*ino%roQBbbM|=_AGCnw)*}s39p|;45sUuFXV1L
zV^fP9@aSb*;<#m7uc43c51F>TtLvBC)ngXgKLX7AuxF3UyFNYAF1ugMjjZjy+(<J&
zH-x;qV*fy%>}1$$KDXYBX7li7q_G;{v_HR1m2oqI)$1D5=$domX&3Rd3wYWNPrHDp
zJ-7ox(3<?yc0j1<=xsJKOx|5jTJr;NqaK|B{s`!#4`b~ygT_RAP_3!<=ty_4y~%?2
zre3pOVmheJV?WXx)a##S;QsmG`vFZ!#1!olXco~cwy=ey+hnrcHR1+8t|;&K@Nv3`
zd822<XtDj<G*%+xKvay^-!Cq6o?CrC+2zj{@;7`5==BunuXlNa-AHlrDPZynrhQso
z@XZJCzf~94`jQ>oK%Zc;XAwL9%iRbSG4aY~kqhH}Yoa-YVu?6=cY{or^WdI{d6ecy
zY(mC4=9>)nQ6q$B2m7)>_`PF!Y~u@K`Ug2LO3wEu@$&Uvp*X(7GlNJP?J;ydO0j(2
z)trAi&a9lE?>{VS*rSJHs>pZu<Q#!9B}LG|v#P;;yIyt-(HI-PFa156Wq-QWJh{o~
zD*uDF@#+2C67WQ6o<QH<|EI|Fk<>c7E`07Tozr-n71c(P`9zc_2#QI{?5V<iSd|^*
z!x_q)zyb@bH&i<OR3$zqwNFH;LE}6&>r`aMTbKFbo*Ig_<~Hf^oyEN4UX0Jb;9)lD
zDQHdb+|sO_p_&Rx$K9fNeO3PT8-RTI&zpbz=hMe8|0oZ44~L<OMX2-nSt`HNp}jIP
zt-QS3WL%a`N*rwU8^0dx`5TPNWB`uY7Bc0%g;Cn>95~SZ!A^h)3C6Qv;yXcQVY4Ps
zX?ANKMg?QJ2bCiSdtquutnCsLwFfGj>to>WEIeK)WS1w1(A@lE-C$wX`g*wRZ=nHw
z6snWSqWyz6m(gqo&mK2;cHiJFufv@p^8P3qUtd-UP1NGN5jxb!R(Vbp&s-DYQcaxG
z51+<m`~q33o%m;)r#dYvIB%xvvR>^R3BE-juzx7NuSg1N@>0o;9ap(AT~G6q7s&q2
zgM_IFT`Dwc)gW~L8Fk?GUI(|C${LTu*d?D|)gjjI{cxMmf}xr{mTqT3$4rRvmrEJ7
zc1mc*(Lcs?OixJp!*sl0(=i>cKTOAqF&&=={P~CJc&t!ucXS-s2_ui)2_sM22_u&Z
zj(5VynLrv(cb7DDdr9{1gpq@tFk+_mU?+^2X>qU<X0YnI*{RT<ceq`OEvEY$_-22D
z2-~9V(a>)<2m3b1e{aF@Ze{lr9NU27p)WeW`(xr2oX7aM3kdhn__#%EerV$}J7Ry>
zpOfs*WWUoHS+pIWfrtBt33{vv>b8y9UJsg<xEnoawtBEXD1NF3%|;K}&=>7?&X{M`
zi1q^P)^>3lb^W0fzp+x>8IbQxFS_T`i|!(Nu_gX1P>oGTkKK1UUvPQf<#PE&*Z7xK
zo$m3DHzj6#bw2~L-B{FCqrF2j?z$gtmNebvG5wFhrbfHnEXg*TB{%y>S?I5mX#uhB
z;++1+0Fc<-EXlVQmGs+|moF;u<IR63uL>3?Y{Od&pT^tpX7|UBjLOUOwAcQLTI!ox
z#51`W-?R_kv8nr39>axu^-ApDLGOZ#XI@<O>^-JiYQM$8t;@SMGyVZrVa7q=YTzMo
zHR~d9b@K?jyYG%GK6A+x-xj6?z~hc>UmrHMPg#z<u-@{#O21jHaY4h|FRc3k>~Gf<
z`Rv;8g_wb^|LPlCg9e9ZUu@fST|ax*snKt=qIXtxyD+1<-9T~A9p@ptYX`S#_3oJC
z@B1C!%je&3<@rchPpyB<>GQK_AG-67Pfm}YE3~G3z@G<Kz4tFhSL5mNVI*P++{o_z
zgh#10TC{n6j<JqKV6r%bn@L}qqee_~BmFTzuczDBr=`rz&1TclpuH#An?nO5mIkI@
z+;ZfIi1CPsengH!eQw0W!iWtq8x55h4V5@NR9k4XW3+kQ4bJEJ#i%pg+NzBC`yBUG
zX>`mUi2EdNg4rpB_lxN=MhDqsrlAEwc5Jh`iStxZK7i!Hs_l)C&r#$UVc*;A9`WB-
z&n&Mpr%N0co^LK8<ZSka*2C?#^=9(i2kP;e_2~PVKrAzX7&5`sTRG{#B5J8&nTgkR
zuutOV`q{*Oyev^ryt(^Zwu7titr;Y_q_5i7YU#B)FjN;+>xVDWJ;p3upVwAS*MxFA
zb^}`C(-}6$8T9MvX)x1LcK=WucV+LvfN_TNr*JQE)P`8v<2;kkI3|Gl_PZ4)Jravu
z+IN1_EaU;Sb0js6YV#c2bfD42<gwU)66Nf!{87$JY|{u+o_Lfp*aPqwk9zhFc+pv!
zCBV~T7#9?>pXlT1!HY}kczW=ln7=pv7;LA;ijC>8?=tzrP0V^P2dg!QH=eu_vrPdk
zF2<bn)$jh?dx`x)lxH^(95DpPns7EX;nTw*7ftw74IFF2`%@xMAHnNyF6R4`{)sb;
zM;$e?;9-hWCi#xTYmN@bH*tJ0c|Z{!-(;g2PpmV4o9>>i;QKmqU<3AXM8BI8qf=t$
zmx9K^3BVV&M5nRK;@<4}vxASdRi_}a*Ls}*Xy0MPVtL=%5%%Z=B=%aUlZNJ`41riW
z-}urtYzB|Lw(PX=+>=pwf%^WKfZ^=xRmL`Rthtxkm`~H7_(C@3l#|r?yg^$$NBuzZ
zYhI1=PL1}duc@Ns^NRBD!RdTK`|$(XZ+ve0{M&tcYGHpZ->;`eXQnT8_tc!@yhh=@
zM%m;XXTskTbB^;mWA72^XJhI^2YEkj>H9M#rHFv1Xql69QriYjOlw?rRpWUFY>o!s
zLXGbqi}MFo&)M4h(^6S`mQ=nNt9#)tos+}Qis}go;+>S_%>2;t{Ih4q=oFT39MTh7
zy&EkpnNA@0RZd%?@@P2cU#fC~BX<(*UWCtgGRBv14^Kp5@5J;8fG*^8o`%G-e|qZB
ze3!25$s>0C!W8DLk8pU+>S6RIPV+YGAE0{DWM(r%C}+ET8k|i=^`yp+TI#n~xt`YG
zRKYH!Y_~>cye_cGjdnzvCO`Rs<maW~j;8Z^OVGkS-4L8k-RY_aHXhAml>ey>?==7?
z0^2bHBjtaZ(m%1`y^8<jp*U(bZ>#jj%D!WnlXd;EI{x%QxqeytZZ@LY)N7hK8Mzq^
z-|n+mINR;~>v&I?bUQgm`7Ne;_GU1jG=H<0!4%hrGnh}9X<5o(ZoB&f&WUXEo0pM?
z*_Bi0+KBi^GVYZ2k9CJHoJ+dor8g5(@nlP}K>ABW9q%@0g3>*a-3HI`39NL|X}ic>
z?p#vHXD%t^p02nXRo@}??9F>4LX%P)L6!aec$ONNBk_84wPJT51YMxFTWkt@bfnDS
zTE#yt0U5Wo`*ymFbQ!zRRKeti;I*4vDLF&Ikt#$bHty#UKxWA>9-J8hveSorqMeQ%
zzZu?eCpCNAhz_r^WQR~4E2QlWoRd+Q66??<o(IXV#G@tc>fJl?Y6hv<hcyeI$arrG
zKD3L{*X$;|yZ!6O`!cS;!>7i18du;b|9?OJTGo9%I>cwDLD4oS#`VQggR*T<jw{GP
zgY-AF=LSt%RBelD3_vZlsM{9xxPsoaSV4Mnj8F+f^Dnw*yGa9ldOvO6w9T7cXifRG
zSwg|KDA>75_Ana6q8oPTpAH_}b?5kuA9W>%jV9JTZ1n$KX9k)Rns#vp{XfkX+NS$k
zF&l%wyDGna`tqOKhkt}mg~F0ix7Zr?XD#mTW?qo13zCSQBzy;{w&I4w8>R(!UyTN8
zE$K#%;Xtiv=giM*wJ=DiVB6a{?6|_>05McjO)Ecd*s-kz0an0iIN=fQufMb$J$ec>
zKHdGje7tY2#J<PSP^tGjrJCmpC0pj8U-#Vz+;7;SsrBbwUUcpAofFU>`hezUvt8z)
zkI5dEg0Q~QDEfNX#tA*8m%B_CI}dJcen^dPvh#>|f)BWOfk=;rbT({G8;D1=)$W(;
z#%{ak?GcdrArjm1eiT0H@l_Xhygi{iqs?(ofTT9OJCWg58T>v`23uh57`^-JtnzDA
z#+>q#sIC&<nk6+>P^x*?DZj14nJPa+iHl(>rn&uyu1fOr%FmE=yB#^+RKb%){b%sL
z@wT>F({v<kkGgIJi#6L;#ofEXZ@O@u_JZ~rqI)wMG$JSs?C2R$T5g7I0<ASwO9M5i
zzp1s*KWe=%)S5r~&Ta;WMKmm|uZMl52d#eUgsXXEH{X`_8#ZSQb=%T+wipgx*qfX8
zJBp-%==yz?Zd!vb8sBdD-@2d8MH2Py^8*=sgpyyj?&ZTMG1(NQB7dV$1%F$w_lo9h
zZtos$e=jImKYsqT<hC$|e&jW5Yc)?=M0SzbTd8?|)pVq}c>3odwo@++5mWb@U^Jwe
z*eyOU4CK_ZVQm@;F)?pqSu9A?3<1pPfpM7*lkObJ&0JVZ%;xCGr6m(>k;6+X8d8r=
zF1Z_w_~5F;hfTWlp}W-ZA^dauY%N6pg*U7$1im$7nrPDQxtKf`H#eh&B@c&Jl5~9?
zjn=|hl)KfMC`C@tkT)Y{+S~F*$Vp_5Aa~2^Lkn_LGxI`v|1ouvIt&&0Ryqg0*p{6W
z<@xG=+s#%F-t^)=3NrTfe8^X))fja1#HQZ8n`jl{$WF$)Y}w8`;)qU)iAVqYw@)96
zSa%ZLRJaYleI1U%0)ci2{_~UScUXk48<j9om0w$xKylBUZdk)XBsH?;H_M7)y|c)w
zs~}o{jGT%&=LH_f+RQmG3KmsU1l*HT?>ZPw#jW$w$Kn(vjeHl|1R6Ut5R^87i{U7w
zct3|0oDjG=E%e44aXU4ez=kLR<4uS9&4Fkf6mm5B$Wt|DbL(cK#MW!R+O@TM9;9v(
zubc3(v&2JtuQ&F-q4&_L`&O&YL&i(ivUUR*%Cv#Ju~I0pF;hE!n2>9s27Va$|4(>w
z*bftufa%dQjJnWUKWq%`fFHK4zp1t0hf(W&q0SG(_fgl(TG(B;iyrySw{}WTfOd_i
zD>maNdY`p>;ioVB#O(q^i5Jb4my%6tNY=Yu!tS_>lCP!MU`W5z=35&RNri7sj!bSV
z^<di<YWhM=FeHeY8lxI|T0{33N->r~%F~&#2PMtedP*}ZkBh!dTge_-r{M+JP><5Y
z+pN<GwcSXrsAD77@C0c7W~z+WiqRB{;v4;Q7WEIXfO&H@W407ts;142wo>ZmZ0+Lz
zf%ZRx5o@x!Uxznxf8E@Z_mu*y=F8UDe;v+<P=Sr-`E{*qS8c7DE2Nd#7VHymP3)vL
zxz?}!bA(POwL0&H0SCQxw7xzCA|T=UOtk@g{-g$kI^4kZQa?$<Zi%=ZgZ5e!8UxV;
zokCB>Ks1?DVa8)1%+9rmr}Dv67*PHzKix0yqRFF0pFFN<+oR-C_^Cm8lwWF|?R8NR
znRc?b$5n02{kB+ZCp#f~*qx)9^Mb_@O^|CaY2qnL;QbsX`Up%~OMXU7uAeUonM}nT
zS7|Aea(%Y&Z9&c-8CG^v8PoA~M~rVXk$Q-k+f2|&a{d0)Q2Y91&Cw<LkIWcMCSRs@
zb?ePTO7Gs?^>h)NiLTl5yR*ggh&RL2Mh!!^SR6pK(Lb%9-YSu99EOfQt?BxSyzt&f
zAHD8h_Fk~q<I0PTh8?IhF__j9-SQZkKx_C5dI@@Ck+u5Qvs^VMURTyMp8G~1`o|V;
z($<+rk)iZ8rOe+5Mbo1Aeok&tY=ioc?Ik}f8d8wgf1ndX@ooQYW?bjgtyD*}smZl}
zT$`sUuBPJO8WH$>KrJ=U+wWUZYrDDF<ohF=y!vu=#dwM}i(=qJC+Vz--Uz0H@`+`k
z#2dRZE4@-Hxe_bBVpoNG$GtUKah-zA&T1bx55>x)q_A%|Tlq~5hZ;Ty7P1Yz*6OoS
zEXPp2%G$=nOO<c9UU9YJa>daEzXE?-n=OaLTZsxX1vot_^H_jmG;ci0GqDnE#r=xA
z6}KyHt{}eBMWGD7gkYIb${4FzR55v9*c+i&LahYQLR~(tj=+U$<+MzmY3Gy^NgL3{
z+Q4kIwW)6QLC8faUt9!%1gH^ZjZ91Cjg8P#$}|w{0U**<>p}i#qv6bY9+?G{q6%YP
zB>6`Am2@j<SJJGcUP;hduB2E=zLIPu{7Se*;3AmfSztveku%24xNL$KL21r(s&5p=
zO|6t%DX~&~2e@K~;md5QFIom;qA1Z-m4vL!CmBMiH4%KnSB9-LSj4TgU1@NaUTL+`
za;3#e^Oa^R<yXqBlwBz^kIX?#qLU)n5_wR<xCqWuQA(vt(YAm;8cf79AtO^PHdGe^
zOFDq_i}%d2P@EGUEKSH*v9f$+*~<7WN(TQ!{>;h%TeUKB8Ob4T4OaV63bI0=v_@zH
z*|pvjWt{g3{Hweyu|Y{bH&(>v)tFF)D#g0WDwK=#GTMYebn=apD+i^*SB|Z$Us<=Z
zc4f`V0$cUG1T5Nln`Kr|8WQ53h2~Je5llzAlu+f2y%cn#;*k6lqk=NFn&cgHHZ`-N
zlQFtS*UOcE85ncoMrd>eB_)F7=z$R_l|mevT_udYe?bUi>@@=i+r*uYg2RAm0qbg`
zWUwfj%$8RtBkcLH2zzz_Vdq!Qt(;vsvvPXn)RllvG%))aMkezL8wdmHDr~=uU>Doq
zY+e@57Pvu8xa1hKhQXz9+9j!#lvZ(gEQGUtVK{3Imx&qLRb)g|-Z?{#lc->kkV=EI
zds#S#9AFKMP}zzQbVyDmI1NhbV1qNIRT=yxX*s8b6~bi1U?H-qYqi`;!FA0MUS)p6
z$yTHISahu@!Q>=)CB;~MO%XmQH`XZ5V<gWF4pP@HXK+@T90REs+rnhZQs%0SbUas6
z3p1q_&5~<@peQqkf%#a2PmXh2Qw~zV6_-9_t%JaSS~bAnX>*23%pC?8;gKaTELcz`
zxXHqZY^wrQl1o0<&N*%1aef?3m*DX#rL8LxcnZgzV4k}Oj@G)CHylI6sS?#fHMp#t
zs&cdSo;Z2`<o=WYj{smZybF!y5FI@Ag3w&kn0o7>Vi{A#;(zbRLFVw;H~?`)AG^@5
zI;uSn&FBmhqOf8$3{uw4vLuAhGD6RvyFH0M2^F~GwV>&2;SNRbK~(Rfsa<>KZ0%vR
zeWvKjX}HP?yrvMbB*t8gGV;9B9&w1E?-(-#F<em0CQfUA#tL~a1g~B==x@&?g0*ZN
zr&y1aPiaxmmqfwx%5yfE=K|+VF$60rI9{R;vGOPz&B2AgBn|+ZYYGUA86wCmy~&zO
zZAFDb$<RU#4)UTy5x~_&#+VR2Da}BFl%qjFzz~Kj5jq^uW&_t<5*LI>DI0j#Lc>%h
zEtrmwcNbaVHMwp~q<Riq5JyS|Z(n!?i|w2)!Y~KIWNTA)sl!D)2QC$!gNRUmyw*~(
z5?VVLEUSDCRvXvhBA){n8ju7+6!<ksF(#s{C<y{Z9<$dSE*F&>SZXU-Ff5u7jh4!0
z#<hpiVjd6sv2o8q4{0c{hP4oI{!@WFni3F6tauY#=w;YGi~N*SC7cnMX-=uMXe}Z=
zSpwLG!E<YIQR=c|BV{BfQfU(yLy*D17R;-VVNBupwm6_IczGOd9#`yH<XIVycqa&}
zZML2%;e%!_NEIFPTC}bU98s?6FMFELk{IbvuS!uNBvl|Z(nbmx4cd{GvMn4QFxT`K
zAm9W)xzXym%}(W%B3w@BawDO`z!PvHB6q53)B=_T2zconZaRmb&f%ZK^Th`U!A0lr
z(K(!Sgx~m}92|Lw7d|Kl&;0<>$9W;eWH_O!cpoq(5#A2@?503^P$QczU-x40_1Yo6
z08NEesZ?W~FSf)2^C^-vq9LxM52{n3<isxG2$wkGC60iJTY?I(h?%&hK~aN_Ep%$9
zBW#2H5tvKHs^mpz*mYy8^bF3AFA{Ws)vqn)=7nM(yzz*nH97vEzK#*PHX!bbp)zk{
z6O_{YfJb#t-vJ6?GWUcv0Rki_f|u8`Vv>(sW&;7>I%Ni3#9}R>WRYt%)H4C@6cloQ
zmpz2j0(ZU$>Aj5Ad4T{ofeQm{wX>zk=!s@thXQ-HYC3j-PLf6Oc<%As(|2>hPFGtz
z;$mg0SAu1DuGI$zMGWUQh2+~#%O9)L@CSAFsxlbZ94rq!A*!i5S+25*rR}u(!8(m*
zBSY}WS%GI$!0QH{pRcYYBX}#olv4STI$dA`CA<miG(sXc7I3A|x(qcI*izMMtsjiN
zp^=M)W94b$JcHFWcd;lKB_FLYsqOR+rpSB%BP+PETm=RXNBCm2W(tBGvQ%v}A(%Ty
zuLY$^&)93h%(1<m$xb<rs7^?u;GzqQNG=91Qy>K{g^OLs{SVi1qj|JE+gzC@!KNf6
zV*Q+&lr|GxHl6)&9cNrB;}Exd3yW1<tSlAbDztepG1ji*{D<p!RtUQ*tDz<yi>;<0
zCezk{(+fj*+$y$aK2T6J`dzxAhBFAV(uQ%SZOS_N;FYf$F=&P&@8`9ePTKFdqX><%
zb3P-G;L^oxiqyb7W#}&k%k@Uk<l1yL%oeD3&z#Ox1d~gQw(>x~gf}7CW~vBv`dK(X
z@q{F;_9-sF7zQVtDlirvl=hh`g!L@|RHYfbeSm6+(I}CVE>>8dwW$SCX*et`e2vrs
zGWgJ6_>&E!Jpfa)CP)b9QuSI|FRL@zz*__Cs9XyW)rhvVR_hSJ8g*8|C0e3TZS)*e
z@&T@{$QG(2(bR=7v~mm(Froq@I+wZ<q*2_ScC3m?+nkK9B2{L5V8+17iZQtuLo=2F
ztn<`{VABwom3B%E#!hF+L<}leEsB$_ZAhW60x(6S0SrkHK`yi?B+VMq0ymUHn?gPg
z5y>oCHeM9sTorstH2J9!HA!J<IbVYaEvC~=)=*F;leqc9h#^KV&VmFGrBY>00dz5e
zB`{<vrW*>)E>EE<bdDxDaz}-&q9nu~szk`I#Q=5`vKL1rLXMy!BSa7ever;^f&eI6
zWe9K=fC%cSXBZl|Vb&Rm5lT{W9=)(pW~g~DGV3W~E<ZFSCM8W00vr;xF~z9LD}zz>
z23*2B9`To_NI)EB1IIwH!ZP$ebRCx#eteO>_RM<up%E&2Xj$fHEpSX3+E&o4FSL1O
z(#j4IettxzZcc%D=M_Am3WEeQn%HB>=PaT5IM*F67tnEY6C}#IY{4tiR4GJ;yM>rC
z!&DcJ=(@wjJO?f{!A1woQuf7Rv?2pRvJ2AcqAl;l2fm1))cGY;?Gz_(;B*IYjZscp
zNKk}~lm6uz&YCkFPU<;vawOEX6yTI&^~oYIk|Gq(Sai^R9ZnZeyfYK9FGcsl4GNq?
z@g@V0iTPjv89tVR!|ANdG_N4w6AKD@$mbnTy$CqL!qED7bFeWDby74r1@LcmrTqv>
zaSNTof>FMi+Y*k}iUA17B|tCX=ovanL5w5!8EwKbhhvEk%E2)gaLk1zL{ZM7931&&
zgbyHTjEAohGko<@5GrQp9WzODS}07>R6D2j&GD3pS4105s7&TFQNRm^_E6Tmns#<l
zGFs<O3*AxOyIq74nj$j52M8fb5)?ThN`ixg59>O#)QMfhkF;u$OWJLsJi?1gsm25~
zt`zf<mL~cZWAW0kb}4eo5Gq+|b-PDQjkpL(wkRSy1)gwP@S&|19v_E~#Rr4Qs7DGP
z`GR^RY~l(UFKDSlF(uimnXypM#@S+d(<9g}DZaO!)#OS^2&`O8lBT1x6%H}1f=sAj
zY}+&a9ri5wh)Rf9l#?|Fu5`@^8jFYp11W4{yd;9@rfY!V#iM&CDZn4~P68iTEPPrU
zBsqOhmIEFKJen=o(`(6(>h+8#Aq)cNz^ci~G3#tBqU7qej=93?YCDd|_DAcuOp$W+
zywLPpfWDNp7)UB-Ehm?^>o{*BXi1ozfdJ%Lj0r&7)tZe{^c}Ft(;)PR#1Lo;{XvM2
z5B=7SM{*Iuz%VN~5FQaT%w14X2U#?avcQV)>N>)(S4S8p0$?jH!7RoYE5Ig7lz_<5
zh*&!vK~Cf=BMgg5^I)Cyk#m)WtFCgy(HdSTD_w#?l861u2$Nie1D>q39L_+q+k#gQ
z8B)>cz)~kl@`qEdu_kR(G299543FMgmO=?kA?zusbRGWz&8Zi_(U_o|gO68DNS<-2
z6K}E@y6d?9;X2N1R31@o&B|C4MB<3RLaC}|hoDq+9XCH*$Cb{&FB``ZyKwxFw3i6c
zer8rz)0@llD7}}|aYV+6CI@4znIRmAi0o-&S*}q>#$?xV_rrC(mKuU>_W>cWE3|x#
z!+D0z^E%1ibM!x4$05e7sKS|-x+-2G*W4y!RiJsySlf>4A1_vbQloWSiAR>ShGYv9
zjY_uE#H+HMR@Ysu&_I424vtqzz|JKRJfbH-n{BlABE$f+Z0NMU{_z}~q@}4m)5fqE
zd{PM(U&T@(AUa0gcl^h5Z~}LZ)^4&8ymyTD5|vmhLLv+GSDICR($VHi+KmGCqz-&n
zsUTyb$_l)U(3e+}YL1Cjt{q%gQ*^UTR|4XuhX#-}erwkW-qS|g%ygJ`dTZOrdp}Dt
zly}i&wGYer;|Nk{X-U+QXHG}=B(A-&MW)Poq5VoNLEP&hNQhNhQ%ecXGcZSp68?S^
zXaPcyJ9A*<#V9gk8qP(L$LG@uH}HUIPBO_rn;#JZYH0-mK_J%o!A89<q6BM;W;GY<
zym4MuSjdz$o!0_O(Q}G^RYdVoDM*gvL4^wA#;i*W3Px2P7#yvRDCSiWCE~HyCDOS`
z%v({E5y?d9;Ag<+Y^{!cMOMctX1$j%FxG%IBDd8C6PWfvT9sO>V_%Wgfg%lX_uzmb
zwoJh}6A_j~hZdNF-D$-JU|*Bi7>I_l%Hpl4Qb%S*23539${5$Doh*M{M2XQCL1~%l
z0u)PCnlb5}Pp$}Edro;>3bq6~&X02|WJK6b%M4t0N-D*q<Fd0l7QM6dSG+3XM48~w
zdd-8k)`YA~GF%5;YzU^XZU)DyS4kW$5E2?z1IdndvW6_kxs^#M6HGTnZtbfgiq(ZF
z4KLOh>p_W-tVdudEN6-(C)zx~<s91=XP!NCbS#6{nn`$UrJA6ah`OLl$%ot$<Z|K9
zizA3BwHn$v1yH%dr8P>!!_869>0P#6WG&t6@>hb2*+N=G2ueGaQz#W~O3jiEQ?sfg
z%Ior1vVqJP<wRld-IU@8l)Yym>zqx>oq~0*%j&RL5CQ2NJx_^&J8VcoNKvYw9a_Ek
zysjjZO{FTKlM5nQUQ`U0cHkvje9<vCyA%~6<T?JD?=bt!l<^f3z`*{#NM%d(7K~uM
zO~J>;t}0+lJ(R#eIy(8>{rKj@TB%vV;G3dF<~~GSy@_-Ry%Jfs4hMSj>IfsO^s>Mo
z6W~^#6SSsr)`*0_rrO$RPwMi8Df1E)2EsgA!y6sE5gB5xCi{R;#}-6@baG=$9P=uP
zlY9z@Xfpg(6N;uS7>*`3WZ==jb={rTrdh{VNTe*K7N8V7`&2cLbcK7cT>4a1f{E@p
zNWX3(WfmB(N#syu$qB|dgygCb4(>^jyGvtVDUpmUj5}LxG&ba_GA%S$l@=1jtbCWN
zBy3+ZkysT4%mcAY2AV0yn1v258%tMTbZI(oUnOzCBu+#g7^VDElJI=EbHO^s@vWa@
zMNeKMaUz0&Xa$4X5iUpJE3MD7w!jObL)cr-`4u{dnTwje*K`g*GEP`Jl8kgtRuV$h
zg%p=(niofys1&b((c#E2=SC>H0mj5;0=AmeDr7~wC10U9d8k`0b<NC2CbKRzSh}zS
zzm?YAHXy}br<GzX=AZ<ttR&$Jyy)tLri~rNWz{R<Zu6L8uQT>?bleKljsY9W?0J>w
zCXB>Hbk6F!vytqz5=p59vdCb3O+m*bxH17PRY&L72e;!nzg8kuD>(#>Za$#9c69O4
zsU%X(&YBYQ&IYsBN+eT+R&aNif<X(G*5P@js`ds{6UBE5`*o%|LZxd=Vx?R<=)+Cc
z#?U@j-5iV5o%+V~tL7lu!2<IxXvQvbo>WLNBOc3i&8A?sBa(X6L^9gJQM8aWNw+u9
zz8A*eN1N(W5WaUBUuS^I>FQ2xYEl&hGMpC+hT_@VNP%h_YS0#i*A{9hLpNcnW~&&Y
zc2!H|zC<{Xvgqh@OBnU~2$K<#R~c$h)+ozrNk&yyt5nA1q;z*2=jA87UZOZji9p>+
z_<}H3Jd_-mNQ{-B68z?FS(f6jGeE7mdZBB~i8k2l%3-%u4YFz{OLKQ$L!8%XrC^C%
zlrF|hXHvVEsx-PdZWvH7xijVbbw=++gj(q`InIryD^h5su=Xh@I@X&m{DzWJ++S7r
z&(?USRf-%QwT8=Bxrr6sb9CZIQ&7-loB|(Cw+n@AOaz?~zWEgBsIzJvlL_#WXe$5<
zB`iJ$ANsDg*SyoQm`)q77%$90BPN-%)o|{W2y~W40|8xC=&O>{yvN5aLp0G~++9g2
zvLfKtF>pl8UMA=hn4u0LU2rasgIK{FL9oK9b3D5wEcZ@@z=8;zs}7<*9-^0&@7LME
z04R~8Yp>Tco(m>q?jZsKctuHbJY?or@gg`bM3Hc4lkwR*+Ok-4F{vBE?y4=-T(?EP
z+pD$|eMeY%a;v!tDQL=qPQH-v6oc}DMUgB9Vl#@(z4Coa>hZ17F~rUnh%cSOA2S_(
zs{)-j7(I-I?pi}_x;pkLEfvEof&vaH$W<d=s&s3M2~t%bO6*#qJ8J22c)BBAJ%NfL
zrxK%<(Sm<dhK@+uOKW0Lj#<@FQS<Y)NK=>63ReXzOZA4XRm#c;^jHV*PsfL6Znb7F
zh&7Zfq8JnCVsB{`bT!>J$~vu~#d%r-|7+So!x`f&Gn>ID89^~E^%j|R`asJwjbV&D
zi@?C-#TQ1GYNu39p?kI%SDpN6)YPb{)p=UAo@rP<<0J!{Lh``1)mq1+tIXBh>0yka
z{q9?BE|r9-2#hY0$~;keOoZfu)WRs!waU)iD!J*<FQO)9XoHr}u+>m>CYS7LXj_Gq
zZd$cy)$ZXagbvCQUFddeKgGh(2jvXl8Nf4uXHdqVo<TiBJcP1vS`eFGDQ2Q`oYV4a
zcs+FUG$PZSr3(gTt5Y1-eiP(sgi%k*DLV35@>sKlj-zvtWb&qVIuw4+w?GcsAo~F8
z&XtN4o(QX<crPh=9}@Q+a{ikjR}x*iu3WZ-PU>#h9rh<HUL^*bZG9sr&LGW9C&oRD
zYYKG309*(YoD(U=Dt+kmqyx$nyPpCX(!#Qcp00JI15bsoNfk7v;7mEu`JZrF6}(pE
o%pP5CLM=inGFZM?Ntvm{65vKrH1BxH`Qr=ze}#Zuvq@$F0HYUyiU0rr

diff --git a/creusot/tests/should_succeed/match_int.mlcfg b/creusot/tests/should_succeed/match_int.mlcfg
index 3d46f62b6b..ed99f9c1a2 100644
--- a/creusot/tests/should_succeed/match_int.mlcfg
+++ b/creusot/tests/should_succeed/match_int.mlcfg
@@ -15,41 +15,41 @@ module MatchInt_F
     [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] (1 : int32));
     [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] (0 : int32)) <= _1;
     switch (_2)
-      | False -> goto BB3
-      | True -> goto BB1
+      | False -> goto BB2
+      | True -> goto BB6
       end
   }
   BB1 {
-    [#"../match_int.rs" 9 8 9 13] _3 <- _1 < ([#"../match_int.rs" 9 8 9 13] (10 : int32));
-    switch (_3)
-      | False -> goto BB3
-      | True -> goto BB2
-      end
-  }
-  BB2 {
     goto BB7
   }
-  BB3 {
+  BB2 {
     switch (_1 = 5)
-      | True -> goto BB4
+      | True -> goto BB3
       | False -> switch (_1 = 6)
-        | True -> goto BB5
+        | True -> goto BB4
         | False -> goto BB19
         end
       end
   }
-  BB4 {
+  BB3 {
     goto BB10
   }
-  BB5 {
+  BB4 {
     goto BB10
   }
-  BB6 {
+  BB5 {
     switch ([#"../match_int.rs" 16 20 16 25] false)
       | False -> goto BB13
       | True -> goto BB14
       end
   }
+  BB6 {
+    [#"../match_int.rs" 9 8 9 13] _3 <- _1 < ([#"../match_int.rs" 9 8 9 13] (10 : int32));
+    switch (_3)
+      | False -> goto BB2
+      | True -> goto BB1
+      end
+  }
   BB7 {
     switch ([#"../match_int.rs" 10 20 10 24] true)
       | False -> goto BB8
@@ -90,13 +90,13 @@ module MatchInt_F
     return _0
   }
   BB17 {
-    goto BB4
+    goto BB3
   }
   BB18 {
-    goto BB5
+    goto BB4
   }
   BB19 {
-    goto BB6
+    goto BB5
   }
   
 end
diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg
index 3d262290c6..8d28e040a5 100644
--- a/creusot/tests/should_succeed/red_black_tree.mlcfg
+++ b/creusot/tests/should_succeed/red_black_tree.mlcfg
@@ -41,6 +41,9 @@ module RedBlackTree_Impl16_Clone
   BB5 {
     return _0
   }
+  BB6 {
+    goto BB2
+  }
   
 end
 module Core_Option_Option_Type
@@ -5639,6 +5642,12 @@ module RedBlackTree_Impl15_InsertRec
   BB34 {
     return _0
   }
+  BB51 {
+    goto BB7
+  }
+  BB52 {
+    goto BB8
+  }
   
 end
 module RedBlackTree_Impl15_Insert
@@ -11636,6 +11645,12 @@ module RedBlackTree_Impl15_Get
   BB15 {
     return _0
   }
+  BB17 {
+    goto BB8
+  }
+  BB18 {
+    goto BB9
+  }
   
 end
 module RedBlackTree_Impl15_GetMut
@@ -12294,6 +12309,12 @@ module RedBlackTree_Impl15_GetMut
     assume { resolve3 tree };
     return _0
   }
+  BB18 {
+    goto BB9
+  }
+  BB19 {
+    goto BB10
+  }
   
 end
 module RedBlackTree_Impl16
diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
index 5e8120e810..c3181a6861 100644
--- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg
+++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg
@@ -48,12 +48,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -695,6 +701,8 @@ module SelectionSortGeneric_SelectionSort
     goto BB12
   }
   BB11 {
+    assert { [@expl:type invariant] inv6 v };
+    assume { resolve4 v };
     assert { [#"../selection_sort_generic.rs" 35 4 35 43] false };
     absurd
   }
@@ -761,62 +769,68 @@ module SelectionSortGeneric_SelectionSort
     assume { inv3 ( ^ _66) };
     [#"../selection_sort_generic.rs" 48 8 48 22] _65 <- ([#"../selection_sort_generic.rs" 48 8 48 22] deref_mut0 _66);
     _66 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global));
-    goto BB31
+    goto BB32
   }
   BB22 {
-    goto BB23
+    goto BB24
   }
   BB23 {
+    assert { [@expl:type invariant] inv6 v };
+    assume { resolve4 v };
+    assert { [#"../selection_sort_generic.rs" 41 8 41 121] false };
+    absurd
+  }
+  BB24 {
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _44;
     [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
-    goto BB24
+    goto BB25
   }
-  BB24 {
+  BB25 {
     [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- _49;
     _49 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1;
     [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ( * v) j);
-    goto BB25
+    goto BB26
   }
-  BB25 {
+  BB26 {
     assert { [@expl:type invariant] inv2 _54 };
     assume { resolve2 _54 };
     [#"../selection_sort_generic.rs" 44 23 44 28] _58 <- ([#"../selection_sort_generic.rs" 44 23 44 28] index0 ( * v) min);
-    goto BB26
+    goto BB27
   }
-  BB26 {
+  BB27 {
     assert { [@expl:type invariant] inv2 _58 };
     assume { resolve2 _58 };
     [#"../selection_sort_generic.rs" 44 15 44 28] _52 <- ([#"../selection_sort_generic.rs" 44 15 44 28] lt0 _54 _58);
-    goto BB27
+    goto BB28
   }
-  BB27 {
+  BB28 {
     switch (_52)
-      | False -> goto BB29
-      | True -> goto BB28
+      | False -> goto BB30
+      | True -> goto BB29
       end
   }
-  BB28 {
+  BB29 {
     [#"../selection_sort_generic.rs" 45 16 45 23] min <- j;
     [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] ());
-    goto BB30
+    goto BB31
   }
-  BB29 {
+  BB30 {
     [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] ());
-    goto BB30
+    goto BB31
   }
-  BB30 {
+  BB31 {
     goto BB18
   }
-  BB31 {
+  BB32 {
     [#"../selection_sort_generic.rs" 48 8 48 9] _64 <- Borrow.borrow_final ( * _65) (Borrow.get_id _65);
     [#"../selection_sort_generic.rs" 48 8 48 9] _65 <- { _65 with current = ( ^ _64) ; };
     assume { inv4 ( ^ _64) };
     [#"../selection_sort_generic.rs" 48 8 48 22] _63 <- ([#"../selection_sort_generic.rs" 48 8 48 22] swap0 _64 i min);
     _64 <- any borrowed (slice t);
-    goto BB32
+    goto BB33
   }
-  BB32 {
+  BB33 {
     assert { [@expl:type invariant] inv5 _65 };
     assume { resolve3 _65 };
     assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v)
@@ -824,15 +838,5 @@ module SelectionSortGeneric_SelectionSort
     [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] ());
     goto BB6
   }
-  BB34 {
-    assert { [@expl:type invariant] inv6 v };
-    assume { resolve4 v };
-    goto BB11
-  }
-  BB35 {
-    assert { [@expl:type invariant] inv6 v };
-    assume { resolve4 v };
-    goto BB11
-  }
   
 end
diff --git a/creusot/tests/should_succeed/selection_sort_generic/why3session.xml b/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
index 6fb20cc0a2..28c6265065 100644
--- a/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
+++ b/creusot/tests/should_succeed/selection_sort_generic/why3session.xml
@@ -81,7 +81,7 @@
   <proof prover="4"><result status="valid" time="0.033361" steps="140"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.177677" steps="1199"/></proof>
+  <proof prover="4"><result status="valid" time="0.177677" steps="1202"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.24" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.101040" steps="712"/></proof>
@@ -102,7 +102,7 @@
     <goal name="selection_sort&#39;vc.27.0.1" expl="assertion" proved="true">
     <transf name="remove" proved="true" arg1="one,(-),(&gt;),(&gt;=),uint64&#39;maxInt,uint64&#39;minInt,max_uint64,length1,singleton,cons,snoc,(++),mem,iseq,occ,occ_all,permut,mAX&#39;,is_inhabited,sorted_range,sorted,permutation_of,shallow_model,Mul_distr_r,Comm,Unitary,NonTrivialRing,Total,CompatOrderAdd,CompatOrderMult,Mod_inf,Div_mult,Mod_mult,Numof_append,Numof_left_no_add,Numof_left_add,Empty,Full,numof_increasing,numof_strictly_increasing,numof_change_any,numof_change_some,numof_change_equiv,length_nonnegative,([&lt;-])&#39;def,singleton&#39;spec,cons&#39;spec,snoc&#39;spec,mem_append,occ_cons,occ_tail,append_num_occ,exchange_set,permut_sym,permut_trans,permut_exists,new&#39;spec,produces_trans_spec,produces_refl_spec,is_inhabited_spec">
      <goal name="selection_sort&#39;vc.27.0.1.0" expl="assertion" proved="true">
-     <proof prover="0" timelimit="5"><result status="valid" time="0.092697" steps="471797"/></proof>
+     <proof prover="0" timelimit="5"><result status="valid" time="0.092697" steps="472905"/></proof>
      </goal>
     </transf>
     </goal>
@@ -111,27 +111,27 @@
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.119854" steps="250051"/></proof>
+  <proof prover="0"><result status="valid" time="0.119854" steps="250038"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.415124" steps="38765"/></proof>
+  <proof prover="2"><result status="valid" time="0.158825" steps="38947"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.040000" steps="659"/></proof>
+  <proof prover="4"><result status="valid" time="0.040000" steps="662"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.31" expl="loop invariant preservation" proved="true">
   <transf name="instantiate" proved="true" arg1="deep_model1_spec" arg2="( * v)">
    <goal name="selection_sort&#39;vc.31.0" expl="loop invariant preservation" proved="true">
    <transf name="assert" proved="true" arg1="(forall x, y. le_log0 x y = True &lt;-&gt; not cmp_log0 x y = C_Greater)">
     <goal name="selection_sort&#39;vc.31.0.0" expl="asserted formula" proved="true">
-    <proof prover="4"><result status="valid" time="0.100609" steps="1390"/></proof>
+    <proof prover="4"><result status="valid" time="0.100609" steps="1400"/></proof>
     </goal>
     <goal name="selection_sort&#39;vc.31.0.1" expl="loop invariant preservation" proved="true">
     <transf name="inline_goal" proved="true" >
      <goal name="selection_sort&#39;vc.31.0.1.0" expl="loop invariant preservation" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="selection_sort&#39;vc.31.0.1.0.0" expl="loop invariant preservation" proved="true">
-      <proof prover="1" timelimit="1"><result status="valid" time="1.021066" steps="330563"/></proof>
+      <proof prover="1" timelimit="1"><result status="valid" time="1.021066" steps="330847"/></proof>
       </goal>
      </transf>
      </goal>
@@ -142,10 +142,10 @@
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.32" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.083692" steps="1027"/></proof>
+  <proof prover="4"><result status="valid" time="0.083692" steps="1029"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.33" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.152739" steps="1234"/></proof>
+  <proof prover="4"><result status="valid" time="0.152739" steps="1235"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.34" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.031688" steps="152"/></proof>
@@ -157,7 +157,7 @@
   <proof prover="4"><result status="valid" time="0.044225" steps="122"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.37" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.077391" steps="568"/></proof>
+  <proof prover="4"><result status="valid" time="0.077391" steps="563"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.38" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.118334" steps="156"/></proof>
@@ -178,17 +178,17 @@
   <proof prover="0"><result status="valid" time="0.125893" steps="238792"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.44" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.313757" steps="37707"/></proof>
+  <proof prover="2"><result status="valid" time="0.148744" steps="37889"/></proof>
   </goal>
   <goal name="selection_sort&#39;vc.45" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="selection_sort&#39;vc.45.0" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.637192" steps="122994"/></proof>
+   <proof prover="1"><result status="valid" time="0.637192" steps="123069"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="selection_sort&#39;vc.46" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.255950" steps="43423"/></proof>
+  <proof prover="2"><result status="valid" time="0.255950" steps="43605"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/selection_sort_generic/why3shapes.gz b/creusot/tests/should_succeed/selection_sort_generic/why3shapes.gz
index d22afe8c60b5af75d640fa439ef4c3fbb244d421..17febaf113a1ac21d256509b8a5c43b75c5d1bcf 100644
GIT binary patch
literal 4100
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
Ck~9hc

literal 4088
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

diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg
index 94dbf46f1b..7336c113a8 100644
--- a/creusot/tests/should_succeed/sparse_array.mlcfg
+++ b/creusot/tests/should_succeed/sparse_array.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/sparse_array/why3session.xml b/creusot/tests/should_succeed/sparse_array/why3session.xml
index 387e1df8d9..3f75890758 100644
--- a/creusot/tests/should_succeed/sparse_array/why3session.xml
+++ b/creusot/tests/should_succeed/sparse_array/why3session.xml
@@ -9,7 +9,7 @@
 <path name=".."/><path name="sparse_array.mlcfg"/>
 <theory name="SparseArray_Impl2_Get" proved="true">
  <goal name="get&#39;vc" expl="VC for get" proved="true">
- <proof prover="3"><result status="valid" time="0.119879" steps="24111"/></proof>
+ <proof prover="3"><result status="valid" time="0.119879" steps="24325"/></proof>
  </goal>
 </theory>
 <theory name="SparseArray_Impl2_LemmaPermutation_Impl" proved="true">
@@ -22,21 +22,21 @@
     <goal name="vc_lemma_permutation.0.0.0" proved="true">
     <transf name="assert" proved="true" arg1="(surjective f (sparse_n self))">
      <goal name="vc_lemma_permutation.0.0.0.0" expl="asserted formula" proved="true">
-     <proof prover="0"><result status="valid" time="0.054183" steps="219953"/></proof>
+     <proof prover="0"><result status="valid" time="0.054183" steps="245973"/></proof>
      </goal>
      <goal name="vc_lemma_permutation.0.0.0.1" proved="true">
      <transf name="assert" proved="true" arg1="(exists k. 0 &lt;= k &lt; sparse_n self /\ (f k) = i)">
       <goal name="vc_lemma_permutation.0.0.0.1.0" expl="asserted formula" proved="true">
       <transf name="unfold" proved="true" arg1="surjective" arg2="in" arg3="h1">
        <goal name="vc_lemma_permutation.0.0.0.1.0.0" expl="asserted formula" proved="true">
-       <proof prover="4"><result status="valid" time="0.142095" steps="2172"/></proof>
+       <proof prover="4"><result status="valid" time="0.142095" steps="2155"/></proof>
        </goal>
       </transf>
       </goal>
       <goal name="vc_lemma_permutation.0.0.0.1.1" proved="true">
-      <proof prover="0"><result status="valid" time="0.066092" steps="279713"/></proof>
-      <proof prover="3"><result status="valid" time="0.107415" steps="12275"/></proof>
-      <proof prover="4"><result status="valid" time="0.030666" steps="303"/></proof>
+      <proof prover="0"><result status="valid" time="0.066092" steps="279710"/></proof>
+      <proof prover="3"><result status="valid" time="0.107415" steps="12473"/></proof>
+      <proof prover="4"><result status="valid" time="0.030666" steps="304"/></proof>
       </goal>
      </transf>
      </goal>
@@ -53,103 +53,103 @@
  <goal name="set&#39;vc" expl="VC for set" proved="true">
  <transf name="split_vc" proved="true" >
   <goal name="set&#39;vc.0" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.060684" steps="17282"/></proof>
+  <proof prover="3"><result status="valid" time="0.060684" steps="17464"/></proof>
   </goal>
   <goal name="set&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.039946" steps="15115"/></proof>
+  <proof prover="3"><result status="valid" time="0.039946" steps="15297"/></proof>
   </goal>
   <goal name="set&#39;vc.2" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.050465" steps="15120"/></proof>
+  <proof prover="3"><result status="valid" time="0.050465" steps="15302"/></proof>
   <proof prover="4"><result status="valid" time="0.015922" steps="37"/></proof>
   </goal>
   <goal name="set&#39;vc.3" expl="type invariant" proved="true">
   <proof prover="3"><result status="valid" time="0.098301" steps="14388"/></proof>
   </goal>
   <goal name="set&#39;vc.4" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.030498" steps="116716"/></proof>
-  <proof prover="3"><result status="valid" time="0.126567" steps="15762"/></proof>
+  <proof prover="0"><result status="valid" time="0.030498" steps="116727"/></proof>
+  <proof prover="3"><result status="valid" time="0.126567" steps="15944"/></proof>
   </goal>
   <goal name="set&#39;vc.5" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.140696" steps="21248"/></proof>
+  <proof prover="3"><result status="valid" time="0.140696" steps="21430"/></proof>
   <proof prover="4"><result status="valid" time="0.034954" steps="277"/></proof>
   </goal>
   <goal name="set&#39;vc.6" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.142968" steps="18552"/></proof>
+  <proof prover="3"><result status="valid" time="0.142968" steps="18734"/></proof>
   <proof prover="4"><result status="valid" time="0.015282" steps="54"/></proof>
   </goal>
   <goal name="set&#39;vc.7" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.109818" steps="18553"/></proof>
+  <proof prover="3"><result status="valid" time="0.109818" steps="18735"/></proof>
   <proof prover="4"><result status="valid" time="0.021630" steps="55"/></proof>
   </goal>
   <goal name="set&#39;vc.8" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.038147" steps="359"/></proof>
   </goal>
   <goal name="set&#39;vc.9" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.109230" steps="19135"/></proof>
+  <proof prover="3"><result status="valid" time="0.109230" steps="19317"/></proof>
   <proof prover="4"><result status="valid" time="0.016175" steps="65"/></proof>
   </goal>
   <goal name="set&#39;vc.10" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.108040" steps="19141"/></proof>
+  <proof prover="3"><result status="valid" time="0.108040" steps="19323"/></proof>
   <proof prover="4"><result status="valid" time="0.016050" steps="66"/></proof>
   </goal>
   <goal name="set&#39;vc.11" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.151516" steps="698756"/></proof>
+  <proof prover="0"><result status="valid" time="0.151516" steps="698760"/></proof>
   </goal>
   <goal name="set&#39;vc.12" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.224840" steps="27373"/></proof>
+  <proof prover="3"><result status="valid" time="0.224840" steps="27555"/></proof>
   </goal>
   <goal name="set&#39;vc.13" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.041721" steps="180027"/></proof>
-  <proof prover="3"><result status="valid" time="0.186530" steps="22948"/></proof>
+  <proof prover="0"><result status="valid" time="0.041721" steps="180034"/></proof>
+  <proof prover="3"><result status="valid" time="0.186530" steps="23130"/></proof>
   </goal>
   <goal name="set&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.048217" steps="19914"/></proof>
+  <proof prover="3"><result status="valid" time="0.048217" steps="20096"/></proof>
   <proof prover="4"><result status="valid" time="0.026925" steps="69"/></proof>
   </goal>
   <goal name="set&#39;vc.15" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.036540" steps="19919"/></proof>
+  <proof prover="3"><result status="valid" time="0.036540" steps="20101"/></proof>
   </goal>
   <goal name="set&#39;vc.16" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.041598" steps="186243"/></proof>
-  <proof prover="3"><result status="valid" time="0.198549" steps="24450"/></proof>
+  <proof prover="0"><result status="valid" time="0.041598" steps="186244"/></proof>
+  <proof prover="3"><result status="valid" time="0.198549" steps="24632"/></proof>
   </goal>
   <goal name="set&#39;vc.17" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.093846" steps="20489"/></proof>
+  <proof prover="3"><result status="valid" time="0.093846" steps="20671"/></proof>
   <proof prover="4"><result status="valid" time="0.028049" steps="134"/></proof>
   </goal>
   <goal name="set&#39;vc.18" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.039638" steps="174100"/></proof>
-  <proof prover="3"><result status="valid" time="0.160266" steps="20504"/></proof>
+  <proof prover="0"><result status="valid" time="0.039638" steps="174104"/></proof>
+  <proof prover="3"><result status="valid" time="0.160266" steps="20686"/></proof>
   </goal>
   <goal name="set&#39;vc.19" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.239162" steps="29063"/></proof>
+  <proof prover="3"><result status="valid" time="0.114869" steps="29245"/></proof>
   <proof prover="4"><result status="valid" time="0.042526" steps="321"/></proof>
   </goal>
   <goal name="set&#39;vc.20" expl="type invariant" proved="true">
-  <proof prover="0"><result status="valid" time="0.333334" steps="1022200"/></proof>
+  <proof prover="0"><result status="valid" time="0.333334" steps="1022543"/></proof>
   </goal>
   <goal name="set&#39;vc.21" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.259022" steps="36407"/></proof>
+  <proof prover="3"><result status="valid" time="0.121540" steps="36589"/></proof>
   </goal>
   <goal name="set&#39;vc.22" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="set&#39;vc.22.0" expl="postcondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.307527" steps="36151"/></proof>
+   <proof prover="3"><result status="valid" time="0.157569" steps="36337"/></proof>
    </goal>
    <goal name="set&#39;vc.22.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.702967" steps="2111549"/></proof>
+   <proof prover="0"><result status="valid" time="0.702967" steps="2554551"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="set&#39;vc.23" expl="postcondition" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="set&#39;vc.23.0" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.048344" steps="471100"/></proof>
-   <proof prover="3"><result status="valid" time="0.206222" steps="24510"/></proof>
+   <proof prover="0"><result status="valid" time="0.048344" steps="471014"/></proof>
+   <proof prover="3"><result status="valid" time="0.206222" steps="24525"/></proof>
    </goal>
    <goal name="set&#39;vc.23.1" expl="postcondition" proved="true">
-   <proof prover="0"><result status="valid" time="0.146411" steps="547616"/></proof>
-   <proof prover="3"><result status="valid" time="0.288166" steps="36336"/></proof>
+   <proof prover="0"><result status="valid" time="0.146411" steps="547626"/></proof>
+   <proof prover="3"><result status="valid" time="0.155241" steps="36518"/></proof>
    </goal>
   </transf>
   </goal>
@@ -158,12 +158,12 @@
 </theory>
 <theory name="SparseArray_Create" proved="true">
  <goal name="create&#39;vc" expl="VC for create" proved="true">
- <proof prover="4"><result status="valid" time="0.040253" steps="504"/></proof>
+ <proof prover="4"><result status="valid" time="0.040253" steps="503"/></proof>
  </goal>
 </theory>
 <theory name="SparseArray_F" proved="true">
  <goal name="f&#39;vc" expl="VC for f" proved="true">
- <proof prover="0"><result status="valid" time="0.115563" steps="403605"/></proof>
+ <proof prover="0"><result status="valid" time="0.115563" steps="391441"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/sparse_array/why3shapes.gz b/creusot/tests/should_succeed/sparse_array/why3shapes.gz
index a5748f4f32c22dfe4245e91cfd77a5a2ba94de8d..dcd64fa10fddecd862fa8a571a207b3920ec6b29 100644
GIT binary patch
literal 4250
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

literal 4244
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

diff --git a/creusot/tests/should_succeed/std_types.rs b/creusot/tests/should_succeed/std_types.rs
index 2aed557a1a..1ec28c7987 100644
--- a/creusot/tests/should_succeed/std_types.rs
+++ b/creusot/tests/should_succeed/std_types.rs
@@ -1,5 +1,5 @@
 extern crate creusot_contracts;
 
-pub struct MyType(Option<u32>);
+pub struct MyType(pub Option<u32>);
 
 pub fn x(_x: MyType) {}
diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
index a10fd8fb62..1545d7e34b 100644
--- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
+++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg
@@ -193,12 +193,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
index aa3ee02811..303988615d 100644
--- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
+++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg
@@ -42,12 +42,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code/why3shapes.gz b/creusot/tests/should_succeed/syntax/12_ghost_code/why3shapes.gz
index 5a543707039391ec3e2c95e1d528fe648e52be73..ee4613588c1a3adc221aae9cecf2bfde8b1d73c9 100644
GIT binary patch
literal 363
zcmV-x0hIn9iwFP!00000|8-HzZi6roy!$J-wav-K51?ueC=!Buwa22xF#(m}6iCwk
zeT|`&+O!vTcG$<v`hF9P4W7&xT+A@Gwtoy%uz4W31p%^fK?2VTpDvMOZ>|tJJebjT
z7egVO`4HIrA2+~&`bw&4Mqn4zb_foQ9jCG#OKnddWO~E4zX(^iLhhPZ7`oXjWNszF
zr!97-KTHierCn#Q<<ag<M?v6Z%eJ5Ji0?G@6K_h2nRfAOBn6p~U0u{^jTv^Mnecfy
z8(@4^%y_%7o}7tLdsiOJ?#^zX5_j&qQr|~lbg2Wj++oq?vOm>3!!%1*>vQKX<@f>#
zj=j}Cc?OAItcGiJjNj`!ywn8Z^&w)2JQIP+)<dWi|2wC;c`n@;{Yr>V;yvS4C<Tw>
zh*MGRxu{TAJc*1;1C~=F7?(<OY4(+pl<HWBD3&^^Fp^qu6(o6_N4d&nE^?lS<P*WE
J(+7G2004XmtKa|t

literal 362
zcmV-w0hRtAiwFP!00000|8-HxZi6roz56S;wav*Ji>u~<A|bd}b8Ivi6Hp0Gfh6tU
z*BDx<O?&aoJkRpp%>5=98$6jYxR_yVZT}cV!RCSB79@m)Ga-nq@Zn+w_T~!Q`GXm4
zcQF+BjB{Y~KW=~l^_f)DjKD6a?GPLqJ5Kv{+-rOKAk!PR{YARG)fKLIb-C-ky3CCv
z__W2&^oOZI$F%G0b$_&#=_p8??7r<MJmNb|eaD-WVuqdlYDpo?$gVExw8jj((M<R}
zoDDEBGiIV)P!G-k*It!(W_4#bFOqleU7_zKFuLRcTlTPUbJ3sdonV@!tMs|@7jt|8
zg=25^Pn?0$i&VZ^hxoa^!c$d{tcOS-_DBp-wk{${@xOIOH|Nrg(XWJPl~hcWJd`3y
zVnJnD30a~pg^G;}1C~?bj?L#pDkRrsScRH#Wmv^jEs{#9K;=mu=TRQ!G8Z`~pG2|;
I;Ccc80Hx!yPyhe`

diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
index a5ee93ce46..738ef3bc83 100644
--- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
+++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro/why3shapes.gz b/creusot/tests/should_succeed/syntax/13_vec_macro/why3shapes.gz
index 2f1ed159900b8c9a264bb8ae45b679dabf7ad349..a8176c822f5cdcc7a2a1026dc45be1ada958ac2f 100644
GIT binary patch
delta 364
zcmV-y0h9jy0{sGz8h<ELIaHHS_yfLHX-Hcn3R_`afBqaks%?y3632di&vugMRoI@)
zyKBR%yR>CfzlJJYy#(EdDeJ33mW^hFFqsm07MM+HDpw!7lOcktYQA>orf?OYFkQ1N
z>&~3bjcxmc86@{^fnuT*C?}I+G?{>ES%_gg6M`9}7ovTlWPi9`rj(fcrcCGYvcTlO
zrYM#VBTGnNX*LjB>iy!{rn)+R%uPxwg388`fSSn?PW|=}EXuaywM0D!8Im|s^GW3^
z`Q)1zYM^xKRa0|xopDvydIz7o!1BK?W}zot=tfw+eHi`OtLW>b()qpDKD(?7ciUCX
zv9yHZ2y4r7vt^-uybLe0Ni8E!_CSu`;lpUSr&)SC0G2Ir4bgk){@9mJ8Y~+h6g<ji
zmc9+Xg@@)6-hv>KaBwbWiWyL`*e8W3oE3%LLlP^Vga8_tPV`#GTIonjEi~7lS?~=J
Kw3*YN0{{TiO0iS`

delta 364
zcmV-y0h9jy0{sGz8h;2=IaHHS_yf6CUYfQ@6t=>;{`{G*Y8|7O#Ic{>vz_F56*fow
z@J)E}=ccHu*HDG4m!SQ`qPi%{veAqzOs2Fv3viuc>8nF~L?S55`g?n-cfJHGu&uX6
z)#3@SY||&qAbIB&R!o$_%E{z5noO{2S%}$qCImA`FGTx9$$zX~rj$0hr%dPZVrP^8
znxa@fj4UC6rP)C2sQ0sP>hj{dV~#1U7F0Hl1k_BHaO&PeuqfM%*An#{WJuyj@r%k=
z@~LZLsDaXDr<&ryx9H2Z=^T9S0>}Tln1h~lp&Q}&=3(@AucEJ$O6Rv;`|P6H`Rlf<
z4}~KXx1b%%ab->Wcp06@I(3XZ*#kL#gAb$O9nI3)0dQ=IYlz-T?~Z-xq`|WBLBXSJ
z=IGnlw{Tyd!)p*gvJ*@vKGE-}rBYl(do58zj9zP|LjVKJBu1OqC=(fJgy9AZ3w{7R
K+>|Px0{{TM9l#6#

diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
index a8b65f896e..5297e85a2b 100644
--- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
+++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg
@@ -721,12 +721,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/take_first_mut.mlcfg b/creusot/tests/should_succeed/take_first_mut.mlcfg
index c015850993..4933c73c34 100644
--- a/creusot/tests/should_succeed/take_first_mut.mlcfg
+++ b/creusot/tests/should_succeed/take_first_mut.mlcfg
@@ -235,10 +235,10 @@ module TakeFirstMut_TakeFirstMut
     goto BB7
   }
   BB5 {
-    assert { [@expl:type invariant] inv2 _3 };
-    assume { resolve0 _3 };
     assert { [@expl:type invariant] inv3 self_ };
     assume { resolve1 self_ };
+    assert { [@expl:type invariant] inv2 _3 };
+    assume { resolve0 _3 };
     assert { [@expl:type invariant] inv0 _5 };
     assume { resolve2 _5 };
     assert { [#"../take_first_mut.rs" 15 10 15 44] false };
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
index 8a88e4f01e..3a093f00b0 100644
--- a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
+++ b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.rs b/creusot/tests/should_succeed/traits/16_impl_cloning.rs
index d9e0ab5aaa..7161813951 100644
--- a/creusot/tests/should_succeed/traits/16_impl_cloning.rs
+++ b/creusot/tests/should_succeed/traits/16_impl_cloning.rs
@@ -2,7 +2,7 @@ extern crate creusot_contracts;
 
 use creusot_contracts::{logic::Seq, *};
 
-pub struct Vec<T>(std::vec::Vec<T>);
+pub struct Vec<T>(pub std::vec::Vec<T>);
 impl<T> ShallowModel for Vec<T> {
     type ShallowModelTy = Seq<T>;
     #[open]
diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning/why3shapes.gz b/creusot/tests/should_succeed/traits/16_impl_cloning/why3shapes.gz
index ad207a13244ec96c3272c4e5ab8ed62d8577e6e2..8f16dcd348ecc79de983fef0090197c8c8ae4055 100644
GIT binary patch
literal 150
zcmV;H0BQdpiwFP!00000|5c023c@fDMfdrNS!!09q&`}3Awp?>AX}N55eu==B*fph
zpe|fp&f(mZgnXk1XQ-U=6z2}MAlITiX_~8Ysuy&iB?%$E&iCj!D2M+7NjkK}QsNv#
z<t4D6Hy*$H<6gKETw{X5xd=hVFnhgkTWmHSFWP9cYer(F44HNWJ>a0k8+d(@NTmP(
E082nZegFUf

literal 151
zcmV;I0BHXoiwFP!00000|5b~z4#FT5MR&g9joJwiX=CDGOq%iotmZ*qV-s2w2>!lJ
z)WPZIoSeIBAm8yp87ieb$MpmnnmsE|oY%@N?-`zPOG1dR+Y(0#+=_o8u(84vgNbqs
zmA1fq-s1AzANR~&VTuU~<-(Zcqb9A?q3w?3e5=&toLAaw*^SyG$UzL8y#c31UA(0L
F002+WNfQ77

diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
index f7a5322f87..5298a9f8be 100644
--- a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
+++ b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg
@@ -32,12 +32,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv/why3shapes.gz b/creusot/tests/should_succeed/type_invariants/vec_inv/why3shapes.gz
index 6238e0697cd81f25936373fbd3e3e333bf3c600b..98e51597983bc1ace2615a1fc841c7a095cf042d 100644
GIT binary patch
literal 355
zcmV-p0i6CHiwFP!00000|8-J9Zi6royz>ffZRy1ZL!b(kqDaU&x7uUTVw?mCa05=7
z=XZfbN=kEq_0D*9hvC_C`#pZ^-aYBAuT1;qMy~hbtSzqdk7M&`I0FE-!m2%CS7B=f
zu)}Z)fo0BE;1>j|sq!EgK>-1Q%M@$f?(80ENL`zsyfLM&0}yCUUbPk*Jd<`h$Ey;=
zsL5y8W@yuUnoiWV)aSf5yGr>G;*oSC@kCFEHn_YyV_#QF=d=`qkib;2J3Ko~+F|C{
zvGiea9kbIGVo2x~Bo|u{Pa2R+7dga_U31{<-uB$xz!~i^DzYgB(25e^{3ZfI`Qbw2
zG%>~3i!$jQ8%v?(h~Dj&A*N7l#wz|}sbPsu_ohDSp>y463gl1c{gGJ`${bj`Thr0c
zr5vXy*dh{sqC^=++ql?<eo!o;xZr`-Wvtyq#&RJe8A>4o=}Rt|^9w~Dw^*S9005_e
Bs`dZ?

literal 354
zcmV-o0iFIIiwFP!00000|8-K!Zi6royz>>@+NKv9Y#vpp6h%VLxz!$vHpWem05{;I
z`TQ=BNKI)ju-+NZ?l3$q{C<yLruR>#>nq#7_>sSO^41R5#oMuYx10e0TVd6nu&c0j
z0@z_VNnp7*7We_-YN{3xj-Y^$z-5NDX?JdqG^DQWchT6=)FB9Twy0W%4W3Cmo8wgp
zV$|d_Y%{d!JxwQSTbgrG+g+stka#5BNIcLJq75!@&e+$LHU%xkKoXc~c7x}KNn7Tg
z8_NLV>zJK!kU&beAidavWYU0iy2v59@0tT=x3=f*2F_@YQISt6fYFoy=f5H#lpiiM
zP7^bHz9^I4v2heyfw=hnWr!&>o3Xb4vGlM+XL?(o%+R@RGzIdf^Lo!L3FRKF{ZHG`
z&!s)j$S94=B<6{bXt;@VutgDbEqPK#T>Gg?RIDN;l~ADy6j#jq0o;J-)u93a0Exz}
AumAu6

diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg
index 35cafebbb6..b24d06446c 100644
--- a/creusot/tests/should_succeed/vecdeque.mlcfg
+++ b/creusot/tests/should_succeed/vecdeque.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Collections_VecDeque_VecDeque_Type
diff --git a/creusot/tests/should_succeed/vecdeque/why3session.xml b/creusot/tests/should_succeed/vecdeque/why3session.xml
index e57eda5377..b14bbbe157 100644
--- a/creusot/tests/should_succeed/vecdeque/why3session.xml
+++ b/creusot/tests/should_succeed/vecdeque/why3session.xml
@@ -55,7 +55,7 @@
   <proof prover="3"><result status="valid" time="0.019949" steps="41"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.15" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.013569" steps="303"/></proof>
+  <proof prover="3"><result status="valid" time="0.013569" steps="304"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.16" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.013097" steps="38"/></proof>
@@ -70,7 +70,7 @@
   <proof prover="3"><result status="valid" time="0.020579" steps="52"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.20" expl="assertion" proved="true">
-  <proof prover="0"><result status="valid" time="0.086368" steps="210684"/></proof>
+  <proof prover="0"><result status="valid" time="0.086368" steps="210674"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.21" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.012610" steps="50"/></proof>
@@ -103,7 +103,7 @@
   <proof prover="3"><result status="valid" time="0.029489" steps="121"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.31" expl="assertion" proved="true">
-  <proof prover="0"><result status="valid" time="0.039880" steps="147317"/></proof>
+  <proof prover="0"><result status="valid" time="0.039880" steps="147200"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.32" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.010661" steps="90"/></proof>
@@ -118,7 +118,7 @@
   <proof prover="3"><result status="valid" time="0.031166" steps="133"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.36" expl="assertion" proved="true">
-  <proof prover="3"><result status="valid" time="0.208192" steps="4298"/></proof>
+  <proof prover="3"><result status="valid" time="0.208192" steps="4296"/></proof>
   </goal>
   <goal name="test_deque&#39;vc.37" expl="unreachable point" proved="true">
   <proof prover="3"><result status="valid" time="0.009516" steps="102"/></proof>
diff --git a/creusot/tests/should_succeed/vecdeque/why3shapes.gz b/creusot/tests/should_succeed/vecdeque/why3shapes.gz
index b344746472c9425d8c3c2c33306aecbaeece04ff..f3332fdeafe999668a95a060b7cfd9d01205dc3e 100644
GIT binary patch
literal 2261
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

literal 2260
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

diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg
index 913aa429f9..2cbeba8fc1 100644
--- a/creusot/tests/should_succeed/vector/01.mlcfg
+++ b/creusot/tests/should_succeed/vector/01.mlcfg
@@ -30,12 +30,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/01/why3session.xml b/creusot/tests/should_succeed/vector/01/why3session.xml
index 84847aa25e..0acb99500e 100644
--- a/creusot/tests/should_succeed/vector/01/why3session.xml
+++ b/creusot/tests/should_succeed/vector/01/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="01.mlcfg"/>
 <theory name="C01_AllZero" proved="true">
  <goal name="all_zero&#39;vc" expl="VC for all_zero" proved="true">
- <proof prover="0"><result status="valid" time="0.244759" steps="64199"/></proof>
+ <proof prover="0"><result status="valid" time="0.244759" steps="64274"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/01/why3shapes.gz b/creusot/tests/should_succeed/vector/01/why3shapes.gz
index 9dc0c3f35e487785410751a470228078df5cd6aa..4c7526bba127a02acf4b4b4cd1cd7d14bf1268ed 100644
GIT binary patch
literal 647
zcmV;20(ku&iwFP!00000|9w=+Zrd;rz56S4YwMr@S1m<y5DW-35cE=DjuB{!NrcLz
zD=Bu`ukVNwEw@o}A)jV>GkhHC^E&FD_0e?E$+TVV?6)Y6)?ZfrFJ0SH2Ber^3ba`1
z+dJJD`_w;c%xW5UE)T9U4FjfoSJt-I2mMNNpYSGRJD3w-fieLeU<@Ka2{J$daey3>
z02!nKQpm8WW9zDyz3B*0qHk`1QlK2D@byRl85)Cy1q%%pvc0BZf#90j^Rj>INo@|t
z{x^a^bZH(jcE8cfilH}ImQp{UE623jR_3*A+*7?L-UvM1W1qLUf0%lEw<j1=Z2PTl
zP3M}ELG=^8DZe{w{%2l;NI|lZS+c-fTWeYnVxp6*$lpDRSndbqO7mH*iIT|+H*l7Z
zQgL=^m4d`uxx-cOT-&;{sXiTkVxy0>)eT7Gsc<cP4A#zy?KDBzdmRqKh-JBv02P}`
zm!|2?&!#nKm2cygNOO&Z<w-X$3rSPm2jAKUah`lV93>xLfROn(|3iV=mOJ-it8O`Q
z&;c*tN~^KzC>LHk%Eb~dmq<Xw0~(6OxCFZdo{b1g@)2=u%^3vq@wkKJxDowz0Hc&3
zs2`g7o8|K_0=?++W8>3>_7>q&#2geROk7PECg__v<bufk@W7E~K+`;BV}oQE`s|v5
z?CHJkYWvif-dS`G=i-^}+`*I>oD}#Ze&EL$@n!zdA$=gew|JZ_jws*gy*nI{%2XI4
z!fTqxdp%g^a#G?waIu0-^yu0MZ>{`eTDMvWDl<Z}v`Tk|$0m-eq>@xVCM2aq&@`e#
hQLZRclqyP8rc#xtSV<)mS7=pa^%sd(sGYY3002i1H{1XK

literal 648
zcmV;30(bo%iwFP!00000|9w<TZ<|06zWY~jYwM`eK6zBh0a-#=ih8Lu$DlE65>(8(
zK<u=?zQf`*ZbNd}{g}r$v)|70c^&l6crbl%G+kfY_FE7J>o2R}7uM}D0hXO%3_M%m
z?Hx9zeHxyTvYN)8ioLB&BS7F_i@F_fkFP9s32#ESqd5ZMDI<^`hM+vupgmL&dMF|C
zP(bV<hlH9sbhdgaP0xTcytx6+flJ`Z)ngtcWb_u{E!<n!_L@d`f@^BWEB>vg(d-Yy
zZvvj^(mY}6euK-3kvCeF5+BHwQd-?s=Cx?-Q(ZD=1R0mq=Pm6YrrzF_jAF9wu*J^w
zwmBM7Kf+D%-L~d`<~67ow3wK+@XU4FnhumY(`k{V?;b@h_d{~U>8#e7Qs@geNRdub
zNpWeFgQi=#qZN0y>+H!?pY}hg(Z{;Q1~l<hv}P`bYA4zDJVD8O9gf1NWx0uf6g!tL
zOw*s9O=rle-^MMGrbvXv5u2BVq;uT|*V+ehj(j~HC7oV?(&;q+V}ZIYcJ`&M`sKt?
z2fBbOt){AzTy*Uumx!EPDgqUbXe<`e;_Vt_G9fA{CnT{oCs4x0(+*nF#_;P1CMiL2
zH#GCNNatS!dCBF*#-%HC7UfdZ9ONfVT}>Dz;LRLzLF|5f;6yW`^E@R}gKQl7<eGw&
z{2u$deQL~LTXK%)k_q;9Zwd;IGI|m}=;K8AGJoXIE|A_^IL($Mly0!J`vXy#ib9ls
zP4jrKN9$ZpYq|%iR<H>kZ5Pn36@N@;SF2F(s<7IbP$W?#9$8#5jKwZg74ERaB;YFN
iGUp=aJm)M=@;Hz3FxR=tWlq+dt^NXX^-FKJ1poj^K0<c@

diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
index 5dfade5ff0..78b03f02f1 100644
--- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg
+++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg
@@ -24,12 +24,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/02_gnome/why3session.xml b/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
index 14778d7a1f..326a99d456 100644
--- a/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
+++ b/creusot/tests/should_succeed/vector/02_gnome/why3session.xml
@@ -30,7 +30,7 @@
   <proof prover="3"><result status="valid" time="0.016845" steps="200"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.6" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027288" steps="131252"/></proof>
+  <proof prover="0"><result status="valid" time="0.027288" steps="131254"/></proof>
   </goal>
   <goal name="gnome_sort&#39;vc.7" expl="integer overflow" proved="true">
   <proof prover="3"><result status="valid" time="0.012470" steps="77"/></proof>
@@ -95,15 +95,15 @@
   <goal name="gnome_sort&#39;vc.27" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="gnome_sort&#39;vc.27.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.234617" steps="3468"/></proof>
+   <proof prover="3"><result status="valid" time="0.234617" steps="3465"/></proof>
    </goal>
    <goal name="gnome_sort&#39;vc.27.1" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.325622" steps="73584"/></proof>
+   <proof prover="1"><result status="valid" time="0.325622" steps="73659"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="gnome_sort&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="2"><result status="valid" time="0.210595" steps="29259"/></proof>
+  <proof prover="2"><result status="valid" time="0.210595" steps="29441"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/02_gnome/why3shapes.gz b/creusot/tests/should_succeed/vector/02_gnome/why3shapes.gz
index 286c8469c90bc830fc24fd45f78b96e34d974543..f9c9c00c41ac87da1cdb11e327db3d18afdb5b35 100644
GIT binary patch
literal 2640
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

literal 2635
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

diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
index 249a188820..36cd1196d5 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg
@@ -41,12 +41,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
index bb575fb89c..791be6bbf7 100644
--- a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
+++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="03_knuth_shuffle.mlcfg"/>
 <theory name="C03KnuthShuffle_KnuthShuffle" proved="true">
  <goal name="knuth_shuffle&#39;vc" expl="VC for knuth_shuffle" proved="true">
- <proof prover="0"><result status="valid" time="0.796893" steps="106763"/></proof>
+ <proof prover="0"><result status="valid" time="0.397790" steps="107029"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3shapes.gz b/creusot/tests/should_succeed/vector/03_knuth_shuffle/why3shapes.gz
index ccf2f3182a8db4ba5d41d7fb99d69da220b3909c..57292663de8709dabe1fe790ffa5dd717b183482 100644
GIT binary patch
literal 650
zcmV;50(Jc#iwFP!00000|9w<VZ<|06z57>iOY17q&VB(^a<C$yMXGw7W6|1PVk;O@
zz)AY=J1kxjV<#8y+sE)`=FQ-5%c$GgXV*n9uI=_s{WH?h^82FyYxngFFl5;Yrw9Qi
z$ODW~1gKF4s89tcQ3oh6&KCCW-d3)D?01$DS5@;`9Gb1GI3~7lihbSNgMDKwpYkFk
zA80y*B*&B_pW9}8+_;V*F#F>N0w4$k>7!u+^jHLnPZR`-<sXH3koYL>mHBx_W!>Sq
z|3@GQO}!JIny1Jwx{ncN?cZMs*l+3gnlr=Ge6$$In+F<bdpP#Cr-2qt$!0#<KL|4g
zDlg6Z+_tW3suw4ar};QZo~{D055@1Mc3-PARQj9&<kZk)8L8E-MIN7kR4C+X^h?O8
z1de(f4Q&vt0?4g<+w5%p=w=R3PkL5~9+=ToR3acPf*2Kb_s(9Oi$0H1pGW2Po<vad
zjF3H2w3atsncLfscLf{Bh7yW(bF8=B<<oJJz9Fv)cHOjX^Xj%Yho`a6a$nmD)vyvk
zN9N<m`P66kWNIH>U(m{^WZ0(Vz$`<oN>Ihw$zBy-t{bIM@#WembrGsB0;vv_ot8$8
zU&Z*Y&#Y(ND0S+F_G>7dr(=cmuJqkd(UN`wFHj90zt4nEh}ML@ukp5dA3e{m^WgQ!
zDmI^)V&_wl>Df(xKEHY7kV2*?z3m~hOs=kxL>Z61(O+r&%lGWxr>ie<_*A4Ek+ijY
zMJc>4ov0-pU~dU5@F6OjHhQX${jTVC$Fi*4VgacZ>zHpDOI0jwQm#P*x2z<J$3jM+
k4JZTBfH1%ffB|MwlbG0Oql`4d5Np`tKQ?)5(l!PF0HT3IzW@LL

literal 651
zcmV;60(AW!iwFP!00000|9w<VZ=)~}z2{eO>u#z_jK6@YJw%m|kyd-0<06NcCMtn0
zkhc5pcQ7$&NZJd29*^J5yczRj8FX9oYP;agw%x9&?*kPqe=hpJW>>#Kh+%rf34(_)
zG7lr<9x4<bN|YW7R337S(uH|=G?lHN`>mnCRn@%b`(|S+hOz0Jd{_5oZ$8463why^
z4Q5(BCBuX$U)yGLC~OxZgy!}Z0T4KXaNaNhI_BQQCKGs5n0+Q<p5imPV`k?OrLp_h
z{vQEPG}TUcDxN&QsXjuOmH&9fVYi|0HD!j=Y?K&Cn<r{$yFc`%r-tTD8P0Sxe-LI2
zlwOkcnQ3j;RBx6eOR}+(ELnMAp7P&KZNFy^QL1wbAftjN$%w7CEwbncghVb@qh4H0
zDKJ!HYiNRC<w0ibN3k{avz;kGHK|!9YOsu=qU0Va?#U>rhm-YcU(~sm{Msusk3@os
zrG(6Zyp_0d%*@<<-b*MT9a6~G&7t0Om#1SVT|tf&%(`jY=G|^?_Ag_d<*qgr%3&mc
zmel!?@`;P?jEQ-+eNH1I<6)YXgJtP`WsEXPkMhdsa@;74j4sDU$_rO@;YfMN^f)wf
zd==we7g^1!k@8p#&DW4POU4Z8u5i^*(t<wT&QT5;pL)V3L}NnlYupv5*0c1w9ULD?
z70!Dm!}G3)<ZP$D?%&*V2q6*_PIezz#8<~ipom7@=vNy3ay7gAv~?*CPeq6k2~*p5
z6x{LBib~J|=8nJupMtV!gO~cyZ}V<@D9g$&7Lsvm60?a5#*(stQgI7Vh;<xCtX#7I
llm@9mXy6){2G9`dM8`VPN=q#?*JRb<;y)W8Ch;}~002-%JHh|}

diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
index 07387cf82d..7103cdb0d3 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
+++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml b/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
index b7f40b7f4c..e36126bd30 100644
--- a/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
+++ b/creusot/tests/should_succeed/vector/04_binary_search/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="04_binary_search.mlcfg"/>
 <theory name="C04BinarySearch_BinarySearch" proved="true">
  <goal name="binary_search&#39;vc" expl="VC for binary_search" proved="true">
- <proof prover="1"><result status="valid" time="0.043744" steps="252301"/></proof>
+ <proof prover="1"><result status="valid" time="0.043744" steps="208692"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/04_binary_search/why3shapes.gz b/creusot/tests/should_succeed/vector/04_binary_search/why3shapes.gz
index 60fe18e3929a7ec21dad323ba9edb028ba4a5bf6..2ed60b930f2c978bbc4809a73a1e6e29f964cb9b 100644
GIT binary patch
literal 466
zcmV;@0WJO?iwFP!00000|CLfrkDEXYz4I%$wcT9Co&iGDtb`&EoO-EzMP33Mv@Epb
zquYPq0fsEI+oWv{$o9PVY{&28oqO2x_wwML%l=Sz?Pu3_?>;%lA6&O*MIv$d%Z8h>
zeLU`2Lz|}inLl^CvOxkqc6r?%`I%otG!ouHvY{*q5+f-I=MYKGA&{CwLEg}lPg+>w
z2mPgBk!Z-Se94>cu`UGpW&#3{Y0f42<G?_EWQ2V+3Wv)CM3V7_*1XN*zNavWhRy%p
z8Ld$>yMuY1Gq76dG~&%QT{(zN;IB_QO|q^2E$9fGaC0b^rBDm%FX1{Kq!+z$%_}R1
z0%HEwpGv}DWCgX+8;bS?(6g3|Ctzjh{z&&Nx-NJc7?~jB%?&++LN(zPp^T%+A}Ax)
zcg)Y+oJuk5{Pv~;*q#SR6}0BLw{{nL_vpV(CYL6YH%+#hVF;H<yi)(sTM}-0%e-Fh
zIf<^`_tP_6AGLUeiSh4;urR@zV7%bPlEF0{`v5Q+0^S+|yjfTWneEP@G(8b$7dW(a
ztFCt+>X!Roxz^~5z2nHLQVInqDFOyB*geQfhDu541t{5bgVayGRHZV-6jI^*1~nZ?
IiQfbO0LR+qkN^Mx

literal 467
zcmV;^0WAI>iwFP!00000|CLfrbDKa6z4I%$wT&;U-369Tof*ah1E*d(x-tsJF%tqU
z{%HE|y9<lMCbir8z)0Hno+Rsiyz>ux`d%OWb3GiIzWeNl{@o|<_=B46ERkg%eOXgm
zcaO(CX=vN_Kg;KSTelp6j(yp5M|!3gmW+gVkiwJ&LS`ie@;T%v<`7WMA;ZA*q>~mF
z{Db~tv`92$TfdZT|JYOvLpuQiD>Ubl{BdBwFtNg+9EIa$0xT<Njfys9It&<RiP`+`
zow+k=;dZdEa|TWeohG!trYnrt1pfM@)2!I&--6D8GHMU?vJ`7U{Y9=)BfaR&6|I~c
zDoE+uaH^3<BP(jGo+-K);DNJbIstc<9**?Tq3c4Rfr$+YTHnyKC@v?wL@v@~vIrLm
z={uHZYELyYJHNfD0lV|?QH4A6+&jB7y?gTCCKF4OiJK-{%`gs^h`mz((OUv;dCR_D
z?m3CB-uKfpTpzW1g|YGPhq$tVLKrW2v1D{j$2|ayhJd$*fM6EZLE*a7l%^*H?E()s
z{;nVVho+<9SE)6IYVUbKibE7LNugp)1wsWX77sfq#cs<8{3s9eAeXtwc@8=Aegn%8
JKbhYI004oS;EDhM

diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
index f7aebdc9ef..6332b41963 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg
@@ -30,12 +30,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -403,7 +409,7 @@ module C05BinarySearchGeneric_BinarySearch
     [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- _10 = ([#"../05_binary_search_generic.rs" 31 20 31 21] (0 : usize));
     _10 <- any usize;
     switch (_9)
-      | False -> goto BB7
+      | False -> goto BB6
       | True -> goto BB5
       end
   }
@@ -416,82 +422,78 @@ module C05BinarySearchGeneric_BinarySearch
     goto BB29
   }
   BB6 {
-    assert { [#"../05_binary_search_generic.rs" 31 22 33 5] false };
-    absurd
+    [#"../05_binary_search_generic.rs" 34 26 34 35] size <- ([#"../05_binary_search_generic.rs" 34 26 34 35] len0 arr);
+    goto BB7
   }
   BB7 {
-    [#"../05_binary_search_generic.rs" 34 26 34 35] size <- ([#"../05_binary_search_generic.rs" 34 26 34 35] len0 arr);
+    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
     goto BB8
   }
   BB8 {
-    [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize));
     goto BB9
   }
   BB9 {
     goto BB10
   }
   BB10 {
-    goto BB11
-  }
-  BB11 {
     invariant { [#"../05_binary_search_generic.rs" 37 16 37 56] 0 < UIntSize.to_int size /\ UIntSize.to_int size + UIntSize.to_int base <= Seq.length (shallow_model1 arr) };
     invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . i < base
      -> le_log0 (Seq.get (deep_model0 arr) (UIntSize.to_int i)) (deep_model1 elem) };
     invariant { [#"../05_binary_search_generic.rs" 37 4 37 58] forall i : usize . UIntSize.to_int base + UIntSize.to_int size <= UIntSize.to_int i /\ UIntSize.to_int i < Seq.length (shallow_model1 arr)
      -> lt_log0 (deep_model1 elem) (Seq.get (deep_model0 arr) (UIntSize.to_int i)) };
-    goto BB12
+    goto BB11
   }
-  BB12 {
+  BB11 {
     [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- size > ([#"../05_binary_search_generic.rs" 40 17 40 18] (1 : usize));
     switch (_21)
-      | False -> goto BB20
-      | True -> goto BB13
+      | False -> goto BB19
+      | True -> goto BB12
       end
   }
-  BB13 {
+  BB12 {
     [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize)) = ([#"../05_binary_search_generic.rs" 41 19 41 27] (0 : usize));
     assert { [@expl:division by zero] [#"../05_binary_search_generic.rs" 41 19 41 27] not _25 };
-    goto BB14
+    goto BB13
   }
-  BB14 {
+  BB13 {
     [#"../05_binary_search_generic.rs" 41 19 41 27] half <- size / ([#"../05_binary_search_generic.rs" 41 26 41 27] (2 : usize));
     [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- base + half;
     [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 arr mid);
-    goto BB15
+    goto BB14
   }
-  BB15 {
+  BB14 {
     assert { [@expl:type invariant] inv1 _32 };
     assume { resolve1 _32 };
     [#"../05_binary_search_generic.rs" 44 18 44 33] _30 <- ([#"../05_binary_search_generic.rs" 44 18 44 33] gt0 _32 elem);
-    goto BB16
+    goto BB15
   }
-  BB16 {
+  BB15 {
     switch (_30)
-      | False -> goto BB18
-      | True -> goto BB17
+      | False -> goto BB17
+      | True -> goto BB16
       end
   }
-  BB17 {
+  BB16 {
     [#"../05_binary_search_generic.rs" 44 36 44 40] _29 <- base;
-    goto BB19
+    goto BB18
   }
-  BB18 {
+  BB17 {
     [#"../05_binary_search_generic.rs" 44 50 44 53] _29 <- mid;
-    goto BB19
+    goto BB18
   }
-  BB19 {
+  BB18 {
     [#"../05_binary_search_generic.rs" 44 8 44 55] base <- _29;
     _29 <- any usize;
     [#"../05_binary_search_generic.rs" 46 8 46 20] size <- size - half;
-    goto BB11
+    goto BB10
   }
-  BB20 {
+  BB19 {
     assert { [@expl:type invariant] inv0 arr };
     assume { resolve0 arr };
     [#"../05_binary_search_generic.rs" 49 18 49 24] _41 <- ([#"../05_binary_search_generic.rs" 49 18 49 24] index0 arr base);
-    goto BB21
+    goto BB20
   }
-  BB21 {
+  BB20 {
     [#"../05_binary_search_generic.rs" 49 14 49 24] cmp <- _41;
     assert { [@expl:type invariant] inv1 _41 };
     assume { resolve1 _41 };
@@ -501,27 +503,31 @@ module C05BinarySearchGeneric_BinarySearch
     assert { [@expl:type invariant] inv1 _47 };
     assume { resolve1 _47 };
     [#"../05_binary_search_generic.rs" 51 10 51 24] _44 <- ([#"../05_binary_search_generic.rs" 51 10 51 24] cmp0 cmp _47);
-    goto BB22
+    goto BB21
   }
-  BB22 {
+  BB21 {
     assert { [@expl:type invariant] inv2 elem };
     assume { resolve2 elem };
     switch (_44)
-      | Core_Cmp_Ordering_Type.C_Less -> goto BB23
-      | Core_Cmp_Ordering_Type.C_Equal -> goto BB24
-      | Core_Cmp_Ordering_Type.C_Greater -> goto BB25
+      | Core_Cmp_Ordering_Type.C_Less -> goto BB22
+      | Core_Cmp_Ordering_Type.C_Equal -> goto BB23
+      | Core_Cmp_Ordering_Type.C_Greater -> goto BB24
       end
   }
-  BB23 {
+  BB22 {
     goto BB27
   }
-  BB24 {
+  BB23 {
     goto BB26
   }
-  BB25 {
+  BB24 {
     [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- Core_Result_Result_Type.C_Err base;
     goto BB28
   }
+  BB25 {
+    assert { [#"../05_binary_search_generic.rs" 51 10 51 24] false };
+    absurd
+  }
   BB26 {
     [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- Core_Result_Result_Type.C_Ok base;
     goto BB28
@@ -538,5 +544,11 @@ module C05BinarySearchGeneric_BinarySearch
   BB29 {
     return _0
   }
+  BB32 {
+    goto BB22
+  }
+  BB33 {
+    goto BB24
+  }
   
 end
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
index 42a6120b1e..920b26633f 100644
--- a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
+++ b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3session.xml
@@ -89,16 +89,16 @@
   <proof prover="4"><result status="valid" time="0.009508" steps="107"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.26" expl="integer overflow" proved="true">
-  <proof prover="4"><result status="valid" time="0.026441" steps="530"/></proof>
+  <proof prover="4"><result status="valid" time="0.026441" steps="532"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.27" expl="loop invariant preservation" proved="true">
   <proof prover="4"><result status="valid" time="0.018221" steps="259"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.305670" steps="46303"/></proof>
+  <proof prover="3"><result status="valid" time="0.156187" steps="46489"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.354482" steps="48615"/></proof>
+  <proof prover="3"><result status="valid" time="0.194575" steps="48801"/></proof>
   </goal>
   <goal name="binary_search&#39;vc.30" expl="type invariant" proved="true">
   <proof prover="0"><result status="valid" time="0.009512" steps="6018"/></proof>
diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic/why3shapes.gz b/creusot/tests/should_succeed/vector/05_binary_search_generic/why3shapes.gz
index 3969b8deb4a329251aa1341000080cb4dfcfbd1f..18d18835cfd11e0d790634d2cfd31bdc1a984833 100644
GIT binary patch
literal 2600
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
K^Pkn7DgXe%?jxZ9

literal 2603
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
N{{i$1!RMVS006>s`UC&~

diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
index a9d527c027..d5220031f2 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
+++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg
@@ -104,12 +104,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -1062,7 +1068,7 @@ module Alloc_Vec_IntoIter_IntoIter_Type
   use Core_Marker_PhantomData_Type as Core_Marker_PhantomData_Type
   use Core_Ptr_NonNull_NonNull_Type as Core_Ptr_NonNull_NonNull_Type
   type t_intoiter 't 'a =
-    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) opaque_ptr opaque_ptr
+    | C_IntoIter (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't) usize (Core_Mem_ManuallyDrop_ManuallyDrop_Type.t_manuallydrop 'a) (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) opaque_ptr
     
 end
 module Core_Option_Option_Type
@@ -2128,45 +2134,43 @@ module C06KnightsTour_Min
       end
   }
   BB12 {
-    goto BB14
+    goto BB15
   }
   BB13 {
     [#"../06_knights_tour.rs" 118 17 118 18] m <- Core_Option_Option_Type.some_0 min;
     [#"../06_knights_tour.rs" 119 19 119 28] _28 <- (let (a, _) = x in a) < (let (a, _) = m in a);
     switch (_28)
-      | False -> goto BB16
-      | True -> goto BB15
+      | False -> goto BB17
+      | True -> goto BB16
       end
   }
   BB14 {
+    assert { [#"../06_knights_tour.rs" 116 14 116 17] false };
+    absurd
+  }
+  BB15 {
     [#"../06_knights_tour.rs" 117 26 117 33] _25 <- Core_Option_Option_Type.C_Some x;
     [#"../06_knights_tour.rs" 117 20 117 33] min <- _25;
     _25 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
     [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] ());
-    goto BB18
+    goto BB19
   }
-  BB15 {
+  BB16 {
     [#"../06_knights_tour.rs" 120 26 120 33] _31 <- Core_Option_Option_Type.C_Some x;
     [#"../06_knights_tour.rs" 120 20 120 33] min <- _31;
     _31 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point);
     [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] ());
-    goto BB17
-  }
-  BB16 {
-    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] ());
-    goto BB17
+    goto BB18
   }
   BB17 {
+    [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] ());
     goto BB18
   }
   BB18 {
-    goto BB4
-  }
-  BB20 {
-    goto BB9
+    goto BB19
   }
-  BB21 {
-    goto BB9
+  BB19 {
+    goto BB4
   }
   
 end
@@ -2864,7 +2868,7 @@ module C06KnightsTour_KnightsTour
   BB12 {
     [#"../06_knights_tour.rs" 163 4 163 15] _0 <- Core_Option_Option_Type.C_Some board;
     board <- any C06KnightsTour_Board_Type.t_board;
-    goto BB46
+    goto BB48
   }
   BB13 {
     goto BB15
@@ -2939,80 +2943,91 @@ module C06KnightsTour_KnightsTour
   }
   BB28 {
     assume { resolve3 iter1 };
-    goto BB39
+    goto BB40
   }
   BB29 {
-    goto BB30
+    goto BB31
   }
   BB30 {
+    assume { resolve3 iter1 };
+    assume { resolve4 candidates };
+    assert { [#"../06_knights_tour.rs" 148 8 149 54] false };
+    absurd
+  }
+  BB31 {
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _54;
     [#"../06_knights_tour.rs" 148 8 149 54] _59 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
-    goto BB31
+    goto BB32
   }
-  BB31 {
+  BB32 {
     [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- _59;
     _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize));
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- __creusot_proc_iter_elem1;
     assume { resolve2 __creusot_proc_iter_elem1 };
     [#"../06_knights_tour.rs" 151 28 151 30] _65 <- m;
     [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 p _65);
-    goto BB32
+    goto BB33
   }
-  BB32 {
+  BB33 {
     assume { resolve2 m };
     [#"../06_knights_tour.rs" 152 15 152 35] _66 <- ([#"../06_knights_tour.rs" 152 15 152 35] available0 board adj);
-    goto BB33
+    goto BB34
   }
-  BB33 {
+  BB34 {
     switch (_66)
-      | False -> goto BB37
-      | True -> goto BB34
+      | False -> goto BB38
+      | True -> goto BB35
       end
   }
-  BB34 {
+  BB35 {
     [#"../06_knights_tour.rs" 153 29 153 52] degree <- ([#"../06_knights_tour.rs" 153 29 153 52] count_degree0 board adj);
-    goto BB35
+    goto BB36
   }
-  BB35 {
+  BB36 {
     [#"../06_knights_tour.rs" 154 16 154 26] _73 <- Borrow.borrow_mut candidates;
     [#"../06_knights_tour.rs" 154 16 154 26] candidates <-  ^ _73;
     [#"../06_knights_tour.rs" 154 32 154 45] _74 <- (degree, adj);
     [#"../06_knights_tour.rs" 154 16 154 46] _72 <- ([#"../06_knights_tour.rs" 154 16 154 46] push0 _73 _74);
     _73 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global));
     _74 <- any (usize, C06KnightsTour_Point_Type.t_point);
-    goto BB36
+    goto BB37
   }
-  BB36 {
+  BB37 {
     [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] ());
-    goto BB38
+    goto BB39
   }
-  BB37 {
+  BB38 {
     [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] ());
-    goto BB38
+    goto BB39
   }
-  BB38 {
+  BB39 {
     goto BB25
   }
-  BB39 {
+  BB40 {
     [#"../06_knights_tour.rs" 157 18 157 29] _81 <- candidates;
     [#"../06_knights_tour.rs" 157 14 157 30] _79 <- ([#"../06_knights_tour.rs" 157 14 157 30] min0 _81);
-    goto BB40
+    goto BB41
   }
-  BB40 {
+  BB41 {
     switch (_79)
-      | Core_Option_Option_Type.C_None -> goto BB41
-      | Core_Option_Option_Type.C_Some _ -> goto BB42
+      | Core_Option_Option_Type.C_None -> goto BB42
+      | Core_Option_Option_Type.C_Some _ -> goto BB43
       end
   }
-  BB41 {
+  BB42 {
     [#"../06_knights_tour.rs" 159 27 159 31] _0 <- Core_Option_Option_Type.C_None;
     assume { resolve4 candidates };
-    goto BB48
-  }
-  BB42 {
-    goto BB43
+    goto BB50
   }
   BB43 {
+    goto BB45
+  }
+  BB44 {
+    assume { resolve4 candidates };
+    assert { [#"../06_knights_tour.rs" 157 14 157 30] false };
+    absurd
+  }
+  BB45 {
     [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- (let (_, a) = Core_Option_Option_Type.some_0 _79 in a);
     assume { resolve4 candidates };
     [#"../06_knights_tour.rs" 158 31 158 38] p <- adj1;
@@ -3020,41 +3035,29 @@ module C06KnightsTour_KnightsTour
     [#"../06_knights_tour.rs" 161 8 161 13] board <-  ^ _87;
     [#"../06_knights_tour.rs" 161 8 161 26] _86 <- ([#"../06_knights_tour.rs" 161 8 161 26] set0 _87 p step);
     _87 <- any borrowed (C06KnightsTour_Board_Type.t_board);
-    goto BB44
-  }
-  BB44 {
-    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] ());
-    goto BB45
-  }
-  BB45 {
-    goto BB9
+    goto BB46
   }
   BB46 {
+    [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] ());
     goto BB47
   }
   BB47 {
-    goto BB50
+    goto BB9
   }
   BB48 {
     goto BB49
   }
   BB49 {
-    goto BB50
+    goto BB52
   }
   BB50 {
-    return _0
-  }
-  BB57 {
-    goto BB14
+    goto BB51
   }
-  BB58 {
-    assume { resolve3 iter1 };
-    assume { resolve4 candidates };
-    goto BB14
+  BB51 {
+    goto BB52
   }
-  BB59 {
-    assume { resolve4 candidates };
-    goto BB14
+  BB52 {
+    return _0
   }
   
 end
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
index fe7cd466b4..1484c10f0b 100644
--- a/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
+++ b/creusot/tests/should_succeed/vector/06_knights_tour/why3session.xml
@@ -47,14 +47,14 @@
   <proof prover="3"><result status="valid" time="0.041395" steps="65"/></proof>
   </goal>
   <goal name="new&#39;vc.7" expl="postcondition" proved="true">
-  <proof prover="2"><result status="valid" time="0.100977" steps="671703"/></proof>
+  <proof prover="2"><result status="valid" time="0.100977" steps="599642"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Impl1_Available" proved="true">
  <goal name="available&#39;vc" expl="VC for available" proved="true">
- <proof prover="3"><result status="valid" time="0.030000" steps="1050"/></proof>
+ <proof prover="3"><result status="valid" time="0.030000" steps="1047"/></proof>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Impl1_CountDegree" proved="true">
@@ -95,7 +95,7 @@
       <goal name="count_degree&#39;vc.8.0.0.0.0" expl="VC for count_degree" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="count_degree&#39;vc.8.0.0.0.0.0" expl="VC for count_degree" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.301505" steps="16858"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.823397" steps="16863"/></proof>
        </goal>
       </transf>
       </goal>
@@ -110,7 +110,7 @@
       <goal name="count_degree&#39;vc.8.0.1.0.0" expl="VC for count_degree" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="count_degree&#39;vc.8.0.1.0.0.0" expl="VC for count_degree" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.338734" steps="16882"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.823558" steps="16886"/></proof>
        </goal>
       </transf>
       </goal>
@@ -133,7 +133,7 @@
       <goal name="count_degree&#39;vc.9.0.0.0.0" expl="VC for count_degree" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="count_degree&#39;vc.9.0.0.0.0.0" expl="VC for count_degree" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.513265" steps="17179"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.861381" steps="17180"/></proof>
        </goal>
       </transf>
       </goal>
@@ -148,7 +148,7 @@
       <goal name="count_degree&#39;vc.9.0.1.0.0" expl="VC for count_degree" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="count_degree&#39;vc.9.0.1.0.0.0" expl="VC for count_degree" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.538625" steps="17206"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="0.845145" steps="17177"/></proof>
        </goal>
       </transf>
       </goal>
@@ -164,7 +164,7 @@
   <proof prover="3"><result status="valid" time="0.020000" steps="67"/></proof>
   </goal>
   <goal name="count_degree&#39;vc.11" expl="integer overflow" proved="true">
-  <proof prover="3"><result status="valid" time="0.172887" steps="854"/></proof>
+  <proof prover="3"><result status="valid" time="0.172887" steps="855"/></proof>
   </goal>
   <goal name="count_degree&#39;vc.12" expl="loop invariant preservation" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="46"/></proof>
@@ -172,7 +172,7 @@
   <goal name="count_degree&#39;vc.13" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="count_degree&#39;vc.13.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.208015" steps="944"/></proof>
+   <proof prover="3"><result status="valid" time="0.069128" steps="945"/></proof>
    </goal>
   </transf>
   </goal>
@@ -188,7 +188,7 @@
 </theory>
 <theory name="C06KnightsTour_Impl1_Set" proved="true">
  <goal name="set&#39;vc" expl="VC for set" proved="true">
- <proof prover="3"><result status="valid" time="0.429232" steps="5671"/></proof>
+ <proof prover="3"><result status="valid" time="0.429232" steps="5614"/></proof>
  </goal>
 </theory>
 <theory name="C06KnightsTour_Min" proved="true">
@@ -218,7 +218,7 @@
    <proof prover="3"><result status="valid" time="0.010000" steps="17"/></proof>
    </goal>
    <goal name="min&#39;vc.0.7" expl="loop invariant preservation" proved="true">
-   <proof prover="1"><result status="valid" time="0.188149" steps="26665"/></proof>
+   <proof prover="1"><result status="valid" time="0.188149" steps="26847"/></proof>
    </goal>
    <goal name="min&#39;vc.0.8" expl="loop invariant preservation" proved="true">
    <transf name="split_vc" proved="true" >
@@ -227,7 +227,7 @@
      <goal name="min&#39;vc.0.8.0.0" expl="loop invariant preservation" proved="true">
      <transf name="split_vc" proved="true" >
       <goal name="min&#39;vc.0.8.0.0.0" expl="loop invariant preservation" proved="true">
-      <proof prover="3"><result status="valid" time="0.584056" steps="13452"/></proof>
+      <proof prover="3"><result status="valid" time="0.584056" steps="13445"/></proof>
       </goal>
      </transf>
      </goal>
@@ -243,7 +243,7 @@
        <proof prover="3"><result status="valid" time="0.024200" steps="244"/></proof>
        </goal>
        <goal name="min&#39;vc.0.8.1.0.0.1" expl="loop invariant preservation" proved="true">
-       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.152518" steps="23058"/></proof>
+       <proof prover="3" timelimit="5" memlimit="2000"><result status="valid" time="1.152518" steps="23026"/></proof>
        </goal>
       </transf>
       </goal>
@@ -279,7 +279,7 @@
   <proof prover="3"><result status="valid" time="0.020000" steps="30"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.4" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.053344" steps="772"/></proof>
+  <proof prover="3"><result status="valid" time="0.053344" steps="767"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.5" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="34"/></proof>
@@ -306,10 +306,10 @@
   <proof prover="3"><result status="valid" time="0.010000" steps="85"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.13" expl="loop invariant init" proved="true">
-  <proof prover="3"><result status="valid" time="0.198898" steps="5015"/></proof>
+  <proof prover="3"><result status="valid" time="0.198898" steps="5224"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.14" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.038473" steps="314"/></proof>
+  <proof prover="3"><result status="valid" time="0.038473" steps="313"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.15" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.010000" steps="213"/></proof>
@@ -333,30 +333,30 @@
   <proof prover="3"><result status="valid" time="0.020000" steps="339"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.22" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.095998" steps="2030"/></proof>
+  <proof prover="3"><result status="valid" time="0.095998" steps="2020"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.23" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="knights_tour&#39;vc.23.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.030719" steps="647"/></proof>
+   <proof prover="3"><result status="valid" time="0.030719" steps="648"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="knights_tour&#39;vc.24" expl="loop invariant preservation" proved="true">
   <transf name="split_vc" proved="true" >
    <goal name="knights_tour&#39;vc.24.0" expl="loop invariant preservation" proved="true">
-   <proof prover="3"><result status="valid" time="0.382463" steps="8287"/></proof>
+   <proof prover="3"><result status="valid" time="0.382463" steps="8245"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="knights_tour&#39;vc.25" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.020000" steps="363"/></proof>
+  <proof prover="3"><result status="valid" time="0.020000" steps="364"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="0.130000" steps="21181"/></proof>
+  <proof prover="1" timelimit="5" memlimit="2000"><result status="valid" time="0.130000" steps="21222"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.325226" steps="39403"/></proof>
+  <proof prover="1"><result status="valid" time="0.163254" steps="39630"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.28" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.040000" steps="972"/></proof>
@@ -364,7 +364,7 @@
   <goal name="knights_tour&#39;vc.29" expl="precondition" proved="true">
   <transf name="use_th" proved="true" arg1="seq.FreeMonoid">
    <goal name="knights_tour&#39;vc.29.0" expl="precondition" proved="true">
-   <proof prover="3"><result status="valid" time="0.050000" steps="1097"/></proof>
+   <proof prover="3"><result status="valid" time="0.050000" steps="1099"/></proof>
    </goal>
   </transf>
   </goal>
@@ -379,7 +379,7 @@
       <goal name="knights_tour&#39;vc.30.0.0.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.30.0.0.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.655442" steps="53080"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.655442" steps="53064"/></proof>
        </goal>
       </transf>
       </goal>
@@ -394,7 +394,7 @@
       <goal name="knights_tour&#39;vc.30.0.1.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.30.0.1.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.660177" steps="53193"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.660177" steps="53122"/></proof>
        </goal>
       </transf>
       </goal>
@@ -417,7 +417,7 @@
       <goal name="knights_tour&#39;vc.31.0.0.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.31.0.0.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.713706" steps="53632"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.713706" steps="53647"/></proof>
        </goal>
       </transf>
       </goal>
@@ -432,7 +432,7 @@
       <goal name="knights_tour&#39;vc.31.0.1.0.0" expl="VC for knights_tour" proved="true">
       <transf name="inline_goal" proved="true" >
        <goal name="knights_tour&#39;vc.31.0.1.0.0.0" expl="VC for knights_tour" proved="true">
-       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.720566" steps="53777"/></proof>
+       <proof prover="3" timelimit="30" memlimit="4000"><result status="valid" time="2.720566" steps="53740"/></proof>
        </goal>
       </transf>
       </goal>
@@ -454,19 +454,19 @@
   <proof prover="3"><result status="valid" time="0.037506" steps="401"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.35" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.079357" steps="907"/></proof>
+  <proof prover="3"><result status="valid" time="0.079357" steps="906"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.36" expl="precondition" proved="true">
   <proof prover="3"><result status="valid" time="0.118800" steps="918"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.37" expl="loop invariant preservation" proved="true">
-  <proof prover="3" timelimit="5"><result status="valid" time="0.058954" steps="553"/></proof>
+  <proof prover="3" timelimit="5"><result status="valid" time="0.058954" steps="551"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.38" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.287290" steps="35562"/></proof>
+  <proof prover="1"><result status="valid" time="0.147380" steps="35786"/></proof>
   </goal>
   <goal name="knights_tour&#39;vc.39" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.663621" steps="78478"/></proof>
+  <proof prover="1"><result status="valid" time="0.356947" steps="78693"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz b/creusot/tests/should_succeed/vector/06_knights_tour/why3shapes.gz
index dd4aec6d2aff7df7935d7f49191dca9227480cf6..4b844811c1f9dc3c2e759ca1dc6258834f5d1635 100644
GIT binary patch
literal 11308
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

literal 11308
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

diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
index 7d543ae314..0cf5956385 100644
--- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg
+++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/07_read_write/why3session.xml b/creusot/tests/should_succeed/vector/07_read_write/why3session.xml
index 98a5df018e..2d10346b52 100644
--- a/creusot/tests/should_succeed/vector/07_read_write/why3session.xml
+++ b/creusot/tests/should_succeed/vector/07_read_write/why3session.xml
@@ -7,7 +7,7 @@
 <path name=".."/><path name="07_read_write.mlcfg"/>
 <theory name="C07ReadWrite_ReadWrite" proved="true">
  <goal name="read_write&#39;vc" expl="VC for read_write" proved="true">
- <proof prover="0"><result status="valid" time="0.021785" steps="185"/></proof>
+ <proof prover="0"><result status="valid" time="0.021785" steps="183"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/creusot/tests/should_succeed/vector/07_read_write/why3shapes.gz b/creusot/tests/should_succeed/vector/07_read_write/why3shapes.gz
index 8ef050ee629a816e23bcef171d7bfd04084c5cef..bfe8b45a8f461daebb63234dd0ee3b5ad6a075fe 100644
GIT binary patch
literal 479
zcmV<50U-V#iwFP!00000|BaJNZ=*02h4=glcAc{Fi&xbwtV+m8vmAL@bP=XOL!bqc
z%+DV`aGIzz>INPA9{V1DHou~9-ov|^!;_lkZXBM%B#a(|<pa9mluA^rGLhKJSQ0Op
zq+U|Vyd*OA63e6r;CTnV8s3&Y=w^LCo~y&ysGi6ama*!F1rG2Jaoh5Xr8Lt>rhZE#
zvm$tD%a*q#OlltclcEx{(gnhddvPfviE-)TV9dRM0{U6~)cj{UDoJ!@r@!60)=a_<
z8l~P{UL*;+8Dd;;hiBc4YR9D)v4eH?s;qnHrFpT|aLz%qt4`1#O+IuBNgFcb=I(Z|
z+ezP8W<*tw$Dx_Gm;Hw5`t16ojyKVQd+~|JxSau8$v>qDjZ>({X&TR}c{uzv)Y@)<
zUg8A0Mt=)y(!t`wcZoTC^ElvDV!Bz<DJl1vD%H>Dy_z<-7~j^WcVVu5Uv0EIKD&8j
zj&h5g*#>v8n}zO8+fEh<yXNKsIC8lGmpg9yzKBtlC4o1!RHkSEMrI<C>w~#GTxP1z
z>py0KY}3q(K)!_SIE9mfraDjEqJn_tHN;6?laxS>DAbr{d6uRrMF~T!4lxqB$V4g<
V5ep`$AOZ^%{0BZuQ=d}=002Oi?2G^a

literal 480
zcmV<60U!P!iwFP!00000|BaJNkDD+Qh4=glc5PYt8uO|q3u`1~q%JEj2i**2f=XZt
zB<atuA2^d}Xw(fl_C5AJ{%pQR;e5b%HHT+4&D}VB57RLE7A(K98_t;|<tkGNUM7-y
z$z<$hESZ;7CSHO}%K)Et*sI}fIiPOV_v58Lj*aT6%y1d&ZdmY$e+aiNKUpd>O=RY`
zBr-39=eBBjTj8YUu|KO=0;^mgVBCvqnMi=j#R1@6V2S;#{@46-Iw?tYWv9R0y4FnM
z4jZN3U0xz7xf=qM+~HX_i?!q0i`v0DdsEgu^wOeSYfy01?CLZ2CzFrdL(+!axVgI>
za69Q6%Z;e_<7sH-?PWhOx;?u-spCzx;9h*7F>Yr7EBS{sp&`TlI8Eb4HD8Xu47Ii!
zu$Pcx*XVC)O*&Xo`Ys8_e>@I+kq~c|bjq0fOttFg%Rx;WT#RpP(}ytEzArY~1E1YI
zGDo?`&TNAR*v&%srfnySgxzv;0UWu)fGZp~eP7fl%aY=oT53}?03$OI$@RfpA1*W1
zr}ZB*LAGfYWgwr!cAUaVVN+kGZc#z-N*gHBJOh>Iq{)?f&Gw8Hc~%s_V$4Dyq7b>r
WL@E-&L@cNPL4v=2!%c8g1ONcdoaVFu

diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
index e60836dca5..33779650cd 100644
--- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg
+++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
@@ -555,7 +561,7 @@ module C08Haystack_Search
   }
   BB10 {
     [#"../08_haystack.rs" 33 11 33 25] _0 <- ([#"../08_haystack.rs" 33 11 33 25] len0 haystack);
-    goto BB30
+    goto BB31
   }
   BB11 {
     goto BB13
@@ -618,53 +624,51 @@ module C08Haystack_Search
   }
   BB22 {
     [#"../08_haystack.rs" 31 15 31 16] _0 <- i;
-    goto BB31
+    goto BB32
   }
   BB23 {
-    goto BB24
+    goto BB25
   }
   BB24 {
+    assert { [#"../08_haystack.rs" 24 8 24 68] false };
+    absurd
+  }
+  BB25 {
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _45;
     [#"../08_haystack.rs" 24 8 24 68] _50 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1)));
-    goto BB25
+    goto BB26
   }
-  BB25 {
+  BB26 {
     [#"../08_haystack.rs" 24 8 24 68] produced1 <- _50;
     _50 <- any Snapshot.snap_ty (Seq.seq usize);
     [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1;
     [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 needle j);
-    goto BB26
+    goto BB27
   }
-  BB26 {
+  BB27 {
     [#"../08_haystack.rs" 26 37 26 42] _61 <- i + j;
     [#"../08_haystack.rs" 26 36 26 43] _59 <- ([#"../08_haystack.rs" 26 36 26 43] index0 haystack _61);
     _61 <- any usize;
-    goto BB27
+    goto BB28
   }
-  BB27 {
+  BB28 {
     [#"../08_haystack.rs" 26 15 26 43] _53 <- _55 <> _59;
     switch (_53)
-      | False -> goto BB29
-      | True -> goto BB28
+      | False -> goto BB30
+      | True -> goto BB29
       end
   }
-  BB28 {
-    goto BB7
-  }
   BB29 {
-    goto BB19
+    goto BB7
   }
   BB30 {
-    goto BB31
+    goto BB19
   }
   BB31 {
-    return _0
-  }
-  BB33 {
-    goto BB12
+    goto BB32
   }
-  BB34 {
-    goto BB12
+  BB32 {
+    return _0
   }
   
 end
diff --git a/creusot/tests/should_succeed/vector/08_haystack/why3session.xml b/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
index 2e26adc058..437da35f86 100644
--- a/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
+++ b/creusot/tests/should_succeed/vector/08_haystack/why3session.xml
@@ -15,7 +15,7 @@
   <proof prover="0"><result status="valid" time="0.021521" steps="76480"/></proof>
   </goal>
   <goal name="search&#39;vc.1" expl="precondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.027003" steps="10898"/></proof>
+  <proof prover="3"><result status="valid" time="0.027003" steps="11080"/></proof>
   </goal>
   <goal name="search&#39;vc.2" expl="integer overflow" proved="true">
   <proof prover="4"><result status="valid" time="0.009606" steps="23"/></proof>
@@ -63,13 +63,13 @@
   <proof prover="4"><result status="valid" time="0.010430" steps="101"/></proof>
   </goal>
   <goal name="search&#39;vc.17" expl="loop invariant init" proved="true">
-  <proof prover="0"><result status="valid" time="0.110319" steps="521237"/></proof>
+  <proof prover="0"><result status="valid" time="0.110319" steps="521242"/></proof>
   </goal>
   <goal name="search&#39;vc.18" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.030444" steps="117"/></proof>
   </goal>
   <goal name="search&#39;vc.19" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.040830" steps="158847"/></proof>
+  <proof prover="0"><result status="valid" time="0.040830" steps="158849"/></proof>
   </goal>
   <goal name="search&#39;vc.20" expl="precondition" proved="true">
   <proof prover="4"><result status="valid" time="0.008926" steps="143"/></proof>
@@ -78,40 +78,40 @@
   <proof prover="4"><result status="valid" time="0.016841" steps="143"/></proof>
   </goal>
   <goal name="search&#39;vc.22" expl="integer overflow" proved="true">
-  <proof prover="0"><result status="valid" time="0.034007" steps="163736"/></proof>
+  <proof prover="0"><result status="valid" time="0.034007" steps="163781"/></proof>
   </goal>
   <goal name="search&#39;vc.23" expl="precondition" proved="true">
-  <proof prover="4"><result status="valid" time="0.184656" steps="2510"/></proof>
+  <proof prover="4"><result status="valid" time="0.184656" steps="2543"/></proof>
   </goal>
   <goal name="search&#39;vc.24" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.027197" steps="133843"/></proof>
+  <proof prover="0"><result status="valid" time="0.027197" steps="133858"/></proof>
   </goal>
   <goal name="search&#39;vc.25" expl="precondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.021902" steps="133918"/></proof>
+  <proof prover="0"><result status="valid" time="0.021902" steps="133933"/></proof>
   </goal>
   <goal name="search&#39;vc.26" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.028925" steps="139120"/></proof>
+  <proof prover="0"><result status="valid" time="0.028925" steps="139135"/></proof>
   </goal>
   <goal name="search&#39;vc.27" expl="loop invariant preservation" proved="true">
-  <proof prover="4"><result status="valid" time="0.172712" steps="2420"/></proof>
+  <proof prover="4"><result status="valid" time="0.172712" steps="2382"/></proof>
   </goal>
   <goal name="search&#39;vc.28" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.356437" steps="42545"/></proof>
+  <proof prover="3"><result status="valid" time="0.179799" steps="42727"/></proof>
   </goal>
   <goal name="search&#39;vc.29" expl="loop invariant preservation" proved="true">
-  <proof prover="3"><result status="valid" time="0.049810" steps="18083"/></proof>
+  <proof prover="3"><result status="valid" time="0.049810" steps="18265"/></proof>
   </goal>
   <goal name="search&#39;vc.30" expl="loop invariant preservation" proved="true">
-  <proof prover="0"><result status="valid" time="0.288665" steps="1157238"/></proof>
+  <proof prover="0"><result status="valid" time="0.288665" steps="1157301"/></proof>
   </goal>
   <goal name="search&#39;vc.31" expl="loop invariant preservation" proved="true">
-  <proof prover="1"><result status="valid" time="0.667284" steps="119833"/></proof>
+  <proof prover="1"><result status="valid" time="0.667284" steps="119908"/></proof>
   </goal>
   <goal name="search&#39;vc.32" expl="postcondition" proved="true">
-  <proof prover="3"><result status="valid" time="0.139861" steps="22034"/></proof>
+  <proof prover="3"><result status="valid" time="0.139861" steps="22216"/></proof>
   </goal>
   <goal name="search&#39;vc.33" expl="postcondition" proved="true">
-  <proof prover="0"><result status="valid" time="0.171700" steps="617325"/></proof>
+  <proof prover="0"><result status="valid" time="0.171700" steps="617319"/></proof>
   </goal>
   <goal name="search&#39;vc.34" expl="postcondition" proved="true">
   <proof prover="0"><result status="valid" time="0.138599" steps="269178"/></proof>
diff --git a/creusot/tests/should_succeed/vector/08_haystack/why3shapes.gz b/creusot/tests/should_succeed/vector/08_haystack/why3shapes.gz
index 27247e78f752725780ea05c532b0d0115fb1acb5..0e0a6e27491570094a75226389c698b065f62c78 100644
GIT binary patch
literal 2916
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
O^Z5T2ke-jhHvj+&)1}h@

literal 2920
zcmV-u3zzgCiwFP!00000|LqysZW~APU0<QM-L(;*tNLD83kZgV)=L)HUCd*MzQ$%k
zaU7DelfU2Uo*8l|niOs2aH0T)SY2ILS6A0D{`-r|^*jGQuP;C3)q377|9Pn{U;N`@
z^P`_HKLBgk&4qt;<rjJRcJs~??PAe=oZWRPFR%f>>1Olg#^3p$*mciwKyzF0wt<^L
zsBLfrO~Xe}H(~@;BS%m+Y6L~2N02vW1hKJX;QLjV?qgm<L;7F7Y=8jXfT*fr1PmcZ
z42~EWG3<6K21fx?(N!+)>ytj;z2E#yz$j>IJi)5>Uds7>?+<d%#;-QBMfaA(>Aju2
zOe6mGTYu%}>sgh(CH~*)K36SeMUt=l$}it$x`DX3U(Y|}8C?_YnaF-T<Trc#W^xQ#
z+Tu234Pt|Qpcw!|$Poi0hK+LU?L-X1C}1kO%7s0BC<eEo7)5WdpI~yK|JSF3j`?NI
zX^|rwjmweb$mTo$Gu=V_;iAURZux$dW4BE64ZVWm+aa`PfaeM7mF{thllB$9S?KPU
zY3;x9_r#*a-$s>tOL0NJ`E6cZcJxeJl2p{}k-(!O>dT3&|1BIv#x5EO!^-Z}HVzA>
z(j5e2-RYxgKe{8^i|DGPTxnq_Q1Q$ruV&=yLtMAs^peYR;OoJw`aA0uiCp(_iyY#q
zM^@`D7G3xLk~sZp?w1>a=9@{}k<4XY?S%Eqt(ac!t1CJMUFs|U!+3rBbmWgazlrZ=
zezOg=F&1__pT6=FtPQG@yyWW%$-YT&UCpNbo567}{0!CEM~9KV_cZwL#%00F$!@Ca
zw|O(GU`5go_|UCZ-N&5%cK1W&mcE@Y{i1C8k+h`ovUTy=$L{X^B5!hHmG<@Q+isaB
z=JtBm^W|Hj>Xr@aLF((-f4jTf5Zs5f?4ea&cZ&}ts>qn$C^1OgtqQ0Asjg>nmG9Tx
zhC;E6eE{Y~zVmA$nXz8xF1?Iq9Oa8u=Q)Jz=+;Ex%a;ci^tfpM@<?!;e~fyFFH+v1
z@ekPuSA*6(613*#DSGWWZuj35!cUt~ZM08v{q>|49XP?>^bu%lp86vB(`<)DRDFvl
z$;TqZPiK{C8ZXc4Kc$x_;mOs5R1JlqKDI41P1+UN=M5OB#>Fmi!!~pG`0eRolD&70
z)q`{e4}G>%aXb|d9+)4wn5XdKa8AlnLVt$YIC2bm7E4m=*JVRZwo_e?iMB`5&q1Ok
zq9M@=?MKqmMVGB<qJ>KPAko60cb8~68>DU%t&n4)Ezpo?p&HX0CAX;+PUTkECf6e8
zGm<Nuon7HXdWDnu70;1=G{fR&9Og)_JIjEE!$FosLY5T9;h1qlp5<^X&z`9p&$<Fi
zwH%L`QVqo?Uc-rOOU}SP-AZ;O-JYdlFGcYptzf=C#jtJW8POeW_^I{&{(|z%diKFD
z?(<PvQrSN{JwoHC@N(MN&!>y;A5H}dPE$`zF0`lS8(t{(3_rm^Cflv?w!aQpz}vw<
z)7wYL>1v?l^EzAj8^2iR9q+K&qo;KSA9npzvetR^!S|Eg*~yuY;=a5t@X^R}fXN60
zXLsT_(jOf^kditnVZOWGmHF<G8Fk3}1Lu5Lw$mhky_edrhs@r=b)WnR_yvkd5m)Qj
zsWJvb9UEws@9?@Wi5*TVV%>gGa4)vYzANaf>Zl5Q#|P5!im#v0He7#pmx9;RXuY1M
z7Tk3|qxlcICB8it_njCd^}t~hR`8$b=XxahQBFffo@@-SPj;BoL)3=!deY){RU!S<
za@FZl5w^vtGyBD=5bx4?XG)pcvQxz=m<MH}Gh;==O1hP_tIyqb=IClDm%Wz-J1ouN
zEK*eJ6aB+fla7^vj&{y$aMrlFKiIz7_V0`i_040i`}CKxe^15%_Sna)5=@itV6V>S
zJoRmZ^GCmJ5Xn~6c)$GSjF)=UvNOK9{El|revWTH=LY*PSo2y#=J14DJI;OR*#=dE
zdNN1vbI|twnEh~Dj~@f<&F%KElTQbS^oPp%5!VdLX?rVnyht{^$X?9jy4CLLPFlD}
zb@UY%mB$oK-|i_@w^Z0^zma^G;AwG`{>`o*C~S&7Xb3(wTJQRSMwhxls79+deLFzV
zUOUie@riDrV0X=cHvYSwt|q!(7>Skpy+9$Utw2*70s7mMiAM7`eIG#3&<8X_7f>)S
zwxn333^19--V8LXQRdCj3s-Ef<TuJ5l=?=g?Iy|Ut8p*%s!@7Z%zK0?h(^hNB^xE)
zj4X!*yivR-AX2`o-;Kf^hmER7+M0XhanhlB2G+=4oV1PXO_ZiuBy|-;zm2x^BdJ2`
z@o6@)zLv>aPbxI+($>wue$l+XY`fJZ_35kl?&89?&{{AIq!yf6V}wyEnWPb|76LB;
ztphX;v;*ZpIuH&xp&Wn%=BzVLJLRMkjyu9Sb`cn$6qZXHB#W&^i!nx?xioDXEM6iw
zWDZF3=Ltq{tS}}U$Xp8uQ7Awi80WeLl|&Ux#P|iWTZO@9rbD)|jVk+?>;H`y$y+NW
zzeMFwIuu_fUTWJKuOlT?joF0O^K1n8AVl&UR5jf=)L*PYcyfU^5|WU*O|7;jg(NeA
ziD25^>-LFCvP?>c7*J^?c=Rf_QL~t&$q_lGqJ$GUcN`rjm_0>X(3t2&MPo>%Y!Q{h
zXrgZ0$ddQ6YU974LKZ+LVPk9)NVF9ENot^p1PpH}ATGIeTsdwW*A<YzlxDDoTNzu<
zg4CX?mK$D9>wRD);TFw;{YuIy$XkZm7%v0`rl1oC&X7W%&aI@X%DEHh1pIndM8W6{
z2Td2OrRDS#SqcVyrgW54Tc3!ef6NIo$2g&#P)?8t@oShPMdSvQu~Bjpkgg<U9X-ps
z&B1~lvY3=k3MaXf_?wyLnL;aDnOUGGPLH0Fwh}2NiWN|;8S<c#P6?+7K&QYdGS)h2
zoYYRL-`?tIc?yaySAm4=QPVRMR?s{4k}1;`tCewz_|(^CJCzyE0b)iEIRI!)MFD)v
zvu9#RuF8J3<_jas*e_e7L#s@XprxkQ7CC2%YG`@j8l2`%V+GjPd5*-<2Q3sA5o6|U
zZh0w2RDhJVt&sH`;tz2Ym4Y=?SYnik>)=D8E?Ux)W(ugBrg{|lM>$Pm^oCO_ln5yc
z35uEMbF_g|W7%dX@569s&=~@l({wnJqMcS>|KVZ=%3Ham&d_?LGL0@?w<7Q?61O6k
z!&&XDa#lJkoaN4<vxH>MkU-;%c1AfPoe_UfA4qO7AvFgqOF`$Rf7CFv*>Eipq8>`l
zpWO{~RFu>b`3ztK{q-e>Ca<*(mU{de3g$U@LJC2X5sfa?F4A~m4E3%Npp{1D<b^Nu
z60pKf{Pxf73l+5136){emWd9jCs0}oZ|Se^ry^h^gyFOBM~*bzQf0OrGPJ=^eWt;}
zwq6P9<57(t0G^RctW2Kjh^4xyERA>y6AvI5We=se=Y5EX=jIlzLZB8pP%W{LsI<`3
z&5R7%Q~MxNxP-zB#VI74k#I)RSxGJO**M92loo^nMjfJ!)KW#DhS6G?MU2T0PQqvJ
zC{#4lsLX6qt>&OK1r!a$mS*BIz}vx5{4ZybvkcAQ2B}an<wfv`OG&di2YPxmT%j49
zMY4*pXX+#_7}rQ0zwq9c&t%HCXlxLi8h<M9gOk*=cNFC)OXW=~nrQ{~#NLF~3bd9b
zs&GM8M~U+Cboq$*m&>Rn2(8jBg5@4^>q9hJP?pbJ2EZ)%C6s2M$R)wQ{e{{P(Pya<
zLGj2@1`lXsXt|LpV{cs%T{@TF%StMVCZ`<Gaz+MG%dLSkMh$q7o+&k0NfOIAf+UkP
S0rKC^;{O9$szxxuHvj<1bJD8-

diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
index e043f3fb01..833d1b8779 100644
--- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg
+++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg
@@ -17,12 +17,18 @@ module Core_Ptr_Unique_Unique_Type
     | C_Unique (Core_Ptr_NonNull_NonNull_Type.t_nonnull 't) (Core_Marker_PhantomData_Type.t_phantomdata 't)
     
 end
-module Alloc_RawVec_RawVec_Type
+module Alloc_RawVec_Cap_Type
   use prelude.UIntSize
   use prelude.Int
+  type t_cap  =
+    | C_Cap usize
+    
+end
+module Alloc_RawVec_RawVec_Type
+  use Alloc_RawVec_Cap_Type as Alloc_RawVec_Cap_Type
   use Core_Ptr_Unique_Unique_Type as Core_Ptr_Unique_Unique_Type
   type t_rawvec 't 'a =
-    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) usize 'a
+    | C_RawVec (Core_Ptr_Unique_Unique_Type.t_unique 't) (Alloc_RawVec_Cap_Type.t_cap) 'a
     
 end
 module Alloc_Vec_Vec_Type
diff --git a/creusot/tests/should_succeed/vector/09_capacity/why3shapes.gz b/creusot/tests/should_succeed/vector/09_capacity/why3shapes.gz
index 0714a03fa3189fba8cfb862320f484f11bf0571f..4c0b0560b35cf49bf4b9c555288e5ca09930b2ac 100644
GIT binary patch
literal 457
zcmV;)0XF_0iwFP!00000|D}@8j+-zL#_v1@x3-*Y<3Dk=dq9;Cynv5IgKZL20$YNz
z+qbXnm{cLzTzbHahMDj84W6%AdOE<HJ*8(mpZaP1p7J#NmMp)aAJ0UgGKN^;GJ%&@
z80@%T4&b_mVR~<lld%I*1eU4k#|4h?fr`+3S5o`5d#{p6<xcX|g~om~!?f=;f}e^i
zEN*jI$kp)TzdYh&MGNOmBUexs@QF#U{aJgx)G*uAG@Pvy;dLCD7i&;E)jK)NwnCV#
z9qcl0sB+Ct0@`Vwr*~_<9DiM!yMBa0;T(G7&N7rSg{hB1j>6t9P5A1^%6uk^r4Q_o
zJ3C~xL;l$zfs=3Tkkt+fXmqhd6vlz(u-G5yF<WlYGLq#LEQ280aAm{_PZa?w)h;4;
z?h%iHd<$IfieG{L(wy!sk4GN$yzr+LS1j_F-?cK{J}ndVBkiU+)dv{&w$bngx?lbz
z&o)e>n_Uu7Ohk90e$vb}`tKoJf~{Lai>Ff!7Ut$`b&?2!dD~IR@(y)o*P`4aY6KI=
zGHzs-vWixDMJimOq}7IUY4e@nozavTB!$}^E~LStMKTo?zZU-m3upw%VFUmGCU@Z=

literal 456
zcmV;(0XP01iwFP!00000|D}@8Zlf>|#_v1@w{AJv#((gtJ)o5kynv6324fPm1iA#J
z?c1;Im{cKYE_=X?hMDj84W1uKeB8sEImRb5ANy(i8S^-Kj+VdBk0+u~5kjnR5y8tV
z3})Odd$3)@Fum7@sWk&q1eU4p#{~}XfpXt_Q&PFKeXo*8rB?FQhOPOihiTVq1iuwk
zSX}24pR3@-eYwZSissgvMz)~H;Tw}q`@8mPsbDt8X*d}x!mBVc&)1-`syA|&ZG|vf
zJJ@+#UuB!E1T@n;Pw%FEI{Y~|cl`*1!YTBvJqusP6s9inISM<o)c&g*D{+}5l-{vJ
zZtRfN4*9Y}JSW}SA*&ta(dcZ4D2zSLVzE2WeYV`9WgyE7Sb9OU;mUv&jw(D<sw^Ng
z`-uBMz6Gv##V<g2X;$}|#{-W#p8wN|D;9Xn?OG9TpB9n&6?fAd>phG+Q)_qw-7lZf
zqYcyOYL`S16TzLR9yD`}{(A_UVC&Y<{NYrCfw?{z9YumlM7x#<LYs~-$}`51Nx4WR
y&P2mwR?;#pNr_7o@kUCn0YlbG*)fyRjtdM8r&@5vSu9F^DgFnZ+BXJa1ONc<ciYJT